Skip to content

[main] Source code updates from dotnet/sdk #6068

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wtgodbe merged 1 commit into from
Apr 16, 2026
Merged

[main] Source code updates from dotnet/sdk #6068

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 8 additions & 13 deletions src/sdk/src/Containers/Microsoft.NET.Build.Containers/ContentStore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System.Diagnostics;
using Microsoft.NET.Build.Containers.Resources;

namespace Microsoft.NET.Build.Containers;
Expand Down Expand Up @@ -35,11 +34,12 @@ public static string TempPath

public static string PathForDescriptor(Descriptor descriptor)
{
string digest = descriptor.Digest;

Debug.Assert(digest.StartsWith("sha256:", StringComparison.Ordinal));

string contentHash = digest.Substring("sha256:".Length);
string digestString = descriptor.Digest;
if (!ReferenceParser.DigestRegexp.IsMatch(digestString))
{
throw new ArgumentException($"Invalid digest: {digestString}", nameof(descriptor.Digest));
}
string digestValue = digestString.Substring("sha256:".Length);

string extension = descriptor.MediaType switch
{
Expand All @@ -53,13 +53,8 @@ public static string PathForDescriptor(Descriptor descriptor)
_ => throw new ArgumentException(Resource.FormatString(nameof(Strings.UnrecognizedMediaType), descriptor.MediaType))
};

return GetPathForHash(contentHash) + extension;
}


public static string GetPathForHash(string contentHash)
{
return Path.Combine(ContentRoot, contentHash);
string descriptorPath = Path.Combine(ContentRoot, digestValue) + extension;
return descriptorPath;
}

public static string GetTempFile()
Expand Down
4 changes: 3 additions & 1 deletion src/sdk/src/Dotnet.Watch/Watch.Aspire/Host/AspireHostLauncher.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ internal sealed class AspireHostLauncher(
launchProfileName: noLaunchProfile ? Optional<string?>.NoValue : launchProfile);
}

internal ProjectOptions GetProjectOptions()
protected override ProjectOptions GetProjectOptions()
{
var commandArguments = new List<string>()
{
Expand Down Expand Up @@ -75,6 +75,8 @@ internal ProjectOptions GetProjectOptions()
};
}

internal ProjectOptions GetHostProjectOptions() => GetProjectOptions();

public override async Task<int> LaunchAsync(CancellationToken cancellationToken)
{
return await LaunchWatcherAsync(
Expand Down
4 changes: 3 additions & 1 deletion src/sdk/src/Dotnet.Watch/Watch.Aspire/Server/AspireWatcherLauncher.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ protected async Task<int> LaunchWatcherAsync(
ProcessRunner = new ProcessRunner(EnvironmentOptions.GetProcessCleanupTimeout()),
Options = GlobalOptions,
EnvironmentOptions = EnvironmentOptions,
MainProjectOptions = null,
MainProjectOptions = GetProjectOptions(),
BuildArguments = [],
RootProjects = rootProjects,
BrowserRefreshServerFactory = new BrowserRefreshServerFactory(),
Expand All @@ -50,4 +50,6 @@ protected async Task<int> LaunchWatcherAsync(

return 0;
}

protected virtual ProjectOptions? GetProjectOptions() => null;
}
2 changes: 1 addition & 1 deletion src/sdk/src/Workloads/Manifests/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<Target Name="LayoutManifest" DependsOnTargets="Pack" Condition="'$(IsShipping)' == 'true'">
<PropertyGroup>
<_manifestTargetDirectory>$(ManifestDirectory)$(BuiltinWorkloadFeatureBand)\$(MSBuildProjectName.Replace('.Manifest', '').ToLower())\$(Version)</_manifestTargetDirectory>
<_manifestTargetDirectory>$(ManifestDirectory)$(BuiltinWorkloadFeatureBand)$(_workloadVersionSuffix)\$(MSBuildProjectName.Replace('.Manifest', '').ToLower())\$(Version)</_manifestTargetDirectory>
</PropertyGroup>

<ItemGroup>
Expand Down
18 changes: 9 additions & 9 deletions src/sdk/test/Microsoft.DotNet.HotReload.Watch.Aspire.Tests/AspireHostLauncherTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public void GetProjectOptions_ProjectFile_UsesProjectFlag()
{
var launcher = CreateLauncher("myapp.csproj");

var options = launcher.GetProjectOptions();
var options = launcher.GetHostProjectOptions()!;

AssertCommonProperties(options, launcher);
Assert.False(options.LaunchProfileName.HasValue);
Expand All @@ -56,7 +56,7 @@ public void GetProjectOptions_EntryPointFile_UsesFileFlag()
{
var launcher = CreateLauncher("Program.cs");

var options = launcher.GetProjectOptions();
var options = launcher.GetHostProjectOptions()!;

AssertCommonProperties(options, launcher);
Assert.False(options.LaunchProfileName.HasValue);
Expand All @@ -68,7 +68,7 @@ public void GetProjectOptions_WithLaunchProfile_AddsLaunchProfileArguments()
{
var launcher = CreateLauncher("myapp.csproj", launchProfileName: "MyProfile");

var options = launcher.GetProjectOptions();
var options = launcher.GetHostProjectOptions()!;

AssertCommonProperties(options, launcher);
Assert.True(options.LaunchProfileName.HasValue);
Expand All @@ -81,7 +81,7 @@ public void GetProjectOptions_NoLaunchProfile_AddsNoLaunchProfileFlag()
{
var launcher = CreateLauncher("myapp.csproj", launchProfileName: Optional<string?>.NoValue);

var options = launcher.GetProjectOptions();
var options = launcher.GetHostProjectOptions()!;

AssertCommonProperties(options, launcher);
Assert.False(options.LaunchProfileName.HasValue);
Expand All @@ -94,7 +94,7 @@ public void GetProjectOptions_NullLaunchProfile_UsesDefault()
// null value (HasValue=true) means use default launch profile - no --launch-profile or --no-launch-profile flag
var launcher = CreateLauncher("myapp.csproj", launchProfileName: (string?)null);

var options = launcher.GetProjectOptions();
var options = launcher.GetHostProjectOptions()!;

AssertCommonProperties(options, launcher);
Assert.True(options.LaunchProfileName.HasValue);
Expand All @@ -107,7 +107,7 @@ public void GetProjectOptions_WithApplicationArguments_AppendsArguments()
{
var launcher = CreateLauncher("myapp.csproj", launchProfileName: "Profile", applicationArguments: ["arg1", "arg2"]);

var options = launcher.GetProjectOptions();
var options = launcher.GetHostProjectOptions()!;

AssertCommonProperties(options, launcher);
Assert.True(options.LaunchProfileName.HasValue);
Expand All @@ -120,7 +120,7 @@ public void GetProjectOptions_SetsCustomWorkingDirectory()
{
var launcher = CreateLauncher("myapp.csproj", workingDirectory: "/custom/path");

var options = launcher.GetProjectOptions();
var options = launcher.GetHostProjectOptions()!;

AssertCommonProperties(options, launcher);
Assert.Equal("/custom/path", options.WorkingDirectory);
Expand All @@ -131,7 +131,7 @@ public void GetProjectOptions_EntryPointFile_WithLaunchProfileAndArguments()
{
var launcher = CreateLauncher("Program.cs", launchProfileName: "Dev", applicationArguments: ["--port", "8080"]);

var options = launcher.GetProjectOptions();
var options = launcher.GetHostProjectOptions()!;

AssertCommonProperties(options, launcher);
Assert.True(options.LaunchProfileName.HasValue);
Expand All @@ -144,7 +144,7 @@ public void GetProjectOptions_NoLaunchProfile_WithApplicationArguments()
{
var launcher = CreateLauncher("myapp.csproj", launchProfileName: Optional<string?>.NoValue, applicationArguments: ["--urls", "http://localhost:5000"]);

var options = launcher.GetProjectOptions();
var options = launcher.GetHostProjectOptions();

AssertCommonProperties(options, launcher);
Assert.False(options.LaunchProfileName.HasValue);
Expand Down
1 change: 1 addition & 0 deletions src/sdk/test/Microsoft.DotNet.HotReload.Watch.Aspire.Tests/AspireLauncherTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ public async Task Host()
host.Start(testAsset, ["--entrypoint", projectPath]);

await host.WaitUntilOutputContains(MessageDescriptor.WaitingForChanges);
await host.WaitUntilOutputContains("Started");
}

[PlatformSpecificFact(TestPlatforms.Windows | TestPlatforms.Linux)] // https://github.com/dotnet/sdk/issues/53061
Expand Down
40 changes: 40 additions & 0 deletions src/sdk/test/Microsoft.NET.Build.Containers.UnitTests/ContentStoreTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

namespace Microsoft.NET.Build.Containers.UnitTests;

public class ContentStoreTests
{
[Theory]
[InlineData("sha256:0000000000000000000000000000000000000000000000000000000000000000")]
[InlineData("sha256:FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF")]
[InlineData("sha256:c5098cc7c2a2ad9bfc66e4c4cb242683a578e9d8f25fd8730b289dd5667916ad")] // random valid sha256 digest
[InlineData("sha256:e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855")] // well known empty content digest
public void PathForDescriptor_AcceptsWellFormedDigest(string digest)
{
Descriptor descriptor = CreateDescriptorWithDigest(digest);
string path = ContentStore.PathForDescriptor(descriptor);
Assert.StartsWith(ContentStore.ContentRoot, path);
}

[Theory]
[InlineData("")]
[InlineData("sha256:")] // missing value
[InlineData("sha256:../..\\xyz_not_hex!!")] // non-hex characters
[InlineData("md5:5b0bcabd1ed22e9fb1310cf6")] // wrong algorithm
[InlineData("sha256:abc")] // too short
[InlineData("sha256:c5098cc7c2a2ad9bfc66e4c4cb242683a578e9d8f25fd8730b289dd5667916a")] // 1 char too short
[InlineData("sha256:c5098cc7c2a2ad9bfc66e4c4cb242683a578e9d8f25fd8730b289dd5667916adF")] // 1 char too long
[InlineData("c5098cc7c2a2ad9bfc66e4c4cb242683a578e9d8f25fd8730b289dd5667916ad")] // valid but missing algorithm prefix
[InlineData("0000000c5098cc7c2a2ad9bfc66e4c4cb242683a578e9d8f25fd8730b289dd5667916ad")] // correct string length, no prefix
[InlineData("sha256:c5098cc7c2a2ad9bfc66e4c4cb242683a578e9d8f25fd8730b289dd5667916ad000000000000")] // many chars too long
public void PathForDescriptor_RejectsInvalidDigest(string digest)
{
Descriptor descriptor = CreateDescriptorWithDigest(digest);
Assert.Throws<ArgumentException>(() =>
ContentStore.PathForDescriptor(descriptor));
}

private static Descriptor CreateDescriptorWithDigest(string digest) =>
new("application/vnd.oci.image.layer.v1.tar+gzip", digest, 1024);
}
4 changes: 2 additions & 2 deletions src/source-manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,10 @@
"commitSha": "5745f7404c4a3ae7f1b08117bc6092a96224a985"
},
{
"barId": 310369,
"barId": 310518,
"path": "sdk",
"remoteUri": "https://github.com/dotnet/sdk",
"commitSha": "2eac35a9507b59f3f19160f9e39aa944379c7e43"
"commitSha": "5be3937332d7d45a12cb8a95fdbfc67c8fb99513"
},
{
"barId": 309186,
Expand Down