Merge pull request #246 from Microsoft/develop

merge version update to master
microsoft · Dec 1, 2016 · 0e58979 · 0e58979
2 parents 7b27ddc + fd607c4
commit 0e58979
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Global.props b/Global.props
@@ -96,7 +96,7 @@
         <NugetVersionFilePath>$(MSBuildThisFileDirectory).nugetVersion</NugetVersionFilePath>
         <BuildNugetVersion Condition="Exists($(NugetVersionFilePath))">$([System.IO.File]::ReadAllText($(NugetVersionFilePath)))</BuildNugetVersion>
 
-        <CoreSdkVersion>2.2.0-beta4</CoreSdkVersion>
+        <CoreSdkVersion>2.2.0-beta6</CoreSdkVersion>
 
         <!-- Forces EventRegister target to generate ETW manifest file --> 
         <EtwManifestForceAll>true</EtwManifestForceAll>

diff --git a/GlobalStaticVersion.props b/GlobalStaticVersion.props
@@ -8,7 +8,7 @@
     <SemanticVersionMajor>2</SemanticVersionMajor>
     <SemanticVersionMinor>2</SemanticVersionMinor>
     <SemanticVersionPatch>0</SemanticVersionPatch>
-    <PreReleaseMilestone>beta4</PreReleaseMilestone>
+    <PreReleaseMilestone>beta6</PreReleaseMilestone>
 
     <!-- 
       Date when Semantic Version was changed.