From e8b2b43f9bd0ae5a79ff2dafa97cf78365d0a639 Mon Sep 17 00:00:00 2001
From: Kenneth Pouncey <kjpou@pt.lu>
Date: Mon, 16 Sep 2019 16:34:41 +0200
Subject: [PATCH] Bump sdk and bindings versions (#16809)

---
 sdks/wasm/common/Versions.props                    | 26 +++++++++++-----------
 .../sdk/Mono.WebAssembly.Sdk/sdk/Versions.props    | 26 +++++++++++-----------
 .../sdk/Templates/templates/DotNet/global.json     |  2 +-
 sdks/wasm/sdk/global.json                          |  2 +-
 sdks/wasm/tests/browser/src/Packages.props         | 18 +++++++--------
 sdks/wasm/tests/browser/src/global.json            |  2 +-
 6 files changed, 38 insertions(+), 38 deletions(-)
 rewrite sdks/wasm/sdk/Mono.WebAssembly.Sdk/sdk/Versions.props (64%)
 rewrite sdks/wasm/tests/browser/src/Packages.props (61%)

diff --git a/sdks/wasm/common/Versions.props b/sdks/wasm/common/Versions.props
index 3734a3d492e..50b6ecfa291 100644
--- a/sdks/wasm/common/Versions.props
+++ b/sdks/wasm/common/Versions.props
@@ -6,56 +6,56 @@
 <Project>
   <PropertyGroup Label="Framework Version settings">
     <FrameworkMajorVersion>0</FrameworkMajorVersion>
-    <FrameworkMinorVersion>1</FrameworkMinorVersion>
-    <FrameworkPatchVersion>0</FrameworkPatchVersion>
+    <FrameworkMinorVersion>2</FrameworkMinorVersion>
+    <FrameworkPatchVersion>1</FrameworkPatchVersion>
     <FrameworkPreReleasePreviewNumber>1</FrameworkPreReleasePreviewNumber>
     <FrameworkPreReleaseVersionLabel>preview$(FrameworkPreReleasePreviewNumber)</FrameworkPreReleaseVersionLabel>
     <FrameworkPreReleaseBrandingLabel>Preview $(FrameworkPreReleasePreviewNumber)</FrameworkPreReleaseBrandingLabel>
     <FrameworkMajorMinorVersion>$(FrameworkMajorVersion).$(FrameworkMinorVersion)</FrameworkMajorMinorVersion>
     <FrameworkVersionPrefix>$(FrameworkMajorVersion).$(FrameworkMinorVersion).$(FrameworkPatchVersion)</FrameworkVersionPrefix>
-    <FrameworkVersion>$(FrameworkVersionPrefix)-$(FrameworkPreReleaseVersionLabel)</FrameworkVersion>
+    <FrameworkVersion>$(FrameworkVersionPrefix)</FrameworkVersion>
     <PreviousFrameworkReleaseVersion Condition=" '$(FrameworkPatchVersion)' != '0' ">$(FrameworkMajorVersion).$(FrameworkMinorVersion).$([MSBuild]::Subtract($(FrameworkPatchVersion), 1))</PreviousFrameworkReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Label="Bindings Version settings">
     <BindingsMajorVersion>0</BindingsMajorVersion>
-    <BindingsMinorVersion>1</BindingsMinorVersion>
-    <BindingsPatchVersion>0</BindingsPatchVersion>
+    <BindingsMinorVersion>2</BindingsMinorVersion>
+    <BindingsPatchVersion>1</BindingsPatchVersion>
     <BindingsPreReleasePreviewNumber>1</BindingsPreReleasePreviewNumber>
     <BindingsPreReleaseVersionLabel>preview$(BindingsPreReleasePreviewNumber)</BindingsPreReleaseVersionLabel>
     <BindingsPreReleaseBrandingLabel>Preview $(BindingsPreReleasePreviewNumber)</BindingsPreReleaseBrandingLabel>
     <BindingsMajorMinorVersion>$(BindingsMajorVersion).$(BindingsMinorVersion)</BindingsMajorMinorVersion>
     <BindingsVersionPrefix>$(BindingsMajorVersion).$(BindingsMinorVersion).$(BindingsPatchVersion)</BindingsVersionPrefix>
-    <BindingsVersion>$(BindingsVersionPrefix)-$(BindingsPreReleaseVersionLabel)</BindingsVersion>
+    <BindingsVersion>$(BindingsVersionPrefix)</BindingsVersion>
     <PreviousBindingsReleaseVersion Condition=" '$(BindingsPatchVersion)' != '0' ">$(BindingsMajorVersion).$(BindingsMinorVersion).$([MSBuild]::Subtract($(BindingsPatchVersion), 1))</PreviousBindingsReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Label="HttpHandler Version settings">
     <HttpHandlerMajorVersion>0</HttpHandlerMajorVersion>
-    <HttpHandlerMinorVersion>1</HttpHandlerMinorVersion>
-    <HttpHandlerPatchVersion>0</HttpHandlerPatchVersion>
+    <HttpHandlerMinorVersion>2</HttpHandlerMinorVersion>
+    <HttpHandlerPatchVersion>1</HttpHandlerPatchVersion>
     <HttpHandlerPreReleasePreviewNumber>1</HttpHandlerPreReleasePreviewNumber>
     <HttpHandlerPreReleaseVersionLabel>preview$(HttpHandlerPreReleasePreviewNumber)</HttpHandlerPreReleaseVersionLabel>
     <HttpHandlerPreReleaseBrandingLabel>Preview $(HttpHandlerPreReleasePreviewNumber)</HttpHandlerPreReleaseBrandingLabel>
     <HttpHandlerMajorMinorVersion>$(HttpHandlerMajorVersion).$(HttpHandlerMinorVersion)</HttpHandlerMajorMinorVersion>
     <HttpHandlerVersionPrefix>$(HttpHandlerMajorVersion).$(HttpHandlerMinorVersion).$(HttpHandlerPatchVersion)</HttpHandlerVersionPrefix>
-    <HttpHandlerVersion>$(HttpHandlerVersionPrefix)-$(HttpHandlerPreReleaseVersionLabel)</HttpHandlerVersion>
+    <HttpHandlerVersion>$(HttpHandlerVersionPrefix)</HttpHandlerVersion>
     <PreviousHttpHandlerReleaseVersion Condition=" '$(HttpHandlerPatchVersion)' != '0' ">$(HttpHandlerMajorVersion).$(HttpHandlerMinorVersion).$([MSBuild]::Subtract($(HttpHandlerPatchVersion), 1))</PreviousHttpHandlerReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Label="ClientWebSocket Version settings">
     <ClientWebSocketMajorVersion>0</ClientWebSocketMajorVersion>
-    <ClientWebSocketMinorVersion>1</ClientWebSocketMinorVersion>
-    <ClientWebSocketPatchVersion>0</ClientWebSocketPatchVersion>
+    <ClientWebSocketMinorVersion>2</ClientWebSocketMinorVersion>
+    <ClientWebSocketPatchVersion>1</ClientWebSocketPatchVersion>
     <ClientWebSocketPreReleasePreviewNumber>1</ClientWebSocketPreReleasePreviewNumber>
     <ClientWebSocketPreReleaseVersionLabel>preview$(ClientWebSocketPreReleasePreviewNumber)</ClientWebSocketPreReleaseVersionLabel>
     <ClientWebSocketPreReleaseBrandingLabel>Preview $(ClientWebSocketPreReleasePreviewNumber)</ClientWebSocketPreReleaseBrandingLabel>
     <ClientWebSocketMajorMinorVersion>$(ClientWebSocketMajorVersion).$(ClientWebSocketMinorVersion)</ClientWebSocketMajorMinorVersion>
     <ClientWebSocketVersionPrefix>$(ClientWebSocketMajorVersion).$(ClientWebSocketMinorVersion).$(ClientWebSocketPatchVersion)</ClientWebSocketVersionPrefix>
-    <ClientWebSocketVersion>$(ClientWebSocketVersionPrefix)-$(ClientWebSocketPreReleaseVersionLabel)</ClientWebSocketVersion>
+    <ClientWebSocketVersion>$(ClientWebSocketVersionPrefix)</ClientWebSocketVersion>
     <PreviousClientWebSocketReleaseVersion Condition=" '$(ClientWebSocketPatchVersion)' != '0' ">$(ClientWebSocketMajorVersion).$(ClientWebSocketMinorVersion).$([MSBuild]::Subtract($(ClientWebSocketPatchVersion), 1))</PreviousClientWebSocketReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Label="SDK Version settings">
     <SDKPackageMajorVersion>0</SDKPackageMajorVersion>
     <SDKPackageMinorVersion>2</SDKPackageMinorVersion>
-    <SDKPackagePatchVersion>0</SDKPackagePatchVersion>
+    <SDKPackagePatchVersion>1</SDKPackagePatchVersion>
     <SDKPackagePreReleasePreviewNumber>1</SDKPackagePreReleasePreviewNumber>
     <SDKPackagePreReleaseVersionLabel>preview$(SDKPackagePreReleasePreviewNumber)</SDKPackagePreReleaseVersionLabel>
     <SDKPackagePreReleaseBrandingLabel>Preview $(SDKPackagePreReleasePreviewNumber)</SDKPackagePreReleaseBrandingLabel>
diff --git a/sdks/wasm/sdk/Mono.WebAssembly.Sdk/sdk/Versions.props b/sdks/wasm/sdk/Mono.WebAssembly.Sdk/sdk/Versions.props
dissimilarity index 64%
index 69d2f583d8e..6b839509ce7 100644
--- a/sdks/wasm/sdk/Mono.WebAssembly.Sdk/sdk/Versions.props
+++ b/sdks/wasm/sdk/Mono.WebAssembly.Sdk/sdk/Versions.props
@@ -1,13 +1,13 @@
-<!--
-  This file is automatically generated by project build.
--->
-<Project>
-  <PropertyGroup>
-    <_MonoWasmBuildPackageVersion>0.2.0</_MonoWasmBuildPackageVersion>
-    <_MonoWasmFrameworkPackageVersion>0.2.0</_MonoWasmFrameworkPackageVersion>
-    <_MonoWasmRuntimePackageVersion>0.2.0</_MonoWasmRuntimePackageVersion>
-    <_MonoWasmBindingsPackageVersion>0.2.0</_MonoWasmBindingsPackageVersion>
-    <_MonoWasmHttpHandlerPackageVersion>0.2.0</_MonoWasmHttpHandlerPackageVersion>
-    <_MonoWasmClientWebSocketPackageVersion>0.2.0</_MonoWasmClientWebSocketPackageVersion>
-  </PropertyGroup>
-</Project>
+<!--
+  This file is automatically generated by project build.
+-->
+<Project>
+  <PropertyGroup>
+    <_MonoWasmBuildPackageVersion>0.2.1</_MonoWasmBuildPackageVersion>
+    <_MonoWasmFrameworkPackageVersion>0.2.1</_MonoWasmFrameworkPackageVersion>
+    <_MonoWasmRuntimePackageVersion>0.2.1</_MonoWasmRuntimePackageVersion>
+    <_MonoWasmBindingsPackageVersion>0.2.1</_MonoWasmBindingsPackageVersion>
+    <_MonoWasmHttpHandlerPackageVersion>0.2.1</_MonoWasmHttpHandlerPackageVersion>
+    <_MonoWasmClientWebSocketPackageVersion>0.2.1</_MonoWasmClientWebSocketPackageVersion>
+  </PropertyGroup>
+</Project>
diff --git a/sdks/wasm/sdk/Templates/templates/DotNet/global.json b/sdks/wasm/sdk/Templates/templates/DotNet/global.json
index f9c2755c7e8..535a1d4270d 100644
--- a/sdks/wasm/sdk/Templates/templates/DotNet/global.json
+++ b/sdks/wasm/sdk/Templates/templates/DotNet/global.json
@@ -1,5 +1,5 @@
 {
   "msbuild-sdks": {
-    "Mono.WebAssembly.Sdk": "0.2.0"
+    "Mono.WebAssembly.Sdk": "0.2.1"
   }
 }
diff --git a/sdks/wasm/sdk/global.json b/sdks/wasm/sdk/global.json
index 3a9e27ff18a..b1003a96eb4 100644
--- a/sdks/wasm/sdk/global.json
+++ b/sdks/wasm/sdk/global.json
@@ -2,6 +2,6 @@
   "msbuild-sdks": {
     "Microsoft.Build.CentralPackageVersions": "2.0.1",
     "Microsoft.Build.Traversal": "1.0.34",
-    "Mono.WebAssembly.Sdk": "0.1.0-preview1"
+    "Mono.WebAssembly.Sdk": "0.2.1"
   }
 }
diff --git a/sdks/wasm/tests/browser/src/Packages.props b/sdks/wasm/tests/browser/src/Packages.props
dissimilarity index 61%
index 083f511d9f3..1a7a3f9d69e 100644
--- a/sdks/wasm/tests/browser/src/Packages.props
+++ b/sdks/wasm/tests/browser/src/Packages.props
@@ -1,9 +1,9 @@
-<Project>
-  <ItemGroup>
-    <PackageReference Update="Mono.WebAssembly.Sdk" Version="0.1.0-preview1" />
-    <PackageReference Update="WebAssembly.Bindings" Version="0.1.0-preview1" />
-    <PackageReference Update="WebAssembly.Net.Http" Version="0.1.0-preview1" />
-    <PackageReference Update="WebAssembly.Net.WebSockets" Version="0.1.0-preview1" />  
-    <PackageReference Update="System.Memory" Version="4.5.3" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
+<Project>
+  <ItemGroup>
+    <PackageReference Update="Mono.WebAssembly.Sdk" Version="0.2.1" />
+    <PackageReference Update="WebAssembly.Bindings" Version="0.2.1" />
+    <PackageReference Update="WebAssembly.Net.Http" Version="0.2.1" />
+    <PackageReference Update="WebAssembly.Net.WebSockets" Version="0.2.1" />  
+    <PackageReference Update="System.Memory" Version="4.5.3" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/sdks/wasm/tests/browser/src/global.json b/sdks/wasm/tests/browser/src/global.json
index 5f635485503..b1003a96eb4 100644
--- a/sdks/wasm/tests/browser/src/global.json
+++ b/sdks/wasm/tests/browser/src/global.json
@@ -2,6 +2,6 @@
   "msbuild-sdks": {
     "Microsoft.Build.CentralPackageVersions": "2.0.1",
     "Microsoft.Build.Traversal": "1.0.34",
-    "Mono.WebAssembly.Sdk": "0.2.0"
+    "Mono.WebAssembly.Sdk": "0.2.1"
   }
 }
-- 
2.11.4.GIT