8000 Fix versioned sdk imports in file-based programs by jjonescz · Pull Request #49008 · dotnet/sdk · GitHub
[go: up one dir, main page]
Skip to content

Fix versioned sdk imports in file-based programs #49008

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
merged 1 commit into from
May 20, 2025
Merged

Fix versioned sdk imports in file-based programs #49008

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
24 changes: 18 additions & 6 deletions src/Cli/dotnet/Commands/Run/VirtualProjectBuildingCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,9 +510,7 @@ public static void WriteProjectFile(
{
if (isVirtualProject)
{
writer.WriteLine($"""
<Import Project="Sdk.props" Sdk="{EscapeValue(sdk.ToSlashDelimitedString())}" />
""");
WriteImport(writer, "Sdk.props", sdk);
}
else if (sdk.Version is null)
{
Expand Down Expand Up @@ -629,9 +627,7 @@ public static void WriteProjectFile(

foreach (var sdk in sdkDirectives)
{
writer.WriteLine($"""
<Import Project="Sdk.targets" Sdk="{EscapeValue(sdk.ToSlashDelimitedString())}" />
""");
WriteImport(writer, "Sdk.targets", sdk);
}

if (!sdkDirectives.Any())
Expand Down Expand Up @@ -679,6 +675,22 @@ Override targets which don't work with project files that are not present on dis
""");

static string EscapeValue(string value) => SecurityElement.Escape(value);

static void WriteImport(TextWriter writer, string project, CSharpDirective.Sdk sdk)
{
if (sdk.Version is null)
{
writer.WriteLine($"""
<Import Project="{EscapeValue(project)}" Sdk="{EscapeValue(sdk.Name)}" />
""");
}
else
{
writer.WriteLine($"""
<Import Project="{EscapeValue(project)}" Sdk="{EscapeValue(sdk.Name)}" Version="{EscapeValue(sdk.Version)}" />
""");
}
}
}

/// <param name="reportAllErrors">
Expand Down
23 changes: 21 additions & 2 deletions test/dotnet.Tests/CommandTests/Run/RunFileTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -973,6 +973,25 @@ public void PackageReference_CentralVersion()
""");
}

[Fact] // https://github.com/dotnet/sdk/issues/48990
public void SdkReference()
{
var testInstance = _testAssetsManager.CreateTestDirectory();
File.WriteAllText(Path.Join(testInstance.Path, "Program.cs"), """
#:sdk Microsoft.NET.Sdk
#:sdk Aspire.AppHost.Sdk 9.2.1
#:package Aspire.Hosting.AppHost@9.2.1

var builder = DistributedApplication.CreateBuilder(args);
builder.Build().Run();
""");

new DotnetCommand(Log, "build", "Program.cs")
.WithWorkingDirectory(testInstance.Path)
.Execute()
.Should().Pass();
}

[Fact]
public void UpToDate()
{
Expand Down Expand Up @@ -1176,7 +1195,7 @@ public void Api()

<!-- We need to explicitly import Sdk props/targets so we can override the targets below. -->
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
<Import Project="Sdk.props" Sdk="Aspire.Hosting.Sdk/9.1.0" />
<Import Project="Sdk.props" Sdk="Aspire.Hosting.Sdk" Version="9.1.0" />

<PropertyGroup>
<OutputType>Exe</OutputType>
Expand Down Expand Up @@ -1207,7 +1226,7 @@ public void Api()
</ItemGroup>

<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
<Import Project="Sdk.targets" Sdk="Aspire.Hosting.Sdk/9.1.0" />
<Import Project="Sdk.targets" Sdk="Aspire.Hosting.Sdk" Version="9.1.0" />

<!--
Override targets which don't work with project files that are not present on disk.
Expand Down
Loading
0