Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update dotnet sdk to latest version @6.0.414 #2852

Merged
merged 4 commits into from
Sep 18, 2023
Merged

Update dotnet sdk to latest version @6.0.414 #2852

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5d65169
Upgrade dotnet sdk to v6.0.414
github-actions[bot] Sep 18, 2023
417cd70
Update computed hashes
github-actions[bot] Sep 18, 2023
243f54e
Merge branch 'main' into feature/dotnetsdk-upgrade/6.0.414
vanZeben Sep 18, 2023
50ae7b3
Add new dotnet asset
vanZeben Sep 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 23 additions & 23 deletions .devcontainer/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
{
"name": "Actions Runner Devcontainer",
"image": "mcr.microsoft.com/devcontainers/base:focal",
"features": {
"ghcr.io/devcontainers/features/docker-in-docker:1": {},
"ghcr.io/devcontainers/features/dotnet": {
"version": "6.0.412"
},
"ghcr.io/devcontainers/features/node:1": {
"version": "16"
}
},
"customizations": {
"vscode": {
"extensions": [
"ms-azuretools.vscode-docker",
"ms-dotnettools.csharp",
"eamodio.gitlens"
]
}
},
"postCreateCommand": "dotnet restore src/Test && dotnet restore src/Runner.PluginHost",
"remoteUser": "vscode"
}
"name": "Actions Runner Devcontainer",
"image": "mcr.microsoft.com/devcontainers/base:focal",
"features": {
"ghcr.io/devcontainers/features/docker-in-docker:1": {},
"ghcr.io/devcontainers/features/dotnet": {
"version": "6.0.414"
},
"ghcr.io/devcontainers/features/node:1": {
"version": "16"
}
},
"customizations": {
"vscode": {
"extensions": [
"ms-azuretools.vscode-docker",
"ms-dotnettools.csharp",
"eamodio.gitlens"
]
}
},
"postCreateCommand": "dotnet restore src/Test && dotnet restore src/Runner.PluginHost",
"remoteUser": "vscode"
}
2 changes: 1 addition & 1 deletion src/Misc/contentHash/dotnetRuntime/linux-arm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7b78ca2997fbe048642d3717ab7321cdd359752b97158f3c67eb3df8786e21d3
7539d33c35b0bc94ee67e3c0de1a6bac5ef89ce8e8efaa110131fa0520a54fb4
2 changes: 1 addition & 1 deletion src/Misc/contentHash/dotnetRuntime/linux-arm64
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6f34c1d501c87c2e22c2278df7152999aca628c66ee4176d32325773487da6d7
d71a31f9a17e1a41d6e1edea596edfa68a0db5948ed160e86f2154a547f4dd10
2 changes: 1 addition & 1 deletion src/Misc/contentHash/dotnetRuntime/linux-x64
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
921ca58050be56e0b84af05e544cab4a151cb66405e815e19c0e0928ef7313f5
3c2f700d8a995efe7895614ee07d9c7880f872d214b45983ad6163e1931870ab
2 changes: 1 addition & 1 deletion src/Misc/contentHash/dotnetRuntime/osx-arm64
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
50f5c147074fc4943b4198b2d9b57c5e94344ab21350b0880ec8e2b85d27152b
b2d85c95ecad13d352f4c7d31c64dbb0d9c6381b48fa5874c4c72a43a025a8a1
2 changes: 1 addition & 1 deletion src/Misc/contentHash/dotnetRuntime/osx-x64
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16269548335b1f2add41a409aa3558c56581b63f280a9a26956707b6370558bd
417d835c1a108619886b4bb5d25988cb6c138eb7b4c00320b1d9455c5630bff9
2 changes: 1 addition & 1 deletion src/Misc/contentHash/dotnetRuntime/win-arm64
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
e4aa6003ec77a2b21f3021927fed48727bde379fafff300f39565ff2fff4dd87
8f35aaecfb53426ea10816442e23065142bab9dd0fb712a29e0fc471d13c44ac
2 changes: 1 addition & 1 deletion src/Misc/contentHash/dotnetRuntime/win-x64
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16ab4c166c58bc4c5600ff055be7ce0a9bb0dd993388114a76efea51e4ea14cb
811c7debdfc54d074385b063b83c997e5360c8a9160cd20fe777713968370063
1 change: 1 addition & 0 deletions src/Misc/runnerdotnetruntimeassets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ mscordaccore_amd64_amd64_6.0.522.21309.dll
mscordaccore_arm64_arm64_6.0.522.21309.dll
mscordaccore_amd64_amd64_6.0.1322.58009.dll
mscordaccore_amd64_amd64_6.0.2023.32017.dll
mscordaccore_amd64_amd64_6.0.2223.42425.dll
mscordbi.dll
mscorlib.dll
mscorrc.debug.dll
Expand Down
2 changes: 1 addition & 1 deletion src/dev.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ DOWNLOAD_DIR="$SCRIPT_DIR/../_downloads/netcore2x"
PACKAGE_DIR="$SCRIPT_DIR/../_package"
PACKAGE_TRIMS_DIR="$SCRIPT_DIR/../_package_trims"
DOTNETSDK_ROOT="$SCRIPT_DIR/../_dotnetsdk"
DOTNETSDK_VERSION="6.0.412"
DOTNETSDK_VERSION="6.0.414"
DOTNETSDK_INSTALLDIR="$DOTNETSDK_ROOT/$DOTNETSDK_VERSION"
RUNNER_VERSION=$(cat runnerversion)

Expand Down
4 changes: 2 additions & 2 deletions src/global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"sdk": {
"version": "6.0.412"
"version": "6.0.414"
}
}
}