Skip to content

[release/10.0] Source code updates from dotnet/dotnet #63959

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

Merged
merged 3 commits into from
Oct 8, 2025
+287 −292
Merged

[release/10.0] Source code updates from dotnet/dotnet #63959

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7d20242
Merge release/10.0 into darc-release/10.0-0f82b1ff-ff22-43ce-a50b-869…
dotnet-maestro[bot] Oct 8, 2025
509c09c
Update dependencies from https://github.com/dotnet/dotnet build 286007
dotnet-maestro[bot] Oct 8, 2025
e26d4fe
Change nginx installation to specific version 12.9.1
wtgodbe Oct 8, 2025
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
4 changes: 2 additions & 2 deletions .azure/pipelines/ci-public.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,7 +518,7 @@ stages:
isAzDOTestingJob: true
buildArgs: --all --test --binaryLog /p:RunTemplateTests=false /p:SkipHelixReadyTests=true $(_InternalRuntimeDownloadArgs)
beforeBuild:
- bash: "./eng/scripts/install-nginx-mac.sh"
- bash: "./eng/scripts/install-nginx.sh"
displayName: Installing Nginx
artifacts:
- name: MacOS_Test_Logs_Attempt_$(System.JobAttempt)
Expand All @@ -539,7 +539,7 @@ stages:
useHostedUbuntu: false
buildArgs: --all --test --binaryLog /p:RunTemplateTests=false /p:SkipHelixReadyTests=true $(_InternalRuntimeDownloadArgs)
beforeBuild:
- bash: "./eng/scripts/install-nginx-linux.sh"
- bash: "./eng/scripts/install-nginx.sh"
displayName: Installing Nginx
- bash: "echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p"
displayName: Increase inotify limit
Expand Down
4 changes: 2 additions & 2 deletions .azure/pipelines/ci-unofficial.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -556,7 +556,7 @@ extends:
beforeBuild:
- script: git submodule update --init
displayName: Update submodules
- bash: "./eng/scripts/install-nginx-mac.sh"
- bash: "./eng/scripts/install-nginx.sh"
displayName: Installing Nginx
artifacts:
- name: MacOS_Test_Logs_Attempt_$(System.JobAttempt)
Expand All @@ -579,7 +579,7 @@ extends:
beforeBuild:
- script: git submodule update --init
displayName: Update submodules
- bash: "./eng/scripts/install-nginx-linux.sh"
- bash: "./eng/scripts/install-nginx.sh"
displayName: Installing Nginx
- bash: "echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p"
displayName: Increase inotify limit
Expand Down
4 changes: 2 additions & 2 deletions .azure/pipelines/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -548,7 +548,7 @@ extends:
isAzDOTestingJob: true
buildArgs: --all --test --binaryLog /p:RunTemplateTests=false /p:SkipHelixReadyTests=true $(_InternalRuntimeDownloadArgs)
beforeBuild:
- bash: "./eng/scripts/install-nginx-mac.sh"
- bash: "./eng/scripts/install-nginx.sh"
displayName: Installing Nginx
artifacts:
- name: MacOS_Test_Logs_Attempt_$(System.JobAttempt)
Expand All @@ -569,7 +569,7 @@ extends:
useHostedUbuntu: false
buildArgs: --all --test --binaryLog /p:RunTemplateTests=false /p:SkipHelixReadyTests=true $(_InternalRuntimeDownloadArgs)
beforeBuild:
- bash: "./eng/scripts/install-nginx-linux.sh"
- bash: "./eng/scripts/install-nginx.sh"
displayName: Installing Nginx
- bash: "echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p"
displayName: Increase inotify limit
Expand Down
184 changes: 92 additions & 92 deletions eng/Version.Details.props
View file
Open in desktop

Large diffs are not rendered by default.

370 changes: 185 additions & 185 deletions eng/Version.Details.xml
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 0 additions & 5 deletions eng/scripts/install-nginx-mac.sh
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion eng/scripts/install-nginx-linux.sh → eng/scripts/install-nginx.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ scriptroot="$( cd -P "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
reporoot="$(dirname "$(dirname "$scriptroot")")"
nginxinstall="$reporoot/.tools/nginx"

curl -sSL http://nginx.org/download/nginx-1.26.3.tar.gz --retry 5 | tar zxfv - -C /tmp && cd /tmp/nginx-1.26.3/
curl -sSL http://nginx.org/download/nginx-1.29.1.tar.gz --retry 5 | tar zxfv - -C /tmp && cd /tmp/nginx-1.29.1/
./configure --prefix=$nginxinstall --with-http_ssl_module --without-http_rewrite_module
make
make install
Expand Down
6 changes: 3 additions & 3 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
"jdk": "latest"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25479.115",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25479.115",
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25479.115",
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25507.103",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25507.103",
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25507.103",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.4.0",
"Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2737382"
Expand Down
Loading