Skip to content

Commit 569fc4c

Browse files
[main] Source code updates from dotnet/dotnet (#63958)
[main] Source code updates from dotnet/dotnet - Change nginx installation to specific version 12.9.1
1 parent 318c481 commit 569fc4c

File tree

8 files changed

+287
-292
lines changed

8 files changed

+287
-292
lines changed

.azure/pipelines/ci-public.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -518,7 +518,7 @@ stages:
518518
isAzDOTestingJob: true
519519
buildArgs: --all --test --binaryLog /p:RunTemplateTests=false /p:SkipHelixReadyTests=true $(_InternalRuntimeDownloadArgs)
520520
beforeBuild:
521-
- bash: "./eng/scripts/install-nginx-mac.sh"
521+
- bash: "./eng/scripts/install-nginx.sh"
522522
displayName: Installing Nginx
523523
artifacts:
524524
- name: MacOS_Test_Logs_Attempt_$(System.JobAttempt)
@@ -539,7 +539,7 @@ stages:
539539
useHostedUbuntu: false
540540
buildArgs: --all --test --binaryLog /p:RunTemplateTests=false /p:SkipHelixReadyTests=true $(_InternalRuntimeDownloadArgs)
541541
beforeBuild:
542-
- bash: "./eng/scripts/install-nginx-linux.sh"
542+
- bash: "./eng/scripts/install-nginx.sh"
543543
displayName: Installing Nginx
544544
- bash: "echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p"
545545
displayName: Increase inotify limit

.azure/pipelines/ci-unofficial.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -556,7 +556,7 @@ extends:
556556
beforeBuild:
557557
- script: git submodule update --init
558558
displayName: Update submodules
559-
- bash: "./eng/scripts/install-nginx-mac.sh"
559+
- bash: "./eng/scripts/install-nginx.sh"
560560
displayName: Installing Nginx
561561
artifacts:
562562
- name: MacOS_Test_Logs_Attempt_$(System.JobAttempt)
@@ -579,7 +579,7 @@ extends:
579579
beforeBuild:
580580
- script: git submodule update --init
581581
displayName: Update submodules
582-
- bash: "./eng/scripts/install-nginx-linux.sh"
582+
- bash: "./eng/scripts/install-nginx.sh"
583583
displayName: Installing Nginx
584584
- bash: "echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p"
585585
displayName: Increase inotify limit

.azure/pipelines/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -548,7 +548,7 @@ extends:
548548
isAzDOTestingJob: true
549549
buildArgs: --all --test --binaryLog /p:RunTemplateTests=false /p:SkipHelixReadyTests=true $(_InternalRuntimeDownloadArgs)
550550
beforeBuild:
551-
- bash: "./eng/scripts/install-nginx-mac.sh"
551+
- bash: "./eng/scripts/install-nginx.sh"
552552
displayName: Installing Nginx
553553
artifacts:
554554
- name: MacOS_Test_Logs_Attempt_$(System.JobAttempt)
@@ -569,7 +569,7 @@ extends:
569569
useHostedUbuntu: false
570570
buildArgs: --all --test --binaryLog /p:RunTemplateTests=false /p:SkipHelixReadyTests=true $(_InternalRuntimeDownloadArgs)
571571
beforeBuild:
572-
- bash: "./eng/scripts/install-nginx-linux.sh"
572+
- bash: "./eng/scripts/install-nginx.sh"
573573
displayName: Installing Nginx
574574
- bash: "echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p"
575575
displayName: Increase inotify limit

eng/Version.Details.props

Lines changed: 92 additions & 92 deletions
Large diffs are not rendered by default.

eng/Version.Details.xml

Lines changed: 185 additions & 185 deletions
Large diffs are not rendered by default.

eng/scripts/install-nginx-mac.sh

Lines changed: 0 additions & 5 deletions
This file was deleted.

eng/scripts/install-nginx-linux.sh renamed to eng/scripts/install-nginx.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ scriptroot="$( cd -P "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
66
reporoot="$(dirname "$(dirname "$scriptroot")")"
77
nginxinstall="$reporoot/.tools/nginx"
88

9-
curl -sSL http://nginx.org/download/nginx-1.26.3.tar.gz --retry 5 | tar zxfv - -C /tmp && cd /tmp/nginx-1.26.3/
9+
curl -sSL http://nginx.org/download/nginx-1.29.1.tar.gz --retry 5 | tar zxfv - -C /tmp && cd /tmp/nginx-1.29.1/
1010
./configure --prefix=$nginxinstall --with-http_ssl_module --without-http_rewrite_module
1111
make
1212
make install

global.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@
3232
"jdk": "latest"
3333
},
3434
"msbuild-sdks": {
35-
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25506.102",
36-
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25506.102",
37-
"Microsoft.DotNet.SharedFramework.Sdk": "11.0.0-beta.25506.102",
35+
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25507.102",
36+
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25507.102",
37+
"Microsoft.DotNet.SharedFramework.Sdk": "11.0.0-beta.25507.102",
3838
"Microsoft.Build.NoTargets": "3.7.0",
3939
"Microsoft.Build.Traversal": "3.4.0",
4040
"Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2737382"

0 commit comments

Comments
 (0)