Skip to content

Commit

Permalink
Update dependencies, plus merge fix (dotnet#1134)
Browse files Browse the repository at this point in the history
Two distinct changes here.

First, update all dependencies. Dependabot should have updated these, but that PR is failing the build. It appears that some updates weren't correctly applied.

Second, a quick work-around for the "update on merge" action so that it runs correctly. It's block, so I just copied the shell script and made mods. I'll take a bit longer to create a single script that reports errors and warnings correctly when the actions run not as part of a PR validation. I need to do some research there, and this is blocking us.
  • Loading branch information
BillWagner authored Jun 24, 2024
1 parent 3202f19 commit 6dcbde0
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/update-on-merge.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
id: renumber-sections
run: |
cd tools
./run-section-renumber.sh
./run-section-renumber-update.sh
shell: bash

- name: Create pull request
Expand Down
4 changes: 2 additions & 2 deletions tools/ExampleTester/ExampleTester.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@

<ItemGroup>
<PackageReference Include="Microsoft.Build.Locator" Version="1.7.8" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.9.2" />
<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.9.2" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.10.0" />
<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.10.0" />
<PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
</ItemGroup>

Expand Down
8 changes: 4 additions & 4 deletions tools/MarkdownConverter/MarkdownConverter.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@

<ItemGroup>
<PackageReference Include="csharp2colorized" Version="1.0.3" />
<PackageReference Include="DocumentFormat.OpenXml" Version="3.0.1" />
<PackageReference Include="FSharp.Core" Version="8.0.101" />
<PackageReference Include="FSharp.Formatting" Version="19.1.1" />
<PackageReference Include="Microsoft.CodeAnalysis" Version="4.8.0" />
<PackageReference Include="DocumentFormat.OpenXml" Version="3.0.2" />
<PackageReference Include="FSharp.Core" Version="8.0.300" />
<PackageReference Include="FSharp.Formatting" Version="20.0.1" />
<PackageReference Include="Microsoft.CodeAnalysis" Version="4.10.0" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion tools/Utilities/Utilities.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Octokit" Version="11.0.1" />
<PackageReference Include="Octokit" Version="12.0.0" />
<PackageReference Include="System.Text.Json" Version="8.0.3" />
</ItemGroup>

Expand Down
12 changes: 12 additions & 0 deletions tools/run-section-renumber-update.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#!/bin/bash

set -e

declare -r PROJECT=StandardAnchorTags

dotnet run --project $PROJECT -- --owner dotnet --repo csharpstandard

if [ -n "$GITHUB_OUTPUT" ]
then
echo "status=success" >> $GITHUB_OUTPUT
fi

0 comments on commit 6dcbde0

Please sign in to comment.