Update the SDK version in the global.json; fixing a previous merge co…

…nflict resolution.
dotnet · May 8, 2018 · 78de2a8 · 78de2a8
1 parent 61fa3cf
commit 78de2a8
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 13 deletions.
diff --git a/build/Versions.props b/build/Versions.props
@@ -12,18 +12,6 @@
     <PreReleaseVersionLabel>preview1</PreReleaseVersionLabel>
   </PropertyGroup>
 
-  <!-- Repo Toolset Features -->
-  <PropertyGroup>
-    <UsingToolMicrosoftNetCompilers>false</UsingToolMicrosoftNetCompilers>
-  </PropertyGroup>
-
-  <!-- Toolset Dependencies -->
-  <PropertyGroup>
-    <DotNetCliVersion>2.2.100-preview1-008636</DotNetCliVersion>
-    <RoslynToolsRepoToolsetVersion>1.0.0-beta-62615-02</RoslynToolsRepoToolsetVersion>
-    <VSWhereVersion>2.2.7</VSWhereVersion>
-  </PropertyGroup>
-
   <!-- Production Dependencies -->
   <PropertyGroup>
     <MicrosoftBuildFrameworkVersion>15.4.8</MicrosoftBuildFrameworkVersion>

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "2.1.300-preview3-008616"
+    "version": "2.2.100-preview1-008636"
   },
   "msbuild-sdks": {
     "RoslynTools.RepoToolset": "1.0.0-beta2-62805-03"