Skip to content

Commit 587be77

Browse files
author
Simon Zhao (BEYONDSOFT CONSULTING INC)
committed
Merge branch 'release/9.0.3xx' of https://github.com/dotnet/sdk into darc-release/9.0.3xx-fa58f506-c0af-473a-8264-8d125239b8e4
2 parents 13a41dd + 2a2cfcb commit 587be77

File tree

7 files changed

+52
-39
lines changed

7 files changed

+52
-39
lines changed

‎NuGet.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<!-- Begin: Package sources from dotnet-emsdk -->
2929
<!-- End: Package sources from dotnet-emsdk -->
3030
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
31-
<add key="darc-pub-DotNet-msbuild-Trusted-65391c5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-65391c53/nuget/v3/index.json" />
31+
<add key="darc-pub-DotNet-msbuild-Trusted-d21f833" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-d21f833b/nuget/v3/index.json" />
3232
<!-- End: Package sources from DotNet-msbuild-Trusted -->
3333
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
3434
<!-- End: Package sources from dotnet-roslyn-analyzers -->

‎eng/Version.Details.xml

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -69,18 +69,18 @@
6969
<Sha>e3d8e8ea6df192d864698cdd76984d74135d0d13</Sha>
7070
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
7171
</Dependency>
72-
<Dependency Name="Microsoft.Build" Version="17.14.13">
72+
<Dependency Name="Microsoft.Build" Version="17.14.15">
7373
<Uri>https://github.com/dotnet/msbuild</Uri>
74-
<Sha>65391c53b2d0d47b01039648ea788fe5c6c5eec1</Sha>
74+
<Sha>d21f833b9027346d36a311d538320d58ab7a8895</Sha>
7575
</Dependency>
76-
<Dependency Name="Microsoft.Build.Localization" Version="17.14.13-servicing-25313-14">
76+
<Dependency Name="Microsoft.Build.Localization" Version="17.14.15-servicing-25353-03">
7777
<Uri>https://github.com/dotnet/msbuild</Uri>
78-
<Sha>65391c53b2d0d47b01039648ea788fe5c6c5eec1</Sha>
78+
<Sha>d21f833b9027346d36a311d538320d58ab7a8895</Sha>
7979
</Dependency>
8080
<!-- Intermediate is necessary for source build. -->
81-
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.14.13-servicing-25313-14">
81+
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.14.15-servicing-25353-03">
8282
<Uri>https://github.com/dotnet/msbuild</Uri>
83-
<Sha>65391c53b2d0d47b01039648ea788fe5c6c5eec1</Sha>
83+
<Sha>d21f833b9027346d36a311d538320d58ab7a8895</Sha>
8484
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
8585
</Dependency>
8686
<Dependency Name="Microsoft.FSharp.Compiler" Version="13.9.300-beta.25228.3">
@@ -374,7 +374,7 @@
374374
<Sha>63ae81154c50a1cf9287cc47d8351d55b4289e6d</Sha>
375375
<SourceBuild RepoName="xdt" ManagedOnly="true" />
376376
</Dependency>
377-
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0-preview.25275.3">
377+
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0-preview.25329.4">
378378
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
379379
<Sha>433fa3e4a54010fcac6e8843460e29d33ba07eb7</Sha>
380380
</Dependency>
@@ -383,7 +383,7 @@
383383
<Sha>cf93d992b25a39656803488aacae4c9131a239b4</Sha>
384384
</Dependency>
385385
<!-- Intermediate is necessary for source build. -->
386-
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn-analyzers" Version="9.0.0-preview.25275.3">
386+
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn-analyzers" Version="9.0.0-preview.25329.4">
387387
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
388388
<Sha>433fa3e4a54010fcac6e8843460e29d33ba07eb7</Sha>
389389
<SourceBuild RepoName="roslyn-analyzers" ManagedOnly="true" />
@@ -555,34 +555,34 @@
555555
</Dependency>
556556
</ProductDependencies>
557557
<ToolsetDependencies>
558-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25302.2">
558+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25325.4">
559559
<Uri>https://github.com/dotnet/arcade</Uri>
560-
<Sha>0d52a8b262d35fa2fde84e398cb2e791b8454bd2</Sha>
560+
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
561561
</Dependency>
562-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25302.2">
562+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25325.4">
563563
<Uri>https://github.com/dotnet/arcade</Uri>
564-
<Sha>0d52a8b262d35fa2fde84e398cb2e791b8454bd2</Sha>
564+
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
565565
</Dependency>
566-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25302.2">
566+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25325.4">
567567
<Uri>https://github.com/dotnet/arcade</Uri>
568-
<Sha>0d52a8b262d35fa2fde84e398cb2e791b8454bd2</Sha>
568+
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
569569
</Dependency>
570-
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.25302.2">
570+
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.25325.4">
571571
<Uri>https://github.com/dotnet/arcade</Uri>
572-
<Sha>0d52a8b262d35fa2fde84e398cb2e791b8454bd2</Sha>
572+
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
573573
</Dependency>
574-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25302.2">
574+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25325.4">
575575
<Uri>https://github.com/dotnet/arcade</Uri>
576-
<Sha>0d52a8b262d35fa2fde84e398cb2e791b8454bd2</Sha>
576+
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
577577
</Dependency>
578-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.25302.2">
578+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.25325.4">
579579
<Uri>https://github.com/dotnet/arcade</Uri>
580-
<Sha>0d52a8b262d35fa2fde84e398cb2e791b8454bd2</Sha>
580+
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
581581
</Dependency>
582582
<!-- Intermediate is necessary for source build. -->
583-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25302.2">
583+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25325.4">
584584
<Uri>https://github.com/dotnet/arcade</Uri>
585-
<Sha>0d52a8b262d35fa2fde84e398cb2e791b8454bd2</Sha>
585+
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
586586
<SourceBuild RepoName="arcade" ManagedOnly="true" />
587587
</Dependency>
588588
<Dependency Name="System.Reflection.MetadataLoadContext" Version="9.0.6">
@@ -597,14 +597,14 @@
597597
<Uri>https://github.com/dotnet/arcade-services</Uri>
598598
<Sha>e156e649f28395d9d0ee1e848225a689b59e0fd3</Sha>
599599
</Dependency>
600-
<Dependency Name="Microsoft.DotNet.ScenarioTests.SdkTemplateTests" Version="9.0.0-preview.25316.1">
600+
<Dependency Name="Microsoft.DotNet.ScenarioTests.SdkTemplateTests" Version="9.0.0-preview.25326.1">
601601
<Uri>https://github.com/dotnet/scenario-tests</Uri>
602-
<Sha>45390d82e9b9686adeee65e046b8232f6814bea0</Sha>
602+
<Sha>270606f9f338c1c2dfb255b6f18bbcb5f085a06c</Sha>
603603
</Dependency>
604604
<!-- Intermediate is necessary for source build. -->
605-
<Dependency Name="Microsoft.SourceBuild.Intermediate.scenario-tests" Version="9.0.0-preview.25316.1">
605+
<Dependency Name="Microsoft.SourceBuild.Intermediate.scenario-tests" Version="9.0.0-preview.25326.1">
606606
<Uri>https://github.com/dotnet/scenario-tests</Uri>
607-
<Sha>45390d82e9b9686adeee65e046b8232f6814bea0</Sha>
607+
<Sha>270606f9f338c1c2dfb255b6f18bbcb5f085a06c</Sha>
608608
<SourceBuild RepoName="scenario-tests" ManagedOnly="true" />
609609
</Dependency>
610610
<!--

‎eng/Versions.props

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@
160160
</PropertyGroup>
161161
<PropertyGroup>
162162
<!-- Dependencies from https://github.com/dotnet/roslyn-analyzers -->
163-
<MicrosoftCodeAnalysisNetAnalyzersVersion>9.0.0-preview.25275.3</MicrosoftCodeAnalysisNetAnalyzersVersion>
163+
<MicrosoftCodeAnalysisNetAnalyzersVersion>9.0.0-preview.25329.4</MicrosoftCodeAnalysisNetAnalyzersVersion>
164164
<MicrosoftCodeAnalysisPublicApiAnalyzersVersion>3.12.0-beta1.25357.9</MicrosoftCodeAnalysisPublicApiAnalyzersVersion>
165165
</PropertyGroup>
166166
<PropertyGroup>
@@ -182,8 +182,8 @@
182182
At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes.
183183
184184
Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent -->
185-
<MicrosoftBuildVersion>17.14.13</MicrosoftBuildVersion>
186-
<MicrosoftBuildLocalizationVersion>17.14.13-servicing-25313-14</MicrosoftBuildLocalizationVersion>
185+
<MicrosoftBuildVersion>17.14.15</MicrosoftBuildVersion>
186+
<MicrosoftBuildLocalizationVersion>17.14.15-servicing-25353-03</MicrosoftBuildLocalizationVersion>
187187
<MicrosoftBuildMinimumVersion Condition="'$(DotNetBuildSourceOnly)' != 'true'">17.11.31</MicrosoftBuildMinimumVersion>
188188
<MinimumVSVersion>17.12</MinimumVSVersion>
189189
</PropertyGroup>
@@ -263,7 +263,7 @@
263263
<PropertyGroup Label="Infrastructure and test only dependencies">
264264
<VersionToolsVersion>2.2.0-beta.19072.10</VersionToolsVersion>
265265
<DotnetDebToolVersion>2.0.0</DotnetDebToolVersion>
266-
<MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>9.0.0-preview.25316.1</MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>
266+
<MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>9.0.0-preview.25326.1</MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>
267267
</PropertyGroup>
268268
<PropertyGroup Label="Manually updated">
269269
<!-- Dependencies from https://github.com/microsoft/MSBuildLocator -->
@@ -272,10 +272,10 @@
272272
</PropertyGroup>
273273
<PropertyGroup>
274274
<!-- Dependencies from https://github.com/dotnet/arcade -->
275-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.25302.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
276-
<MicrosoftDotNetSignToolVersion>9.0.0-beta.25302.2</MicrosoftDotNetSignToolVersion>
277-
<MicrosoftDotNetXliffTasksVersion>9.0.0-beta.25302.2</MicrosoftDotNetXliffTasksVersion>
278-
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25302.2</MicrosoftDotNetXUnitExtensionsVersion>
275+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.25325.4</MicrosoftDotNetBuildTasksInstallersPackageVersion>
276+
<MicrosoftDotNetSignToolVersion>9.0.0-beta.25325.4</MicrosoftDotNetSignToolVersion>
277+
<MicrosoftDotNetXliffTasksVersion>9.0.0-beta.25325.4</MicrosoftDotNetXliffTasksVersion>
278+
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25325.4</MicrosoftDotNetXUnitExtensionsVersion>
279279
</PropertyGroup>
280280
<PropertyGroup>
281281
<!-- Dependencies from https://github.com/dotnet/sourcelink -->

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,10 @@ jobs:
134134
signType: $(_SignType)
135135
zipSources: false
136136
feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
137+
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
138+
ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea
139+
${{ else }}:
140+
ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca
137141
env:
138142
TeamName: $(_TeamName)
139143
MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)'

‎eng/common/internal/NuGet.config

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,7 @@
44
<clear />
55
<add key="dotnet-core-internal-tooling" value="https://pkgs.dev.azure.com/devdiv/_packaging/dotnet-core-internal-tooling/nuget/v3/index.json" />
66
</packageSources>
7+
<packageSourceMapping>
8+
<clear />
9+
</packageSourceMapping>
710
</configuration>

‎global.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "9.0.106",
3+
"dotnet": "9.0.107",
44
"runtimes": {
55
"dotnet": [
66
"$(VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion)"
@@ -17,8 +17,8 @@
1717
"cmake": "latest"
1818
},
1919
"msbuild-sdks": {
20-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25302.2",
21-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25302.2",
20+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25325.4",
21+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25325.4",
2222
"Microsoft.Build.NoTargets": "3.7.0",
2323
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1"
2424
}

‎test/Microsoft.NET.Build.Containers.IntegrationTests/DockerRegistryManager.cs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,12 @@ public class DockerRegistryManager
2424
public const string FullyQualifiedBaseImageAspNetDigest = $"{BaseImageSource}/{AspNetBaseImage}@{Net9ImageDigest}";
2525
private static string? s_registryContainerId;
2626

27+
private static string SDK_AzureContainerRegistryImage => "dotnetdhmirror-f8bzbjakh8cga6ab.azurecr.io/registry:2";
28+
private static string Docker_HubRegistryImage => "docker.io/library/registry:2";
29+
30+
// TODO: some logic to pivot between this and Docker Hub
31+
private static string RegistryImageToUse => SDK_AzureContainerRegistryImage;
32+
2733
internal class SameArchManifestPicker : IManifestPicker
2834
{
2935
public PlatformSpecificManifest? PickBestManifestForRid(IReadOnlyDictionary<string, PlatformSpecificManifest> manifestList, string runtimeIdentifier)
@@ -61,7 +67,7 @@ public static async Task StartAndPopulateDockerRegistry(ITestOutputHelper testOu
6167
{
6268
logger.LogInformation("Spawning local registry at '{registry}', attempt #{attempt}.", LocalRegistry, spawnRegistryAttempt);
6369

64-
CommandResult processResult = ContainerCli.RunCommand(testOutput, "--rm", "--publish", "5010:5000", "--detach", "docker.io/library/registry:2").Execute();
70+
CommandResult processResult = ContainerCli.RunCommand(testOutput, "--rm", "--publish", "5010:5000", "--detach", RegistryImageToUse).Execute();
6571

6672
processResult.Should().Pass().And.HaveStdOut();
6773

0 commit comments

Comments
 (0)