Skip to content

Commit

Permalink
Bump to .NET 9 SDK, bump libraries, update actions (#388)
Browse files Browse the repository at this point in the history
  • Loading branch information
veikkoeeva authored Nov 14, 2024
1 parent e1e6448 commit f9450db
Show file tree
Hide file tree
Showing 15 changed files with 247 additions and 247 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
build-mode: none
queries: security-and-quality

- uses: actions/setup-dotnet@4d6c8fcf3c8f7a60068d26b594648e99df24cee3
- uses: actions/setup-dotnet@3e891b0cb619bf60e2c25674b222b8940e2c1c25
with:
global-json-file: global.json

Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -122,15 +122,15 @@ jobs:
fetch-tags: true

- name: Cache Nuget packages '${{ matrix.os }}'
uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8
uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a
with:
path: ${{ env.NUGET_PACKAGES }}
key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
restore-keys: |
${{runner.os}}-nuget-
- name: Setup .NET SDK
uses: actions/setup-dotnet@6bd8b7f7774af54e05809fcc5431931b3eb1ddee
uses: actions/setup-dotnet@3e891b0cb619bf60e2c25674b222b8940e2c1c25
with:
global-json-file: global.json

Expand Down Expand Up @@ -211,7 +211,7 @@ jobs:

#- name: Upload Stryker output artefacts
# if: ${{ matrix.os == 'ubuntu-latest' }}
# uses: actions/upload-artifact@84480863f228bb9747b473957fcc9e309aa96097
# uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882
# with:
# name: 'Stryker output artefacts'
# path: ${{ github.workspace }}/StrykerOutput/
Expand All @@ -220,7 +220,7 @@ jobs:
# run: dotnet publish -c Release --verbosity normal -o ./publish/

# - name: Archive publish results
# uses: actions/upload-artifact@84480863f228bb9747b473957fcc9e309aa96097
# uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882
# with:
# name: Verifiable.Benchmarks
# path: ./publish/*
Expand All @@ -229,7 +229,7 @@ jobs:
# run: dotnet "./publish/Verifiable.Benchmarks.dll" -f "Verifiable.Benchmarks.*"

# - name: Upload benchmark results
# uses: actions/upload-artifact@84480863f228bb9747b473957fcc9e309aa96097
# uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882
# with:
# name: Benchmark_Results
# path: ./BenchmarkDotNet.Artifacts/results/*
Expand All @@ -249,7 +249,7 @@ jobs:

- name: Create test summary
if: ${{ matrix.os == 'ubuntu-latest' && github.event_name == 'pull_request' && github.actor != 'dependabot[bot]' }}
uses: EnricoMi/publish-unit-test-result-action@v2.16.1
uses: EnricoMi/publish-unit-test-result-action@170bf24d20d201b842d7a52403b73ed297e6645b
with:
trx_files: '${{ github.workspace }}/reports/**/*.trx'

Expand All @@ -269,7 +269,7 @@ jobs:

# - name: Upload PR build information artefact
# if: ${{ matrix.os == 'ubuntu-latest' && github.event_name == 'pull_request' && github.actor != 'dependabot[bot]' }}
# uses: actions/upload-artifact@84480863f228bb9747b473957fcc9e309aa96097
# uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882
# with:
# name: 'Test Run'
# path: ${{ github.workspace }}/${{ env.file_name }}
Expand Down Expand Up @@ -313,7 +313,7 @@ jobs:
- name: Upload Verifiable NuGet packages
if: ${{ matrix.os == 'ubuntu-latest' }}
uses: actions/upload-artifact@84480863f228bb9747b473957fcc9e309aa96097
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882
with:
name: nupkg
path: ./nupkgs/*.*
Expand Down
14 changes: 7 additions & 7 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,21 @@
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="BenchmarkDotNet" Version="0.14.0" />
<PackageVersion Include="dotNetRdf" Version="3.2.1" />
<PackageVersion Include="dotNetRdf" Version="3.3.0" />
<PackageVersion Include="LiquidTestReports.Markdown" Version="1.4.3-beta" />
<PackageVersion Include="Microsoft.TSS" Version="2.1.1" />
<PackageVersion Include="NSec.Cryptography" Version="24.4.0" />
<PackageVersion Include="Portable.BouncyCastle" Version="1.9.0" />
<PackageVersion Include="SharpFuzz" Version="2.1.1" />
<PackageVersion Include="SIL.ReleaseTasks" Version="2.6.0-beta0030" />
<PackageVersion Include="SIL.ReleaseTasks" Version="3.0.0" />
<PackageVersion Include="SimpleBase" Version="4.0.2" />
<PackageVersion Include="Spectre.Console" Version="0.49.1" />
<PackageVersion Include="Spectre.Console.Cli" Version="0.49.1" />
<PackageVersion Include="System.Collections.Immutable" Version="9.0.0-rc.2.24473.5" />
<PackageVersion Include="System.Net.Http.Json" Version="9.0.0-rc.2.24473.5" />
<PackageVersion Include="System.Security.Cryptography.ProtectedData" Version="9.0.0-rc.2.24473.5" />
<PackageVersion Include="System.Text.Json" Version="9.0.0-rc.2.24473.5" />
<PackageVersion Include="System.Collections.Immutable" Version="9.0.0" />
<PackageVersion Include="System.Net.Http.Json" Version="9.0.0" />
<PackageVersion Include="System.Security.Cryptography.ProtectedData" Version="9.0.0" />
<PackageVersion Include="System.Text.Json" Version="9.0.0" />
<PackageVersion Include="WinSharpFuzz" Version="1.0.0" />
<PackageVersion Include="CsCheck" Version="4.0.0" />
<PackageVersion Include="CsCheck" Version="4.1.0" />
</ItemGroup>
</Project>
6 changes: 3 additions & 3 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"sdk": {
"allowPrerelease": true,
"version": "9.0.100-rc.2.24474.11"
"allowPrerelease": false,
"version": "9.0.100"
},
"msbuild-sdks": {
"MSTest.Sdk": "3.6.1"
"MSTest.Sdk": "3.6.3"
}
}
28 changes: 14 additions & 14 deletions src/Verifiable.BouncyCastle/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@
},
"SIL.ReleaseTasks": {
"type": "Direct",
"requested": "[2.6.0-beta0030, )",
"resolved": "2.6.0-beta0030",
"contentHash": "iytkRVZ7tEBY00kzB55Qs0/TyfYBJ0GyvRnDPKw2AfakBWrBBTkTCdBSAGmCFoL4Wf6asRFOrenRJ6VGGhCuUQ==",
"requested": "[3.0.0, )",
"resolved": "3.0.0",
"contentHash": "DR0X2IORUVD2gFQCrokzqR0UEaGkVwsuqPOFKdI0BcJN7I1IJxdh6yB2WTMhGIfGg1la5PQDxe7gVotgWyB2jQ==",
"dependencies": {
"Markdig.Signed": "0.30.2"
"Markdig.Signed": "0.37.0"
}
},
"Markdig.Signed": {
"type": "Transitive",
"resolved": "0.30.2",
"contentHash": "nQlUtPbp9pQFoArFSp/CZb699W6pqBG/DSpnWHgKbIuQjAu3KNjTZHaIir2vSCPJZuSMGii7tbI6K+nalh4X7w=="
"resolved": "0.37.0",
"contentHash": "J7Mt1QjKijE7aAK81u5nt4SYPYEvt1odfr4ddMvyOscyNT3PoGfHKKTBB5VBSXJrWZWhfJlcG7hHBLiqawg+nw=="
},
"System.Memory": {
"type": "Transitive",
Expand All @@ -31,8 +31,8 @@
"type": "Project",
"dependencies": {
"SimpleBase": "[4.0.2, )",
"System.Collections.Immutable": "[9.0.0-rc.2.24473.5, )",
"System.Text.Json": "[9.0.0-rc.2.24473.5, )",
"System.Collections.Immutable": "[9.0.0, )",
"System.Text.Json": "[9.0.0, )",
"Verifiable.Jwt": "[0.0.0, )"
}
},
Expand All @@ -50,15 +50,15 @@
},
"System.Collections.Immutable": {
"type": "CentralTransitive",
"requested": "[9.0.0-rc.2.24473.5, )",
"resolved": "9.0.0-rc.2.24473.5",
"contentHash": "03KbZJuPX2uYx03Ui0d6Tdk2dBw8Kt+BeaK/p8jbKundqAt/XKuORf7zTuAIolcLV+OZrTalYEOhMTLAX3QL2g=="
"requested": "[9.0.0, )",
"resolved": "9.0.0",
"contentHash": "QhkXUl2gNrQtvPmtBTQHb0YsUrDiDQ2QS09YbtTTiSjGcf7NBqtYbrG/BE06zcBPCKEwQGzIv13IVdXNOSub2w=="
},
"System.Text.Json": {
"type": "CentralTransitive",
"requested": "[9.0.0-rc.2.24473.5, )",
"resolved": "9.0.0-rc.2.24473.5",
"contentHash": "IsQCD+zBcFhteX7fUrS4cU/GvfLPy8F4oLtC9VBcF1U1qu1gZB/zlAxW8G0kqmAiXI84/gowZtcX1MjLk2QWoQ=="
"requested": "[9.0.0, )",
"resolved": "9.0.0",
"contentHash": "js7+qAu/9mQvnhA4EfGMZNEzXtJCDxgkgj8ohuxq/Qxv+R56G+ljefhiJHOxTNiw54q8vmABCWUwkMulNdlZ4A=="
}
}
}
Expand Down
24 changes: 12 additions & 12 deletions src/Verifiable.Core/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
"net9.0": {
"SIL.ReleaseTasks": {
"type": "Direct",
"requested": "[2.6.0-beta0030, )",
"resolved": "2.6.0-beta0030",
"contentHash": "iytkRVZ7tEBY00kzB55Qs0/TyfYBJ0GyvRnDPKw2AfakBWrBBTkTCdBSAGmCFoL4Wf6asRFOrenRJ6VGGhCuUQ==",
"requested": "[3.0.0, )",
"resolved": "3.0.0",
"contentHash": "DR0X2IORUVD2gFQCrokzqR0UEaGkVwsuqPOFKdI0BcJN7I1IJxdh6yB2WTMhGIfGg1la5PQDxe7gVotgWyB2jQ==",
"dependencies": {
"Markdig.Signed": "0.30.2"
"Markdig.Signed": "0.37.0"
}
},
"SimpleBase": {
Expand All @@ -22,20 +22,20 @@
},
"System.Collections.Immutable": {
"type": "Direct",
"requested": "[9.0.0-rc.2.24473.5, )",
"resolved": "9.0.0-rc.2.24473.5",
"contentHash": "03KbZJuPX2uYx03Ui0d6Tdk2dBw8Kt+BeaK/p8jbKundqAt/XKuORf7zTuAIolcLV+OZrTalYEOhMTLAX3QL2g=="
"requested": "[9.0.0, )",
"resolved": "9.0.0",
"contentHash": "QhkXUl2gNrQtvPmtBTQHb0YsUrDiDQ2QS09YbtTTiSjGcf7NBqtYbrG/BE06zcBPCKEwQGzIv13IVdXNOSub2w=="
},
"System.Text.Json": {
"type": "Direct",
"requested": "[9.0.0-rc.2.24473.5, )",
"resolved": "9.0.0-rc.2.24473.5",
"contentHash": "IsQCD+zBcFhteX7fUrS4cU/GvfLPy8F4oLtC9VBcF1U1qu1gZB/zlAxW8G0kqmAiXI84/gowZtcX1MjLk2QWoQ=="
"requested": "[9.0.0, )",
"resolved": "9.0.0",
"contentHash": "js7+qAu/9mQvnhA4EfGMZNEzXtJCDxgkgj8ohuxq/Qxv+R56G+ljefhiJHOxTNiw54q8vmABCWUwkMulNdlZ4A=="
},
"Markdig.Signed": {
"type": "Transitive",
"resolved": "0.30.2",
"contentHash": "nQlUtPbp9pQFoArFSp/CZb699W6pqBG/DSpnWHgKbIuQjAu3KNjTZHaIir2vSCPJZuSMGii7tbI6K+nalh4X7w=="
"resolved": "0.37.0",
"contentHash": "J7Mt1QjKijE7aAK81u5nt4SYPYEvt1odfr4ddMvyOscyNT3PoGfHKKTBB5VBSXJrWZWhfJlcG7hHBLiqawg+nw=="
},
"System.Memory": {
"type": "Transitive",
Expand Down
12 changes: 6 additions & 6 deletions src/Verifiable.DecentralizedWebNode/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@
"net9.0": {
"SIL.ReleaseTasks": {
"type": "Direct",
"requested": "[2.6.0-beta0030, )",
"resolved": "2.6.0-beta0030",
"contentHash": "iytkRVZ7tEBY00kzB55Qs0/TyfYBJ0GyvRnDPKw2AfakBWrBBTkTCdBSAGmCFoL4Wf6asRFOrenRJ6VGGhCuUQ==",
"requested": "[3.0.0, )",
"resolved": "3.0.0",
"contentHash": "DR0X2IORUVD2gFQCrokzqR0UEaGkVwsuqPOFKdI0BcJN7I1IJxdh6yB2WTMhGIfGg1la5PQDxe7gVotgWyB2jQ==",
"dependencies": {
"Markdig.Signed": "0.30.2"
"Markdig.Signed": "0.37.0"
}
},
"Markdig.Signed": {
"type": "Transitive",
"resolved": "0.30.2",
"contentHash": "nQlUtPbp9pQFoArFSp/CZb699W6pqBG/DSpnWHgKbIuQjAu3KNjTZHaIir2vSCPJZuSMGii7tbI6K+nalh4X7w=="
"resolved": "0.37.0",
"contentHash": "J7Mt1QjKijE7aAK81u5nt4SYPYEvt1odfr4ddMvyOscyNT3PoGfHKKTBB5VBSXJrWZWhfJlcG7hHBLiqawg+nw=="
}
}
}
Expand Down
12 changes: 6 additions & 6 deletions src/Verifiable.Jwt/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@
"net9.0": {
"SIL.ReleaseTasks": {
"type": "Direct",
"requested": "[2.6.0-beta0030, )",
"resolved": "2.6.0-beta0030",
"contentHash": "iytkRVZ7tEBY00kzB55Qs0/TyfYBJ0GyvRnDPKw2AfakBWrBBTkTCdBSAGmCFoL4Wf6asRFOrenRJ6VGGhCuUQ==",
"requested": "[3.0.0, )",
"resolved": "3.0.0",
"contentHash": "DR0X2IORUVD2gFQCrokzqR0UEaGkVwsuqPOFKdI0BcJN7I1IJxdh6yB2WTMhGIfGg1la5PQDxe7gVotgWyB2jQ==",
"dependencies": {
"Markdig.Signed": "0.30.2"
"Markdig.Signed": "0.37.0"
}
},
"Markdig.Signed": {
"type": "Transitive",
"resolved": "0.30.2",
"contentHash": "nQlUtPbp9pQFoArFSp/CZb699W6pqBG/DSpnWHgKbIuQjAu3KNjTZHaIir2vSCPJZuSMGii7tbI6K+nalh4X7w=="
"resolved": "0.37.0",
"contentHash": "J7Mt1QjKijE7aAK81u5nt4SYPYEvt1odfr4ddMvyOscyNT3PoGfHKKTBB5VBSXJrWZWhfJlcG7hHBLiqawg+nw=="
}
}
}
Expand Down
34 changes: 17 additions & 17 deletions src/Verifiable.Microsoft/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,23 @@
"net9.0": {
"SIL.ReleaseTasks": {
"type": "Direct",
"requested": "[2.6.0-beta0030, )",
"resolved": "2.6.0-beta0030",
"contentHash": "iytkRVZ7tEBY00kzB55Qs0/TyfYBJ0GyvRnDPKw2AfakBWrBBTkTCdBSAGmCFoL4Wf6asRFOrenRJ6VGGhCuUQ==",
"requested": "[3.0.0, )",
"resolved": "3.0.0",
"contentHash": "DR0X2IORUVD2gFQCrokzqR0UEaGkVwsuqPOFKdI0BcJN7I1IJxdh6yB2WTMhGIfGg1la5PQDxe7gVotgWyB2jQ==",
"dependencies": {
"Markdig.Signed": "0.30.2"
"Markdig.Signed": "0.37.0"
}
},
"System.Security.Cryptography.ProtectedData": {
"type": "Direct",
"requested": "[9.0.0-rc.2.24473.5, )",
"resolved": "9.0.0-rc.2.24473.5",
"contentHash": "WmEKZcNdOoUSEVQVTs8LsD0WdnliOij0G4s9ljfVTFekI82JWk3WfvlpFzDsc7sXO12w/ckXrkaaRkiUBT8Gyw=="
"requested": "[9.0.0, )",
"resolved": "9.0.0",
"contentHash": "CJW+x/F6fmRQ7N6K8paasTw9PDZp4t7G76UjGNlSDgoHPF0h08vTzLYbLZpOLEJSg35d5wy2jCXGo84EN05DpQ=="
},
"Markdig.Signed": {
"type": "Transitive",
"resolved": "0.30.2",
"contentHash": "nQlUtPbp9pQFoArFSp/CZb699W6pqBG/DSpnWHgKbIuQjAu3KNjTZHaIir2vSCPJZuSMGii7tbI6K+nalh4X7w=="
"resolved": "0.37.0",
"contentHash": "J7Mt1QjKijE7aAK81u5nt4SYPYEvt1odfr4ddMvyOscyNT3PoGfHKKTBB5VBSXJrWZWhfJlcG7hHBLiqawg+nw=="
},
"System.Memory": {
"type": "Transitive",
Expand All @@ -31,8 +31,8 @@
"type": "Project",
"dependencies": {
"SimpleBase": "[4.0.2, )",
"System.Collections.Immutable": "[9.0.0-rc.2.24473.5, )",
"System.Text.Json": "[9.0.0-rc.2.24473.5, )",
"System.Collections.Immutable": "[9.0.0, )",
"System.Text.Json": "[9.0.0, )",
"Verifiable.Jwt": "[0.0.0, )"
}
},
Expand All @@ -50,15 +50,15 @@
},
"System.Collections.Immutable": {
"type": "CentralTransitive",
"requested": "[9.0.0-rc.2.24473.5, )",
"resolved": "9.0.0-rc.2.24473.5",
"contentHash": "03KbZJuPX2uYx03Ui0d6Tdk2dBw8Kt+BeaK/p8jbKundqAt/XKuORf7zTuAIolcLV+OZrTalYEOhMTLAX3QL2g=="
"requested": "[9.0.0, )",
"resolved": "9.0.0",
"contentHash": "QhkXUl2gNrQtvPmtBTQHb0YsUrDiDQ2QS09YbtTTiSjGcf7NBqtYbrG/BE06zcBPCKEwQGzIv13IVdXNOSub2w=="
},
"System.Text.Json": {
"type": "CentralTransitive",
"requested": "[9.0.0-rc.2.24473.5, )",
"resolved": "9.0.0-rc.2.24473.5",
"contentHash": "IsQCD+zBcFhteX7fUrS4cU/GvfLPy8F4oLtC9VBcF1U1qu1gZB/zlAxW8G0kqmAiXI84/gowZtcX1MjLk2QWoQ=="
"requested": "[9.0.0, )",
"resolved": "9.0.0",
"contentHash": "js7+qAu/9mQvnhA4EfGMZNEzXtJCDxgkgj8ohuxq/Qxv+R56G+ljefhiJHOxTNiw54q8vmABCWUwkMulNdlZ4A=="
}
}
}
Expand Down
Loading

0 comments on commit f9450db

Please sign in to comment.