From 1fe65d2e6d2a539f357f016af4202218c6922255 Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Thu, 8 Sep 2022 16:54:35 -0700 Subject: [PATCH 01/10] Implement implicit rids and add tests, eradicate publishselfcontained from history' --- src/Cli/dotnet/CommonOptions.cs | 7 --- src/Tasks/Common/Resources/Strings.resx | 8 +++- ...oft.NET.RuntimeIdentifierInference.targets | 29 +++++++++++- .../GlobalPropertyFlowTests.cs | 5 +-- ...enThatWeWantToPublishAHelloWorldProject.cs | 23 ++++++++++ ...venThatWeWantToPublishASelfContainedApp.cs | 26 ++--------- .../GivenThatWeWantToPublishASingleFileApp.cs | 23 +++------- .../GivenThatWeWantToPublishAnAotApp.cs | 22 ++++++++- .../GivenThatWeWantToRunILLink.cs | 45 +++++++++++-------- .../GivenDotnetBuildBuildsCsproj.cs | 15 ++++--- .../GivenDotnetOsArchOptions.cs | 3 +- 11 files changed, 126 insertions(+), 80 deletions(-) diff --git a/src/Cli/dotnet/CommonOptions.cs b/src/Cli/dotnet/CommonOptions.cs index 8fdfef697714..ca7216708874 100644 --- a/src/Cli/dotnet/CommonOptions.cs +++ b/src/Cli/dotnet/CommonOptions.cs @@ -269,13 +269,6 @@ public static string GetCurrentRuntimeId() private static IEnumerable ForwardSelfContainedOptions(bool isSelfContained, ParseResult parseResult) { IEnumerable selfContainedProperties = new string[] { $"-property:SelfContained={isSelfContained}", "-property:_CommandLineDefinedSelfContained=true" }; - - if (!UserSpecifiedRidOption(parseResult) && isSelfContained) - { - var ridProperties = RuntimeArgFunc(GetCurrentRuntimeId()); - selfContainedProperties = selfContainedProperties.Concat(ridProperties); - } - return selfContainedProperties; } diff --git a/src/Tasks/Common/Resources/Strings.resx b/src/Tasks/Common/Resources/Strings.resx index 7afca8b8de79..93db7f7f05ca 100644 --- a/src/Tasks/Common/Resources/Strings.resx +++ b/src/Tasks/Common/Resources/Strings.resx @@ -1,4 +1,4 @@ - + + ResourceName="ImplicitRuntimeIdentifierResolutionForPublishPropertyFailed" + FormatArguments="SelfContained"/> + + + + + + + diff --git a/src/Tests/Microsoft.NET.Build.Tests/GlobalPropertyFlowTests.cs b/src/Tests/Microsoft.NET.Build.Tests/GlobalPropertyFlowTests.cs index d90d5ea403f6..7eb276da0463 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GlobalPropertyFlowTests.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GlobalPropertyFlowTests.cs @@ -207,8 +207,7 @@ public void TestGlobalPropertyFlowInSolution(bool passSelfContained, bool passRu var testAsset = _testAssetsManager.CreateTestProject(_testProject, identifier: identifier); - new DotnetNewCommand(Log, "sln") - .WithVirtualHive() + new DotnetCommand(Log, "new", "sln") .WithWorkingDirectory(testAsset.TestRoot) .Execute() .Should() @@ -228,7 +227,7 @@ public void TestGlobalPropertyFlowInSolution(bool passSelfContained, bool passRu var arguments = GetDotnetArguments(passSelfContained, passRuntimeIdentifier); - if (passSelfContained || passRuntimeIdentifier) + if (passRuntimeIdentifier) { new DotnetBuildCommand(Log, arguments.ToArray()) .WithWorkingDirectory(testAsset.TestRoot) diff --git a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAHelloWorldProject.cs b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAHelloWorldProject.cs index 396b25b4443c..9759b2d13821 100644 --- a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAHelloWorldProject.cs +++ b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAHelloWorldProject.cs @@ -721,6 +721,29 @@ public void It_publishes_with_full_path_publish_profile() .Pass(); } + [Theory] + [InlineData("--p:PublishReadyToRun=true")] + [InlineData("-p:PublishSingleFile=true")] + [InlineData("")] + public void It_publishes_with_implicit_rid_with_rid_specific_properties(string executeOptionsAndProperties) + { + var testProject = new TestProject() + { + Name = "PublishImplicitRid", + TargetFrameworks = $"net472;{ToolsetInfo.CurrentTargetFramework}", + }; + testProject.AdditionalProperties.Add("IsPublishable", "false"); + var testAsset = _testAssetsManager.CreateTestProject(testProject, identifier: executeOptionsAndProperties); + + var publishCommand = new PublishCommand(testAsset); + publishCommand + .Execute(executeOptionsAndProperties) + .Should() + .Pass() + .And + .NotHaveStdErrContaining("NETSDK1191"); // Publish Properties Requiring RID Checks + } + [Fact] public void IsPublishableIsRespectedWhenMultitargeting() { diff --git a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASelfContainedApp.cs b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASelfContainedApp.cs index a9506f11b46d..2217665e8f05 100644 --- a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASelfContainedApp.cs +++ b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASelfContainedApp.cs @@ -24,24 +24,6 @@ public GivenThatWeWantToPublishASelfContainedApp(ITestOutputHelper log) : base(l { } - [Fact] - public void It_errors_when_publishing_self_contained_app_without_rid() - { - var testAsset = _testAssetsManager - .CopyTestAsset(TestProjectName) - .WithSource(); - - var publishCommand = new PublishCommand(testAsset); - publishCommand - .Execute( - "/p:SelfContained=true", - $"/p:TargetFramework={TargetFramework}") - .Should() - .Fail() - .And - .HaveStdOutContaining(Strings.CannotHaveSelfContainedWithoutRuntimeIdentifier); - } - [Fact] public void It_errors_when_publishing_self_contained_without_apphost() { @@ -140,7 +122,7 @@ public void It_publishes_an_app_with_a_netcoreapp_lib_reference() { "/p:SelfContained=true", $"/p:TargetFramework={ToolsetInfo.CurrentTargetFramework}", - $"/p:RuntimeIdentifier={EnvironmentInfo.GetCompatibleRid(ToolsetInfo.CurrentTargetFramework)}" + $"/p:RuntimeIdentifier={EnvironmentInfo.GetCompatibleRid(ToolsetInfo.CurrentTargetFramework)}", }; new RestoreCommand(testAsset, "main").Execute(args); @@ -248,9 +230,9 @@ public void It_publishes_runtime_pack_resources_for_specific_languages() [RequiresMSBuildVersionFact("17.0.0.32901")] public void NoStaticLibs() { - var testAsset = _testAssetsManager - .CopyTestAsset(TestProjectName) - .WithSource(); + var testAsset = _testAssetsManager + .CopyTestAsset(TestProjectName) + .WithSource(); var publishCommand = new PublishCommand(testAsset); var tfm = ToolsetInfo.CurrentTargetFramework; diff --git a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASingleFileApp.cs b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASingleFileApp.cs index 18250f975820..2079fef2fc49 100644 --- a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASingleFileApp.cs +++ b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASingleFileApp.cs @@ -125,17 +125,6 @@ public void Incremental_add_single_file() .HaveStdOutContaining("Hello World"); } - [Fact] - public void It_errors_when_publishing_single_file_app_without_rid() - { - GetPublishCommand() - .Execute(PublishSingleFile) - .Should() - .Fail() - .And - .HaveStdOutContaining(Strings.CannotHaveSingleFileWithoutRuntimeIdentifier); - } - [Fact] public void It_errors_when_publishing_single_file_without_apphost() { @@ -680,12 +669,12 @@ static void ProduceLinkerAnalysisWarning() [InlineData("netcoreapp3.1", true, IncludeDefault)] [InlineData("netcoreapp3.1", false, IncludePdb)] [InlineData("netcoreapp3.1", true, IncludePdb)] - [InlineData("net6.0", false, IncludeDefault)] - [InlineData("net6.0", false, IncludeNative)] - [InlineData("net6.0", false, IncludeAllContent)] - [InlineData("net6.0", true, IncludeDefault)] - [InlineData("net6.0", true, IncludeNative)] - [InlineData("net6.0", true, IncludeAllContent)] + [InlineData("net5.0", false, IncludeDefault)] + [InlineData("net5.0", false, IncludeNative)] + [InlineData("net5.0", false, IncludeAllContent)] + [InlineData("net5.0", true, IncludeDefault)] + [InlineData("net5.0", true, IncludeNative)] + [InlineData("net5.0", true, IncludeAllContent)] [InlineData(ToolsetInfo.CurrentTargetFramework, false, IncludeDefault)] [InlineData(ToolsetInfo.CurrentTargetFramework, false, IncludeNative)] [InlineData(ToolsetInfo.CurrentTargetFramework, false, IncludeAllContent)] diff --git a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs index f4a88b1db5f8..64c7127452ad 100644 --- a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs +++ b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs @@ -243,10 +243,10 @@ public void NativeAot_app_builds_with_config_when_PublishAot_is_enabled(string t .WithProjectChanges(project => AddRuntimeConfigOption(project)); var buildCommand = new BuildCommand(testAsset); - buildCommand.Execute() + buildCommand.Execute($"/p:RuntimeIdentifier={rid}") .Should().Pass(); - var outputDirectory = buildCommand.GetOutputDirectory(targetFramework).FullName; + var outputDirectory = buildCommand.GetOutputDirectory(targetFramework, runtimeIdentifier: rid).FullName; var assemblyPath = Path.Combine(outputDirectory, $"{projectName}{Constants.ExeSuffix}"); var runtimeConfigPath = Path.Combine(outputDirectory, $"{projectName}.runtimeconfig.json"); var depsPath = Path.Combine(outputDirectory, $"{projectName}.deps.json"); @@ -644,6 +644,24 @@ public void NativeAotSharedLib_only_runs_when_switch_is_enabled(string targetFra } } + [RequiresMSBuildVersionTheory("17.0.0.32901")] + [InlineData(ToolsetInfo.CurrentTargetFramework)] + public void It_publishes_with_implicit_rid_with_NativeAotApp(string targetFramework) + { + if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) || RuntimeInformation.IsOSPlatform(OSPlatform.Linux)) + { + var projectName = "ImplicitRidNativeAotApp"; + var testProject = CreateHelloWorldTestProject(targetFramework, projectName, true); + testProject.AdditionalProperties["PublishAot"] = "true"; + var testAsset = _testAssetsManager.CreateTestProject(testProject); + + var publishCommand = new PublishCommand(Log, Path.Combine(testAsset.TestRoot, testProject.Name)); + publishCommand + .Execute() + .Should().Pass(); + } + } + private TestProject CreateHelloWorldTestProject(string targetFramework, string projectName, bool isExecutable) { var testProject = new TestProject() diff --git a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToRunILLink.cs b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToRunILLink.cs index af5d1bb17f7f..b91a5c3bac65 100644 --- a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToRunILLink.cs +++ b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToRunILLink.cs @@ -215,10 +215,13 @@ public void ILLink_respects_global_TrimMode(string targetFramework, string trimM File.Exists(publishedDll).Should().BeTrue(); File.Exists(isTrimmableDll).Should().BeTrue(); DoesImageHaveMethod(isTrimmableDll, "UnusedMethodToRoot").Should().BeTrue(); - if (trimMode is "link" or "full" or "partial") { + if (trimMode is "link" or "full" or "partial") + { // Check that the assembly was trimmed at the member level DoesImageHaveMethod(isTrimmableDll, "UnusedMethod").Should().BeFalse(); - } else { + } + else + { // Check that the assembly was trimmed at the assembxly level DoesImageHaveMethod(isTrimmableDll, "UnusedMethod").Should().BeTrue(); } @@ -228,7 +231,7 @@ public void ILLink_respects_global_TrimMode(string targetFramework, string trimM [MemberData(nameof(Net5Plus), MemberType = typeof(PublishTestUtils))] public void ILLink_roots_IntermediateAssembly(string targetFramework) { - var projectName = "HelloWorld"; + var projectName = "HelloWorld"; var rid = EnvironmentInfo.GetCompatibleRid(targetFramework); var testProject = CreateTestProjectForILLinkTesting(targetFramework, projectName); @@ -582,7 +585,8 @@ public void ILLink_can_show_single_warning_per_assembly(string targetFramework) var testAsset = _testAssetsManager .CopyTestAsset(testAssetName, identifier: targetFramework) .WithSource() - .WithProjectChanges(project => { + .WithProjectChanges(project => + { SetMetadata(project, "PackageReference", "TrimmerSingleWarn", "false"); SetMetadata(project, "ProjectReference", "TrimmerSingleWarn", "true"); SetMetadata(project, "App", "TrimmerSingleWarn", "true"); @@ -681,7 +685,7 @@ public void ILLink_verify_analysis_warnings_hello_world_app_trim_mode_link(strin ValidateWarningsOnHelloWorldApp(publishCommand, result, Array.Empty(), targetFramework, rid); } - private void ValidateWarningsOnHelloWorldApp (PublishCommand publishCommand, CommandResult result, string[] expectedOutput, string targetFramework, string rid) + private void ValidateWarningsOnHelloWorldApp(PublishCommand publishCommand, CommandResult result, string[] expectedOutput, string targetFramework, string rid) { // This checks that there are no unexpected warnings, but does not cause failures for missing expected warnings. var warnings = result.StdOut.Split('\n', '\r').Where(line => line.Contains("warning IL")); @@ -1453,7 +1457,8 @@ public void Build_respects_IsTrimmable_property(string targetFramework, bool isE // just setting IsTrimmable doesn't enable feature settings // (these only affect apps, and wouldn't make sense for libraries either) - if (isExe) { + if (isExe) + { JObject runtimeConfig = JObject.Parse(File.ReadAllText(runtimeConfigPath)); JToken configProperties = runtimeConfig["runtimeOptions"]["configProperties"]; if (configProperties != null) @@ -1466,18 +1471,18 @@ public void Build_respects_IsTrimmable_property(string targetFramework, bool isE public void Build_respects_PublishTrimmed_property(string targetFramework) { var projectName = "AnalysisWarnings"; - + var rid = EnvironmentInfo.GetCompatibleRid(targetFramework); var testProject = CreateTestProjectWithAnalysisWarnings(targetFramework, projectName); testProject.AdditionalProperties["PublishTrimmed"] = "true"; var testAsset = _testAssetsManager.CreateTestProject(testProject, identifier: targetFramework); var buildCommand = new BuildCommand(testAsset); // PublishTrimmed enables analysis warnings during build - buildCommand.Execute() + buildCommand.Execute($"-p:RuntimeIdentifier={rid}") .Should().Pass() .And.HaveStdOutMatching("warning IL2026.*Program.IL_2026.*Testing analysis warning IL2026"); - var outputDirectory = buildCommand.GetOutputDirectory(targetFramework).FullName; + var outputDirectory = buildCommand.GetOutputDirectory(targetFramework, runtimeIdentifier: rid).FullName; var assemblyPath = Path.Combine(outputDirectory, $"{projectName}.dll"); var runtimeConfigPath = Path.Combine(outputDirectory, $"{projectName}.runtimeconfig.json"); @@ -1577,7 +1582,8 @@ private void SetMetadata(XDocument project, string assemblyName, string key, str .Where(e => e.Attribute("Name")?.Value == targetName) .FirstOrDefault(); - if (target == null) { + if (target == null) + { target = new XElement(ns + "Target", new XAttribute("BeforeTargets", "PrepareForILLink"), new XAttribute("Name", targetName)); @@ -1646,8 +1652,9 @@ private void AddFeatureDefinition(TestProject testProject, string assemblyName) "; - - testProject.AddItem("EmbeddedResource", new Dictionary { + + testProject.AddItem("EmbeddedResource", new Dictionary + { ["Include"] = substitutionsFilename, ["LogicalName"] = substitutionsFilename }); @@ -1728,7 +1735,7 @@ public override void IL_2046() {} return testProject; } - private TestProject CreateTestProjectWithIsTrimmableAttributes ( + private TestProject CreateTestProjectWithIsTrimmableAttributes( string targetFramework, string projectName) { @@ -1772,7 +1779,7 @@ public static void UnusedMethod() { } }"; - testProject.ReferencedProjects.Add (trimmableProject); + testProject.ReferencedProjects.Add(trimmableProject); var nonTrimmableProject = new TestProject() { @@ -1791,7 +1798,7 @@ public static void UnusedMethod() { } }"; - testProject.ReferencedProjects.Add (nonTrimmableProject); + testProject.ReferencedProjects.Add(nonTrimmableProject); var unusedTrimmableProject = new TestProject() { @@ -1811,7 +1818,7 @@ public static void UnusedMethod() } } "; - testProject.ReferencedProjects.Add (unusedTrimmableProject); + testProject.ReferencedProjects.Add(unusedTrimmableProject); var unusedNonTrimmableProject = new TestProject() { @@ -1827,7 +1834,7 @@ public static void UnusedMethod() } } "; - testProject.ReferencedProjects.Add (unusedNonTrimmableProject); + testProject.ReferencedProjects.Add(unusedNonTrimmableProject); return testProject; } @@ -1871,7 +1878,9 @@ public static void UseClassLib() ClassLib.UsedMethod(); } }"; - } else { + } + else + { testProject.SourceFiles[$"{mainProjectName}.cs"] += @"}"; } diff --git a/src/Tests/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs b/src/Tests/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs index e1e34c69ff5d..122a8e9bbb2e 100644 --- a/src/Tests/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs +++ b/src/Tests/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs @@ -204,7 +204,7 @@ public void It_does_not_warn_on_rid_with_self_contained_set_in_project() TargetFrameworks = ToolsetInfo.CurrentTargetFramework, }; testProject.AdditionalProperties["SelfContained"] = "true"; - + var testInstance = _testAssetsManager.CreateTestProject(testProject); new DotnetBuildCommand(Log) @@ -252,8 +252,11 @@ public void It_does_not_warn_on_rid_with_self_contained_options_prior_to_net6() .NotHaveStdOutContaining("NETSDK1179"); } - [Fact] - public void It_builds_with_implicit_rid_with_self_contained_option() + [Theory] + [InlineData("--self-contained")] + [InlineData("-p:PublishTrimmed=true")] + [InlineData("")] + public void It_builds_with_implicit_rid_with_rid_specific_properties(string executeOptionsAndProperties) { var testInstance = _testAssetsManager.CopyTestAsset("HelloWorld") .WithSource() @@ -262,11 +265,13 @@ public void It_builds_with_implicit_rid_with_self_contained_option() new DotnetBuildCommand(Log) .WithWorkingDirectory(testInstance.Path) - .Execute("--self-contained") + .Execute(executeOptionsAndProperties) .Should() .Pass() .And - .NotHaveStdOutContaining("NETSDK1031"); + .NotHaveStdOutContaining("NETSDK1031") // Self Contained Checks + .And + .NotHaveStdErrContaining("NETSDK1191"); // Check that publish properties don't interfere with build either } [RequiresMSBuildVersionFact("17.4.0.41702")] diff --git a/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetOsArchOptions.cs b/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetOsArchOptions.cs index 6f68a648b745..49ca2bd8fffe 100644 --- a/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetOsArchOptions.cs +++ b/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetOsArchOptions.cs @@ -155,8 +155,7 @@ public void ItUsesImplicitRidWhenNoneIsSpecifiedForSelfContained() command.GetArgumentsToMSBuild() .Should() .StartWith($"{ExpectedPrefix} -restore -consoleloggerparameters:Summary " + - $"-property:SelfContained=True -property:_CommandLineDefinedSelfContained=true " + - $"-property:RuntimeIdentifier={currentRid} -property:_CommandLineDefinedRuntimeIdentifier=true"); + $"-property:SelfContained=True -property:_CommandLineDefinedSelfContained=true"); }); } From dd5632d56ca4df4a51946ae097591b92ea49f8f9 Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Thu, 8 Sep 2022 16:59:35 -0700 Subject: [PATCH 02/10] update xlf --- src/Tasks/Common/Resources/xlf/Strings.cs.xlf | 5 +++++ src/Tasks/Common/Resources/xlf/Strings.de.xlf | 5 +++++ src/Tasks/Common/Resources/xlf/Strings.es.xlf | 5 +++++ src/Tasks/Common/Resources/xlf/Strings.fr.xlf | 5 +++++ src/Tasks/Common/Resources/xlf/Strings.it.xlf | 5 +++++ src/Tasks/Common/Resources/xlf/Strings.ja.xlf | 5 +++++ src/Tasks/Common/Resources/xlf/Strings.ko.xlf | 5 +++++ src/Tasks/Common/Resources/xlf/Strings.pl.xlf | 5 +++++ src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf | 5 +++++ src/Tasks/Common/Resources/xlf/Strings.ru.xlf | 5 +++++ src/Tasks/Common/Resources/xlf/Strings.tr.xlf | 5 +++++ src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf | 5 +++++ src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf | 5 +++++ 13 files changed, 65 insertions(+) diff --git a/src/Tasks/Common/Resources/xlf/Strings.cs.xlf b/src/Tasks/Common/Resources/xlf/Strings.cs.xlf index aca92e04b876..46c735103bc9 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.cs.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.cs.xlf @@ -464,6 +464,11 @@ Optimalizace velikosti sestavení Tento proces může chvíli trvat. + + NETSDK1189: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + NETSDK1189: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + {StrBegin="NETSDK1191: "} + NETSDK1020: Package Root {0} was incorrectly given for Resolved library {1} NETSDK1020: Kořen balíčku {0} byl pro rozpoznanou knihovnu {1} nesprávně zadán. diff --git a/src/Tasks/Common/Resources/xlf/Strings.de.xlf b/src/Tasks/Common/Resources/xlf/Strings.de.xlf index 88421887a7c4..d36c8b1f0ca2 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.de.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.de.xlf @@ -464,6 +464,11 @@ Assemblys werden für die Größe optimiert. Dieser Vorgang kann eine Weile dauern. + + NETSDK1189: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + NETSDK1189: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + {StrBegin="NETSDK1191: "} + NETSDK1020: Package Root {0} was incorrectly given for Resolved library {1} NETSDK1020: Der Paketstamm "{0}" war für die aufgelöste Bibliothek "{1}" falsch angegeben. diff --git a/src/Tasks/Common/Resources/xlf/Strings.es.xlf b/src/Tasks/Common/Resources/xlf/Strings.es.xlf index c1f29ea2dd35..31b14f40c31a 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.es.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.es.xlf @@ -464,6 +464,11 @@ Optimización del tamaño de los ensamblados. Este proceso puede tardar un momento. + + NETSDK1189: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + NETSDK1189: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + {StrBegin="NETSDK1191: "} + NETSDK1020: Package Root {0} was incorrectly given for Resolved library {1} NETSDK1020: Se proporcionó incorrectamente la raíz del paquete {0} para la biblioteca resuelta {1} diff --git a/src/Tasks/Common/Resources/xlf/Strings.fr.xlf b/src/Tasks/Common/Resources/xlf/Strings.fr.xlf index ae3d920dbe89..efb1bc337875 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.fr.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.fr.xlf @@ -464,6 +464,11 @@ Optimisation des assemblages pour la taille. Ce processus peut prendre un certain temps. + + NETSDK1189: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + NETSDK1189: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + {StrBegin="NETSDK1191: "} + NETSDK1020: Package Root {0} was incorrectly given for Resolved library {1} NETSDK1020: La racine de package {0} a été spécifiée de manière incorrecte pour la bibliothèque Resolved {1} diff --git a/src/Tasks/Common/Resources/xlf/Strings.it.xlf b/src/Tasks/Common/Resources/xlf/Strings.it.xlf index e05e07ff2c0f..9eaa19215816 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.it.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.it.xlf @@ -464,6 +464,11 @@ Ottimizzazione degli assembly per le dimensioni. Questo processo potrebbe richiedere del tempo. + + NETSDK1189: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + NETSDK1189: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + {StrBegin="NETSDK1191: "} + NETSDK1020: Package Root {0} was incorrectly given for Resolved library {1} NETSDK1020: la radice {0} del pacchetto specificata per la libreria risolta {1} non è corretta diff --git a/src/Tasks/Common/Resources/xlf/Strings.ja.xlf b/src/Tasks/Common/Resources/xlf/Strings.ja.xlf index 62ebe16e2cbc..a60753f437f4 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.ja.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.ja.xlf @@ -464,6 +464,11 @@ アセンブリのサイズを最適化しています。このプロセスには時間がかかる場合があります。 + + NETSDK1189: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + NETSDK1189: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + {StrBegin="NETSDK1191: "} + NETSDK1020: Package Root {0} was incorrectly given for Resolved library {1} NETSDK1020: 解決されたライブラリ {1} に対して指定されたパッケージ ルート {0} が正しくありません。 diff --git a/src/Tasks/Common/Resources/xlf/Strings.ko.xlf b/src/Tasks/Common/Resources/xlf/Strings.ko.xlf index e3f6c874f761..c1b1c5a89185 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.ko.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.ko.xlf @@ -464,6 +464,11 @@ 크기에 맞게 어셈블리 최적화. 이 프로세스는 시간이 걸릴 수 있습니다. + + NETSDK1189: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + NETSDK1189: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + {StrBegin="NETSDK1191: "} + NETSDK1020: Package Root {0} was incorrectly given for Resolved library {1} NETSDK1020: 패키지 루트 {0}이(가) 확인된 라이브러리 {1}에 대해 잘못 지정되었습니다. diff --git a/src/Tasks/Common/Resources/xlf/Strings.pl.xlf b/src/Tasks/Common/Resources/xlf/Strings.pl.xlf index e1240133f122..dce5bd12bdf4 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.pl.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.pl.xlf @@ -464,6 +464,11 @@ Optymalizowanie zestawów pod kątem rozmiaru. Ten proces może trochę potrwać. + + NETSDK1189: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + NETSDK1189: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + {StrBegin="NETSDK1191: "} + NETSDK1020: Package Root {0} was incorrectly given for Resolved library {1} NETSDK1020: Podano niepoprawny element główny pakietu {0} dla rozpoznanej biblioteki {1} diff --git a/src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf b/src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf index aa05df1cbe10..05cce650b9c0 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf @@ -464,6 +464,11 @@ Otimizando montagens para tamanho. Esse processo pode demorar um pouco. + + NETSDK1189: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + NETSDK1189: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + {StrBegin="NETSDK1191: "} + NETSDK1020: Package Root {0} was incorrectly given for Resolved library {1} NETSDK1020: A raiz do pacote {0} foi atribuída incorretamente para a biblioteca resolvida {1} diff --git a/src/Tasks/Common/Resources/xlf/Strings.ru.xlf b/src/Tasks/Common/Resources/xlf/Strings.ru.xlf index 49b4ac2f4e27..8b6747b9dd96 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.ru.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.ru.xlf @@ -464,6 +464,11 @@ Оптимизация сборок по размеру. Этот процесс может занять некоторое время. + + NETSDK1189: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + NETSDK1189: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + {StrBegin="NETSDK1191: "} + NETSDK1020: Package Root {0} was incorrectly given for Resolved library {1} NETSDK1020: корневой каталог пакета {0} указан некорректно для разрешенной библиотеки {1} diff --git a/src/Tasks/Common/Resources/xlf/Strings.tr.xlf b/src/Tasks/Common/Resources/xlf/Strings.tr.xlf index 4dccfb26c568..69df393ff1fc 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.tr.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.tr.xlf @@ -464,6 +464,11 @@ Derlemelerin boyutu iyileştiriliyor. Bu işlem biraz zaman alabilir. + + NETSDK1189: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + NETSDK1189: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + {StrBegin="NETSDK1191: "} + NETSDK1020: Package Root {0} was incorrectly given for Resolved library {1} NETSDK1020: {0} Paket Kökü, Çözümlenmiş {1} kitaplığı için yanlışlıkla verildi diff --git a/src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf b/src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf index 888b751168b4..b7cf31c1b7da 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf @@ -464,6 +464,11 @@ 正在优化程序集以调整大小。此过程可能需要一段时间。 + + NETSDK1189: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + NETSDK1189: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + {StrBegin="NETSDK1191: "} + NETSDK1020: Package Root {0} was incorrectly given for Resolved library {1} NETSDK1020: 对于“已解析”库 {1}，包根目录 {0} 分配错误 diff --git a/src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf b/src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf index 2872750e47c3..8fb977476f51 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf @@ -464,6 +464,11 @@ 正在針對大小最佳化組件。此流程可能需要一些時間。 + + NETSDK1189: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + NETSDK1189: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + {StrBegin="NETSDK1191: "} + NETSDK1020: Package Root {0} was incorrectly given for Resolved library {1} NETSDK1020: 為已解析的程式庫 {1} 指定的套件根 {0} 不正確 From ae1c82c9bd0ececf19a76d131aab93fffa25d916 Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Fri, 9 Sep 2022 09:46:48 -0700 Subject: [PATCH 03/10] apply fixes --- src/Tasks/Common/Resources/Strings.resx | 2 +- src/Tasks/Common/Resources/xlf/Strings.cs.xlf | 4 ++-- src/Tasks/Common/Resources/xlf/Strings.de.xlf | 4 ++-- src/Tasks/Common/Resources/xlf/Strings.es.xlf | 4 ++-- src/Tasks/Common/Resources/xlf/Strings.fr.xlf | 4 ++-- src/Tasks/Common/Resources/xlf/Strings.it.xlf | 4 ++-- src/Tasks/Common/Resources/xlf/Strings.ja.xlf | 4 ++-- src/Tasks/Common/Resources/xlf/Strings.ko.xlf | 4 ++-- src/Tasks/Common/Resources/xlf/Strings.pl.xlf | 4 ++-- src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf | 4 ++-- src/Tasks/Common/Resources/xlf/Strings.ru.xlf | 4 ++-- src/Tasks/Common/Resources/xlf/Strings.tr.xlf | 4 ++-- src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf | 4 ++-- src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf | 4 ++-- .../GlobalPropertyFlowTests.cs | 9 +++++---- .../GivenThatWeWantToPublishASingleFileApp.cs | 12 ++++++------ 16 files changed, 38 insertions(+), 37 deletions(-) diff --git a/src/Tasks/Common/Resources/Strings.resx b/src/Tasks/Common/Resources/Strings.resx index 93db7f7f05ca..0c2127a6dd27 100644 --- a/src/Tasks/Common/Resources/Strings.resx +++ b/src/Tasks/Common/Resources/Strings.resx @@ -860,7 +860,7 @@ You may need to build the project on another operating system or architecture, o Error code is NETSDK1188. 0 is a package name, 1 is a package version, and 2 is the incorrect locale string - NETSDK1189: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. {StrBegin="NETSDK1191: "} diff --git a/src/Tasks/Common/Resources/xlf/Strings.cs.xlf b/src/Tasks/Common/Resources/xlf/Strings.cs.xlf index 46c735103bc9..5bc32f861611 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.cs.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.cs.xlf @@ -465,8 +465,8 @@ - NETSDK1189: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. - NETSDK1189: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. {StrBegin="NETSDK1191: "} diff --git a/src/Tasks/Common/Resources/xlf/Strings.de.xlf b/src/Tasks/Common/Resources/xlf/Strings.de.xlf index d36c8b1f0ca2..f1f535dcd963 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.de.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.de.xlf @@ -465,8 +465,8 @@ - NETSDK1189: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. - NETSDK1189: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. {StrBegin="NETSDK1191: "} diff --git a/src/Tasks/Common/Resources/xlf/Strings.es.xlf b/src/Tasks/Common/Resources/xlf/Strings.es.xlf index 31b14f40c31a..ff55ccd46597 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.es.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.es.xlf @@ -465,8 +465,8 @@ - NETSDK1189: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. - NETSDK1189: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. {StrBegin="NETSDK1191: "} diff --git a/src/Tasks/Common/Resources/xlf/Strings.fr.xlf b/src/Tasks/Common/Resources/xlf/Strings.fr.xlf index efb1bc337875..152ad9c1bec2 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.fr.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.fr.xlf @@ -465,8 +465,8 @@ - NETSDK1189: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. - NETSDK1189: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. {StrBegin="NETSDK1191: "} diff --git a/src/Tasks/Common/Resources/xlf/Strings.it.xlf b/src/Tasks/Common/Resources/xlf/Strings.it.xlf index 9eaa19215816..0074c81b3c4d 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.it.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.it.xlf @@ -465,8 +465,8 @@ - NETSDK1189: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. - NETSDK1189: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. {StrBegin="NETSDK1191: "} diff --git a/src/Tasks/Common/Resources/xlf/Strings.ja.xlf b/src/Tasks/Common/Resources/xlf/Strings.ja.xlf index a60753f437f4..e723457036fa 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.ja.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.ja.xlf @@ -465,8 +465,8 @@ - NETSDK1189: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. - NETSDK1189: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. {StrBegin="NETSDK1191: "} diff --git a/src/Tasks/Common/Resources/xlf/Strings.ko.xlf b/src/Tasks/Common/Resources/xlf/Strings.ko.xlf index c1b1c5a89185..1f44a2f27669 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.ko.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.ko.xlf @@ -465,8 +465,8 @@ - NETSDK1189: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. - NETSDK1189: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. {StrBegin="NETSDK1191: "} diff --git a/src/Tasks/Common/Resources/xlf/Strings.pl.xlf b/src/Tasks/Common/Resources/xlf/Strings.pl.xlf index dce5bd12bdf4..ddb9090bad59 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.pl.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.pl.xlf @@ -465,8 +465,8 @@ - NETSDK1189: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. - NETSDK1189: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. {StrBegin="NETSDK1191: "} diff --git a/src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf b/src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf index 05cce650b9c0..eeb76a1b4db1 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf @@ -465,8 +465,8 @@ - NETSDK1189: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. - NETSDK1189: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. {StrBegin="NETSDK1191: "} diff --git a/src/Tasks/Common/Resources/xlf/Strings.ru.xlf b/src/Tasks/Common/Resources/xlf/Strings.ru.xlf index 8b6747b9dd96..5b67ffd73570 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.ru.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.ru.xlf @@ -465,8 +465,8 @@ - NETSDK1189: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. - NETSDK1189: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. {StrBegin="NETSDK1191: "} diff --git a/src/Tasks/Common/Resources/xlf/Strings.tr.xlf b/src/Tasks/Common/Resources/xlf/Strings.tr.xlf index 69df393ff1fc..0e2fa0791a72 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.tr.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.tr.xlf @@ -465,8 +465,8 @@ - NETSDK1189: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. - NETSDK1189: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. {StrBegin="NETSDK1191: "} diff --git a/src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf b/src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf index b7cf31c1b7da..8cb24f6ac8a6 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf @@ -465,8 +465,8 @@ - NETSDK1189: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. - NETSDK1189: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. {StrBegin="NETSDK1191: "} diff --git a/src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf b/src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf index 8fb977476f51..abfdd8728fac 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf @@ -465,8 +465,8 @@ - NETSDK1189: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. - NETSDK1189: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. {StrBegin="NETSDK1191: "} diff --git a/src/Tests/Microsoft.NET.Build.Tests/GlobalPropertyFlowTests.cs b/src/Tests/Microsoft.NET.Build.Tests/GlobalPropertyFlowTests.cs index 7eb276da0463..c374a94b123a 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GlobalPropertyFlowTests.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GlobalPropertyFlowTests.cs @@ -45,7 +45,7 @@ public GlobalPropertyFlowTests(ITestOutputHelper log) : base(log) TestAsset Build(bool passSelfContained, bool passRuntimeIdentifier, [CallerMemberName] string callingMethod = "", string identifier = "") { - var testAsset = _testAssetsManager.CreateTestProject(_testProject, callingMethod: callingMethod, identifier:identifier); + var testAsset = _testAssetsManager.CreateTestProject(_testProject, callingMethod: callingMethod, identifier: identifier); var arguments = GetDotnetArguments(passSelfContained, passRuntimeIdentifier); @@ -207,7 +207,8 @@ public void TestGlobalPropertyFlowInSolution(bool passSelfContained, bool passRu var testAsset = _testAssetsManager.CreateTestProject(_testProject, identifier: identifier); - new DotnetCommand(Log, "new", "sln") + new DotnetNewCommand(Log, "sln") + .WithVirtualHive() .WithWorkingDirectory(testAsset.TestRoot) .Execute() .Should() @@ -251,7 +252,7 @@ private static void ValidateProperties(TestAsset testAsset, TestProject testProj { targetFramework = targetFramework ?? testProject.TargetFrameworks; - + if (string.IsNullOrEmpty(expectedRuntimeIdentifier) && (expectSelfContained || expectRuntimeIdentifier)) { // RuntimeIdentifier might be inferred, so look at the output path to figure out what the actual value used was @@ -268,7 +269,7 @@ private static void ValidateProperties(TestAsset testAsset, TestProject testProj { properties["SelfContained"].ToLowerInvariant().Should().BeOneOf("false", ""); } - + properties["RuntimeIdentifier"].Should().Be(expectedRuntimeIdentifier); } diff --git a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASingleFileApp.cs b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASingleFileApp.cs index 2079fef2fc49..27739ff07cac 100644 --- a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASingleFileApp.cs +++ b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASingleFileApp.cs @@ -669,12 +669,12 @@ static void ProduceLinkerAnalysisWarning() [InlineData("netcoreapp3.1", true, IncludeDefault)] [InlineData("netcoreapp3.1", false, IncludePdb)] [InlineData("netcoreapp3.1", true, IncludePdb)] - [InlineData("net5.0", false, IncludeDefault)] - [InlineData("net5.0", false, IncludeNative)] - [InlineData("net5.0", false, IncludeAllContent)] - [InlineData("net5.0", true, IncludeDefault)] - [InlineData("net5.0", true, IncludeNative)] - [InlineData("net5.0", true, IncludeAllContent)] + [InlineData("net6.0", false, IncludeDefault)] + [InlineData("net6.0", false, IncludeNative)] + [InlineData("net6.0", false, IncludeAllContent)] + [InlineData("net6.0", true, IncludeDefault)] + [InlineData("net6.0", true, IncludeNative)] + [InlineData("net6.0", true, IncludeAllContent)] [InlineData(ToolsetInfo.CurrentTargetFramework, false, IncludeDefault)] [InlineData(ToolsetInfo.CurrentTargetFramework, false, IncludeNative)] [InlineData(ToolsetInfo.CurrentTargetFramework, false, IncludeAllContent)] From 7a6c1bbc2d543e4f2f9fba9840e0ae278796ea70 Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Fri, 9 Sep 2022 09:57:35 -0700 Subject: [PATCH 04/10] Update xlf post merge --- src/Tasks/Common/Resources/Strings.resx | 4 ++-- src/Tasks/Common/Resources/xlf/Strings.cs.xlf | 6 +++--- src/Tasks/Common/Resources/xlf/Strings.de.xlf | 6 +++--- src/Tasks/Common/Resources/xlf/Strings.es.xlf | 6 +++--- src/Tasks/Common/Resources/xlf/Strings.fr.xlf | 6 +++--- src/Tasks/Common/Resources/xlf/Strings.it.xlf | 6 +++--- src/Tasks/Common/Resources/xlf/Strings.ja.xlf | 6 +++--- src/Tasks/Common/Resources/xlf/Strings.ko.xlf | 6 +++--- src/Tasks/Common/Resources/xlf/Strings.pl.xlf | 6 +++--- src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf | 6 +++--- src/Tasks/Common/Resources/xlf/Strings.ru.xlf | 6 +++--- src/Tasks/Common/Resources/xlf/Strings.tr.xlf | 6 +++--- src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf | 6 +++--- src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf | 6 +++--- .../GivenThatWeWantToPublishAHelloWorldProject.cs | 2 +- .../GivenThatWeWantToPublishASelfContainedApp.cs | 2 +- .../dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs | 2 +- 17 files changed, 44 insertions(+), 44 deletions(-) diff --git a/src/Tasks/Common/Resources/Strings.resx b/src/Tasks/Common/Resources/Strings.resx index 4255306b94af..ebec214b6824 100644 --- a/src/Tasks/Common/Resources/Strings.resx +++ b/src/Tasks/Common/Resources/Strings.resx @@ -864,7 +864,7 @@ You may need to build the project on another operating system or architecture, o {StrBegin="NETSDK1189: "} - NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. - {StrBegin="NETSDK1191: "} + NETSDK1190: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + {StrBegin="NETSDK1190: "} diff --git a/src/Tasks/Common/Resources/xlf/Strings.cs.xlf b/src/Tasks/Common/Resources/xlf/Strings.cs.xlf index 6d07bd842846..36ff5aa63511 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.cs.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.cs.xlf @@ -465,9 +465,9 @@ - NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. - NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. - {StrBegin="NETSDK1191: "} + NETSDK1190: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + NETSDK1190: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + {StrBegin="NETSDK1190: "} NETSDK1020: Package Root {0} was incorrectly given for Resolved library {1} diff --git a/src/Tasks/Common/Resources/xlf/Strings.de.xlf b/src/Tasks/Common/Resources/xlf/Strings.de.xlf index a8ddb92cce1a..d76816459335 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.de.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.de.xlf @@ -465,9 +465,9 @@ - NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. - NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. - {StrBegin="NETSDK1191: "} + NETSDK1190: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + NETSDK1190: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + {StrBegin="NETSDK1190: "} NETSDK1020: Package Root {0} was incorrectly given for Resolved library {1} diff --git a/src/Tasks/Common/Resources/xlf/Strings.es.xlf b/src/Tasks/Common/Resources/xlf/Strings.es.xlf index e9d0522c38a0..afaba5fe54ef 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.es.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.es.xlf @@ -465,9 +465,9 @@ - NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. - NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. - {StrBegin="NETSDK1191: "} + NETSDK1190: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + NETSDK1190: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + {StrBegin="NETSDK1190: "} NETSDK1020: Package Root {0} was incorrectly given for Resolved library {1} diff --git a/src/Tasks/Common/Resources/xlf/Strings.fr.xlf b/src/Tasks/Common/Resources/xlf/Strings.fr.xlf index 15ded2624f02..3fef1e01bcce 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.fr.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.fr.xlf @@ -465,9 +465,9 @@ - NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. - NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. - {StrBegin="NETSDK1191: "} + NETSDK1190: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + NETSDK1190: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + {StrBegin="NETSDK1190: "} NETSDK1020: Package Root {0} was incorrectly given for Resolved library {1} diff --git a/src/Tasks/Common/Resources/xlf/Strings.it.xlf b/src/Tasks/Common/Resources/xlf/Strings.it.xlf index 56d165c7384f..f2f6ca75f5ce 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.it.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.it.xlf @@ -465,9 +465,9 @@ - NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. - NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. - {StrBegin="NETSDK1191: "} + NETSDK1190: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + NETSDK1190: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + {StrBegin="NETSDK1190: "} NETSDK1020: Package Root {0} was incorrectly given for Resolved library {1} diff --git a/src/Tasks/Common/Resources/xlf/Strings.ja.xlf b/src/Tasks/Common/Resources/xlf/Strings.ja.xlf index ab0858bd3549..98526b670804 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.ja.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.ja.xlf @@ -465,9 +465,9 @@ - NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. - NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. - {StrBegin="NETSDK1191: "} + NETSDK1190: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + NETSDK1190: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + {StrBegin="NETSDK1190: "} NETSDK1020: Package Root {0} was incorrectly given for Resolved library {1} diff --git a/src/Tasks/Common/Resources/xlf/Strings.ko.xlf b/src/Tasks/Common/Resources/xlf/Strings.ko.xlf index fb9edf790c8f..c8f67509d1b1 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.ko.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.ko.xlf @@ -465,9 +465,9 @@ - NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. - NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. - {StrBegin="NETSDK1191: "} + NETSDK1190: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + NETSDK1190: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + {StrBegin="NETSDK1190: "} NETSDK1020: Package Root {0} was incorrectly given for Resolved library {1} diff --git a/src/Tasks/Common/Resources/xlf/Strings.pl.xlf b/src/Tasks/Common/Resources/xlf/Strings.pl.xlf index 15ae92c24591..26e618b6b28a 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.pl.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.pl.xlf @@ -465,9 +465,9 @@ - NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. - NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. - {StrBegin="NETSDK1191: "} + NETSDK1190: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + NETSDK1190: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + {StrBegin="NETSDK1190: "} NETSDK1020: Package Root {0} was incorrectly given for Resolved library {1} diff --git a/src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf b/src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf index b2e24cca2521..01892a1893b6 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf @@ -465,9 +465,9 @@ - NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. - NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. - {StrBegin="NETSDK1191: "} + NETSDK1190: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + NETSDK1190: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + {StrBegin="NETSDK1190: "} NETSDK1020: Package Root {0} was incorrectly given for Resolved library {1} diff --git a/src/Tasks/Common/Resources/xlf/Strings.ru.xlf b/src/Tasks/Common/Resources/xlf/Strings.ru.xlf index 0705231d94d6..aa5252aa4d30 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.ru.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.ru.xlf @@ -465,9 +465,9 @@ - NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. - NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. - {StrBegin="NETSDK1191: "} + NETSDK1190: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + NETSDK1190: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + {StrBegin="NETSDK1190: "} NETSDK1020: Package Root {0} was incorrectly given for Resolved library {1} diff --git a/src/Tasks/Common/Resources/xlf/Strings.tr.xlf b/src/Tasks/Common/Resources/xlf/Strings.tr.xlf index 50bdc0893b13..60d52e0daf30 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.tr.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.tr.xlf @@ -465,9 +465,9 @@ - NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. - NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. - {StrBegin="NETSDK1191: "} + NETSDK1190: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + NETSDK1190: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + {StrBegin="NETSDK1190: "} NETSDK1020: Package Root {0} was incorrectly given for Resolved library {1} diff --git a/src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf b/src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf index a3ba82756ec3..91499164b7db 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf @@ -465,9 +465,9 @@ - NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. - NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. - {StrBegin="NETSDK1191: "} + NETSDK1190: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + NETSDK1190: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + {StrBegin="NETSDK1190: "} NETSDK1020: Package Root {0} was incorrectly given for Resolved library {1} diff --git a/src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf b/src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf index 5746c29d1726..efbbb67fdc25 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf @@ -465,9 +465,9 @@ - NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. - NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. - {StrBegin="NETSDK1191: "} + NETSDK1190: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + NETSDK1190: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + {StrBegin="NETSDK1190: "} NETSDK1020: Package Root {0} was incorrectly given for Resolved library {1} diff --git a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAHelloWorldProject.cs b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAHelloWorldProject.cs index 8879e9d36b1e..80a7ac62badd 100644 --- a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAHelloWorldProject.cs +++ b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAHelloWorldProject.cs @@ -1071,7 +1071,7 @@ public void It_publishes_with_implicit_rid_with_rid_specific_properties(string e .Should() .Pass() .And - .NotHaveStdErrContaining("NETSDK1191"); // Publish Properties Requiring RID Checks + .NotHaveStdErrContaining("NETSDK1190"); // Publish Properties Requiring RID Checks } [Fact] diff --git a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASelfContainedApp.cs b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASelfContainedApp.cs index 2217665e8f05..aaa9e980a175 100644 --- a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASelfContainedApp.cs +++ b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASelfContainedApp.cs @@ -122,7 +122,7 @@ public void It_publishes_an_app_with_a_netcoreapp_lib_reference() { "/p:SelfContained=true", $"/p:TargetFramework={ToolsetInfo.CurrentTargetFramework}", - $"/p:RuntimeIdentifier={EnvironmentInfo.GetCompatibleRid(ToolsetInfo.CurrentTargetFramework)}", + $"/p:RuntimeIdentifier={EnvironmentInfo.GetCompatibleRid(ToolsetInfo.CurrentTargetFramework)}" }; new RestoreCommand(testAsset, "main").Execute(args); diff --git a/src/Tests/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs b/src/Tests/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs index 122a8e9bbb2e..c2871b869b4b 100644 --- a/src/Tests/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs +++ b/src/Tests/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs @@ -271,7 +271,7 @@ public void It_builds_with_implicit_rid_with_rid_specific_properties(string exec .And .NotHaveStdOutContaining("NETSDK1031") // Self Contained Checks .And - .NotHaveStdErrContaining("NETSDK1191"); // Check that publish properties don't interfere with build either + .NotHaveStdErrContaining("NETSDK1190"); // Check that publish properties don't interfere with build either } [RequiresMSBuildVersionFact("17.4.0.41702")] From 1f25126a4cf3f5c783e890d5fc7f7103999d2cd0 Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Mon, 12 Sep 2022 10:23:14 -0700 Subject: [PATCH 05/10] Try to stop helix from duplicating the test path for weird reasons --- .../GivenThatWeWantToPublishASelfContainedApp.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASelfContainedApp.cs b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASelfContainedApp.cs index aaa9e980a175..238a1cad07bf 100644 --- a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASelfContainedApp.cs +++ b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASelfContainedApp.cs @@ -127,7 +127,7 @@ public void It_publishes_an_app_with_a_netcoreapp_lib_reference() new RestoreCommand(testAsset, "main").Execute(args); - new PublishCommand(testAsset, "main") + new PublishCommand(Log, Path.Combine(testAsset.Path, "main", "main.csproj")) .Execute(args) .Should() .Pass(); From 329b218cc5896a2eadd3fc3afafb29d5b62a7a0e Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Mon, 12 Sep 2022 10:30:06 -0700 Subject: [PATCH 06/10] More helix weirdness --- .../GivenThatWeWantToPublishASelfContainedApp.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASelfContainedApp.cs b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASelfContainedApp.cs index 238a1cad07bf..a8be3a047c50 100644 --- a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASelfContainedApp.cs +++ b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASelfContainedApp.cs @@ -125,7 +125,8 @@ public void It_publishes_an_app_with_a_netcoreapp_lib_reference() $"/p:RuntimeIdentifier={EnvironmentInfo.GetCompatibleRid(ToolsetInfo.CurrentTargetFramework)}" }; - new RestoreCommand(testAsset, "main").Execute(args); + new RestoreCommand(Log, Path.Combine(testAsset.Path, "main", "main.csproj")) + .Execute(args); new PublishCommand(Log, Path.Combine(testAsset.Path, "main", "main.csproj")) .Execute(args) From a091e049e6276132daa3510ebfe8687b071dfef9 Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Tue, 13 Sep 2022 11:09:50 -0700 Subject: [PATCH 07/10] Revert "More helix weirdness" This reverts commit 329b218cc5896a2eadd3fc3afafb29d5b62a7a0e. --- .../GivenThatWeWantToPublishASelfContainedApp.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASelfContainedApp.cs b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASelfContainedApp.cs index a8be3a047c50..238a1cad07bf 100644 --- a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASelfContainedApp.cs +++ b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASelfContainedApp.cs @@ -125,8 +125,7 @@ public void It_publishes_an_app_with_a_netcoreapp_lib_reference() $"/p:RuntimeIdentifier={EnvironmentInfo.GetCompatibleRid(ToolsetInfo.CurrentTargetFramework)}" }; - new RestoreCommand(Log, Path.Combine(testAsset.Path, "main", "main.csproj")) - .Execute(args); + new RestoreCommand(testAsset, "main").Execute(args); new PublishCommand(Log, Path.Combine(testAsset.Path, "main", "main.csproj")) .Execute(args) From a90d2f561f2780ac8eaad2a78cb276e4c633bf0f Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Tue, 13 Sep 2022 11:10:08 -0700 Subject: [PATCH 08/10] Revert "Try to stop helix from duplicating the test path for weird reasons" This reverts commit 1f25126a4cf3f5c783e890d5fc7f7103999d2cd0. --- .../GivenThatWeWantToPublishASelfContainedApp.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASelfContainedApp.cs b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASelfContainedApp.cs index 238a1cad07bf..aaa9e980a175 100644 --- a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASelfContainedApp.cs +++ b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASelfContainedApp.cs @@ -127,7 +127,7 @@ public void It_publishes_an_app_with_a_netcoreapp_lib_reference() new RestoreCommand(testAsset, "main").Execute(args); - new PublishCommand(Log, Path.Combine(testAsset.Path, "main", "main.csproj")) + new PublishCommand(testAsset, "main") .Execute(args) .Should() .Pass(); From 9474e26f3cd60f3d1f38d83a4881ceb9f60b0265 Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Tue, 13 Sep 2022 11:11:59 -0700 Subject: [PATCH 09/10] Require newer MSBuild version to fix test in helix --- .../GivenThatWeWantToPublishASelfContainedApp.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASelfContainedApp.cs b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASelfContainedApp.cs index aaa9e980a175..6ef5bcdfe3ce 100644 --- a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASelfContainedApp.cs +++ b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASelfContainedApp.cs @@ -111,7 +111,7 @@ public void It_can_make_a_Windows_GUI_exe() .Be(2); } - [Fact] + [RequiresMSBuildVersionFact("17.4.0.41702")] public void It_publishes_an_app_with_a_netcoreapp_lib_reference() { var testAsset = _testAssetsManager From 4e81ebb4cc199e02fd493a84b8d10ff3c62530ad Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Tue, 13 Sep 2022 11:23:53 -0700 Subject: [PATCH 10/10] Update xlf --- src/Tasks/Common/Resources/xlf/Strings.cs.xlf | 6 +++--- src/Tasks/Common/Resources/xlf/Strings.de.xlf | 6 +++--- src/Tasks/Common/Resources/xlf/Strings.es.xlf | 6 +++--- src/Tasks/Common/Resources/xlf/Strings.fr.xlf | 6 +++--- src/Tasks/Common/Resources/xlf/Strings.it.xlf | 6 +++--- src/Tasks/Common/Resources/xlf/Strings.ja.xlf | 6 +++--- src/Tasks/Common/Resources/xlf/Strings.ko.xlf | 6 +++--- src/Tasks/Common/Resources/xlf/Strings.pl.xlf | 6 +++--- src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf | 6 +++--- src/Tasks/Common/Resources/xlf/Strings.ru.xlf | 6 +++--- src/Tasks/Common/Resources/xlf/Strings.tr.xlf | 6 +++--- src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf | 6 +++--- src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf | 6 +++--- 13 files changed, 39 insertions(+), 39 deletions(-) diff --git a/src/Tasks/Common/Resources/xlf/Strings.cs.xlf b/src/Tasks/Common/Resources/xlf/Strings.cs.xlf index 7e6f3e32f35d..447b23495736 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.cs.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.cs.xlf @@ -465,9 +465,9 @@ - NETSDK1190: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. - NETSDK1190: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. - {StrBegin="NETSDK1190: "} + NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + {StrBegin="NETSDK1191: "} NETSDK1020: Package Root {0} was incorrectly given for Resolved library {1} diff --git a/src/Tasks/Common/Resources/xlf/Strings.de.xlf b/src/Tasks/Common/Resources/xlf/Strings.de.xlf index b3f8aa054703..3cdbcae38a6a 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.de.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.de.xlf @@ -465,9 +465,9 @@ - NETSDK1190: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. - NETSDK1190: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. - {StrBegin="NETSDK1190: "} + NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + {StrBegin="NETSDK1191: "} NETSDK1020: Package Root {0} was incorrectly given for Resolved library {1} diff --git a/src/Tasks/Common/Resources/xlf/Strings.es.xlf b/src/Tasks/Common/Resources/xlf/Strings.es.xlf index 4a76847f66c9..feaefd722c31 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.es.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.es.xlf @@ -465,9 +465,9 @@ - NETSDK1190: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. - NETSDK1190: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. - {StrBegin="NETSDK1190: "} + NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + {StrBegin="NETSDK1191: "} NETSDK1020: Package Root {0} was incorrectly given for Resolved library {1} diff --git a/src/Tasks/Common/Resources/xlf/Strings.fr.xlf b/src/Tasks/Common/Resources/xlf/Strings.fr.xlf index cc54c8125d54..585cb37d27b4 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.fr.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.fr.xlf @@ -465,9 +465,9 @@ - NETSDK1190: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. - NETSDK1190: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. - {StrBegin="NETSDK1190: "} + NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + {StrBegin="NETSDK1191: "} NETSDK1020: Package Root {0} was incorrectly given for Resolved library {1} diff --git a/src/Tasks/Common/Resources/xlf/Strings.it.xlf b/src/Tasks/Common/Resources/xlf/Strings.it.xlf index 87ff1a2ccfbc..5a1980ac7276 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.it.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.it.xlf @@ -465,9 +465,9 @@ - NETSDK1190: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. - NETSDK1190: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. - {StrBegin="NETSDK1190: "} + NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + {StrBegin="NETSDK1191: "} NETSDK1020: Package Root {0} was incorrectly given for Resolved library {1} diff --git a/src/Tasks/Common/Resources/xlf/Strings.ja.xlf b/src/Tasks/Common/Resources/xlf/Strings.ja.xlf index 714a890722fa..1a33a0cd3962 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.ja.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.ja.xlf @@ -465,9 +465,9 @@ - NETSDK1190: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. - NETSDK1190: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. - {StrBegin="NETSDK1190: "} + NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + {StrBegin="NETSDK1191: "} NETSDK1020: Package Root {0} was incorrectly given for Resolved library {1} diff --git a/src/Tasks/Common/Resources/xlf/Strings.ko.xlf b/src/Tasks/Common/Resources/xlf/Strings.ko.xlf index cc73452ac958..5444bd628d87 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.ko.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.ko.xlf @@ -465,9 +465,9 @@ - NETSDK1190: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. - NETSDK1190: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. - {StrBegin="NETSDK1190: "} + NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + {StrBegin="NETSDK1191: "} NETSDK1020: Package Root {0} was incorrectly given for Resolved library {1} diff --git a/src/Tasks/Common/Resources/xlf/Strings.pl.xlf b/src/Tasks/Common/Resources/xlf/Strings.pl.xlf index a6a1268f1650..7b6ba1a64bb4 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.pl.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.pl.xlf @@ -465,9 +465,9 @@ - NETSDK1190: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. - NETSDK1190: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. - {StrBegin="NETSDK1190: "} + NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + {StrBegin="NETSDK1191: "} NETSDK1020: Package Root {0} was incorrectly given for Resolved library {1} diff --git a/src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf b/src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf index 5be346512042..e337f524b6cb 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf @@ -465,9 +465,9 @@ - NETSDK1190: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. - NETSDK1190: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. - {StrBegin="NETSDK1190: "} + NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + {StrBegin="NETSDK1191: "} NETSDK1020: Package Root {0} was incorrectly given for Resolved library {1} diff --git a/src/Tasks/Common/Resources/xlf/Strings.ru.xlf b/src/Tasks/Common/Resources/xlf/Strings.ru.xlf index 160af0836496..8f7348fd0859 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.ru.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.ru.xlf @@ -465,9 +465,9 @@ - NETSDK1190: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. - NETSDK1190: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. - {StrBegin="NETSDK1190: "} + NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + {StrBegin="NETSDK1191: "} NETSDK1020: Package Root {0} was incorrectly given for Resolved library {1} diff --git a/src/Tasks/Common/Resources/xlf/Strings.tr.xlf b/src/Tasks/Common/Resources/xlf/Strings.tr.xlf index a1c5ccb97352..f78e1450f460 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.tr.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.tr.xlf @@ -465,9 +465,9 @@ - NETSDK1190: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. - NETSDK1190: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. - {StrBegin="NETSDK1190: "} + NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + {StrBegin="NETSDK1191: "} NETSDK1020: Package Root {0} was incorrectly given for Resolved library {1} diff --git a/src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf b/src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf index 7380bf552814..58c7606ebe44 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf @@ -465,9 +465,9 @@ - NETSDK1190: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. - NETSDK1190: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. - {StrBegin="NETSDK1190: "} + NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + {StrBegin="NETSDK1191: "} NETSDK1020: Package Root {0} was incorrectly given for Resolved library {1} diff --git a/src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf b/src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf index 60aec790d375..58abf8f5c095 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf @@ -465,9 +465,9 @@ - NETSDK1190: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. - NETSDK1190: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. - {StrBegin="NETSDK1190: "} + NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. + {StrBegin="NETSDK1191: "} NETSDK1020: Package Root {0} was incorrectly given for Resolved library {1}