From b7360cd544629e872da8e0b7d5604a5c5fdaf339 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Thu, 21 Apr 2022 00:13:37 -0700 Subject: [PATCH 1/4] Update the hardcoded netcoreapp3.0 to the current framework --- ...GivenAGenerateRuntimeConfigurationFiles.cs | 3 +- .../ProcessFrameworkReferencesTests.cs | 9 ++-- .../CompatibleFrameworkValidatorTests.cs | 20 ++++---- .../COMReferenceTests.cs | 4 +- .../DepsFileSkipTests.cs | 12 ++--- .../DesignTimeBuildTests.cs | 4 +- .../GenerateResourceTests.cs | 2 +- .../GivenFrameworkReferences.cs | 36 +++++++------- .../GivenThatAProjectHasntBeenRestored.cs | 4 +- .../GivenThatWeManifestSupportedFrameworks.cs | 4 +- .../GivenThatWeWantACustomTFM.cs | 4 +- .../GivenThatWeWantBuildsToBeIncremental.cs | 4 +- ...tRuntimeConfigInBuiltProjectOutputGroup.cs | 6 +-- .../GivenThatWeWantToBuildALibrary.cs | 12 ++--- .../GivenThatWeWantToBuildANetCoreApp.cs | 24 +++++----- ...hatWeWantToControlGeneratedAssemblyInfo.cs | 4 +- .../GivenThatWeWantToCopyLocalDependencies.cs | 20 ++++---- .../GivenThatWeWantToCopyPPFileToOutput.cs | 4 +- .../GivenThatWeWantToResolveConflicts.cs | 4 +- ...venThatWeWantToResolveRuntimePackAssets.cs | 4 +- .../GivenThatWeWantToRunFromMSBuildTarget.cs | 2 +- ...nThatWeWantToVerifyNuGetReferenceCompat.cs | 7 +-- .../GivenThereAreDefaultItems.cs | 4 +- .../NonCopyLocalProjectReferenceTests.cs | 2 +- ...GivenThatWeWantToPackAHelloWorldProject.cs | 2 +- .../FilesCopiedToPublishDirTests.cs | 2 +- ...nThatWeWantToExcludeAPackageFromPublish.cs | 8 ++-- ...enThatWeWantToFilterSatelliteAssemblies.cs | 4 +- ...atWeWantToPublishAFrameworkDependentApp.cs | 6 +-- ...enThatWeWantToPublishAHelloWorldProject.cs | 14 +++--- ...venThatWeWantToPublishASelfContainedApp.cs | 4 +- .../GivenThatWeWantToPublishIncrementally.cs | 12 ++--- .../PublishItemsOutputGroupOutputsTests.cs | 2 +- .../PublishItemsOutputGroupTests.cs | 2 +- .../PublishWebApp.cs | 2 +- .../RuntimeIdentifiersTests.cs | 8 ++-- ...tWeWantAutomaticTargetingPackReferences.cs | 2 +- .../GivenThatWeWantToPackAToolProject.cs | 2 +- ...eWantToPackAToolProjectWithPackagedShim.cs | 48 +++++++++---------- ...enDotnetTestBuildsAndRunsTestfromCsproj.cs | 2 +- 40 files changed, 159 insertions(+), 160 deletions(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenAGenerateRuntimeConfigurationFiles.cs b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenAGenerateRuntimeConfigurationFiles.cs index bbf12934d684..4520fb132689 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenAGenerateRuntimeConfigurationFiles.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenAGenerateRuntimeConfigurationFiles.cs @@ -5,6 +5,7 @@ using System.Collections.Generic; using System.IO; using FluentAssertions; +using Microsoft.NET.TestFramework; using Xunit; namespace Microsoft.NET.Build.Tasks.UnitTests @@ -140,7 +141,7 @@ public void Given2RuntimeFrameworksItCanGenerateWithoutAssetFile() var task = new TestableGenerateRuntimeConfigurationFiles { BuildEngine = new MockNeverCacheBuildEngine4(), - TargetFrameworkMoniker = ".NETCoreApp,Version=v3.0", + TargetFrameworkMoniker = $".NETCoreApp,Version=v3.0", RuntimeConfigPath = _runtimeConfigPath, RuntimeConfigDevPath = _runtimeConfigDevPath, RuntimeFrameworks = new[] diff --git a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/ProcessFrameworkReferencesTests.cs b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/ProcessFrameworkReferencesTests.cs index bd05d14a325c..bfaeb1f95911 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/ProcessFrameworkReferencesTests.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/ProcessFrameworkReferencesTests.cs @@ -3,6 +3,7 @@ using System.IO; using System.Linq; using FluentAssertions; +using Microsoft.NET.TestFramework; using Xunit; namespace Microsoft.NET.Build.Tasks.UnitTests @@ -47,7 +48,7 @@ public void It_resolves_FrameworkReferences() task.EnableTargetingPackDownload = true; task.TargetFrameworkIdentifier = ".NETCoreApp"; - task.TargetFrameworkVersion = "3.0"; + task.TargetFrameworkVersion = ToolsetInfo.CurrentTargetFrameworkVersion; task.FrameworkReferences = new[] { new MockTaskItem("Microsoft.AspNetCore.App", new Dictionary()) @@ -58,7 +59,7 @@ public void It_resolves_FrameworkReferences() new MockTaskItem("Microsoft.AspNetCore.App", new Dictionary() { - {"TargetFramework", "netcoreapp3.0"}, + {"TargetFramework", ToolsetInfo.CurrentTargetFramework}, {"RuntimeFrameworkName", "Microsoft.AspNetCore.App"}, {"DefaultRuntimeFrameworkVersion", "1.9.5"}, {"LatestRuntimeFrameworkVersion", "1.9.6"}, @@ -83,7 +84,7 @@ public void Given_targetPlatform_and_targetPlatform_version_It_resolves_Framewor task.EnableTargetingPackDownload = true; task.TargetFrameworkIdentifier = ".NETCoreApp"; - task.TargetFrameworkVersion = "3.0"; + task.TargetFrameworkVersion = ToolsetInfo.CurrentTargetFrameworkVersion; task.TargetPlatformIdentifier = "Windows"; task.TargetPlatformVersion = "10.0.18362"; task.FrameworkReferences = new[] @@ -96,7 +97,7 @@ public void Given_targetPlatform_and_targetPlatform_version_It_resolves_Framewor new MockTaskItem("Microsoft.AspNetCore.App", new Dictionary() { - {"TargetFramework", "netcoreapp3.0"}, + {"TargetFramework", ToolsetInfo.CurrentTargetFramework}, {"RuntimeFrameworkName", "Microsoft.AspNetCore.App"}, {"DefaultRuntimeFrameworkVersion", "1.9.5"}, {"LatestRuntimeFrameworkVersion", "1.9.6"}, diff --git a/src/Tests/Microsoft.DotNet.PackageValidation.Tests/CompatibleFrameworkValidatorTests.cs b/src/Tests/Microsoft.DotNet.PackageValidation.Tests/CompatibleFrameworkValidatorTests.cs index e22a53d6d99c..a2278355be7b 100644 --- a/src/Tests/Microsoft.DotNet.PackageValidation.Tests/CompatibleFrameworkValidatorTests.cs +++ b/src/Tests/Microsoft.DotNet.PackageValidation.Tests/CompatibleFrameworkValidatorTests.cs @@ -98,7 +98,7 @@ public void NoCompileTimeAssetForSpecificFramework() { string[] filePaths = new[] { - @"ref/netcoreapp3.0/TestPackage.dll", + $@"ref/{ToolsetInfo.CurrentTargetFramework}/TestPackage.dll", @"lib/netstandard2.0/TestPackage.dll", @"lib/netcoreapp3.1/TestPackage.dll" }; @@ -114,14 +114,14 @@ public void NoRuntimeAssetForSpecificFramework() { string[] filePaths = new[] { - @"ref/netcoreapp3.0/TestPackage.dll", - @"runtimes/win/lib/netcoreapp3.0/TestPackage.dll" + $@"ref/{ToolsetInfo.CurrentTargetFramework}/TestPackage.dll", + $@"runtimes/win/lib/{ToolsetInfo.CurrentTargetFramework}/TestPackage.dll" }; Package package = new("TestPackage", "1.0.0", filePaths, null, null); new CompatibleTfmValidator(string.Empty, null, false, false, _log, null).Validate(package); Assert.NotEmpty(_log.errors); - Assert.Contains(DiagnosticIds.CompatibleRuntimeRidLessAsset + " " + string.Format(Resources.NoCompatibleRuntimeAsset, ".NETCoreApp,Version=v3.0"), _log.errors); + Assert.Contains(DiagnosticIds.CompatibleRuntimeRidLessAsset + " " + string.Format(Resources.NoCompatibleRuntimeAsset, ToolsetInfo.CurrentTargetFramework), _log.errors); } [Fact] @@ -130,9 +130,9 @@ public void NoRuntimeSpecificAssetForSpecificFramework() string[] filePaths = new[] { @"lib/netstandard2.0/TestPackage.dll", - @"lib/netcoreapp3.0/TestPackage.dll", - @"runtimes/win/lib/netcoreapp3.0/TestPackage.dll", - @"runtimes/unix/lib/netcoreapp3.0/TestPackage.dll" + $@"lib/{ToolsetInfo.CurrentTargetFramework}/TestPackage.dll", + $@"runtimes/win/lib/{ToolsetInfo.CurrentTargetFramework}/TestPackage.dll", + $@"runtimes/unix/lib/{ToolsetInfo.CurrentTargetFramework}/TestPackage.dll" }; Package package = new("TestPackage", "1.0.0", filePaths, null, null); @@ -161,8 +161,8 @@ public void CompatibleRidSpecificAsset() string[] filePaths = new[] { @"lib/netcoreapp2.0/TestPackage.dll", - @"lib/netcoreapp3.0/TestPackage.dll", - @"runtimes/win/lib/netcoreapp3.0/TestPackage.dll" + $@"lib/{ToolsetInfo.CurrentTargetFramework}/TestPackage.dll", + $@"runtimes/win/lib/{ToolsetInfo.CurrentTargetFramework}/TestPackage.dll" }; Package package = new("TestPackage", "1.0.0", filePaths, null, null); @@ -178,7 +178,7 @@ public void CompatibleFrameworksWithDifferentAssets() @"ref/netstandard2.0/TestPackage.dll", @"ref/netcoreapp3.1/TestPackage.dll", @"lib/netstandard2.0/TestPackage.dll", - @"lib/net5.0/TestPackage.dll" + $@"lib/{ToolsetInfo.CurrentTargetFramework}/TestPackage.dll" }; Package package = new("TestPackage", "1.0.0", filePaths, null, null); diff --git a/src/Tests/Microsoft.NET.Build.Tests/COMReferenceTests.cs b/src/Tests/Microsoft.NET.Build.Tests/COMReferenceTests.cs index 0c8ecf57f965..b4d9dd473235 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/COMReferenceTests.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/COMReferenceTests.cs @@ -24,7 +24,7 @@ public COMReferenceTests(ITestOutputHelper log) : base(log) [InlineData(false)] public void COMReferenceBuildsAndRuns(bool embedInteropTypes) { - var targetFramework = "netcoreapp3.0"; + var targetFramework = ToolsetInfo.CurrentTargetFramework; var testProject = new TestProject { @@ -71,7 +71,7 @@ static void Main(string[] args) [FullMSBuildOnlyFact] public void COMReferenceProperlyPublish() { - var targetFramework = "netcoreapp3.0"; + var targetFramework = ToolsetInfo.CurrentTargetFramework; var testProject = new TestProject { diff --git a/src/Tests/Microsoft.NET.Build.Tests/DepsFileSkipTests.cs b/src/Tests/Microsoft.NET.Build.Tests/DepsFileSkipTests.cs index b4282743c287..8795de444adf 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/DepsFileSkipTests.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/DepsFileSkipTests.cs @@ -31,7 +31,7 @@ public void RuntimeAssemblyFromPackageCanBeSkipped() var testProject = new TestProject() { Name = "SkipRuntimeAssemblyFromPackage", - TargetFrameworks = "netcoreapp3.0", + TargetFrameworks = ToolsetInfo.CurrentTargetFramework, IsExe = true }; @@ -48,7 +48,7 @@ public void RuntimeAssemblyFromRuntimePackCanBeSkipped() var testProject = new TestProject() { Name = "SkipRuntimeAssemblyFromRuntimePack", - TargetFrameworks = "netcoreapp3.0", + TargetFrameworks = ToolsetInfo.CurrentTargetFramework, IsExe = true }; @@ -65,7 +65,7 @@ public void NativeAssetFromPackageCanBeSkipped() var testProject = new TestProject() { Name = "SkipNativeAssetFromPackage", - TargetFrameworks = "netcoreapp3.0", + TargetFrameworks = ToolsetInfo.CurrentTargetFramework, IsExe = true }; @@ -84,7 +84,7 @@ public void RuntimeTargetFromPackageCanBeSkipped() var testProject = new TestProject() { Name = "SkipNativeAssetFromPackage", - TargetFrameworks = "netcoreapp3.0", + TargetFrameworks = ToolsetInfo.CurrentTargetFramework, IsExe = true }; @@ -101,7 +101,7 @@ public void NativeAssetFromRuntimePackCanBeSkipped() var testProject = new TestProject() { Name = "SkipNativeAssetFromRuntimePack", - TargetFrameworks = "netcoreapp3.0", + TargetFrameworks = ToolsetInfo.CurrentTargetFramework, IsExe = true }; @@ -118,7 +118,7 @@ public void ResourceAssetFromPackageCanBeSkipped() var testProject = new TestProject() { Name = "SkipResourceFromPackage", - TargetFrameworks = "netcoreapp3.0", + TargetFrameworks = ToolsetInfo.CurrentTargetFramework, IsExe = true }; diff --git a/src/Tests/Microsoft.NET.Build.Tests/DesignTimeBuildTests.cs b/src/Tests/Microsoft.NET.Build.Tests/DesignTimeBuildTests.cs index de480cb839b1..126624c4ba38 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/DesignTimeBuildTests.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/DesignTimeBuildTests.cs @@ -25,7 +25,7 @@ public DesignTimeBuildTests(ITestOutputHelper log) : base(log) [InlineData("TestLibrary", null)] [InlineData("TestApp", null)] [InlineData("TestApp", "netcoreapp2.1")] - [InlineData("TestApp", "netcoreapp3.0")] + [InlineData("TestApp", ToolsetInfo.CurrentTargetFramework)] public void The_design_time_build_succeeds_before_nuget_restore(string relativeProjectPath, string targetFramework) { var args = GetDesignTimeMSBuildArgs(); @@ -193,7 +193,7 @@ private void TestDesignTimeBuildAfterChange(Action projectChange, [Ca var testProject = new TestProject() { Name = "App", - TargetFrameworks = "netcoreapp3.0", + TargetFrameworks = ToolsetInfo.CurrentTargetFramework, IsExe = true }; diff --git a/src/Tests/Microsoft.NET.Build.Tests/GenerateResourceTests.cs b/src/Tests/Microsoft.NET.Build.Tests/GenerateResourceTests.cs index e5712b61b760..3e7bcbb2ea0c 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GenerateResourceTests.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GenerateResourceTests.cs @@ -19,7 +19,7 @@ public GenerateResourceTests(ITestOutputHelper log) : base(log) } [Theory(Skip="https://github.com/microsoft/msbuild/issues/4488")] - [InlineData("netcoreapp3.0", true)] + [InlineData(ToolsetInfo.CurrentTargetFramework, true)] public void DependentUponTest(string targetFramework, bool isExe) { var testProject = new TestProject diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenFrameworkReferences.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenFrameworkReferences.cs index 5751f898c8c7..98dee82d9284 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenFrameworkReferences.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenFrameworkReferences.cs @@ -77,7 +77,7 @@ public void Multiple_frameworks_are_written_to_runtimeconfig_when_there_are_mult [Theory] [InlineData("netcoreapp3.0", false)] - [InlineData("netcoreapp3.1", true)] + [InlineData("net6.0", true)] public void Multiple_frameworks_are_written_to_runtimeconfig_for_self_contained_apps(string tfm, bool shouldHaveIncludedFrameworks) { var testProject = new TestProject() @@ -90,7 +90,7 @@ public void Multiple_frameworks_are_written_to_runtimeconfig_for_self_contained_ // Specifying RID makes the produced app self-contained. testProject.RuntimeIdentifier = EnvironmentInfo.GetCompatibleRid(testProject.TargetFrameworks); - if (tfm == "netcoreapp3.1") + if (tfm == "net6.0") { testProject.FrameworkReferences.Add("Microsoft.ASPNETCORE.App"); } @@ -187,7 +187,7 @@ public void The_build_fails_when_there_is_an_unknown_FrameworkReference() var testProject = new TestProject() { Name = "UnknownFrameworkReferenceTest", - TargetFrameworks = "netcoreapp3.0", + TargetFrameworks = ToolsetInfo.CurrentTargetFramework, IsExe = true }; @@ -220,7 +220,7 @@ public void The_build_fails_when_there_is_an_unknown_FrameworkReference() [Theory] [InlineData("netcoreapp2.1", false)] - [InlineData("netcoreapp3.0", true)] + [InlineData(ToolsetInfo.CurrentTargetFramework, true)] public void KnownFrameworkReferencesOnlyApplyToCorrectTargetFramework(string targetFramework, bool shouldPass) { var testProject = new TestProject() @@ -305,7 +305,7 @@ public void TargetingPackDownloadCanBeDisabled() var testProject = new TestProject() { Name = "DisableTargetingPackDownload", - TargetFrameworks = "netcoreapp3.0", + TargetFrameworks = ToolsetInfo.CurrentTargetFramework, IsExe = true }; @@ -336,10 +336,10 @@ public void TargetingPackDownloadCanBeDisabled() } [Theory] - [InlineData("Major", "netcoreapp3.0", true)] + [InlineData("Major", ToolsetInfo.CurrentTargetFramework, true)] [InlineData("Major", "netcoreapp2.0", true)] - [InlineData("latestMinor", "netcoreapp3.0", true)] - [InlineData("Invalid", "netcoreapp3.0", false)] + [InlineData("latestMinor", ToolsetInfo.CurrentTargetFramework, true)] + [InlineData("Invalid", ToolsetInfo.CurrentTargetFramework, false)] public void RollForwardCanBeSpecifiedViaProperty(string rollForwardValue, string tfm, bool valid) { var testProject = new TestProject() @@ -428,7 +428,7 @@ public void BuildFailsIfRuntimePackIsNotAvailableForRuntimeIdentifier() var testProject = new TestProject() { Name = "RuntimePackNotAvailable", - TargetFrameworks = "netcoreapp3.0", + TargetFrameworks = ToolsetInfo.CurrentTargetFramework, IsExe = true, RuntimeIdentifier = "linux-x64" }; @@ -465,7 +465,7 @@ public void BuildFailsIfInvalidRuntimeIdentifierIsSpecified() var testProject = new TestProject() { Name = "RuntimePackNotAvailable", - TargetFrameworks = "netcoreapp3.0", + TargetFrameworks = ToolsetInfo.CurrentTargetFramework, IsExe = true, RuntimeIdentifier = "invalid-rid" }; @@ -491,7 +491,7 @@ public void BuildFailsIfRuntimePackHasNotBeenRestored() var testProject = new TestProject() { Name = "RuntimePackNotRestored", - TargetFrameworks = "netcoreapp3.0", + TargetFrameworks = ToolsetInfo.CurrentTargetFramework, IsExe = true, }; @@ -721,7 +721,7 @@ public void TransitiveFrameworkReferenceFromPackageReference() var referencedPackage = new TestProject() { Name = "ReferencedPackage", - TargetFrameworks = "netcoreapp3.0", + TargetFrameworks = ToolsetInfo.CurrentTargetFramework, }; referencedPackage.FrameworkReferences.Add("Microsoft.ASPNETCORE.App"); @@ -738,7 +738,7 @@ public void TransitiveFrameworkReferenceFromPackageReference() var testProject = new TestProject() { Name = "TransitiveFrameworkReference", - TargetFrameworks = "netcoreapp3.0", + TargetFrameworks = ToolsetInfo.CurrentTargetFramework, IsExe = true }; @@ -765,7 +765,7 @@ public void TransitiveFrameworkReferenceFromPackageReference() // When we remove the workaround for https://github.com/dotnet/core-setup/issues/4947 in GenerateRuntimeConfigurationFiles, // Microsoft.NETCore.App will need to be added to this list - runtimeFrameworkNames.Should().BeEquivalentTo("Microsoft.AspNetCore.App"); + runtimeFrameworkNames.Should().BeEquivalentTo("Microsoft.NETCore.App", "Microsoft.AspNetCore.App"); } [Fact] @@ -781,7 +781,7 @@ public void IsTrimmableDefaultsComeFromKnownFrameworkReference() foreach (var runtimeAsset in runtimeAssetTrimInfo[runtimePackName]) { - runtimeAsset.isTrimmable.Should().Be("true"); + runtimeAsset.isTrimmable.Should().Be(""); } } @@ -969,7 +969,7 @@ private void TestFrameworkReferenceProfiles( var testProject = new TestProject() { Name = "WindowsFormsFrameworkReference", - TargetFrameworks = "netcoreapp3.0", + TargetFrameworks = ToolsetInfo.CurrentTargetFramework, IsExe = true }; testProject.FrameworkReferences.AddRange(frameworkReferences); @@ -1058,7 +1058,7 @@ private ResolvedVersionInfo GetResolvedVersions(TestProject testProject, string identifier = null) { testProject.Name = "ResolvedVersionsTest"; - testProject.TargetFrameworks = "netcoreapp3.0"; + testProject.TargetFrameworks = ToolsetInfo.CurrentTargetFramework; testProject.IsExe = true; testProject.AdditionalProperties["DisableImplicitFrameworkReferences"] = "true"; testProject.RuntimeIdentifier = EnvironmentInfo.GetCompatibleRid(testProject.TargetFrameworks); @@ -1130,7 +1130,7 @@ private ResolvedVersionInfo GetResolvedVersions(TestProject testProject, [CallerMemberName] string callingMethod = null, string identifier = null) { - string targetFramework = "netcoreapp3.0"; + string targetFramework = ToolsetInfo.CurrentTargetFramework; testProject.Name = "TrimInfoTest"; testProject.TargetFrameworks = targetFramework;; diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatAProjectHasntBeenRestored.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatAProjectHasntBeenRestored.cs index 129eccdf6ddf..49f74ed8af31 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenThatAProjectHasntBeenRestored.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatAProjectHasntBeenRestored.cs @@ -23,7 +23,7 @@ public GivenThatAProjectHasntBeenRestored(ITestOutputHelper log) : base(log) [InlineData("TestLibrary", null)] [InlineData("TestApp", null)] [InlineData("TestApp", "netcoreapp2.1")] - [InlineData("TestApp", "netcoreapp3.0")] + [InlineData("TestApp", ToolsetInfo.CurrentTargetFramework)] public void The_build_fails_if_nuget_restore_has_not_occurred(string relativeProjectPath, string targetFramework) { var testAsset = _testAssetsManager @@ -58,7 +58,7 @@ public void ReadingCacheDoesNotFail() var testProject = new TestProject() { Name = "App", - TargetFrameworks = "netcoreapp3.0", + TargetFrameworks = ToolsetInfo.CurrentTargetFramework, IsExe = true }; diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeManifestSupportedFrameworks.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeManifestSupportedFrameworks.cs index d96d80d62256..7ae0d35bc509 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeManifestSupportedFrameworks.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeManifestSupportedFrameworks.cs @@ -28,7 +28,7 @@ public void TheMaximumVersionsAreSupported(string targetFrameworkIdentifier) var project = new TestProject { Name = "packagethatwillgomissing", - TargetFrameworks = targetFrameworkIdentifier == ".NETCoreApp" ? "netcoreapp3.0" : "netstandard2.1", + TargetFrameworks = targetFrameworkIdentifier == ".NETCoreApp" ? ToolsetInfo.CurrentTargetFramework : "netstandard2.1", }; TestAsset asset = _testAssetsManager @@ -71,7 +71,7 @@ public void TheSupportedTargetFrameworkListIsComposed() var project = new TestProject { Name = "SupportedTargetFrameworkLists", - TargetFrameworks = "netcoreapp3.0", + TargetFrameworks = ToolsetInfo.CurrentTargetFramework, }; TestAsset asset = _testAssetsManager.CreateTestProject(project); diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantACustomTFM.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantACustomTFM.cs index a90b03d2e949..89086f7f1c1c 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantACustomTFM.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantACustomTFM.cs @@ -21,7 +21,7 @@ public GivenThatWeWantACustomTFM(ITestOutputHelper log) : base(log) [Fact] public void It_imports_custom_parsing_targets() { - var targetFramework = "netcoreapp3.0"; + var targetFramework = ToolsetInfo.CurrentTargetFramework; var runtimeIdentifier = "osx-x64"; TestProject testProject = new TestProject() { @@ -47,7 +47,7 @@ public void It_imports_custom_parsing_targets() { { "TargetFramework", targetFramework }, { "TargetFrameworkIdentifier", ".NETCoreApp" }, - { "TargetFrameworkVersion", "v3.0" }, + { "TargetFrameworkVersion", $"v{ToolsetInfo.CurrentTargetFrameworkVersion}" }, { "RuntimeIdentifier", runtimeIdentifier } }; diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantBuildsToBeIncremental.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantBuildsToBeIncremental.cs index 24dd6851a2dd..9174fafccd08 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantBuildsToBeIncremental.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantBuildsToBeIncremental.cs @@ -21,7 +21,7 @@ public GivenThatWeWantBuildsToBeIncremental(ITestOutputHelper log) : base(log) [Theory] [InlineData("netcoreapp1.1")] - [InlineData("netcoreapp3.0")] + [InlineData(ToolsetInfo.CurrentTargetFramework)] public void GenerateBuildRuntimeConfigurationFiles_runs_incrementally(string targetFramework) { var testAsset = _testAssetsManager @@ -44,7 +44,7 @@ public void GenerateBuildRuntimeConfigurationFiles_runs_incrementally(string tar [Theory] [InlineData("netcoreapp1.1")] - [InlineData("netcoreapp3.0")] + [InlineData(ToolsetInfo.CurrentTargetFramework)] public void ResolvePackageAssets_runs_incrementally(string targetFramework) { var testAsset = _testAssetsManager diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantRuntimeConfigInBuiltProjectOutputGroup.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantRuntimeConfigInBuiltProjectOutputGroup.cs index 9f01c571af41..6455b08fa0e0 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantRuntimeConfigInBuiltProjectOutputGroup.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantRuntimeConfigInBuiltProjectOutputGroup.cs @@ -23,7 +23,7 @@ public GivenThatWeWantRuntimeConfigInBuiltProjectOutputGroup(ITestOutputHelper l [Theory] [InlineData("netcoreapp1.1")] - [InlineData("netcoreapp3.0")] + [InlineData(ToolsetInfo.CurrentTargetFramework)] public void It_has_target_path_and_final_outputput_path_metadata(string targetFramework) { var testAsset = _testAssetsManager @@ -59,7 +59,7 @@ public void It_has_runtime_config_properties_after_partial_build() var testProject = new TestProject() { Name = "RuntimeConfigPartialBuild", - TargetFrameworks = "netcoreapp3.0", + TargetFrameworks = ToolsetInfo.CurrentTargetFramework, IsExe = true, RuntimeIdentifier = "win-x86" }; @@ -104,7 +104,7 @@ public void It_updates_runtime_config_properties_after_partial_build() var testProject = new TestProject() { Name = "UpdateRuntimeConfigPartialBuild", - TargetFrameworks = "netcoreapp3.0", + TargetFrameworks = ToolsetInfo.CurrentTargetFramework, IsExe = true, RuntimeIdentifier = "win-x86" }; diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibrary.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibrary.cs index 4a3541969991..164bfbd8915b 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibrary.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibrary.cs @@ -29,7 +29,7 @@ public GivenThatWeWantToBuildALibrary(ITestOutputHelper log) : base(log) [Theory] [InlineData("netstandard1.5")] [InlineData("netcoreapp2.1")] - [InlineData("netcoreapp3.0")] + [InlineData(ToolsetInfo.CurrentTargetFramework)] public void It_builds_the_library_successfully(string targetFramework) { var testAsset = _testAssetsManager @@ -896,10 +896,10 @@ public void It_can_implicitly_define_predefined_Cultures_only(string targetFrame [Theory] [InlineData("netcoreapp2.2", null, false, null, false)] - [InlineData("netcoreapp3.0", null, true, null, true)] - [InlineData("netcoreapp3.0", "LatestMajor", true, null, true)] - [InlineData("netcoreapp3.0", null, true, false, false)] - [InlineData("netcoreapp3.0", "LatestMajor", true, false, false)] + [InlineData(ToolsetInfo.CurrentTargetFramework, null, true, null, true)] + [InlineData(ToolsetInfo.CurrentTargetFramework, "LatestMajor", true, null, true)] + [InlineData(ToolsetInfo.CurrentTargetFramework, null, true, false, false)] + [InlineData(ToolsetInfo.CurrentTargetFramework, "LatestMajor", true, false, false)] public void It_can_build_with_dynamic_loading_enabled(string targetFramework, string rollForwardValue, bool shouldSetRollForward, bool? copyLocal, bool shouldCopyLocal) { var testProject = new TestProject() @@ -934,7 +934,7 @@ public void It_can_build_with_dynamic_loading_enabled(string targetFramework, st var outputDirectory = buildCommand.GetOutputDirectory(testProject.TargetFrameworks); outputDirectory.Should().HaveFiles(new[] { runtimeConfigName, - $"{testProject.Name}.runtimeconfig.dev.json" + $"{testProject.Name}.runtimeconfig.json" }); if (shouldCopyLocal) diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildANetCoreApp.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildANetCoreApp.cs index 40530d8aadac..181d83283889 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildANetCoreApp.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildANetCoreApp.cs @@ -272,7 +272,7 @@ public void It_restores_only_ridless_tfm() [Theory] [InlineData("netcoreapp2.0")] [InlineData("netcoreapp2.1")] - [InlineData("netcoreapp3.0")] + [InlineData(ToolsetInfo.CurrentTargetFramework)] public void It_runs_the_app_from_the_output_folder(string targetFramework) { RunAppFromOutputFolder("RunFromOutputFolder_" + targetFramework, false, false, targetFramework); @@ -280,7 +280,7 @@ public void It_runs_the_app_from_the_output_folder(string targetFramework) [Theory] [InlineData("netcoreapp2.1")] - [InlineData("netcoreapp3.0")] + [InlineData(ToolsetInfo.CurrentTargetFramework)] public void It_runs_a_rid_specific_app_from_the_output_folder(string targetFramework) { RunAppFromOutputFolder("RunFromOutputFolderWithRID_" + targetFramework, true, false, targetFramework); @@ -288,7 +288,7 @@ public void It_runs_a_rid_specific_app_from_the_output_folder(string targetFrame [Theory] [InlineData("netcoreapp2.0")] - [InlineData("netcoreapp3.0")] + [InlineData(ToolsetInfo.CurrentTargetFramework)] public void It_runs_the_app_with_conflicts_from_the_output_folder(string targetFramework) { if (!EnvironmentInfo.SupportsTargetFramework(targetFramework)) @@ -301,7 +301,7 @@ public void It_runs_the_app_with_conflicts_from_the_output_folder(string targetF [Theory] [InlineData("netcoreapp2.0")] - [InlineData("netcoreapp3.0")] + [InlineData(ToolsetInfo.CurrentTargetFramework)] public void It_runs_a_rid_specific_app_with_conflicts_from_the_output_folder(string targetFramework) { if (!EnvironmentInfo.SupportsTargetFramework(targetFramework)) @@ -440,7 +440,7 @@ public void It_stops_generating_runtimeconfig_dev_json_after_net6_allow_property [Theory] [InlineData("netcoreapp2.0")] - [InlineData("netcoreapp3.0")] + [InlineData(ToolsetInfo.CurrentTargetFramework)] public void It_trims_conflicts_from_the_deps_file(string targetFramework) { TestProject project = new TestProject() @@ -506,7 +506,7 @@ public static void Main() [InlineData(false)] public void It_generates_rid_fallback_graph(bool isSelfContained) { - var targetFramework = "netcoreapp3.0"; + var targetFramework = ToolsetInfo.CurrentTargetFramework; var runtimeIdentifier = EnvironmentInfo.GetCompatibleRid(targetFramework); TestProject project = new TestProject() @@ -654,7 +654,7 @@ public void BuildWithTransitiveReferenceToNetCoreAppPackage() var testProject = new TestProject() { Name = "NetCoreAppPackageReference", - TargetFrameworks = "netcoreapp3.0", + TargetFrameworks = ToolsetInfo.CurrentTargetFramework, IsExe = true }; @@ -735,9 +735,9 @@ public void ReferenceLegacyContracts() var testProject = new TestProject() { Name = "ReferencesLegacyContracts", - TargetFrameworks = "netcoreapp3.0", + TargetFrameworks = ToolsetInfo.CurrentTargetFramework, IsExe = true, - RuntimeIdentifier = EnvironmentInfo.GetCompatibleRid("netcoreapp3.0") + RuntimeIdentifier = EnvironmentInfo.GetCompatibleRid(ToolsetInfo.CurrentTargetFramework) }; // Dependencies on contracts from different 1.x "bands" can cause downgrades when building @@ -762,7 +762,7 @@ public void ItHasNoPackageReferences() var testProject = new TestProject() { Name = "NoPackageReferences", - TargetFrameworks = "netcoreapp3.0", + TargetFrameworks = ToolsetInfo.CurrentTargetFramework, IsExe = true }; @@ -792,7 +792,7 @@ public void It_builds_with_unicode_characters_in_path() var testProject = new TestProject() { Name = "Prj_すおヸょー", - TargetFrameworks = "netcoreapp3.0", + TargetFrameworks = ToolsetInfo.CurrentTargetFramework, IsExe = true, }; @@ -810,7 +810,7 @@ public void It_builds_with_unicode_characters_in_path() [Fact] public void It_regenerates_files_if_self_contained_changes() { - const string TFM = "netcoreapp3.0"; + const string TFM = ToolsetInfo.CurrentTargetFramework; var runtimeIdentifier = EnvironmentInfo.GetCompatibleRid(TFM); diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToControlGeneratedAssemblyInfo.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToControlGeneratedAssemblyInfo.cs index a23abc27552a..403867ee9f1c 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToControlGeneratedAssemblyInfo.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToControlGeneratedAssemblyInfo.cs @@ -661,14 +661,14 @@ public void GenerateUserSecretsForTestProject() var testProject = new TestProject() { Name = "WebApp", - TargetFrameworks = "netcoreapp3.0" + TargetFrameworks = ToolsetInfo.CurrentTargetFramework }; testProject.FrameworkReferences.Add("Microsoft.AspNetCore.App"); var testTestProject = new TestProject() { Name = "WebAppTests", - TargetFrameworks = "netcoreapp3.0", + TargetFrameworks = ToolsetInfo.CurrentTargetFramework, ReferencedProjects = { testProject } }; diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToCopyLocalDependencies.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToCopyLocalDependencies.cs index db205a16da23..28498a7cfaee 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToCopyLocalDependencies.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToCopyLocalDependencies.cs @@ -35,7 +35,7 @@ public void It_copies_local_package_dependencies_on_build() TestProject testProject = new TestProject() { Name = ProjectName, - TargetFrameworks = "netcoreapp3.0", + TargetFrameworks = ToolsetInfo.CurrentTargetFramework, IsExe = true }; @@ -59,7 +59,6 @@ public void It_copies_local_package_dependencies_on_build() $"{ProjectName}.deps.json", $"{ProjectName}.dll", $"{ProjectName}.pdb", - $"{ProjectName}.runtimeconfig.dev.json", $"{ProjectName}.runtimeconfig.json", "Newtonsoft.Json.dll", "runtimes/linux-x64/native/libsqlite3.so", @@ -79,7 +78,7 @@ public void It_does_not_copy_local_package_dependencies_when_requested_not_to() TestProject testProject = new TestProject() { Name = ProjectName, - TargetFrameworks = "netcoreapp3.0", + TargetFrameworks = ToolsetInfo.CurrentTargetFramework, IsExe = true }; @@ -100,7 +99,6 @@ public void It_does_not_copy_local_package_dependencies_when_requested_not_to() $"{ProjectName}.deps.json", $"{ProjectName}.dll", $"{ProjectName}.pdb", - $"{ProjectName}.runtimeconfig.dev.json", $"{ProjectName}.runtimeconfig.json", }); } @@ -110,12 +108,12 @@ public void It_copies_local_specific_runtime_package_dependencies_on_build() { const string ProjectName = "TestProjWithPackageDependencies"; - var rid = EnvironmentInfo.GetCompatibleRid("netcoreapp3.0"); + var rid = EnvironmentInfo.GetCompatibleRid(ToolsetInfo.CurrentTargetFramework); TestProject testProject = new TestProject() { Name = ProjectName, - TargetFrameworks = "netcoreapp3.0", + TargetFrameworks = ToolsetInfo.CurrentTargetFramework, IsExe = true }; @@ -140,7 +138,6 @@ public void It_copies_local_specific_runtime_package_dependencies_on_build() $"{ProjectName}.deps.json", $"{ProjectName}.dll", $"{ProjectName}.pdb", - $"{ProjectName}.runtimeconfig.dev.json", $"{ProjectName}.runtimeconfig.json", "Newtonsoft.Json.dll", // NOTE: this may break in the future when the SDK supports platforms that sqlite does not @@ -156,7 +153,7 @@ public void It_does_not_copy_local_package_dependencies_for_lib_projects() TestProject testProject = new TestProject() { Name = ProjectName, - TargetFrameworks = "netcoreapp3.0", + TargetFrameworks = ToolsetInfo.CurrentTargetFramework, IsExe = false }; @@ -188,7 +185,7 @@ public void It_copies_local_package_dependencies_for_lib_projects_when_requested TestProject testProject = new TestProject() { Name = ProjectName, - TargetFrameworks = "netcoreapp3.0", + TargetFrameworks = ToolsetInfo.CurrentTargetFramework, IsExe = false }; @@ -323,12 +320,12 @@ public void It_copies_local_all_assets_on_self_contained_build() { const string ProjectName = "TestProjWithPackageDependencies"; - var rid = EnvironmentInfo.GetCompatibleRid("netcoreapp3.0"); + var rid = EnvironmentInfo.GetCompatibleRid(ToolsetInfo.CurrentTargetFramework); TestProject testProject = new TestProject() { Name = ProjectName, - TargetFrameworks = "netcoreapp3.0", + TargetFrameworks = ToolsetInfo.CurrentTargetFramework, IsExe = true }; @@ -352,7 +349,6 @@ public void It_copies_local_all_assets_on_self_contained_build() $"{ProjectName}.deps.json", $"{ProjectName}.dll", $"{ProjectName}.pdb", - $"{ProjectName}.runtimeconfig.dev.json", $"{ProjectName}.runtimeconfig.json", "Newtonsoft.Json.dll", // NOTE: this may break in the future when the SDK supports platforms that sqlite does not diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToCopyPPFileToOutput.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToCopyPPFileToOutput.cs index 5d55f92c8566..166346adf201 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToCopyPPFileToOutput.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToCopyPPFileToOutput.cs @@ -27,7 +27,7 @@ public void It_copies_to_output_successfully() { Name = "CopyPPToOutputTest", IsExe = true, - TargetFrameworks = "netcoreapp3.0" + TargetFrameworks = ToolsetInfo.CurrentTargetFramework }; testProject.PackageReferences.Add(packageReference); testProject.AdditionalProperties.Add("RestoreAdditionalProjectSources", Path.GetDirectoryName(packageReference.NupkgPath)); @@ -52,7 +52,7 @@ private TestPackageReference GetPackageReference() var referencedPackage = new TestProject() { Name = "CopyPPFilesToOutput", - TargetFrameworks = "netcoreapp3.0", + TargetFrameworks = ToolsetInfo.CurrentTargetFramework, }; var packageAsset = _testAssetsManager.CreateTestProject(referencedPackage); diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToResolveConflicts.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToResolveConflicts.cs index d2e33c1b5cb9..f7b2e88e5958 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToResolveConflicts.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToResolveConflicts.cs @@ -145,7 +145,7 @@ public void AProjectCanReferenceADllInAPackageDirectly() TestProject testProject = new TestProject() { Name = "ReferencePackageDllDirectly", - TargetFrameworks = "netcoreapp3.0", + TargetFrameworks = ToolsetInfo.CurrentTargetFramework, IsExe = true }; @@ -199,7 +199,7 @@ public void FilesFromAspNetCoreSharedFrameworkAreNotIncluded() var testProject = new TestProject() { Name = "AspNetCoreProject", - TargetFrameworks = "netcoreapp3.0", + TargetFrameworks = ToolsetInfo.CurrentTargetFramework, IsExe = true }; diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToResolveRuntimePackAssets.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToResolveRuntimePackAssets.cs index a57f915e9263..61aa535c87bc 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToResolveRuntimePackAssets.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToResolveRuntimePackAssets.cs @@ -26,7 +26,7 @@ public void It_errors_if_the_runtime_list_is_missing() var testProject = new TestProject() { Name = "MissingRuntimeListProject", - TargetFrameworks = "netcoreapp3.0", + TargetFrameworks = ToolsetInfo.CurrentTargetFramework, }; var testAsset = _testAssetsManager.CreateTestProject(testProject, testProject.Name) @@ -59,7 +59,7 @@ public void It_errors_if_the_runtime_list_has_duplicates() var testProject = new TestProject() { Name = "DuplicateRuntimeListProject", - TargetFrameworks = "netcoreapp3.0", + TargetFrameworks = ToolsetInfo.CurrentTargetFramework, }; var testAsset = _testAssetsManager.CreateTestProject(testProject, testProject.Name) diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToRunFromMSBuildTarget.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToRunFromMSBuildTarget.cs index a61810bd7745..41f9fe620921 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToRunFromMSBuildTarget.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToRunFromMSBuildTarget.cs @@ -25,7 +25,7 @@ public void It_runs_successfully() { Name = "TestRunTargetProject", IsExe = true, - TargetFrameworks = "netcoreapp3.0" + TargetFrameworks = ToolsetInfo.CurrentTargetFramework }; var testAsset = _testAssetsManager.CreateTestProject(testProject); diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToVerifyNuGetReferenceCompat.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToVerifyNuGetReferenceCompat.cs index b82b65ae9815..93b8ae47577a 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToVerifyNuGetReferenceCompat.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToVerifyNuGetReferenceCompat.cs @@ -14,6 +14,7 @@ using System.Linq; using Xunit.Abstractions; using System.Runtime.CompilerServices; +using System.Text.RegularExpressions; namespace Microsoft.NET.Build.Tests { @@ -188,11 +189,11 @@ public void It_is_possible_to_disable_netfx_implicit_asset_target_fallback() [WindowsOnlyFact] public void It_chooses_lowest_netfx_in_default_atf() { - var testProjectName = "netcoreapp30_multiple_atf"; + var testProjectName = $"{Regex.Replace(ToolsetInfo.CurrentTargetFramework, @"\.", "")}_multiple_atf"; var (testProjectTestAsset, testPackageReference) = CreateTestAsset( testProjectName, - "netcoreapp3.0", + ToolsetInfo.CurrentTargetFramework, "net462;net472", new Dictionary { ["CopyLocalLockFileAssemblies"] = "true" }); @@ -206,7 +207,7 @@ public void It_chooses_lowest_netfx_in_default_atf() var buildCommand = new BuildCommand(testProjectTestAsset); buildCommand.Execute().Should().Pass(); - var referencedDll = buildCommand.GetOutputDirectory("netcoreapp3.0").File("net462_net472_pkg.dll").FullName; + var referencedDll = buildCommand.GetOutputDirectory(ToolsetInfo.CurrentTargetFramework).File("net462_net472_pkg.dll").FullName; var referencedTargetFramework = AssemblyInfo.Get(referencedDll)["TargetFrameworkAttribute"]; referencedTargetFramework.Should().Be(".NETFramework,Version=v4.6.2"); } diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThereAreDefaultItems.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThereAreDefaultItems.cs index 997f71185537..127a98f26792 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenThereAreDefaultItems.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThereAreDefaultItems.cs @@ -632,7 +632,7 @@ public void DuplicateFrameworkReferencesCauseError() var testProject = new TestProject() { Name = "DuplicateFrameworkReference", - TargetFrameworks = "netcoreapp3.0", + TargetFrameworks = ToolsetInfo.CurrentTargetFramework, }; var testAsset = _testAssetsManager.CreateTestProject(testProject) @@ -707,7 +707,7 @@ public void DuplicatePackageReferencesCanBeUsed() var testProject = new TestProject() { Name = "DuplicatePackageReference", - TargetFrameworks = "netcoreapp3.0", + TargetFrameworks = ToolsetInfo.CurrentTargetFramework, }; testProject.PackageReferences.Add(new TestPackageReference("Newtonsoft.Json", "13.0.1")); diff --git a/src/Tests/Microsoft.NET.Build.Tests/NonCopyLocalProjectReferenceTests.cs b/src/Tests/Microsoft.NET.Build.Tests/NonCopyLocalProjectReferenceTests.cs index 2b70037f1c75..eadff3e804e3 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/NonCopyLocalProjectReferenceTests.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/NonCopyLocalProjectReferenceTests.cs @@ -24,7 +24,7 @@ public NonCopyLocalProjectReferenceTests(ITestOutputHelper log) : base(log) [Fact] public void NonCopyLocalProjectReferenceDoesNotGoToDeps() { - var targetFramework = "netcoreapp3.0"; + var targetFramework = ToolsetInfo.CurrentTargetFramework; var referencedProject = new TestProject { diff --git a/src/Tests/Microsoft.NET.Pack.Tests/GivenThatWeWantToPackAHelloWorldProject.cs b/src/Tests/Microsoft.NET.Pack.Tests/GivenThatWeWantToPackAHelloWorldProject.cs index c08f95d5099f..e24ff892560c 100644 --- a/src/Tests/Microsoft.NET.Pack.Tests/GivenThatWeWantToPackAHelloWorldProject.cs +++ b/src/Tests/Microsoft.NET.Pack.Tests/GivenThatWeWantToPackAHelloWorldProject.cs @@ -62,7 +62,7 @@ public void It_fails_if_nobuild_was_requested_but_build_was_invoked() var testProject = new TestProject() { Name = "InvokeBuildOnPack", - TargetFrameworks = "netcoreapp3.0", + TargetFrameworks = ToolsetInfo.CurrentTargetFramework, IsExe = true }; diff --git a/src/Tests/Microsoft.NET.Publish.Tests/FilesCopiedToPublishDirTests.cs b/src/Tests/Microsoft.NET.Publish.Tests/FilesCopiedToPublishDirTests.cs index c99b7fb19534..7aa673e2d97e 100644 --- a/src/Tests/Microsoft.NET.Publish.Tests/FilesCopiedToPublishDirTests.cs +++ b/src/Tests/Microsoft.NET.Publish.Tests/FilesCopiedToPublishDirTests.cs @@ -39,7 +39,7 @@ public void RunFilesCopiedToPublishDirTest(bool specifyRid, bool singleFile) var testProject = new TestProject() { Name = "TestFilesCopiedToPublishDir", - TargetFrameworks = "netcoreapp3.0", + TargetFrameworks = ToolsetInfo.CurrentTargetFramework, IsExe = true }; diff --git a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToExcludeAPackageFromPublish.cs b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToExcludeAPackageFromPublish.cs index a1a70c098656..1736128dfe60 100644 --- a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToExcludeAPackageFromPublish.cs +++ b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToExcludeAPackageFromPublish.cs @@ -23,7 +23,7 @@ public GivenThatWeWantToExcludeAPackageFromPublish(ITestOutputHelper log) : base [Theory] [InlineData("netcoreapp1.1", false)] [InlineData("netcoreapp2.0", false)] - [InlineData("netcoreapp3.0", true)] + [InlineData(ToolsetInfo.CurrentTargetFramework, true)] public void It_does_not_publish_a_PackageReference_with_PrivateAssets_All(string targetFramework, bool shouldIncludeExecutable) { var helloWorldAsset = _testAssetsManager @@ -69,7 +69,7 @@ public void It_does_not_publish_a_PackageReference_with_PrivateAssets_All(string [Theory] [InlineData("netcoreapp1.1", false)] [InlineData("netcoreapp2.0", false)] - [InlineData("netcoreapp3.0", true)] + [InlineData(ToolsetInfo.CurrentTargetFramework, true)] public void It_does_not_publish_a_PackageReference_with_Publish_false(string targetFramework, bool shouldIncludeExecutable) { var helloWorldAsset = _testAssetsManager @@ -114,7 +114,7 @@ public void It_does_not_publish_a_PackageReference_with_Publish_false(string tar [Theory] [InlineData("netcoreapp1.1", false)] [InlineData("netcoreapp2.0", false)] - [InlineData("netcoreapp3.0", true)] + [InlineData(ToolsetInfo.CurrentTargetFramework, true)] public void It_publishes_a_PackageReference_with_PrivateAssets_All_and_Publish_true(string targetFramework, bool shouldIncludeExecutable) { var helloWorldAsset = _testAssetsManager @@ -178,7 +178,7 @@ public void TransitiveNetStandardPackageReferenceAndPublishFalse() { Name = "TestApp", IsExe = true, - TargetFrameworks = "netcoreapp3.0" + TargetFrameworks = ToolsetInfo.CurrentTargetFramework }; testProject.PackageReferences.Add(new TestPackageReference("Newtonsoft.Json", "13.0.1", privateAssets: "all")); diff --git a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToFilterSatelliteAssemblies.cs b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToFilterSatelliteAssemblies.cs index 29237693e237..b3d543266c41 100644 --- a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToFilterSatelliteAssemblies.cs +++ b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToFilterSatelliteAssemblies.cs @@ -22,7 +22,7 @@ public GivenThatWeWantToFilterSatelliteAssemblies(ITestOutputHelper log) : base( [Theory] [InlineData("netcoreapp2.0")] - [InlineData("netcoreapp3.0")] + [InlineData(ToolsetInfo.CurrentTargetFramework)] public void It_only_publishes_selected_ResourceLanguages(string tfm) { @@ -55,7 +55,7 @@ public void It_only_publishes_selected_ResourceLanguages(string tfm) $"{testProject.Name}.runtimeconfig.json" }; - if (tfm == "netcoreapp3.0") + if (tfm == ToolsetInfo.CurrentTargetFramework) { files.Add($"{testProject.Name}{Constants.ExeSuffix}"); } diff --git a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAFrameworkDependentApp.cs b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAFrameworkDependentApp.cs index e7d11b03be09..6bf37290983a 100644 --- a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAFrameworkDependentApp.cs +++ b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAFrameworkDependentApp.cs @@ -31,9 +31,9 @@ public GivenThatWeWantToPublishAFrameworkDependentApp(ITestOutputHelper log) : b [InlineData(null, "netcoreapp2.2")] [InlineData("true", "netcoreapp2.2")] [InlineData("false", "netcoreapp2.2")] - [InlineData(null, "netcoreapp3.0")] - [InlineData("true", "netcoreapp3.0")] - [InlineData("false", "netcoreapp3.0")] + [InlineData(null, ToolsetInfo.CurrentTargetFramework)] + [InlineData("true", ToolsetInfo.CurrentTargetFramework)] + [InlineData("false", ToolsetInfo.CurrentTargetFramework)] public void It_publishes_with_or_without_apphost(string useAppHost, string targetFramework) { var runtimeIdentifier = RuntimeInformation.RuntimeIdentifier; diff --git a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAHelloWorldProject.cs b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAHelloWorldProject.cs index f876a399b3c4..b7119929fe72 100644 --- a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAHelloWorldProject.cs +++ b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAHelloWorldProject.cs @@ -26,7 +26,7 @@ public GivenThatWeWantToPublishAHelloWorldProject(ITestOutputHelper log) : base( [Theory] [InlineData("netcoreapp1.1")] [InlineData("netcoreapp2.0")] - [InlineData("netcoreapp3.0")] + [InlineData(ToolsetInfo.CurrentTargetFramework)] public void It_publishes_portable_apps_to_the_publish_folder_and_the_app_should_run(string targetFramework) { if (!EnvironmentInfo.SupportsTargetFramework(targetFramework)) @@ -68,7 +68,7 @@ public void It_publishes_portable_apps_to_the_publish_folder_and_the_app_should_ [Theory] [InlineData("netcoreapp1.1")] [InlineData("netcoreapp2.0")] - [InlineData("netcoreapp3.0")] + [InlineData(ToolsetInfo.CurrentTargetFramework)] public void It_publishes_self_contained_apps_to_the_publish_folder_and_the_app_should_run(string targetFramework) { if (!EnvironmentInfo.SupportsTargetFramework(targetFramework)) @@ -439,7 +439,7 @@ public void It_allows_unsupported_rid_with_override() [Theory] [InlineData("netcoreapp2.1")] - [InlineData("netcoreapp3.0")] + [InlineData(ToolsetInfo.CurrentTargetFramework)] public void It_preserves_newest_files_on_publish(string tfm) { var testProject = new TestProject() @@ -474,7 +474,7 @@ public void It_fails_if_nobuild_was_requested_but_build_was_invoked() var testProject = new TestProject() { Name = "InvokeBuildOnPublish", - TargetFrameworks = "netcoreapp3.0", + TargetFrameworks = ToolsetInfo.CurrentTargetFramework, IsExe = true }; @@ -654,7 +654,7 @@ public void It_publishes_with_full_path_publish_profile() var testProject = new TestProject() { Name = "ExeWithPublishProfile", - TargetFrameworks = "netcoreapp3.0", + TargetFrameworks = ToolsetInfo.CurrentTargetFramework, IsExe = true, }; @@ -677,10 +677,10 @@ public void It_publishes_with_full_path_publish_profile() var publishProfilePath = Path.Combine(publishProfilesDirectory, "test.pubxml"); Directory.CreateDirectory(publishProfilesDirectory); - File.WriteAllText(publishProfilePath, @" + File.WriteAllText(publishProfilePath, $@" - netcoreapp3.0 + {ToolsetInfo.CurrentTargetFramework} "); diff --git a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASelfContainedApp.cs b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASelfContainedApp.cs index c5070abf8a96..b7aa0a08b9e0 100644 --- a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASelfContainedApp.cs +++ b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASelfContainedApp.cs @@ -154,7 +154,7 @@ public void It_publishes_an_app_with_a_netcoreapp_lib_reference() [WindowsOnlyFact] public void It_publishes_runtime_pack_resources() { - const string tfm = "netcoreapp3.0"; + const string tfm = $"{ToolsetInfo.CurrentTargetFramework}-windows"; var testProject = new TestProject() { @@ -198,7 +198,7 @@ public void It_publishes_runtime_pack_resources() [WindowsOnlyFact] public void It_publishes_runtime_pack_resources_for_specific_languages() { - const string tfm = "netcoreapp3.0"; + const string tfm = $"{ToolsetInfo.CurrentTargetFramework}-windows"; var testProject = new TestProject() { diff --git a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishIncrementally.cs b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishIncrementally.cs index 12a9f52d2fd8..9e4fab7bb90d 100644 --- a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishIncrementally.cs +++ b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishIncrementally.cs @@ -26,7 +26,7 @@ public void It_cleans_before_single_file_publish() var testProject = new TestProject() { Name = "RegularPublishToSingleExe", - TargetFrameworks = "netcoreapp3.0", + TargetFrameworks = ToolsetInfo.CurrentTargetFramework, IsExe = true, RuntimeIdentifier = "win-x86" }; @@ -60,7 +60,7 @@ public void It_cleans_between_renames() var testProject = new TestProject() { Name = "PublishSingleFile1", - TargetFrameworks = "netcoreapp3.0", + TargetFrameworks = ToolsetInfo.CurrentTargetFramework, IsExe = true, RuntimeIdentifier = "win-x86" }; @@ -99,7 +99,7 @@ public void It_cleans_between_single_file_publishes() var testProject = new TestProject() { Name = "PublishSingleExe", - TargetFrameworks = "netcoreapp3.0", + TargetFrameworks = ToolsetInfo.CurrentTargetFramework, IsExe = true, RuntimeIdentifier = "win-x86" }; @@ -132,7 +132,7 @@ public void It_cleans_before_trimmed_single_file_publish() var testProject = new TestProject() { Name = "RegularPublishToTrimmedSingleExe", - TargetFrameworks = "netcoreapp3.0", + TargetFrameworks = ToolsetInfo.CurrentTargetFramework, IsExe = true, RuntimeIdentifier = "win-x86" }; @@ -203,7 +203,7 @@ public void It_cleans_with_custom_output_dir() var testProject = new TestProject() { Name = "PublishToCustomDir", - TargetFrameworks = "netcoreapp3.0", + TargetFrameworks = ToolsetInfo.CurrentTargetFramework, IsExe = true, RuntimeIdentifier = "win-x86" }; @@ -238,7 +238,7 @@ public void It_cleans_with_multiple_output_dirs() var testProject = new TestProject() { Name = "PublishToMultipleDirs", - TargetFrameworks = "netcoreapp3.0", + TargetFrameworks = ToolsetInfo.CurrentTargetFramework, IsExe = true, RuntimeIdentifier = "win-x86" }; diff --git a/src/Tests/Microsoft.NET.Publish.Tests/PublishItemsOutputGroupOutputsTests.cs b/src/Tests/Microsoft.NET.Publish.Tests/PublishItemsOutputGroupOutputsTests.cs index 5226af5c1c5e..8e90da788208 100644 --- a/src/Tests/Microsoft.NET.Publish.Tests/PublishItemsOutputGroupOutputsTests.cs +++ b/src/Tests/Microsoft.NET.Publish.Tests/PublishItemsOutputGroupOutputsTests.cs @@ -39,7 +39,7 @@ public void RunPublishItemsOutputGroupOutputsTest(bool specifyRid, bool singleFi var testProject = new TestProject() { Name = "TestPublishItemsOutputGroupOutputs", - TargetFrameworks = "netcoreapp3.0", + TargetFrameworks = ToolsetInfo.CurrentTargetFramework, IsExe = true }; diff --git a/src/Tests/Microsoft.NET.Publish.Tests/PublishItemsOutputGroupTests.cs b/src/Tests/Microsoft.NET.Publish.Tests/PublishItemsOutputGroupTests.cs index acc8bdc15e1d..33b6519cd33f 100644 --- a/src/Tests/Microsoft.NET.Publish.Tests/PublishItemsOutputGroupTests.cs +++ b/src/Tests/Microsoft.NET.Publish.Tests/PublishItemsOutputGroupTests.cs @@ -128,7 +128,7 @@ private TestProject SetupProject(bool specifyRid = true, bool singleFile = false var testProject = new TestProject() { Name = "TestPublishOutputGroup", - TargetFrameworks = "netcoreapp3.0", + TargetFrameworks = ToolsetInfo.CurrentTargetFramework, IsExe = true }; diff --git a/src/Tests/Microsoft.NET.Publish.Tests/PublishWebApp.cs b/src/Tests/Microsoft.NET.Publish.Tests/PublishWebApp.cs index 1dd6f05ff66f..636db7b1a4fb 100644 --- a/src/Tests/Microsoft.NET.Publish.Tests/PublishWebApp.cs +++ b/src/Tests/Microsoft.NET.Publish.Tests/PublishWebApp.cs @@ -25,7 +25,7 @@ public void It_publishes_and_runs_self_contained_web_app() var testProject = new TestProject() { Name = "SelfContainedWebApp", - TargetFrameworks = "netcoreapp3.0", + TargetFrameworks = ToolsetInfo.CurrentTargetFramework, IsExe = true }; diff --git a/src/Tests/Microsoft.NET.Publish.Tests/RuntimeIdentifiersTests.cs b/src/Tests/Microsoft.NET.Publish.Tests/RuntimeIdentifiersTests.cs index 532b35e7104a..facaa4ac7ce5 100644 --- a/src/Tests/Microsoft.NET.Publish.Tests/RuntimeIdentifiersTests.cs +++ b/src/Tests/Microsoft.NET.Publish.Tests/RuntimeIdentifiersTests.cs @@ -30,7 +30,7 @@ public void BuildWithRuntimeIdentifier() var testProject = new TestProject() { Name = "BuildWithRid", - TargetFrameworks = "netcoreapp3.0", + TargetFrameworks = ToolsetInfo.CurrentTargetFramework, IsExe = true }; @@ -88,7 +88,7 @@ public void BuildWithUseCurrentRuntimeIdentifier() var testProject = new TestProject() { Name = "BuildWithUseCurrentRuntimeIdentifier", - TargetFrameworks = "netcoreapp3.0", + TargetFrameworks = ToolsetInfo.CurrentTargetFramework, IsSdkProject = true, IsExe = true }; @@ -133,7 +133,7 @@ public void PublishWithRuntimeIdentifier(bool publishNoBuild) var testProject = new TestProject() { Name = "PublishWithRid", - TargetFrameworks = "netcoreapp3.0", + TargetFrameworks = ToolsetInfo.CurrentTargetFramework, IsExe = true }; @@ -199,7 +199,7 @@ public void DuplicateRuntimeIdentifiers() var testProject = new TestProject() { Name = "DuplicateRuntimeIdentifiers", - TargetFrameworks = "netcoreapp3.0", + TargetFrameworks = ToolsetInfo.CurrentTargetFramework, IsExe = true }; diff --git a/src/Tests/Microsoft.NET.Restore.Tests/GivenThatWeWantAutomaticTargetingPackReferences.cs b/src/Tests/Microsoft.NET.Restore.Tests/GivenThatWeWantAutomaticTargetingPackReferences.cs index 3a6733649116..65c9af8544b4 100644 --- a/src/Tests/Microsoft.NET.Restore.Tests/GivenThatWeWantAutomaticTargetingPackReferences.cs +++ b/src/Tests/Microsoft.NET.Restore.Tests/GivenThatWeWantAutomaticTargetingPackReferences.cs @@ -70,7 +70,7 @@ public void It_restores_multitargeted_net_framework_project_successfully(bool in var testProject = new TestProject() { Name = "ProjectWithoutTargetingPackRef", - TargetFrameworks = "net471;net472;netcoreapp3.0", + TargetFrameworks = $"net471;net472;{ToolsetInfo.CurrentTargetFramework}", }; TestAsset testAsset = null; diff --git a/src/Tests/Microsoft.NET.ToolPack.Tests/GivenThatWeWantToPackAToolProject.cs b/src/Tests/Microsoft.NET.ToolPack.Tests/GivenThatWeWantToPackAToolProject.cs index 7e10ce0f8edb..577ee5c3754b 100644 --- a/src/Tests/Microsoft.NET.ToolPack.Tests/GivenThatWeWantToPackAToolProject.cs +++ b/src/Tests/Microsoft.NET.ToolPack.Tests/GivenThatWeWantToPackAToolProject.cs @@ -169,7 +169,7 @@ public void It_contains_runtimeconfig_for_each_tfm(bool multiTarget) public void It_does_not_contain_apphost_exe(bool multiTarget) { var extension = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? ".exe" : ""; - _targetFrameworkOrFrameworks = "netcoreapp3.0"; + _targetFrameworkOrFrameworks = ToolsetInfo.CurrentTargetFramework; var nugetPackage = SetupNuGetPackage(multiTarget); using (var nupkgReader = new PackageArchiveReader(nugetPackage)) diff --git a/src/Tests/Microsoft.NET.ToolPack.Tests/GivenThatWeWantToPackAToolProjectWithPackagedShim.cs b/src/Tests/Microsoft.NET.ToolPack.Tests/GivenThatWeWantToPackAToolProjectWithPackagedShim.cs index 2f257139d26e..4910ce6db46c 100644 --- a/src/Tests/Microsoft.NET.ToolPack.Tests/GivenThatWeWantToPackAToolProjectWithPackagedShim.cs +++ b/src/Tests/Microsoft.NET.ToolPack.Tests/GivenThatWeWantToPackAToolProjectWithPackagedShim.cs @@ -84,8 +84,8 @@ private TestAsset CreateTestAsset( [Theory] [InlineData(true, "netcoreapp2.1")] [InlineData(false, "netcoreapp2.1")] - [InlineData(true, "netcoreapp3.0")] - [InlineData(false, "netcoreapp3.0")] + [InlineData(true, ToolsetInfo.CurrentTargetFramework)] + [InlineData(false, ToolsetInfo.CurrentTargetFramework)] public void It_packs_successfully(bool multiTarget, string targetFramework) { var nugetPackage = _fixture.GetTestToolPackagePath(multiTarget, targetFramework: targetFramework); @@ -100,8 +100,8 @@ public void It_packs_successfully(bool multiTarget, string targetFramework) [Theory] [InlineData(true, "netcoreapp2.1")] [InlineData(false, "netcoreapp2.1")] - [InlineData(true, "netcoreapp3.0")] - [InlineData(false, "netcoreapp3.0")] + [InlineData(true, ToolsetInfo.CurrentTargetFramework)] + [InlineData(false, ToolsetInfo.CurrentTargetFramework)] public void It_contains_dependencies_dll(bool multiTarget, string targetFramework) { var nugetPackage = _fixture.GetTestToolPackagePath(multiTarget, targetFramework: targetFramework); @@ -121,8 +121,8 @@ public void It_contains_dependencies_dll(bool multiTarget, string targetFramewor [Theory] [InlineData(true, "netcoreapp2.1")] [InlineData(false, "netcoreapp2.1")] - [InlineData(true, "netcoreapp3.0")] - [InlineData(false, "netcoreapp3.0")] + [InlineData(true, ToolsetInfo.CurrentTargetFramework)] + [InlineData(false, ToolsetInfo.CurrentTargetFramework)] public void It_contains_shim(bool multiTarget, string targetFramework) { var nugetPackage = _fixture.GetTestToolPackagePath(multiTarget, targetFramework: targetFramework); @@ -145,8 +145,8 @@ public void It_contains_shim(bool multiTarget, string targetFramework) [Theory] [InlineData(true, "netcoreapp2.1")] [InlineData(false, "netcoreapp2.1")] - [InlineData(true, "netcoreapp3.0")] - [InlineData(false, "netcoreapp3.0")] + [InlineData(true, ToolsetInfo.CurrentTargetFramework)] + [InlineData(false, ToolsetInfo.CurrentTargetFramework)] public void It_uses_customized_PackagedShimOutputRootDirectory(bool multiTarget, string targetFramework) { string shimoutputPath = Path.Combine(TestContext.Current.TestExecutionDirectory, "shimoutput"); @@ -178,8 +178,8 @@ public void It_uses_customized_PackagedShimOutputRootDirectory(bool multiTarget, [Theory] [InlineData(true, "netcoreapp2.1")] [InlineData(false, "netcoreapp2.1")] - [InlineData(true, "netcoreapp3.0")] - [InlineData(false, "netcoreapp3.0")] + [InlineData(true, ToolsetInfo.CurrentTargetFramework)] + [InlineData(false, ToolsetInfo.CurrentTargetFramework)] public void It_uses_outputs_to_bin_by_default(bool multiTarget, string targetFramework) { TestAsset helloWorldAsset = CreateTestAsset( @@ -204,8 +204,8 @@ public void It_uses_outputs_to_bin_by_default(bool multiTarget, string targetFra [Theory] [InlineData(true, "netcoreapp2.1")] [InlineData(false, "netcoreapp2.1")] - [InlineData(true, "netcoreapp3.0")] - [InlineData(false, "netcoreapp3.0")] + [InlineData(true, ToolsetInfo.CurrentTargetFramework)] + [InlineData(false, ToolsetInfo.CurrentTargetFramework)] public void Clean_should_remove_bin_output(bool multiTarget, string targetFramework) { TestAsset helloWorldAsset = CreateTestAsset( @@ -233,8 +233,8 @@ public void Clean_should_remove_bin_output(bool multiTarget, string targetFramew [Theory] [InlineData(true, "netcoreapp2.1")] [InlineData(false, "netcoreapp2.1")] - [InlineData(true, "netcoreapp3.0")] - [InlineData(false, "netcoreapp3.0")] + [InlineData(true, ToolsetInfo.CurrentTargetFramework)] + [InlineData(false, ToolsetInfo.CurrentTargetFramework)] public void Generate_shims_runs_incrementally(bool multiTarget, string targetFramework) { TestAsset helloWorldAsset = CreateTestAsset( @@ -264,8 +264,8 @@ public void Generate_shims_runs_incrementally(bool multiTarget, string targetFra [Theory] [InlineData(true, "netcoreapp2.1")] [InlineData(false, "netcoreapp2.1")] - [InlineData(true, "netcoreapp3.0")] - [InlineData(false, "netcoreapp3.0")] + [InlineData(true, ToolsetInfo.CurrentTargetFramework)] + [InlineData(false, ToolsetInfo.CurrentTargetFramework)] public void It_contains_shim_with_no_build(bool multiTarget, string targetFramework) { var testAsset = CreateTestAsset(multiTarget, nameof(It_contains_shim_with_no_build) + multiTarget + targetFramework, targetFramework); @@ -297,8 +297,8 @@ public void It_contains_shim_with_no_build(bool multiTarget, string targetFramew [WindowsOnlyTheory] [InlineData(true, "netcoreapp2.1")] [InlineData(false, "netcoreapp2.1")] - [InlineData(true, "netcoreapp3.0")] - [InlineData(false, "netcoreapp3.0")] + [InlineData(true, ToolsetInfo.CurrentTargetFramework)] + [InlineData(false, ToolsetInfo.CurrentTargetFramework)] public void It_produces_valid_shims(bool multiTarget, string targetFramework) { if (!Environment.Is64BitOperatingSystem) @@ -314,8 +314,8 @@ public void It_produces_valid_shims(bool multiTarget, string targetFramework) [WindowsOnlyTheory] [InlineData(true, "netcoreapp2.1")] [InlineData(false, "netcoreapp2.1")] - [InlineData(true, "netcoreapp3.0")] - [InlineData(false, "netcoreapp3.0")] + [InlineData(true, ToolsetInfo.CurrentTargetFramework)] + [InlineData(false, ToolsetInfo.CurrentTargetFramework)] public void It_produces_valid_shims_when_the_first_build_is_wrong(bool multiTarget, string targetFramework) { // The first build use wrong package id and should embed wrong string to shims. However, the pack should produce correct shim @@ -349,8 +349,8 @@ public void It_produces_valid_shims_when_the_first_build_is_wrong(bool multiTarg [WindowsOnlyTheory] [InlineData(true, "netcoreapp2.1")] [InlineData(false, "netcoreapp2.1")] - [InlineData(true, "netcoreapp3.0")] - [InlineData(false, "netcoreapp3.0")] + [InlineData(true, ToolsetInfo.CurrentTargetFramework)] + [InlineData(false, ToolsetInfo.CurrentTargetFramework)] public void When_version_and_packageVersion_is_different_It_produces_valid_shims(bool multiTarget, string targetFramework) { if (!Environment.Is64BitOperatingSystem) @@ -373,8 +373,8 @@ public void When_version_and_packageVersion_is_different_It_produces_valid_shims [WindowsOnlyTheory] [InlineData(true, "netcoreapp2.1")] [InlineData(false, "netcoreapp2.1")] - [InlineData(true, "netcoreapp3.0")] - [InlineData(false, "netcoreapp3.0")] + [InlineData(true, ToolsetInfo.CurrentTargetFramework)] + [InlineData(false, ToolsetInfo.CurrentTargetFramework)] public void When_version_and_packageVersion_is_different_It_produces_valid_shims2(bool multiTarget, string targetFramework) { if (!Environment.Is64BitOperatingSystem) diff --git a/src/Tests/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestfromCsproj.cs b/src/Tests/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestfromCsproj.cs index f2b06a7cbaa9..a86e612e5d65 100644 --- a/src/Tests/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestfromCsproj.cs +++ b/src/Tests/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestfromCsproj.cs @@ -216,7 +216,7 @@ public void TestWillNotBuildTheProjectIfNoBuildArgsIsGiven() var testProjectDirectory = this.CopyAndRestoreVSTestDotNetCoreTestApp("5"); string configuration = Environment.GetEnvironmentVariable("CONFIGURATION") ?? "Debug"; string expectedError = Path.Combine(testProjectDirectory, "bin", - configuration, "netcoreapp3.0", "VSTestCore.dll"); + configuration, ToolsetInfo.CurrentTargetFramework, "VSTestCore.dll"); expectedError = "The test source file " + "\"" + expectedError + "\"" + " provided was not found."; // Call test From a6bcdb3c939bcbffcc045422d85f6fe7e08dad12 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Thu, 21 Apr 2022 02:00:20 -0700 Subject: [PATCH 2/4] Update the hardcoded netcoreapp3.0 to the current framework --- ...GivenAGenerateRuntimeConfigurationFiles.cs | 52 +++++++++---------- .../GivenFrameworkReferences.cs | 4 +- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenAGenerateRuntimeConfigurationFiles.cs b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenAGenerateRuntimeConfigurationFiles.cs index 4520fb132689..7e5de2d1ec3b 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenAGenerateRuntimeConfigurationFiles.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenAGenerateRuntimeConfigurationFiles.cs @@ -40,7 +40,7 @@ public void ItCanGenerateWithoutAssetFile() var task = new TestableGenerateRuntimeConfigurationFiles { BuildEngine = new MockNeverCacheBuildEngine4(), - TargetFrameworkMoniker = ".NETCoreApp,Version=v3.0", + TargetFrameworkMoniker = $".NETCoreApp,Version=v{ToolsetInfo.CurrentTargetFrameworkVersion}", RuntimeConfigPath = _runtimeConfigPath, RuntimeConfigDevPath = _runtimeConfigDevPath, RuntimeFrameworks = new[] @@ -61,16 +61,16 @@ public void ItCanGenerateWithoutAssetFile() File.ReadAllText(_runtimeConfigPath).Should() .Be( - @"{ - ""runtimeOptions"": { - ""tfm"": ""netcoreapp3.0"", + $@"{{ + ""runtimeOptions"": {{ + ""tfm"": ""{ToolsetInfo.CurrentTargetFramework}"", ""rollForward"": ""LatestMinor"", - ""framework"": { + ""framework"": {{ ""name"": ""Microsoft.NETCore.App"", ""version"": ""3.0.0-preview1.100"" - } - } -}"); + }} + }} +}}"); File.Exists(_runtimeConfigDevPath).Should().BeFalse("No nuget involved, so no extra probing path"); } @@ -81,7 +81,7 @@ public void Given3RuntimeFrameworksItCanGenerateWithoutAssetFile() var task = new TestableGenerateRuntimeConfigurationFiles { BuildEngine = new MockNeverCacheBuildEngine4(), - TargetFrameworkMoniker = ".NETCoreApp,Version=v3.0", + TargetFrameworkMoniker = $".NETCoreApp,Version=v{ToolsetInfo.CurrentTargetFrameworkVersion}", RuntimeConfigPath = _runtimeConfigPath, RuntimeConfigDevPath = _runtimeConfigDevPath, RuntimeFrameworks = new[] @@ -116,22 +116,22 @@ public void Given3RuntimeFrameworksItCanGenerateWithoutAssetFile() File.ReadAllText(_runtimeConfigPath).Should() .Be( - @"{ - ""runtimeOptions"": { - ""tfm"": ""netcoreapp3.0"", + $@"{{ + ""runtimeOptions"": {{ + ""tfm"": ""{ToolsetInfo.CurrentTargetFramework}"", ""rollForward"": ""LatestMinor"", ""frameworks"": [ - { + {{ ""name"": ""Microsoft.WindowsDesktop.App"", ""version"": ""3.1.0"" - }, - { + }}, + {{ ""name"": ""Microsoft.AspNetCore.App"", ""version"": ""3.1.0"" - } + }} ] - } -}", + }} +}}", "There is no Microsoft.NETCore.App. And it is under frameworkS."); } @@ -141,7 +141,7 @@ public void Given2RuntimeFrameworksItCanGenerateWithoutAssetFile() var task = new TestableGenerateRuntimeConfigurationFiles { BuildEngine = new MockNeverCacheBuildEngine4(), - TargetFrameworkMoniker = $".NETCoreApp,Version=v3.0", + TargetFrameworkMoniker = $".NETCoreApp,Version=v{ToolsetInfo.CurrentTargetFrameworkVersion}", RuntimeConfigPath = _runtimeConfigPath, RuntimeConfigDevPath = _runtimeConfigDevPath, RuntimeFrameworks = new[] @@ -169,16 +169,16 @@ public void Given2RuntimeFrameworksItCanGenerateWithoutAssetFile() File.ReadAllText(_runtimeConfigPath).Should() .Be( - @"{ - ""runtimeOptions"": { - ""tfm"": ""netcoreapp3.0"", + $@"{{ + ""runtimeOptions"": {{ + ""tfm"": ""{ToolsetInfo.CurrentTargetFramework}"", ""rollForward"": ""LatestMinor"", - ""framework"": { + ""framework"": {{ ""name"": ""Microsoft.WindowsDesktop.App"", ""version"": ""3.1.0"" - } - } -}", + }} + }} +}}", "There is no Microsoft.NETCore.App."); } diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenFrameworkReferences.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenFrameworkReferences.cs index 98dee82d9284..e9d0386f0a5d 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenFrameworkReferences.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenFrameworkReferences.cs @@ -77,7 +77,7 @@ public void Multiple_frameworks_are_written_to_runtimeconfig_when_there_are_mult [Theory] [InlineData("netcoreapp3.0", false)] - [InlineData("net6.0", true)] + [InlineData(ToolsetInfo.CurrentTargetFramework, true)] public void Multiple_frameworks_are_written_to_runtimeconfig_for_self_contained_apps(string tfm, bool shouldHaveIncludedFrameworks) { var testProject = new TestProject() @@ -90,7 +90,7 @@ public void Multiple_frameworks_are_written_to_runtimeconfig_for_self_contained_ // Specifying RID makes the produced app self-contained. testProject.RuntimeIdentifier = EnvironmentInfo.GetCompatibleRid(testProject.TargetFrameworks); - if (tfm == "net6.0") + if (tfm == ToolsetInfo.CurrentTargetFramework) { testProject.FrameworkReferences.Add("Microsoft.ASPNETCORE.App"); } From b1b70033e0e572c2543e8a2b6800f3bd16c1a67d Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Tue, 24 May 2022 00:23:25 -0700 Subject: [PATCH 3/4] Update code according to comments --- .../GivenAGenerateRuntimeConfigurationFiles.cs | 16 ++++++++-------- .../GivenFrameworkReferences.cs | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenAGenerateRuntimeConfigurationFiles.cs b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenAGenerateRuntimeConfigurationFiles.cs index 7e5de2d1ec3b..cdf056a984ab 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenAGenerateRuntimeConfigurationFiles.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenAGenerateRuntimeConfigurationFiles.cs @@ -90,21 +90,21 @@ public void Given3RuntimeFrameworksItCanGenerateWithoutAssetFile() "Microsoft.NETCore.App", new Dictionary { - {"FrameworkName", "Microsoft.NETCore.App"}, {"Version", "3.1.0"} + {"FrameworkName", "Microsoft.NETCore.App"}, {"Version", "6.0.5"} } ), new MockTaskItem( "Microsoft.WindowsDesktop.App", new Dictionary { - {"FrameworkName", "Microsoft.WindowsDesktop.App"}, {"Version", "3.1.0"} + {"FrameworkName", "Microsoft.WindowsDesktop.App"}, {"Version", "6.0.5"} } ), new MockTaskItem( "Microsoft.AspNetCore.App", new Dictionary { - {"FrameworkName", "Microsoft.AspNetCore.App"}, {"Version", "3.1.0"} + {"FrameworkName", "Microsoft.AspNetCore.App"}, {"Version", "6.0.5"} } ) }, @@ -123,11 +123,11 @@ public void Given3RuntimeFrameworksItCanGenerateWithoutAssetFile() ""frameworks"": [ {{ ""name"": ""Microsoft.WindowsDesktop.App"", - ""version"": ""3.1.0"" + ""version"": ""6.0.5"" }}, {{ ""name"": ""Microsoft.AspNetCore.App"", - ""version"": ""3.1.0"" + ""version"": ""6.0.5"" }} ] }} @@ -150,14 +150,14 @@ public void Given2RuntimeFrameworksItCanGenerateWithoutAssetFile() "Microsoft.NETCore.App", new Dictionary { - {"FrameworkName", "Microsoft.NETCore.App"}, {"Version", "3.1.0"} + {"FrameworkName", "Microsoft.NETCore.App"}, {"Version", "6.0.5"} } ), new MockTaskItem( "Microsoft.WindowsDesktop.App", new Dictionary { - {"FrameworkName", "Microsoft.WindowsDesktop.App"}, {"Version", "3.1.0"} + {"FrameworkName", "Microsoft.WindowsDesktop.App"}, {"Version", "6.0.5"} } ) }, @@ -175,7 +175,7 @@ public void Given2RuntimeFrameworksItCanGenerateWithoutAssetFile() ""rollForward"": ""LatestMinor"", ""framework"": {{ ""name"": ""Microsoft.WindowsDesktop.App"", - ""version"": ""3.1.0"" + ""version"": ""6.0.5"" }} }} }}", diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenFrameworkReferences.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenFrameworkReferences.cs index e9d0386f0a5d..e751d652598a 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenFrameworkReferences.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenFrameworkReferences.cs @@ -336,10 +336,10 @@ public void TargetingPackDownloadCanBeDisabled() } [Theory] - [InlineData("Major", ToolsetInfo.CurrentTargetFramework, true)] + [InlineData("Major", "netcoreapp3.0", true)] [InlineData("Major", "netcoreapp2.0", true)] - [InlineData("latestMinor", ToolsetInfo.CurrentTargetFramework, true)] - [InlineData("Invalid", ToolsetInfo.CurrentTargetFramework, false)] + [InlineData("latestMinor", "netcoreapp3.0", true)] + [InlineData("Invalid", "netcoreapp3.0", false)] public void RollForwardCanBeSpecifiedViaProperty(string rollForwardValue, string tfm, bool valid) { var testProject = new TestProject() From d9907498730e3237fc2afda9ec103e4ed52f7929 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Mon, 4 Jul 2022 01:29:05 -0700 Subject: [PATCH 4/4] Update code according to comments --- ...GivenAGenerateRuntimeConfigurationFiles.cs | 46 +++++++++---------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenAGenerateRuntimeConfigurationFiles.cs b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenAGenerateRuntimeConfigurationFiles.cs index cdf056a984ab..20c9adabaa65 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenAGenerateRuntimeConfigurationFiles.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenAGenerateRuntimeConfigurationFiles.cs @@ -40,7 +40,7 @@ public void ItCanGenerateWithoutAssetFile() var task = new TestableGenerateRuntimeConfigurationFiles { BuildEngine = new MockNeverCacheBuildEngine4(), - TargetFrameworkMoniker = $".NETCoreApp,Version=v{ToolsetInfo.CurrentTargetFrameworkVersion}", + TargetFrameworkMoniker = ".NETCoreApp,Version=v6.0", RuntimeConfigPath = _runtimeConfigPath, RuntimeConfigDevPath = _runtimeConfigDevPath, RuntimeFrameworks = new[] @@ -49,7 +49,7 @@ public void ItCanGenerateWithoutAssetFile() "Microsoft.NETCore.App", new Dictionary { - {"FrameworkName", "Microsoft.NETCore.App"}, {"Version", "3.0.0-preview1.100"} + {"FrameworkName", "Microsoft.NETCore.App"}, {"Version", "6.0.0"} } ) }, @@ -67,7 +67,7 @@ public void ItCanGenerateWithoutAssetFile() ""rollForward"": ""LatestMinor"", ""framework"": {{ ""name"": ""Microsoft.NETCore.App"", - ""version"": ""3.0.0-preview1.100"" + ""version"": ""6.0.0"" }} }} }}"); @@ -81,7 +81,7 @@ public void Given3RuntimeFrameworksItCanGenerateWithoutAssetFile() var task = new TestableGenerateRuntimeConfigurationFiles { BuildEngine = new MockNeverCacheBuildEngine4(), - TargetFrameworkMoniker = $".NETCoreApp,Version=v{ToolsetInfo.CurrentTargetFrameworkVersion}", + TargetFrameworkMoniker = ".NETCoreApp,Version=v6.0", RuntimeConfigPath = _runtimeConfigPath, RuntimeConfigDevPath = _runtimeConfigDevPath, RuntimeFrameworks = new[] @@ -90,21 +90,21 @@ public void Given3RuntimeFrameworksItCanGenerateWithoutAssetFile() "Microsoft.NETCore.App", new Dictionary { - {"FrameworkName", "Microsoft.NETCore.App"}, {"Version", "6.0.5"} + {"FrameworkName", "Microsoft.NETCore.App"}, {"Version", "6.0.0"} } ), new MockTaskItem( "Microsoft.WindowsDesktop.App", new Dictionary { - {"FrameworkName", "Microsoft.WindowsDesktop.App"}, {"Version", "6.0.5"} + {"FrameworkName", "Microsoft.WindowsDesktop.App"}, {"Version", "6.0.0"} } ), new MockTaskItem( "Microsoft.AspNetCore.App", new Dictionary { - {"FrameworkName", "Microsoft.AspNetCore.App"}, {"Version", "6.0.5"} + {"FrameworkName", "Microsoft.AspNetCore.App"}, {"Version", "6.0.0"} } ) }, @@ -123,11 +123,11 @@ public void Given3RuntimeFrameworksItCanGenerateWithoutAssetFile() ""frameworks"": [ {{ ""name"": ""Microsoft.WindowsDesktop.App"", - ""version"": ""6.0.5"" + ""version"": ""6.0.0"" }}, {{ ""name"": ""Microsoft.AspNetCore.App"", - ""version"": ""6.0.5"" + ""version"": ""6.0.0"" }} ] }} @@ -141,7 +141,7 @@ public void Given2RuntimeFrameworksItCanGenerateWithoutAssetFile() var task = new TestableGenerateRuntimeConfigurationFiles { BuildEngine = new MockNeverCacheBuildEngine4(), - TargetFrameworkMoniker = $".NETCoreApp,Version=v{ToolsetInfo.CurrentTargetFrameworkVersion}", + TargetFrameworkMoniker = ".NETCoreApp,Version=v6.0", RuntimeConfigPath = _runtimeConfigPath, RuntimeConfigDevPath = _runtimeConfigDevPath, RuntimeFrameworks = new[] @@ -150,14 +150,14 @@ public void Given2RuntimeFrameworksItCanGenerateWithoutAssetFile() "Microsoft.NETCore.App", new Dictionary { - {"FrameworkName", "Microsoft.NETCore.App"}, {"Version", "6.0.5"} + {"FrameworkName", "Microsoft.NETCore.App"}, {"Version", "6.0.0"} } ), new MockTaskItem( "Microsoft.WindowsDesktop.App", new Dictionary { - {"FrameworkName", "Microsoft.WindowsDesktop.App"}, {"Version", "6.0.5"} + {"FrameworkName", "Microsoft.WindowsDesktop.App"}, {"Version", "6.0.0"} } ) }, @@ -175,7 +175,7 @@ public void Given2RuntimeFrameworksItCanGenerateWithoutAssetFile() ""rollForward"": ""LatestMinor"", ""framework"": {{ ""name"": ""Microsoft.WindowsDesktop.App"", - ""version"": ""6.0.5"" + ""version"": ""6.0.0"" }} }} }}", @@ -188,7 +188,7 @@ public void GivenTargetMonikerItGeneratesShortName() var task = new TestableGenerateRuntimeConfigurationFiles { BuildEngine = new MockNeverCacheBuildEngine4(), - TargetFrameworkMoniker = ".NETCoreApp,Version=v5.0", + TargetFrameworkMoniker = ".NETCoreApp,Version=v6.0", RuntimeConfigPath = _runtimeConfigPath, RuntimeConfigDevPath = _runtimeConfigDevPath, RuntimeFrameworks = new[] @@ -197,7 +197,7 @@ public void GivenTargetMonikerItGeneratesShortName() "Microsoft.NETCore.App", new Dictionary { - {"FrameworkName", "Microsoft.NETCore.App"}, {"Version", "5.0.0"} + {"FrameworkName", "Microsoft.NETCore.App"}, {"Version", "6.0.0"} } ) }, @@ -209,16 +209,16 @@ public void GivenTargetMonikerItGeneratesShortName() File.ReadAllText(_runtimeConfigPath).Should() .Be( - @"{ - ""runtimeOptions"": { - ""tfm"": ""net5.0"", + $@"{{ + ""runtimeOptions"": {{ + ""tfm"": ""{ToolsetInfo.CurrentTargetFramework}"", ""rollForward"": ""LatestMinor"", - ""framework"": { + ""framework"": {{ ""name"": ""Microsoft.NETCore.App"", - ""version"": ""5.0.0"" - } - } -}"); + ""version"": ""6.0.0"" + }} + }} +}}"); } private class TestableGenerateRuntimeConfigurationFiles : GenerateRuntimeConfigurationFiles