Skip to content

Commit d87f340

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-26ed3a34-55df-4ca3-9d36-f67eb0e6daac
2 parents 7686cd8 + 65a62a0 commit d87f340

File tree

4 files changed

+16
-7
lines changed

4 files changed

+16
-7
lines changed

NuGet.config

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,10 @@
3535
<!-- Begin: Package sources from dotnet-runtime -->
3636
<!-- End: Package sources from dotnet-runtime -->
3737
<!-- Begin: Package sources from dotnet-templating -->
38-
<add key="darc-pub-dotnet-templating-f207089" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f207089d/nuget/v3/index.json" />
38+
<add key="darc-pub-dotnet-templating-d23a2ad" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-d23a2ad2/nuget/v3/index.json" />
39+
<add key="darc-pub-dotnet-templating-d23a2ad-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-d23a2ad2-3/nuget/v3/index.json" />
40+
<add key="darc-pub-dotnet-templating-d23a2ad-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-d23a2ad2-2/nuget/v3/index.json" />
41+
<add key="darc-pub-dotnet-templating-d23a2ad-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-d23a2ad2-1/nuget/v3/index.json" />
3942
<!-- End: Package sources from dotnet-templating -->
4043
<!-- Begin: Package sources from dotnet-windowsdesktop -->
4144
<!-- End: Package sources from dotnet-windowsdesktop -->

eng/Version.Details.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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 -->

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)