Skip to content

Don't fire NETSDK1206 if known RID platforms were not determined #34021

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 2 commits into from
Aug 11, 2023
Merged

Don't fire NETSDK1206 if known RID platforms were not determined #34021

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f5d7b0
Don't fire NETSDK1206 if known RID platforms were not determined
elinor-fung Jul 14, 2023
ed758b8
Add test
elinor-fung Aug 11, 2023
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
3 changes: 2 additions & 1 deletion src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,8 @@ Copyright (c) .NET Foundation. All rights reserved.

<!-- Set valid RID platforms for runtime assets if targeting .NET 8+ and using the RID graph is not enabled. -->
<ItemGroup Condition="$([MSBuild]::VersionGreaterThanOrEquals($(_TargetFrameworkVersionWithoutV), '8.0'))
and @(RuntimeHostConfigurationOption->WithMetadataValue('Identity', 'System.Runtime.Loader.UseRidGraph')->WithMetadataValue('Value', 'true')->Count()) == 0">
and @(RuntimeHostConfigurationOption->WithMetadataValue('Identity', 'System.Runtime.Loader.UseRidGraph')->WithMetadataValue('Value', 'true')->Count()) == 0
and '@(_KnownRuntimeIdentifierPlatformsForTargetFramework)' != ''">
<!-- Known RID platforms for all target frameworks comes from BundledVersions -->
<_ValidRuntimeIdentifierPlatformsForAssets Include="@(_KnownRuntimeIdentiferPlatforms)" />
<!-- Known RID platforms for current target framework comes from ProcessFrameworkReferences output -->
Expand Down
77 changes: 59 additions & 18 deletions src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildANetCoreApp.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -952,24 +952,7 @@ public void It_builds_the_project_successfully_with_only_reference_assembly_set(
}
}

[Theory]
// Non-portable RID should warn
[InlineData(ToolsetInfo.CurrentTargetFramework, new[] { "ubuntu.22.04-x64" }, true, true, null, true)]
[InlineData(ToolsetInfo.CurrentTargetFramework, new[] { "ubuntu.22.04-x64" }, true, false, null, true)]
[InlineData(ToolsetInfo.CurrentTargetFramework, new[] { "ubuntu.22.04-x64" }, false, true, null, true)]
// Non-portable and portable RIDs should warn
[InlineData(ToolsetInfo.CurrentTargetFramework, new[] { "ubuntu.22.04-x64", "win7-x86", "unix" }, true, true, null, true)]
// Portable RIDs only should not warn
[InlineData(ToolsetInfo.CurrentTargetFramework, new[] { "win-x86", "win", "linux", "linux-musl-x64", "osx", "osx-arm64", "unix", "browser", "browser-wasm", "ios-arm64" }, true, true, null, false)]
// No RID assets should not warn
[InlineData(ToolsetInfo.CurrentTargetFramework, new string[] { }, false, false, null, false)]
// Below .NET 8 should not warn
[InlineData("net7.0", new string[] { "ubuntu.22.04-x64", "win7-x86" }, true, true, null, false)]
// Explicitly set to use RID graph should not warn
[InlineData(ToolsetInfo.CurrentTargetFramework, new[] { "alpine-x64" }, true, true, true, false)]
// Explicitly set to not use RID graph should warn
[InlineData(ToolsetInfo.CurrentTargetFramework, new[] { "alpine-x64" }, true, true, false, true)]
public void It_warns_on_nonportable_rids(string targetFramework, string[] rids, bool addLibAssets, bool addNativeAssets, bool? useRidGraph, bool shouldWarn)
private TestProject CreateProjectWithRidAssets(string targetFramework, string[] rids, bool addLibAssets, bool addNativeAssets)
{
var packageProject = new TestProject()
{
Expand Down Expand Up @@ -1003,6 +986,30 @@ public void It_warns_on_nonportable_rids(string targetFramework, string[] rids,
}
}

return packageProject;
}

[Theory]
// Non-portable RID should warn
[InlineData(ToolsetInfo.CurrentTargetFramework, new[] { "ubuntu.22.04-x64" }, true, true, null, true)]
[InlineData(ToolsetInfo.CurrentTargetFramework, new[] { "ubuntu.22.04-x64" }, true, false, null, true)]
[InlineData(ToolsetInfo.CurrentTargetFramework, new[] { "ubuntu.22.04-x64" }, false, true, null, true)]
// Non-portable and portable RIDs should warn
[InlineData(ToolsetInfo.CurrentTargetFramework, new[] { "ubuntu.22.04-x64", "win7-x86", "unix" }, true, true, null, true)]
// Portable RIDs only should not warn
[InlineData(ToolsetInfo.CurrentTargetFramework, new[] { "win-x86", "win", "linux", "linux-musl-x64", "osx", "osx-arm64", "unix", "browser", "browser-wasm", "ios-arm64" }, true, true, null, false)]
// No RID assets should not warn
[InlineData(ToolsetInfo.CurrentTargetFramework, new string[] { }, false, false, null, false)]
// Below .NET 8 should not warn
[InlineData("net7.0", new string[] { "ubuntu.22.04-x64", "win7-x86" }, true, true, null, false)]
// Explicitly set to use RID graph should not warn
[InlineData(ToolsetInfo.CurrentTargetFramework, new[] { "alpine-x64" }, true, true, true, false)]
// Explicitly set to not use RID graph should warn
[InlineData(ToolsetInfo.CurrentTargetFramework, new[] { "alpine-x64" }, true, true, false, true)]
public void It_warns_on_nonportable_rids(string targetFramework, string[] rids, bool addLibAssets, bool addNativeAssets, bool? useRidGraph, bool shouldWarn)
{
var packageProject = CreateProjectWithRidAssets(targetFramework, rids, addLibAssets, addNativeAssets);

// Identifer based on test inputs to create test assets that are unique for each test case
string assetIdentifier = $"{targetFramework}{string.Join(null, rids)}{addLibAssets}{addNativeAssets}{useRidGraph}{shouldWarn}";

Expand Down Expand Up @@ -1054,6 +1061,40 @@ public void It_warns_on_nonportable_rids(string targetFramework, string[] rids,
}
}

[Fact]
public void It_does_not_warn_on_rids_if_no_framework_references()
{
var packageProject = CreateProjectWithRidAssets(ToolsetInfo.CurrentTargetFramework, new string[] { "unix", "win", "alpine-x64"}, true, true);

var packCommand = new PackCommand(_testAssetsManager.CreateTestProject(packageProject));
packCommand.Execute().Should().Pass();
var package = new TestPackageReference(packageProject.Name, "1.0.0", packCommand.GetNuGetPackage());

var testProject = new TestProject()
{
Name = "NoFrameworkReferences",
TargetFrameworks = ToolsetInfo.CurrentTargetFramework,
IsExe = true
};

// Reference the package, add it to restore sources, and use a test-specific packages folder
testProject.PackageReferences.Add(package);
testProject.AdditionalProperties["RestoreAdditionalProjectSources"] = Path.GetDirectoryName(package.NupkgPath);
testProject.AdditionalProperties["RestorePackagesPath"] = @"$(MSBuildProjectDirectory)\packages";

// Disable implicit framework references and don't add any framework references.
// This mimics the scenario of building runtime framework libraries. Since they are part of the
// framework itself, they just directly reference the other framework libraries they need.
testProject.AdditionalProperties["DisableImplicitFrameworkReferences"] = "true";
testProject.AdditionalProperties["UseAppHost"] = "false";
testProject.PackageReferences.Add(new TestPackageReference("NETStandard.Library", "1.6.1"));

TestAsset testAsset = _testAssetsManager.CreateTestProject(testProject);
var result = new BuildCommand(testAsset).Execute();
result.Should().Pass()
.And.NotHaveStdOutContaining("NETSDK1206");
}

[Theory]
[InlineData(true, "TRACE DISABLED")]
[InlineData(false, "TRACE ENABLED")]
Expand Down