Skip to content

Commit 83a88aa

Browse files
vseanreesermsftvseanreesermsft
committed
Merged PR 54331: merge from public
2 parents 4848e2c + 9f57035 commit 83a88aa

File tree

16 files changed

+85
-44
lines changed

16 files changed

+85
-44
lines changed

‎.azure/pipelines/ci-public.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -578,7 +578,7 @@ stages:
578578
isAzDOTestingJob: true
579579
buildArgs: --all --test --binaryLog /p:RunTemplateTests=false /p:SkipHelixReadyTests=true $(_InternalRuntimeDownloadArgs)
580580
beforeBuild:
581-
- bash: "./eng/scripts/install-nginx-mac.sh"
581+
- bash: "./eng/scripts/install-nginx.sh"
582582
displayName: Installing Nginx
583583
artifacts:
584584
- name: MacOS_Test_Logs_Attempt_$(System.JobAttempt)
@@ -599,7 +599,7 @@ stages:
599599
useHostedUbuntu: false
600600
buildArgs: --all --test --binaryLog /p:RunTemplateTests=false /p:SkipHelixReadyTests=true $(_InternalRuntimeDownloadArgs)
601601
beforeBuild:
602-
- bash: "./eng/scripts/install-nginx-linux.sh"
602+
- bash: "./eng/scripts/install-nginx.sh"
603603
displayName: Installing Nginx
604604
- bash: "echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p"
605605
displayName: Increase inotify limit

‎.azure/pipelines/ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -639,7 +639,7 @@ extends:
639639
isAzDOTestingJob: true
640640
buildArgs: --all --test --binaryLog /p:RunTemplateTests=false /p:SkipHelixReadyTests=true $(_InternalRuntimeDownloadArgs)
641641
beforeBuild:
642-
- bash: "./eng/scripts/install-nginx-mac.sh"
642+
- bash: "./eng/scripts/install-nginx.sh"
643643
displayName: Installing Nginx
644644
artifacts:
645645
- name: MacOS_Test_Logs_Attempt_$(System.JobAttempt)
@@ -660,7 +660,7 @@ extends:
660660
useHostedUbuntu: false
661661
buildArgs: --all --test --binaryLog /p:RunTemplateTests=false /p:SkipHelixReadyTests=true $(_InternalRuntimeDownloadArgs)
662662
beforeBuild:
663-
- bash: "./eng/scripts/install-nginx-linux.sh"
663+
- bash: "./eng/scripts/install-nginx.sh"
664664
displayName: Installing Nginx
665665
- bash: "echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p"
666666
displayName: Increase inotify limit

‎eng/Version.Details.xml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -388,39 +388,39 @@
388388
<Uri>https://github.com/dotnet/winforms</Uri>
389389
<Sha>9b822fd70005bf5632d12fe76811b97b3dd044e4</Sha>
390390
</Dependency>
391-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25460.1">
391+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25503.3">
392392
<Uri>https://github.com/dotnet/arcade</Uri>
393-
<Sha>43df065432cbc74c0fa44d7569a0c31f64883f03</Sha>
393+
<Sha>f8c9a6d12e5a3b281661924da22d7de1cc6ab27d</Sha>
394394
</Dependency>
395395
<!-- Intermediate is necessary for source build. -->
396-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25460.1">
396+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25503.3">
397397
<Uri>https://github.com/dotnet/arcade</Uri>
398-
<Sha>43df065432cbc74c0fa44d7569a0c31f64883f03</Sha>
398+
<Sha>f8c9a6d12e5a3b281661924da22d7de1cc6ab27d</Sha>
399399
<SourceBuild RepoName="arcade" ManagedOnly="true" />
400400
</Dependency>
401-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25460.1">
401+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25503.3">
402402
<Uri>https://github.com/dotnet/arcade</Uri>
403-
<Sha>43df065432cbc74c0fa44d7569a0c31f64883f03</Sha>
403+
<Sha>f8c9a6d12e5a3b281661924da22d7de1cc6ab27d</Sha>
404404
</Dependency>
405-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.25460.1">
405+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.25503.3">
406406
<Uri>https://github.com/dotnet/arcade</Uri>
407-
<Sha>43df065432cbc74c0fa44d7569a0c31f64883f03</Sha>
407+
<Sha>f8c9a6d12e5a3b281661924da22d7de1cc6ab27d</Sha>
408408
</Dependency>
409-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25460.1">
409+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25503.3">
410410
<Uri>https://github.com/dotnet/arcade</Uri>
411-
<Sha>43df065432cbc74c0fa44d7569a0c31f64883f03</Sha>
411+
<Sha>f8c9a6d12e5a3b281661924da22d7de1cc6ab27d</Sha>
412412
</Dependency>
413-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.25460.1">
413+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.25503.3">
414414
<Uri>https://github.com/dotnet/arcade</Uri>
415-
<Sha>43df065432cbc74c0fa44d7569a0c31f64883f03</Sha>
415+
<Sha>f8c9a6d12e5a3b281661924da22d7de1cc6ab27d</Sha>
416416
</Dependency>
417-
<Dependency Name="Microsoft.Extensions.Diagnostics.Testing" Version="9.10.0-preview.1.25456.3">
417+
<Dependency Name="Microsoft.Extensions.Diagnostics.Testing" Version="9.10.0-preview.1.25475.1">
418418
<Uri>https://github.com/dotnet/extensions</Uri>
419-
<Sha>3645ccc33d29294341654cc37d0c448ed47c836c</Sha>
419+
<Sha>c4e57fb1e6b8403a527ea3cd737f1146dcbc1f31</Sha>
420420
</Dependency>
421-
<Dependency Name="Microsoft.Extensions.TimeProvider.Testing" Version="9.10.0-preview.1.25456.3">
421+
<Dependency Name="Microsoft.Extensions.TimeProvider.Testing" Version="9.10.0-preview.1.25475.1">
422422
<Uri>https://github.com/dotnet/extensions</Uri>
423-
<Sha>3645ccc33d29294341654cc37d0c448ed47c836c</Sha>
423+
<Sha>c4e57fb1e6b8403a527ea3cd737f1146dcbc1f31</Sha>
424424
</Dependency>
425425
<Dependency Name="NuGet.Frameworks" Version="6.2.4">
426426
<Uri>https://github.com/nuget/nuget.client</Uri>

‎eng/Versions.props‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,8 @@
143143
<SystemIOHashingVersion>9.0.11</SystemIOHashingVersion>
144144
<SystemRuntimeCachingVersion>9.0.11</SystemRuntimeCachingVersion>
145145
<!-- Packages from dotnet/extensions -->
146-
<MicrosoftExtensionsDiagnosticsTestingVersion>9.10.0-preview.1.25456.3</MicrosoftExtensionsDiagnosticsTestingVersion>
147-
<MicrosoftExtensionsTimeProviderTestingVersion>9.10.0-preview.1.25456.3</MicrosoftExtensionsTimeProviderTestingVersion>
146+
<MicrosoftExtensionsDiagnosticsTestingVersion>9.10.0-preview.1.25475.1</MicrosoftExtensionsDiagnosticsTestingVersion>
147+
<MicrosoftExtensionsTimeProviderTestingVersion>9.10.0-preview.1.25475.1</MicrosoftExtensionsTimeProviderTestingVersion>
148148
<!-- Packages from dotnet/efcore -->
149149
<dotnetefVersion>9.0.11</dotnetefVersion>
150150
<MicrosoftEntityFrameworkCoreInMemoryVersion>9.0.11</MicrosoftEntityFrameworkCoreInMemoryVersion>
@@ -166,10 +166,10 @@
166166
<NuGetVersioningVersion>6.2.4</NuGetVersioningVersion>
167167
<NuGetFrameworksVersion>6.2.4</NuGetFrameworksVersion>
168168
<!-- Packages from dotnet/arcade -->
169-
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.25460.1</MicrosoftDotNetBuildTasksInstallersVersion>
170-
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.25460.1</MicrosoftDotNetBuildTasksTemplatingVersion>
171-
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.25460.1</MicrosoftDotNetRemoteExecutorVersion>
172-
<MicrosoftSourceBuildIntermediatearcadeVersion>9.0.0-beta.25460.1</MicrosoftSourceBuildIntermediatearcadeVersion>
169+
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.25503.3</MicrosoftDotNetBuildTasksInstallersVersion>
170+
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.25503.3</MicrosoftDotNetBuildTasksTemplatingVersion>
171+
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.25503.3</MicrosoftDotNetRemoteExecutorVersion>
172+
<MicrosoftSourceBuildIntermediatearcadeVersion>9.0.0-beta.25503.3</MicrosoftSourceBuildIntermediatearcadeVersion>
173173
<!-- Packages from dotnet/source-build-externals -->
174174
<MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>9.0.0-alpha.1.24575.1</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
175175
<!-- Packages from dotnet/source-build-reference-packages -->

‎eng/common/core-templates/job/publish-build-assets.yml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ parameters:
3434

3535
repositoryAlias: self
3636

37+
officialBuildId: ''
38+
3739
jobs:
3840
- job: Asset_Registry_Publish
3941

@@ -56,6 +58,11 @@ jobs:
5658
value: false
5759
# unconditional - needed for logs publishing (redactor tool version)
5860
- template: /eng/common/core-templates/post-build/common-variables.yml
61+
- name: OfficialBuildId
62+
${{ if ne(parameters.officialBuildId, '') }}:
63+
value: ${{ parameters.officialBuildId }}
64+
${{ else }}:
65+
value: $(Build.BuildNumber)
5966

6067
pool:
6168
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
@@ -100,7 +107,7 @@ jobs:
100107
/p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests'
101108
/p:MaestroApiEndpoint=https://maestro.dot.net
102109
/p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }}
103-
/p:OfficialBuildId=$(Build.BuildNumber)
110+
/p:OfficialBuildId=$(OfficialBuildId)
104111
condition: ${{ parameters.condition }}
105112
continueOnError: ${{ parameters.continueOnError }}
106113

‎eng/common/core-templates/jobs/jobs.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ parameters:
4444
artifacts: {}
4545
is1ESPipeline: ''
4646
repositoryAlias: self
47+
officialBuildId: ''
4748

4849
# Internal resources (telemetry, microbuild) can only be accessed from non-public projects,
4950
# and some (Microbuild) should only be applied to non-PR cases for internal builds.
@@ -119,3 +120,4 @@ jobs:
119120
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
120121
signingValidationAdditionalParameters: ${{ parameters.signingValidationAdditionalParameters }}
121122
repositoryAlias: ${{ parameters.repositoryAlias }}
123+
officialBuildId: ${{ parameters.officialBuildId }}

‎eng/common/post-build/nuget-verification.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
[CmdletBinding(PositionalBinding = $false)]
3131
param(
3232
[string]$NuGetExePath,
33-
[string]$PackageSource = "https://api.nuget.org/v3/index.json",
33+
[string]$PackageSource = "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json",
3434
[string]$DownloadPath,
3535
[Parameter(ValueFromRemainingArguments = $true)]
3636
[string[]]$args

‎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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"jdk": "latest"
2828
},
2929
"msbuild-sdks": {
30-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25460.1",
31-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25460.1"
30+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25503.3",
31+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25503.3"
3232
}
3333
}

0 commit comments

Comments
 (0)