From bd0b3b1cec93404c86df7a4c84c110ae38654c9f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 8 Oct 2025 02:03:59 +0000 Subject: [PATCH 1/2] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20251007.1 On relative base path root Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.25474.1 -> To Version 8.0.0-alpha.1.25507.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6f3b9cf17f31..284cb879b985 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -338,9 +338,9 @@ 9a1c3e1b7f0c8763d4c96e593961a61a72679a7b - + https://github.com/dotnet/source-build-reference-packages - fcf0226bfea241d4e4f127600b6c3ae10d772e9a + 7a3266db9e2b7422e8277f04932eff9b7064b66e diff --git a/eng/Versions.props b/eng/Versions.props index 59ebc4acc814..f43ced5accd8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -168,7 +168,7 @@ 8.0.0-alpha.1.25202.2 - 8.0.0-alpha.1.25474.1 + 8.0.0-alpha.1.25507.1 2.0.0-beta-23228-03 From 79be6100fe1054bc98b74739405af86a1c1b23a6 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Wed, 8 Oct 2025 06:43:06 -0700 Subject: [PATCH 2/2] Fix nginx --- .azure/pipelines/ci-public.yml | 4 ++-- .azure/pipelines/ci.yml | 4 ++-- eng/scripts/install-nginx-mac.sh | 5 ----- eng/scripts/{install-nginx-linux.sh => install-nginx.sh} | 2 +- 4 files changed, 5 insertions(+), 10 deletions(-) delete mode 100755 eng/scripts/install-nginx-mac.sh rename eng/scripts/{install-nginx-linux.sh => install-nginx.sh} (75%) diff --git a/.azure/pipelines/ci-public.yml b/.azure/pipelines/ci-public.yml index f7d33e8e4c09..34c5e44593cf 100644 --- a/.azure/pipelines/ci-public.yml +++ b/.azure/pipelines/ci-public.yml @@ -545,7 +545,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) @@ -566,7 +566,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 diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index 5e4e2e533b16..d236fef0212a 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -610,7 +610,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) @@ -631,7 +631,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 diff --git a/eng/scripts/install-nginx-mac.sh b/eng/scripts/install-nginx-mac.sh deleted file mode 100755 index e7df86f57c0a..000000000000 --- a/eng/scripts/install-nginx-mac.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -brew update -brew list openssl || brew install openssl -brew list nginx || brew install nginx diff --git a/eng/scripts/install-nginx-linux.sh b/eng/scripts/install-nginx.sh similarity index 75% rename from eng/scripts/install-nginx-linux.sh rename to eng/scripts/install-nginx.sh index f075a899d1cf..23d71043ed19 100755 --- a/eng/scripts/install-nginx-linux.sh +++ b/eng/scripts/install-nginx.sh @@ -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