Skip to content

Commit a2c9bbb

Browse files
author
Simon Zhao (BEYONDSOFT CONSULTING INC)
committed
Merge branch 'release/8.0.3xx' of https://github.com/dotnet/sdk into darc-release/8.0.3xx-86790119-c2ec-4f19-a122-df8e00cb8545
2 parents fbee30e + 86df84c commit a2c9bbb

File tree

7 files changed

+42
-24
lines changed

7 files changed

+42
-24
lines changed

‎NuGet.config

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,18 @@
1515
<!-- Begin: Package sources from dotnet-aspnetcore -->
1616
<!-- End: Package sources from dotnet-aspnetcore -->
1717
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
18-
<add key="darc-pub-DotNet-msbuild-Trusted-bb7294f-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-bb7294f7-1/nuget/v3/index.json" />
18+
<add key="darc-pub-DotNet-msbuild-Trusted-dbc02fd" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-dbc02fd5/nuget/v3/index.json" />
1919
<!-- End: Package sources from DotNet-msbuild-Trusted -->
2020
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
2121
<!-- End: Package sources from dotnet-roslyn-analyzers -->
2222
<!-- Begin: Package sources from dotnet-runtime -->
2323
<!-- End: Package sources from dotnet-runtime -->
2424
<!-- Begin: Package sources from dotnet-templating -->
25-
<add key="darc-pub-dotnet-templating-fc618ad" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-fc618ad8/nuget/v3/index.json" />
25+
<add key="darc-pub-dotnet-templating-7994f94" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-7994f94e/nuget/v3/index.json" />
26+
<add key="darc-pub-dotnet-templating-7994f94-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-7994f94e-4/nuget/v3/index.json" />
27+
<add key="darc-pub-dotnet-templating-7994f94-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-7994f94e-3/nuget/v3/index.json" />
28+
<add key="darc-pub-dotnet-templating-7994f94-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-7994f94e-2/nuget/v3/index.json" />
29+
<add key="darc-pub-dotnet-templating-7994f94-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-7994f94e-1/nuget/v3/index.json" />
2630
<!-- End: Package sources from dotnet-templating -->
2731
<!-- Begin: Package sources from dotnet-windowsdesktop -->
2832
<!-- End: Package sources from dotnet-windowsdesktop -->

‎eng/Version.Details.xml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -55,17 +55,17 @@
5555
<Uri>https://github.com/dotnet/emsdk</Uri>
5656
<Sha>2b0cca8ad3a88e02fe0878139009ffffde071f1f</Sha>
5757
</Dependency>
58-
<Dependency Name="Microsoft.Build" Version="17.10.32">
58+
<Dependency Name="Microsoft.Build" Version="17.10.33">
5959
<Uri>https://github.com/dotnet/msbuild</Uri>
60-
<Sha>bb7294f72e2779834a7898b8d7f1d8c54eac9845</Sha>
60+
<Sha>dbc02fd53b9594bf912231e2955694827ed18884</Sha>
6161
</Dependency>
62-
<Dependency Name="Microsoft.Build.Localization" Version="17.10.32-servicing-25313-10">
62+
<Dependency Name="Microsoft.Build.Localization" Version="17.10.33-servicing-25353-02">
6363
<Uri>https://github.com/dotnet/msbuild</Uri>
64-
<Sha>bb7294f72e2779834a7898b8d7f1d8c54eac9845</Sha>
64+
<Sha>dbc02fd53b9594bf912231e2955694827ed18884</Sha>
6565
</Dependency>
66-
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.10.32-servicing-25313-10">
66+
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.10.33-servicing-25353-02">
6767
<Uri>https://github.com/dotnet/msbuild</Uri>
68-
<Sha>bb7294f72e2779834a7898b8d7f1d8c54eac9845</Sha>
68+
<Sha>dbc02fd53b9594bf912231e2955694827ed18884</Sha>
6969
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
7070
</Dependency>
7171
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.8.301-beta.24271.6">
@@ -491,22 +491,22 @@
491491
</Dependency>
492492
</ProductDependencies>
493493
<ToolsetDependencies>
494-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25310.3">
494+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25326.1">
495495
<Uri>https://github.com/dotnet/arcade</Uri>
496-
<Sha>2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1</Sha>
496+
<Sha>6e3320b5eaab29bd1bff1f398c7f4e18ef0ed57d</Sha>
497497
<SourceBuild RepoName="arcade" ManagedOnly="true" />
498498
</Dependency>
499-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25310.3">
499+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25326.1">
500500
<Uri>https://github.com/dotnet/arcade</Uri>
501-
<Sha>2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1</Sha>
501+
<Sha>6e3320b5eaab29bd1bff1f398c7f4e18ef0ed57d</Sha>
502502
</Dependency>
503-
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25310.3">
503+
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25326.1">
504504
<Uri>https://github.com/dotnet/arcade</Uri>
505-
<Sha>2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1</Sha>
505+
<Sha>6e3320b5eaab29bd1bff1f398c7f4e18ef0ed57d</Sha>
506506
</Dependency>
507-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25310.3">
507+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25326.1">
508508
<Uri>https://github.com/dotnet/arcade</Uri>
509-
<Sha>2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1</Sha>
509+
<Sha>6e3320b5eaab29bd1bff1f398c7f4e18ef0ed57d</Sha>
510510
</Dependency>
511511
<Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.1">
512512
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>

‎eng/Versions.props

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</PropertyGroup>
1212
<!-- Repo Version Information -->
1313
<PropertyGroup>
14-
<VersionPrefix>8.0.315</VersionPrefix>
14+
<VersionPrefix>8.0.316</VersionPrefix>
1515
<WorkloadsFeatureBand>8.0.300</WorkloadsFeatureBand>
1616
<!-- Enable to remove prerelease label. -->
1717
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">true</StabilizePackageVersion>
@@ -36,7 +36,7 @@
3636
<SystemCollectionsImmutablePackageVersion>7.0.0</SystemCollectionsImmutablePackageVersion>
3737
<SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
3838
<SystemReflectionMetadataVersion>7.0.0</SystemReflectionMetadataVersion>
39-
<MicrosoftDotNetSignToolVersion>8.0.0-beta.25310.3</MicrosoftDotNetSignToolVersion>
39+
<MicrosoftDotNetSignToolVersion>8.0.0-beta.25326.1</MicrosoftDotNetSignToolVersion>
4040
<MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
4141
<SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0</SystemSecurityCryptographyProtectedDataPackageVersion>
4242
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
@@ -124,7 +124,7 @@
124124
</PropertyGroup>
125125
<PropertyGroup>
126126
<!-- Dependencies from https://github.com/Microsoft/msbuild -->
127-
<MicrosoftBuildPackageVersion>17.10.32</MicrosoftBuildPackageVersion>
127+
<MicrosoftBuildPackageVersion>17.10.33</MicrosoftBuildPackageVersion>
128128
<MicrosoftBuildCurrentPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildCurrentPackageVersion>
129129
<!-- Some tasks and the resolver will need to run in an MSBuild that is older than the very latest,
130130
so target one that matches the version in minimumMSBuildVersion.
@@ -133,7 +133,7 @@
133133
<MicrosoftBuildPackageVersion Condition="'$(DotNetBuildFromSource)' != 'true'">17.8.29</MicrosoftBuildPackageVersion>
134134
<MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>
135135
<MicrosoftBuildRuntimePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildRuntimePackageVersion>
136-
<MicrosoftBuildLocalizationPackageVersion>17.10.32-servicing-25313-10</MicrosoftBuildLocalizationPackageVersion>
136+
<MicrosoftBuildLocalizationPackageVersion>17.10.33-servicing-25353-02</MicrosoftBuildLocalizationPackageVersion>
137137
<MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
138138
<MicrosoftBuildTasksCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildTasksCorePackageVersion>
139139
<MicrosoftBuildTasksCoreVersion>$(MicrosoftBuildTasksCorePackageVersion)</MicrosoftBuildTasksCoreVersion>
@@ -213,7 +213,7 @@
213213
<PropertyGroup>
214214
<FluentAssertionsVersion>6.12.0</FluentAssertionsVersion>
215215
<FluentAssertionsJsonVersion>6.1.0</FluentAssertionsJsonVersion>
216-
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25310.3</MicrosoftDotNetXUnitExtensionsVersion>
216+
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25326.1</MicrosoftDotNetXUnitExtensionsVersion>
217217
<MoqPackageVersion>4.18.4</MoqPackageVersion>
218218
<XunitCombinatorialVersion>1.3.2</XunitCombinatorialVersion>
219219
<MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>8.0.0-beta.23607.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>

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

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

‎eng/common/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
continueOnError: ${{ parameters.continueOnError }}

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
}
1515
},
1616
"msbuild-sdks": {
17-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25310.3",
18-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25310.3"
17+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25326.1",
18+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25326.1"
1919
}
2020
}

‎src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerRegistryManager.cs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,12 @@ public class DockerRegistryManager
2121
public const string FullyQualifiedBaseImageAspNet = $"{BaseImageSource}/{AspNetBaseImage}:{Net8ImageTag}";
2222
private static string? s_registryContainerId;
2323

24+
private static string SDK_AzureContainerRegistryImage => "dotnetdhmirror-f8bzbjakh8cga6ab.azurecr.io/registry:2";
25+
private static string Docker_HubRegistryImage => "docker.io/library/registry:2";
26+
27+
// TODO: some logic to pivot between this and Docker Hub
28+
private static string RegistryImageToUse => SDK_AzureContainerRegistryImage;
29+
2430
internal class SameArchManifestPicker : IManifestPicker
2531
{
2632
public PlatformSpecificManifest? PickBestManifestForRid(IReadOnlyDictionary<string, PlatformSpecificManifest> manifestList, string runtimeIdentifier)
@@ -52,7 +58,7 @@ public static async Task StartAndPopulateDockerRegistry(ITestOutputHelper testOu
5258
{
5359
logger.LogInformation("Spawning local registry at '{registry}', attempt #{attempt}.", LocalRegistry, spawnRegistryAttempt);
5460

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

5763
processResult.Should().Pass().And.HaveStdOut();
5864

0 commit comments

Comments
 (0)