Move Core-Setup to 2.1 Preview1 (dotnet/core-setup#2422)

Commit migrated from https://github.com/dotnet/core-setup/commit/a2e09b8d6ac6b251d961b684ff34887a2bcbd3c7

diff --git a/src/installer/branchinfo.txt b/src/installer/branchinfo.txt
index 4c97cb5..a00ff3b 100644 (file)
--- a/src/installer/branchinfo.txt
+++ b/src/installer/branchinfo.txt
@@ -2,10 +2,10 @@
 # Any line that is not blank and does not start with '#' is interpreted as a variable to set.
 # Each line is expected to be in the format "[Name]=[Value]".
 MAJOR_VERSION=2
-MINOR_VERSION=0
+MINOR_VERSION=1
 PATCH_VERSION=0
 STABILIZE_PACKAGE_VERSION=false
 LOCK_HOST_VERSION=false
-RELEASE_SUFFIX=preview2
+RELEASE_SUFFIX=preview1
 CHANNEL=master
 BRANCH_NAME=master

diff --git a/src/installer/managed/CommonManaged.props b/src/installer/managed/CommonManaged.props
index b15a7f1..de4a733 100644 (file)
--- a/src/installer/managed/CommonManaged.props
+++ b/src/installer/managed/CommonManaged.props
@@ -5,7 +5,7 @@
 
   <PropertyGroup>
     <RepoRoot>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)../..'))/</RepoRoot>
-    <VersionPrefix>2.0.0</VersionPrefix>
+    <VersionPrefix>2.1.0</VersionPrefix>
     <AssemblyFileVersion>$(VersionPrefix)</AssemblyFileVersion>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>

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 9a4bda0..e5c915f 100644 (file)
--- 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,7 +6,10 @@
 
   <PropertyGroup>
     <Version>$(SharedFrameworkNugetVersion)</Version>
-    <NETCoreAppFramework>netcoreapp$([System.Version]::Parse('$(ProductionVersion)').ToString(2))</NETCoreAppFramework>
+
+    <!-- This corresponds to TFM we want the SharedFX to target and should be updated when needed. -->
+
+    <NETCoreAppFramework>netcoreapp2.0</NETCoreAppFramework>
     <OmitDependencies>true</OmitDependencies>
     <SkipValidatePackage>true</SkipValidatePackage>
     <ShouldCreateLayout>false</ShouldCreateLayout>

diff --git a/src/installer/pkg/projects/Microsoft.Net.UWPCoreRuntimeSdk/Microsoft.Net.UWPCoreRuntimeSdk.pkgproj b/src/installer/pkg/projects/Microsoft.Net.UWPCoreRuntimeSdk/Microsoft.Net.UWPCoreRuntimeSdk.pkgproj
index 9c4a846..0b6ea18 100644 (file)
--- a/src/installer/pkg/projects/Microsoft.Net.UWPCoreRuntimeSdk/Microsoft.Net.UWPCoreRuntimeSdk.pkgproj
+++ b/src/installer/pkg/projects/Microsoft.Net.UWPCoreRuntimeSdk/Microsoft.Net.UWPCoreRuntimeSdk.pkgproj
@@ -3,7 +3,7 @@
   <Import Project="dir.props" />
 
   <PropertyGroup>
-    <Version>2.0.0</Version>
+    <Version>$(ProductVersion)</Version>
   </PropertyGroup>
 
   <ItemGroup>