Support netcoreapp2.1

* Need to move from netcoreapp2.0 to netcoreapp2.1 in master branch. * Fixes dotnet#2230
StephenBonikowsky · Aug 24, 2017 · d31d40b · d31d40b
1 parent 63b9a45
commit d31d40b
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 17 deletions.
diff --git a/dependencies.props b/dependencies.props
@@ -9,28 +9,28 @@
        These ref versions are pulled from https://github.com/dotnet/versions.
   -->
   <PropertyGroup>
-    <CoreFxCurrentRef>5b20aed750792e206f7ec8409d7939246283f87b</CoreFxCurrentRef>
-    <WCFCurrentRef>c9a03fe0c3309508cb509a4ffdd6dc8b79ed525e</WCFCurrentRef>
+    <CoreFxCurrentRef>d15fab89bc8054324d62b5250f2f36d531395f9e</CoreFxCurrentRef>
+    <WCFCurrentRef>d15fab89bc8054324d62b5250f2f36d531395f9e</WCFCurrentRef>
     <StandardCurrentRef>9d670595478e52f203b9b8925576ce5e7f6826dd</StandardCurrentRef>
-    <ProjectNTfsCurrentRef>d1cec650123d1124f51b6144a149453abd45bee4</ProjectNTfsCurrentRef>
-    <ProjectNTfsTestILCCurrentRef>d1cec650123d1124f51b6144a149453abd45bee4</ProjectNTfsTestILCCurrentRef>
+    <ProjectNTfsCurrentRef>d15fab89bc8054324d62b5250f2f36d531395f9e</ProjectNTfsCurrentRef>
+    <ProjectNTfsTestILCCurrentRef>d15fab89bc8054324d62b5250f2f36d531395f9e</ProjectNTfsTestILCCurrentRef>
   </PropertyGroup>
 
   <!-- Auto-upgraded properties for each build info dependency. -->
   <PropertyGroup>
-    <WCFExpectedPrerelease>preview1-25302-01</WCFExpectedPrerelease>
-    <CoreFxExpectedPrerelease>preview2-25607-02</CoreFxExpectedPrerelease>
+    <WCFExpectedPrerelease>preview2-25624-01</WCFExpectedPrerelease>
+    <CoreFxExpectedPrerelease>preview2-25624-01</CoreFxExpectedPrerelease>
     <NETStandardPackageVersion>2.1.0-preview1-25319-01</NETStandardPackageVersion>
     <NETStandardPackageId>NETStandard.Library</NETStandardPackageId>
     <!--
       This property is used for many CoreFX packages, because they have the same
       versions. Make more properties for CoreFX if split versions are required.
     -->
-    <MicrosoftPrivateCoreFxNETCoreAppPackageVersion>4.5.0-preview2-25524-02</MicrosoftPrivateCoreFxNETCoreAppPackageVersion>
+    <MicrosoftPrivateCoreFxNETCoreAppPackageVersion>4.5.0-preview2-25624-01</MicrosoftPrivateCoreFxNETCoreAppPackageVersion>
 
-    <ProjectNTfsExpectedPrerelease>beta-25331-00</ProjectNTfsExpectedPrerelease>
-    <ProjectNTfsTestILCExpectedPrerelease>beta-25331-00</ProjectNTfsTestILCExpectedPrerelease>
-    <ProjectNTfsTestILCPackageVersion>1.0.0-beta-25331-00</ProjectNTfsTestILCPackageVersion>
+    <ProjectNTfsExpectedPrerelease>beta-25624-01</ProjectNTfsExpectedPrerelease>
+    <ProjectNTfsTestILCExpectedPrerelease>beta-25624-01</ProjectNTfsTestILCExpectedPrerelease>
+    <ProjectNTfsTestILCPackageVersion>1.0.0-beta-25624-01</ProjectNTfsTestILCPackageVersion>
   </PropertyGroup>
 
   <!-- Full package version strings that are used in other parts of the build. -->
@@ -40,7 +40,7 @@
     <XunitPerfAnalysisPackageVersion>1.0.0-beta-build0007</XunitPerfAnalysisPackageVersion>
     <XunitNetcoreExtensionsVersion>1.0.1-prerelease-01616-05</XunitNetcoreExtensionsVersion>
 
-    <CoreClrPackageVersion>2.1.0-preview2-25603-01</CoreClrPackageVersion>
+    <CoreClrPackageVersion>2.1.0-preview2-25624-02</CoreClrPackageVersion>
     <DotNetHostPackageVersion>2.0.0-preview2-25310-02</DotNetHostPackageVersion>
 
     <!-- Microsoft.NETCore.Platforms is part of CoreFX, but allow separate upgrade. -->
@@ -158,4 +158,4 @@
     </DependencyBuildInfo>
 
   </ItemGroup>
-</Project>
+</Project>
diff --git a/tools-local/targetgroups.props b/tools-local/targetgroups.props
@@ -130,15 +130,21 @@
       <NuGetTargetMoniker>.NETCoreApp,Version=v2.0</NuGetTargetMoniker>
       <NuGetTargetMonikerShort>netcoreapp2.0</NuGetTargetMonikerShort>
       <Imports>netcoreapp1.0</Imports>
-      <CompatibleWith>netstandard2.0</CompatibleWith>
+      <CompatibleWith>netstandard</CompatibleWith>
     </TargetGroups>
-    <!-- netcoreapp is an alias for netcoreapp2.0 -->
-    <TargetGroups Include="netcoreapp">
-      <NuGetTargetMoniker>.NETCoreApp,Version=v2.0</NuGetTargetMoniker>
-      <NuGetTargetMonikerShort>netcoreapp2.0</NuGetTargetMonikerShort>
+    <TargetGroups Include="netcoreapp2.1">
+      <NuGetTargetMoniker>.NETCoreApp,Version=v2.1</NuGetTargetMoniker>
+      <NuGetTargetMonikerShort>netcoreapp2.1</NuGetTargetMonikerShort>
       <Imports>netcoreapp2.0</Imports>
       <CompatibleWith>netstandard</CompatibleWith>
     </TargetGroups>
+    <!-- netcoreapp is an alias for netcoreapp2.1 -->
+    <TargetGroups Include="netcoreapp">
+      <NuGetTargetMoniker>.NETCoreApp,Version=v2.1</NuGetTargetMoniker>
+      <NuGetTargetMonikerShort>netcoreapp2.1</NuGetTargetMonikerShort>
+      <Imports>netcoreapp2.1</Imports>
+      <CompatibleWith>netstandard</CompatibleWith>
+    </TargetGroups>
     <TargetGroups Include="netcoreapp1.2">
       <NuGetTargetMoniker>.NETCoreApp,Version=v1.2</NuGetTargetMoniker>
       <NuGetTargetMonikerShort>netcoreapp1.2</NuGetTargetMonikerShort>