From: Wes Haggard Date: Mon, 23 Apr 2018 22:51:51 +0000 (-0700) Subject: Move to netcoreapp2.2 as TFM X-Git-Tag: submit/tizen/20210909.063632~11032^2~708^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b4260b45856aeb8810578438d36b62ac614e6697;p=platform%2Fupstream%2Fdotnet%2Fruntime.git Move to netcoreapp2.2 as TFM Commit migrated from https://github.com/dotnet/core-setup/commit/1e7f4e8de9f57a45c3f5eac8d1ac327544498e13 --- diff --git a/src/installer/config.json b/src/installer/config.json index f20b4d5..87736917 100644 --- a/src/installer/config.json +++ b/src/installer/config.json @@ -36,12 +36,6 @@ "values": ["x64", "x86", "arm", "arm64", "armel"], "defaultValue": "x64" }, - "Framework":{ - "description": "Build the specified framework (netcoreapp1.0, netcoreapp1.1, netcoreapp2.0, or netcoreapp2.1 default: netcoreapp2.1)", - "valueType": "property", - "values": ["netcoreapp1.0", "netcoreapp1.1", "netcoreapp2.0", "netcoreapp2.1"], - "defaultValue": "netcoreapp2.1" - }, "ConfigurationGroup": { "description": "Sets the configuration group as Release or Debug.", "valueType": "property", @@ -65,7 +59,7 @@ "valueType": "property", "values": ["true", "false"], "defaultValue": false - }, + }, "Project": { "description": "Project where the commands are going to be applied.", "valueType": "passThrough", @@ -281,13 +275,12 @@ "settings": { "PortableBuild":"true" } - } + } }, "defaultValues":{ "toolName": "msbuild", "settings": { "TargetArchitecture": "default", - "Framework": "default", "OSGroup": "default", "MsBuildLogging":"/flp:v=n;LogFile=msbuild-cmake.log" } @@ -305,9 +298,8 @@ "defaultValues":{ "toolName": "msbuild", "settings": { - "Architecture": "default", + "Architecture": "default", "TargetArchitecture": "default", - "Framework": "default", "OSGroup": "default", "MsBuildLogging":"/flp:v=n;LogFile=msbuild.log" } diff --git a/src/installer/pkg/projects/Microsoft.NETCore.App/Microsoft.NETCore.App.pkgproj b/src/installer/pkg/projects/Microsoft.NETCore.App/Microsoft.NETCore.App.pkgproj index d2077df..b206c6e 100644 --- a/src/installer/pkg/projects/Microsoft.NETCore.App/Microsoft.NETCore.App.pkgproj +++ b/src/installer/pkg/projects/Microsoft.NETCore.App/Microsoft.NETCore.App.pkgproj @@ -6,10 +6,6 @@ $(SharedFrameworkNugetVersion) - - - - netcoreapp2.1 true true false @@ -43,7 +39,7 @@ .NETCoreApp2.0 - + $(HostPolicyVersion) @@ -55,7 +51,7 @@ ref/netcoreapp - + build/$(NETCoreAppFramework) @@ -73,18 +69,18 @@ NuGetRuntimeIdentifier=$(PackageTargetRuntime) - + - + unused - .NETCoreApp,Version=v2.1 - netcoreapp2.1 - netcoreapp2.1 + $(NETCoreAppFrameworkMoniker) + $(NETCoreAppFramework) + $(NETCoreAppFramework) Microsoft.Private.CoreFx.NETCoreApp $(CrossGenRootPath)/$(MSBuildProjectName)/$(NuGetRuntimeIdentifier) true diff --git a/src/installer/sharedFramework/sharedFramework.proj b/src/installer/sharedFramework/sharedFramework.proj index 082c193..34a39c8 100644 --- a/src/installer/sharedFramework/sharedFramework.proj +++ b/src/installer/sharedFramework/sharedFramework.proj @@ -17,7 +17,7 @@ - $(MSBuildPassThroughPropertyList) /p:TargetFramework=$(Framework) /p:RuntimeIdentifier=$(PackageTargetRid) + $(MSBuildPassThroughPropertyList) /p:TargetFramework=$(NETCoreAppFramework) /p:RuntimeIdentifier=$(PackageTargetRid) $(IntermediateOutputRootPath)SFP.packages\ @@ -28,11 +28,11 @@ - + $(MSBuildThisFileDirectory)framework $(CommonProjectArgs) /p:RuntimeFrameworkVersion=$(SharedFrameworkNugetVersion) - + @@ -64,9 +64,9 @@ - - + - win osx alpine - linux + linux @@ -133,7 +133,7 @@ - + - netcoreapp2.1 + $(NETCoreAppFramework) Exe $(MNAVersion) diff --git a/src/installer/test/Assets/TestProjects/LightupClient/LightupClient.csproj b/src/installer/test/Assets/TestProjects/LightupClient/LightupClient.csproj index 59fdabf..80f4310 100644 --- a/src/installer/test/Assets/TestProjects/LightupClient/LightupClient.csproj +++ b/src/installer/test/Assets/TestProjects/LightupClient/LightupClient.csproj @@ -1,7 +1,7 @@  - netcoreapp2.1 + $(NETCoreAppFramework) Exe $(MNAVersion) diff --git a/src/installer/test/Assets/TestProjects/LightupLib/LightupLib.csproj b/src/installer/test/Assets/TestProjects/LightupLib/LightupLib.csproj index e5a0ba7..ccdbc07 100644 --- a/src/installer/test/Assets/TestProjects/LightupLib/LightupLib.csproj +++ b/src/installer/test/Assets/TestProjects/LightupLib/LightupLib.csproj @@ -1,7 +1,7 @@  - netcoreapp2.1 + $(NETCoreAppFramework) Library $(MNAVersion) diff --git a/src/installer/test/Assets/TestProjects/PortableApp/PortableApp.csproj b/src/installer/test/Assets/TestProjects/PortableApp/PortableApp.csproj index 3072b5c..83efdd4 100644 --- a/src/installer/test/Assets/TestProjects/PortableApp/PortableApp.csproj +++ b/src/installer/test/Assets/TestProjects/PortableApp/PortableApp.csproj @@ -1,7 +1,7 @@  - netcoreapp2.1 + $(NETCoreAppFramework) Exe $(MNAVersion) diff --git a/src/installer/test/Assets/TestProjects/PortableTestApp/PortableTestApp.csproj b/src/installer/test/Assets/TestProjects/PortableTestApp/PortableTestApp.csproj index d86c31d..d5f0f6c 100644 --- a/src/installer/test/Assets/TestProjects/PortableTestApp/PortableTestApp.csproj +++ b/src/installer/test/Assets/TestProjects/PortableTestApp/PortableTestApp.csproj @@ -1,7 +1,7 @@  - netcoreapp2.1 + $(NETCoreAppFramework) true $(PackageTargetFallback);dotnet5.4;portable-net451+win8 $(MNAVersion) diff --git a/src/installer/test/Assets/TestProjects/ResourceLookup/ResourceLookup.csproj b/src/installer/test/Assets/TestProjects/ResourceLookup/ResourceLookup.csproj index 060f77f..554c740 100644 --- a/src/installer/test/Assets/TestProjects/ResourceLookup/ResourceLookup.csproj +++ b/src/installer/test/Assets/TestProjects/ResourceLookup/ResourceLookup.csproj @@ -1,7 +1,7 @@  - netcoreapp2.1 + $(NETCoreAppFramework) Exe $(MNAVersion) diff --git a/src/installer/test/Assets/TestProjects/SharedFxLookupPortableApp/SharedFxLookupPortableApp.csproj b/src/installer/test/Assets/TestProjects/SharedFxLookupPortableApp/SharedFxLookupPortableApp.csproj index 3072b5c..83efdd4 100644 --- a/src/installer/test/Assets/TestProjects/SharedFxLookupPortableApp/SharedFxLookupPortableApp.csproj +++ b/src/installer/test/Assets/TestProjects/SharedFxLookupPortableApp/SharedFxLookupPortableApp.csproj @@ -1,7 +1,7 @@  - netcoreapp2.1 + $(NETCoreAppFramework) Exe $(MNAVersion) diff --git a/src/installer/test/Assets/TestProjects/StandaloneApp/StandaloneApp.csproj b/src/installer/test/Assets/TestProjects/StandaloneApp/StandaloneApp.csproj index bdd2084..6c7f3f3 100644 --- a/src/installer/test/Assets/TestProjects/StandaloneApp/StandaloneApp.csproj +++ b/src/installer/test/Assets/TestProjects/StandaloneApp/StandaloneApp.csproj @@ -1,7 +1,7 @@  - netcoreapp2.1 + $(NETCoreAppFramework) Exe $(TestTargetRid) $(MNAVersion) diff --git a/src/installer/test/Assets/TestProjects/StandaloneTestApp/StandaloneTestApp.csproj b/src/installer/test/Assets/TestProjects/StandaloneTestApp/StandaloneTestApp.csproj index 3df01e5..613a84e 100644 --- a/src/installer/test/Assets/TestProjects/StandaloneTestApp/StandaloneTestApp.csproj +++ b/src/installer/test/Assets/TestProjects/StandaloneTestApp/StandaloneTestApp.csproj @@ -1,7 +1,7 @@  - netcoreapp2.1 + $(NETCoreAppFramework) Exe true $(PackageTargetFallback);dotnet5.4;portable-net451+win8 diff --git a/src/installer/test/TestUtils/TestProjectFixture.cs b/src/installer/test/TestUtils/TestProjectFixture.cs index ddc8d5f..a549511 100644 --- a/src/installer/test/TestUtils/TestProjectFixture.cs +++ b/src/installer/test/TestUtils/TestProjectFixture.cs @@ -53,11 +53,12 @@ namespace Microsoft.DotNet.CoreSetup.Test string dotnetInstallPath = null, string currentRid = null, string builtDotnetOutputPath = null, - string framework = "netcoreapp2.1") + string framework = null) { ValidateRequiredDirectories(repoDirectoriesProvider); _testProjectName = testProjectName; + _framework = framework ?? Environment.GetEnvironmentVariable("MNA_TFM"); _exeExtension = exeExtension ?? RuntimeInformationExtensions.GetExeExtensionForCurrentOSPlatform(); _sharedLibraryExtension = sharedLibraryExtension @@ -77,7 +78,6 @@ namespace Microsoft.DotNet.CoreSetup.Test _currentRid = currentRid ?? repoDirectoriesProvider.TargetRID; _builtDotnet = new DotNetCli(repoDirectoriesProvider.BuiltDotnet); - _framework = framework; InitializeTestProject( _testProjectName, _testProjectSourceDirectory, @@ -297,6 +297,7 @@ namespace Microsoft.DotNet.CoreSetup.Test } storeArgs.Add($"/p:MNAVersion={_repoDirectoriesProvider.MicrosoftNETCoreAppVersion}"); + storeArgs.Add($"/p:NETCoreAppFramework={_framework}"); // Ensure the project's OutputType isn't 'Exe', since that causes issues with 'dotnet store' storeArgs.Add("/p:OutputType=Library"); @@ -371,6 +372,7 @@ namespace Microsoft.DotNet.CoreSetup.Test restoreArgs.Add("--disable-parallel"); restoreArgs.Add($"/p:MNAVersion={_repoDirectoriesProvider.MicrosoftNETCoreAppVersion}"); + restoreArgs.Add($"/p:NETCoreAppFramework={_framework}"); if (extraMSBuildProperties != null) { diff --git a/src/installer/test/dir.proj b/src/installer/test/dir.proj index e1d0626..274985d 100644 --- a/src/installer/test/dir.proj +++ b/src/installer/test/dir.proj @@ -90,7 +90,7 @@