Skip to content

Commit

Permalink
Update deps+use global.json
Browse files Browse the repository at this point in the history
  • Loading branch information
Cryptoc1 committed May 25, 2024
1 parent 62d4e18 commit 8b4971d
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 16 deletions.
15 changes: 8 additions & 7 deletions .github/workflows/default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,7 @@ jobs:
with:
cache: true
cache-dependency-path: ./**/packages.lock.json
dotnet-version: |
9.0.x
8.0.x
global-json-file: global.json

- name: restore
run: dotnet workload restore && dotnet restore --locked-mode
Expand All @@ -57,9 +55,7 @@ jobs:
with:
cache: true
cache-dependency-path: ./**/packages.lock.json
dotnet-version: |
9.0.x
8.0.x
global-json-file: global.json

- name: restore
run: dotnet workload restore && dotnet restore --locked-mode
Expand All @@ -78,10 +74,15 @@ jobs:

runs-on: windows-latest
steps:
- name: checkout
uses: actions/checkout@v4
with:
sparse-checkout: global.json

- name: setup dotnet
uses: actions/setup-dotnet@v4
with:
dotnet-version: 9.0.x
global-json-file: global.json

- name: download artifact
uses: actions/download-artifact@v4
Expand Down
7 changes: 7 additions & 0 deletions global.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"sdk": {
"allowPrerelease": false,
"rollForward": "latestMajor",
"version": "8.0.300"
}
}
12 changes: 6 additions & 6 deletions sample/App/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@
},
"Microsoft.NET.ILLink.Tasks": {
"type": "Direct",
"requested": "[8.0.4, )",
"resolved": "8.0.4",
"contentHash": "PZb5nfQ+U19nhnmnR9T1jw+LTmozhuG2eeuzuW5A7DqxD/UXW2ucjmNJqnqOuh8rdPzM3MQXoF8AfFCedJdCUw=="
"requested": "[8.0.5, )",
"resolved": "8.0.5",
"contentHash": "4ISW1Ndgz86FkIbu5rVlMqhhtojdy5rUlxC/N+9kPh9qbYcvHiCvYbHKzAPVIx9OPYIjT9trXt7JI42Y5Ukq6A=="
},
"Microsoft.NET.Sdk.WebAssembly.Pack": {
"type": "Direct",
"requested": "[9.0.0-preview.4.24266.19, )",
"resolved": "9.0.0-preview.4.24266.19",
"contentHash": "7aicx4kEEXI97NdeTl4XJf8X6wq+DOBtPJvqsFRlnxt8dHt9JM67YTeVzF9/qi5Utj9d4NDSVK/Bs9T5GP9Plw=="
"requested": "[8.0.5, )",
"resolved": "8.0.5",
"contentHash": "CABBOqZZEDgiVSjkwUr+pJEGEtQbrT+6dltzJnBDap7mOSvfn53+zwb112hRGB7ynm9ikAocGZTUp+GizbH7XQ=="
},
"MessagePack": {
"type": "Transitive",
Expand Down
6 changes: 3 additions & 3 deletions src/App/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@
},
"Microsoft.NET.ILLink.Tasks": {
"type": "Direct",
"requested": "[8.0.4, )",
"resolved": "8.0.4",
"contentHash": "PZb5nfQ+U19nhnmnR9T1jw+LTmozhuG2eeuzuW5A7DqxD/UXW2ucjmNJqnqOuh8rdPzM3MQXoF8AfFCedJdCUw=="
"requested": "[8.0.5, )",
"resolved": "8.0.5",
"contentHash": "4ISW1Ndgz86FkIbu5rVlMqhhtojdy5rUlxC/N+9kPh9qbYcvHiCvYbHKzAPVIx9OPYIjT9trXt7JI42Y5Ukq6A=="
},
"Microsoft.SourceLink.GitHub": {
"type": "Direct",
Expand Down

0 comments on commit 8b4971d

Please sign in to comment.