Skip to content

Commit 2e75eab

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
committed
Merge main into darc-main-fd7392c9-7ce8-47b6-9b0b-3b69c685dada
2 parents 1ce4716 + 9503f97 commit 2e75eab

File tree

161 files changed

+278
-99
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

161 files changed

+278
-99
lines changed

‎.config/dotnet-tools.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"microsoft.dotnet.darc": {
6-
"version": "1.1.0-beta.25330.2",
6+
"version": "1.1.0-beta.25358.3",
77
"commands": [
88
"darc"
99
]

‎eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -541,21 +541,21 @@
541541
<Uri>https://github.com/dotnet/dotnet</Uri>
542542
<Sha>eaa19c281d34580a8168cff9ce1e7337da8bfe4f</Sha>
543543
</Dependency>
544-
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.25330.2">
544+
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.25358.3">
545545
<Uri>https://github.com/dotnet/arcade-services</Uri>
546-
<Sha>9d0b640e7b68a2f791bd30f2b6ae0da8860996cc</Sha>
546+
<Sha>afa79da3b68fd0fe48d90ea7fcbffbf7789c6d7f</Sha>
547547
</Dependency>
548-
<Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.25330.2">
548+
<Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.25358.3">
549549
<Uri>https://github.com/dotnet/arcade-services</Uri>
550-
<Sha>9d0b640e7b68a2f791bd30f2b6ae0da8860996cc</Sha>
550+
<Sha>afa79da3b68fd0fe48d90ea7fcbffbf7789c6d7f</Sha>
551551
</Dependency>
552-
<Dependency Name="Microsoft.Testing.Platform" Version="1.8.0-preview.25352.4">
552+
<Dependency Name="Microsoft.Testing.Platform" Version="1.8.0-preview.25357.5">
553553
<Uri>https://github.com/microsoft/testfx</Uri>
554-
<Sha>97137bdc544f35c9de5a09010741dac23160c261</Sha>
554+
<Sha>5f68c32577a976e1d878700f1abb3a6a27e1e803</Sha>
555555
</Dependency>
556-
<Dependency Name="MSTest" Version="3.10.0-preview.25352.4">
556+
<Dependency Name="MSTest" Version="3.10.0-preview.25357.5">
557557
<Uri>https://github.com/microsoft/testfx</Uri>
558-
<Sha>97137bdc544f35c9de5a09010741dac23160c261</Sha>
558+
<Sha>5f68c32577a976e1d878700f1abb3a6a27e1e803</Sha>
559559
</Dependency>
560560
<Dependency Name="Microsoft.Extensions.Configuration.Ini" Version="10.0.0-preview.7.25351.106">
561561
<Uri>https://github.com/dotnet/dotnet</Uri>

‎eng/Versions.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<UsingToolVSSDK>true</UsingToolVSSDK>
3131
<FlagNetStandard1XDependencies Condition="'$(DotNetBuildSourceOnly)' == 'true'">true</FlagNetStandard1XDependencies>
3232
<!-- This property is only used in the dotnet test integration tests. -->
33-
<MicrosoftTestingPlatformVersion>1.8.0-preview.25352.4</MicrosoftTestingPlatformVersion>
33+
<MicrosoftTestingPlatformVersion>1.8.0-preview.25357.5</MicrosoftTestingPlatformVersion>
3434
</PropertyGroup>
3535
<PropertyGroup Label="Servicing version information">
3636
<VersionFeature21>30</VersionFeature21>
@@ -89,7 +89,7 @@
8989
</PropertyGroup>
9090
<PropertyGroup>
9191
<!-- Dependency from https://github.com/dotnet/arcade-services -->
92-
<MicrosoftDotNetDarcLibVersion>1.1.0-beta.25330.2</MicrosoftDotNetDarcLibVersion>
92+
<MicrosoftDotNetDarcLibVersion>1.1.0-beta.25358.3</MicrosoftDotNetDarcLibVersion>
9393
</PropertyGroup>
9494
<PropertyGroup>
9595
<!-- Dependency from https://github.com/dotnet/aspire -->
@@ -323,7 +323,7 @@
323323
<AwesomeAssertionsVersion>8.0.2</AwesomeAssertionsVersion>
324324
<AwesomeAssertionsJsonVersion>8.0.0</AwesomeAssertionsJsonVersion>
325325
<MoqPackageVersion>4.18.4</MoqPackageVersion>
326-
<MSTestVersion>3.10.0-preview.25352.4</MSTestVersion>
326+
<MSTestVersion>3.10.0-preview.25357.5</MSTestVersion>
327327
<XunitCombinatorialVersion>1.3.2</XunitCombinatorialVersion>
328328
<MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>8.0.0-beta.23607.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>
329329
<BenchmarkDotNetPackageVersion>0.14.0</BenchmarkDotNetPackageVersion>

‎sdk.slnx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -313,6 +313,7 @@
313313
<Project Path="test/Microsoft.NET.Sdk.Publish.Tasks.Tests/Microsoft.NET.Sdk.Publish.Tasks.Tests.csproj" />
314314
<Project Path="test/Microsoft.NET.Sdk.Razor.Tests/Microsoft.NET.Sdk.Razor.Tests.csproj" />
315315
<Project Path="test/Microsoft.NET.Sdk.Razor.Tool.Tests/Microsoft.NET.Sdk.Razor.Tool.Tests.csproj" />
316+
<Project Path="test/Microsoft.NET.Sdk.StaticWebAssets.Tests/Microsoft.NET.Sdk.StaticWebAssets.Tests.csproj" />
316317
<Project Path="test/Microsoft.NET.Sdk.Web.Tests/Microsoft.NET.Sdk.Web.Tests.csproj" />
317318
<Project Path="test/Microsoft.NET.Sdk.WorkloadManifestReader.Tests/Microsoft.NET.Sdk.WorkloadManifestReader.Tests.csproj" />
318319
<Project Path="test/Microsoft.NET.TestFramework/Microsoft.NET.TestFramework.csproj" />

‎src/Layout/redist/dnx.ps1

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# dnx.ps1
2+
# PowerShell script to launch dotnet.exe with 'dnx' and all passed arguments
3+
$scriptDir = Split-Path -Parent $MyInvocation.MyCommand.Definition
4+
$dotnet = Join-Path $scriptDir 'dotnet.exe'
5+
& $dotnet dnx @Args
6+
exit $LASTEXITCODE

‎src/Layout/redist/targets/GenerateInstallerLayout.targets

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,13 @@
6464
Overwrite="true" />
6565
</Target>
6666

67-
<Target Name="LayoutDnxScript">
68-
<PropertyGroup>
69-
<DnxScriptSource Condition="$([MSBuild]::IsOSPlatform('WINDOWS'))">dnx.cmd</DnxScriptSource>
70-
<DnxScriptSource Condition="!$([MSBuild]::IsOSPlatform('WINDOWS'))">dnx</DnxScriptSource>
71-
</PropertyGroup>
72-
<Copy SourceFiles="$(DnxScriptSource)" DestinationFolder="$(RedistInstallerLayoutPath)" />
67+
<Target Name="LayoutDnxShim">
68+
<ItemGroup>
69+
<DnxShimSource Condition="$([MSBuild]::IsOSPlatform('Windows'))" Include="dnx.cmd" />
70+
<DnxShimSource Condition="$([MSBuild]::IsOSPlatform('Windows'))" Include="dnx.ps1" />
71+
<DnxShimSource Condition="!$([MSBuild]::IsOSPlatform('WINDOWS'))" Include="dnx" />
72+
</ItemGroup>
73+
<Copy SourceFiles="@(DnxShimSource)" DestinationFolder="$(RedistInstallerLayoutPath)" />
7374

7475
<!-- Mark script as executable -->
7576
<Exec Command="chmod 755 &quot;$(RedistInstallerLayoutPath)/dnx&quot;" Condition="!$([MSBuild]::IsOSPlatform('Windows'))" />
@@ -92,7 +93,7 @@
9293
LayoutManifests;
9394
LayoutBaselineWorkloadSet;
9495
LayoutWorkloadUserLocalMarker;
95-
LayoutDnxScript;
96+
LayoutDnxShim;
9697
CrossgenLayout;
9798
ReplaceBundledRuntimePackFilesWithSymbolicLinks"
9899
AfterTargets="AfterBuild" />
@@ -115,7 +116,7 @@
115116
SkipUnchangedFiles="true" />
116117

117118
<!-- Copy dnx script to root dotnet folder (which will map to DOTNETHOME) -->
118-
<Copy SourceFiles="dnx.cmd" DestinationFolder="$(IntermediateSdkInstallerOutputPath)" />
119+
<Copy SourceFiles="@(DnxShimSource)" DestinationFolder="$(IntermediateSdkInstallerOutputPath)" />
119120

120121
</Target>
121122

‎src/StaticWebAssetsSdk/Tasks/Microsoft.NET.Sdk.StaticWebAssets.Tasks.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343

4444
<ItemGroup>
4545
<InternalsVisibleTo Include="Microsoft.NET.Sdk.Razor.Tests" />
46+
<InternalsVisibleTo Include="Microsoft.NET.Sdk.StaticWebAssets.Tests" />
4647
</ItemGroup>
4748

4849
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">

‎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

‎test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/BlazorLegacyIntegrationTest50.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Licensed to the .NET Foundation under one or more agreements.
22
// The .NET Foundation licenses this file to you under the MIT license.
33

4-
using Microsoft.NET.Sdk.Razor.Tests;
4+
using Microsoft.NET.Sdk.StaticWebAssets.Tests;
55

66
namespace Microsoft.NET.Sdk.BlazorWebAssembly.Tests
77
{

‎test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/BlazorLegacyIntegrationTest60.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,20 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33

44
using Microsoft.AspNetCore.StaticWebAssets.Tasks;
5-
using Microsoft.NET.Sdk.Razor.Tests;
5+
using Microsoft.NET.Sdk.StaticWebAssets.Tests;
66

77
namespace Microsoft.NET.Sdk.BlazorWebAssembly.Tests
88
{
99
public class BlazorLegacyIntegrationTest60(ITestOutputHelper log)
1010
: IsolatedNuGetPackageFolderAspNetSdkBaselineTest(log, nameof(BlazorLegacyIntegrationTest60))
1111
{
1212

13-
protected override string EmbeddedResourcePrefix =>
13+
protected override string EmbeddedResourcePrefix =>
1414
string.Join('.', "Microsoft.NET.Sdk.BlazorWebAssembly.Tests", "StaticWebAssetsBaselines");
1515

1616
protected override string ComputeBaselineFolder() =>
1717
Path.Combine(TestContext.GetRepoRoot() ?? AppContext.BaseDirectory, "test", "Microsoft.NET.Sdk.BlazorWebAssembly.Tests", "StaticWebAssetsBaselines");
18-
18+
1919
[CoreMSBuildOnlyFact]
2020
public void Build60Hosted_Works()
2121
{

0 commit comments

Comments
 (0)