Merge pull request #29436 from weshaggard/UpdateToRC1SDK

[release/2.1] Move to 2.1 RC1 CLI
dotnet · May 2, 2018 · 5820819 · 5820819
2 parents 77732da + f10d99c
commit 5820819
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/BuildToolsVersion.txt b/BuildToolsVersion.txt
@@ -1 +1 @@
-2.1.0-rc1-02726-01
+2.1.0-rc1-02801-02
diff --git a/DotnetCLIVersion.txt b/DotnetCLIVersion.txt
@@ -1 +1 @@
-2.1.2
+2.1.300-rc1-008673
diff --git a/dependencies.props b/dependencies.props
@@ -17,7 +17,7 @@
     <ProjectNTfsTestILCCurrentRef>ccd922b62227c43ed2dac6bcb737321dd2b07be0</ProjectNTfsTestILCCurrentRef>
     <SniCurrentRef>8bd1ec5fac9f0eec34ff6b34b1d878b4359e02dd</SniCurrentRef>
     <StandardCurrentRef>eff554f39ee29c9f2b470bf7755b83ceaaf2b1a1</StandardCurrentRef>
-    <BuildToolsCurrentRef>8fc0a89b2be0751366b37d467d6711b575904bd7</BuildToolsCurrentRef>
+    <BuildToolsCurrentRef>2fe2dd669d608471666a89d5c003f412f743ae46</BuildToolsCurrentRef>
   </PropertyGroup>
 
   <!-- Product dependency versions. -->
@@ -47,7 +47,7 @@
     <AppXRunnerVersion>1.0.3-prerelease-00921-01</AppXRunnerVersion>
     <XunitPerfAnalysisPackageVersion>1.0.0-beta-build0018</XunitPerfAnalysisPackageVersion>
     <TraceEventPackageVersion>2.0.5</TraceEventPackageVersion>
-    <XunitNetcoreExtensionsVersion>2.1.0-rc1-02726-01</XunitNetcoreExtensionsVersion>
+    <XunitNetcoreExtensionsVersion>2.1.0-rc1-02801-02</XunitNetcoreExtensionsVersion>
 
     <!-- Roslyn optimization data package version -->
     <OptimizationDataVersion>2.0.0-rc-61101-17</OptimizationDataVersion>
@@ -56,7 +56,7 @@
   <!-- Package versions used as toolsets -->
   <PropertyGroup>
     <FeedTasksPackage>Microsoft.DotNet.Build.Tasks.Feed</FeedTasksPackage>
-    <FeedTasksPackageVersion>2.1.0-rc1-02726-01</FeedTasksPackageVersion>
+    <FeedTasksPackageVersion>2.1.0-rc1-02801-02</FeedTasksPackageVersion>
   </PropertyGroup>
 
   <!-- Publish symbol build task package -->

diff --git a/pkg/test/testPackages.proj b/pkg/test/testPackages.proj
@@ -28,6 +28,9 @@
     <!-- no targeting pack was ever shipped for net463 -->
     <TargetFrameworksToExclude Include="net463" />
     <TargetFrameworksToExclude Include="net47" />
+
+    <!-- exclude netcoreapp2.2 in release branch for 2.1 -->
+    <TargetFrameworksToExclude Include="netcoreapp2.2" />
   </ItemGroup>
 
   <PropertyGroup>