Merge pull request #3052 from ericstj/netcoreapp2.1

Make Microsoft.NETCore.App target netcoreapp2.1
dotnet · Aug 15, 2017 · 8aa34a9 · 8aa34a9
2 parents 2d818e8 + f242fcb
commit 8aa34a9
Show file tree

Hide file tree

Showing 13 changed files with 26 additions and 18 deletions.
diff --git a/config.json b/config.json
@@ -49,10 +49,10 @@
       "defaultValue": "x64"
     },
     "Framework":{
-      "description": "Build the specified framework (netcoreapp1.0 or netcoreapp1.1, default: netcoreapp1.0)",
+      "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"],
-      "defaultValue": "netcoreapp2.0"
+      "values": ["netcoreapp1.0", "netcoreapp1.1", "netcoreapp2.0", "netcoreapp2.1"],
+      "defaultValue": "netcoreapp2.1"
     },    
     "ConfigurationGroup": {
       "description": "Sets the configuration group as Release or Debug.",

diff --git a/dir.props b/dir.props
@@ -195,7 +195,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <Framework>netcoreapp2.0</Framework>
+    <Framework>netcoreapp2.1</Framework>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(TargetRid)' == '' and '$(OSGroup)' == 'Windows_NT'">

diff --git a/src/pkg/projects/Microsoft.NETCore.App/Microsoft.NETCore.App.pkgproj b/src/pkg/projects/Microsoft.NETCore.App/Microsoft.NETCore.App.pkgproj
@@ -9,7 +9,7 @@
 
     <!-- This corresponds to TFM we want the SharedFX to target and should be updated when needed. -->
 
-    <NETCoreAppFramework>netcoreapp2.0</NETCoreAppFramework>
+    <NETCoreAppFramework>netcoreapp2.1</NETCoreAppFramework>
     <OmitDependencies>true</OmitDependencies>
     <SkipValidatePackage>true</SkipValidatePackage>
     <ShouldCreateLayout>false</ShouldCreateLayout>
@@ -38,10 +38,16 @@
     <Dependency Include="@(NETCoreApp11Dependency)">
       <TargetFramework>.NETCoreApp1.1</TargetFramework>
     </Dependency>
+
+    <!-- temporarily disable netcoreapp2.0 until https://github.com/dotnet/core-setup/issues/2437 is fixed -->
+    <Dependency Include="_._">
+      <TargetFramework>.NETCoreApp2.0</TargetFramework>
+    </Dependency>
+
     <!-- references the host packages -->
     <Dependency Include="Microsoft.NETCore.DotNetHostPolicy">
        <Version>$(HostPolicyVersion)</Version>
-       <TargetFramework>.NETCoreApp2.0</TargetFramework>
+       <TargetFramework>$(NETCoreAppFramework)</TargetFramework>
     </Dependency>
 
     <!-- Add a placeholder to make sure NuGet understands we still support older versions,

diff --git a/src/pkg/projects/Microsoft.NETCore.App/src/Microsoft.NETCore.App.depproj b/src/pkg/projects/Microsoft.NETCore.App/src/Microsoft.NETCore.App.depproj
@@ -7,9 +7,9 @@
     <!-- we don't want any analyzers by ResolveNuGetPackageAssets 
          null-refs when this isn't set and an analyzer is in the packages -->
     <Language>unused</Language>
-    <NuGetTargetMoniker>.NETCoreApp,Version=v2.0</NuGetTargetMoniker>
-    <NuGetTargetMonikerShort>netcoreapp2.0</NuGetTargetMonikerShort>
-    <PackageTargetFramework>netcoreapp2.0</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETCoreApp,Version=v2.1</NuGetTargetMoniker>
+    <NuGetTargetMonikerShort>netcoreapp2.1</NuGetTargetMonikerShort>
+    <PackageTargetFramework>netcoreapp2.1</PackageTargetFramework>
     <PrimaryPackage>Microsoft.Private.CoreFx.NETCoreApp</PrimaryPackage>
     <CrossGenOutputPath>$(CrossGenRootPath)/$(MSBuildProjectName)/$(NuGetRuntimeIdentifier)</CrossGenOutputPath>
     <ContainsPackageReferences>true</ContainsPackageReferences>

diff --git a/src/test/Assets/TestProjects/LightupClient/LightupClient.csproj b/src/test/Assets/TestProjects/LightupClient/LightupClient.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <OutputType>Exe</OutputType>
     <RuntimeFrameworkVersion>$(MNAVersion)</RuntimeFrameworkVersion>
   </PropertyGroup>

diff --git a/src/test/Assets/TestProjects/LightupLib/LightupLib.csproj b/src/test/Assets/TestProjects/LightupLib/LightupLib.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <OutputType>Library</OutputType>
     <RuntimeFrameworkVersion>$(MNAVersion)</RuntimeFrameworkVersion>
   </PropertyGroup>

diff --git a/src/test/Assets/TestProjects/PortableApp/PortableApp.csproj b/src/test/Assets/TestProjects/PortableApp/PortableApp.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <OutputType>Exe</OutputType>
     <RuntimeFrameworkVersion>$(MNAVersion)</RuntimeFrameworkVersion>
   </PropertyGroup>

diff --git a/src/test/Assets/TestProjects/PortableTestApp/PortableTestApp.csproj b/src/test/Assets/TestProjects/PortableTestApp/PortableTestApp.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
     <PackageTargetFallback>$(PackageTargetFallback);dotnet5.4;portable-net451+win8</PackageTargetFallback>
     <RuntimeFrameworkVersion>$(MNAVersion)</RuntimeFrameworkVersion>

diff --git a/src/test/Assets/TestProjects/ResourceLookup/ResourceLookup.csproj b/src/test/Assets/TestProjects/ResourceLookup/ResourceLookup.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <OutputType>Exe</OutputType>
     <RuntimeFrameworkVersion>$(MNAVersion)</RuntimeFrameworkVersion>
   </PropertyGroup>

diff --git a/src/test/Assets/TestProjects/SharedFxLookupPortableApp/SharedFxLookupPortableApp.csproj b/src/test/Assets/TestProjects/SharedFxLookupPortableApp/SharedFxLookupPortableApp.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <OutputType>Exe</OutputType>
     <RuntimeFrameworkVersion>$(MNAVersion)</RuntimeFrameworkVersion>
   </PropertyGroup>

diff --git a/src/test/Assets/TestProjects/StandaloneApp/StandaloneApp.csproj b/src/test/Assets/TestProjects/StandaloneApp/StandaloneApp.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <OutputType>Exe</OutputType>
     <RuntimeIdentifier>$(TestTargetRid)</RuntimeIdentifier>
     <RuntimeFrameworkVersion>$(MNAVersion)</RuntimeFrameworkVersion>

diff --git a/src/test/Assets/TestProjects/StandaloneTestApp/StandaloneTestApp.csproj b/src/test/Assets/TestProjects/StandaloneTestApp/StandaloneTestApp.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <OutputType>Exe</OutputType>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
     <PackageTargetFallback>$(PackageTargetFallback);dotnet5.4;portable-net451+win8</PackageTargetFallback>

diff --git a/src/test/TestUtils/TestProjectFixture.cs b/src/test/TestUtils/TestProjectFixture.cs
@@ -52,7 +52,7 @@ public class TestProjectFixture
             string dotnetInstallPath = null,
             string currentRid = null,
             string builtDotnetOutputPath = null,
-            string framework = "netcoreapp2.0")
+            string framework = "netcoreapp2.1")
         {
             ValidateRequiredDirectories(repoDirectoriesProvider);
 
@@ -289,6 +289,8 @@ private void ValidateRequiredDirectories(RepoDirectoriesProvider repoDirectories
             storeArgs.Add("--working-dir");
             storeArgs.Add("store_workin_dir");
 
+            storeArgs.Add($"/p:MNAVersion={_repoDirectoriesProvider.MicrosoftNETCoreAppVersion}");
+
             dotnet.Store(storeArgs.ToArray())
                 .WorkingDirectory(_testProject.ProjectDirectory)
                 .Environment("NUGET_PACKAGES", _repoDirectoriesProvider.NugetPackages)