From cae6a9cfb3519136ea8691df26d9a865f337b66b Mon Sep 17 00:00:00 2001
From: William Godbe <wigodbe@microsoft.com>
Date: Mon, 10 Feb 2020 14:05:36 -0800
Subject: [PATCH] Use non-stable versioning in blazor-wasm (#18894)

* Use stable versioning in blazor-wasm

* This branch never builds the targeting pack

* Update eng/Versions.props

* Undo changes to patchconfig.props

Co-authored-by: Pranav K <prkrishn@hotmail.com>
---
 Directory.Build.props                                     | 4 ++--
 Directory.Build.targets                                   | 3 +--
 eng/Versions.props                                        | 8 ++++----
 src/Components/Blazor/Blazor.Version.props                | 8 --------
 src/Components/Blazor/Directory.Build.props               | 1 -
 .../Microsoft.AspNetCore.Blazor.Templates.csproj          | 2 --
 6 files changed, 7 insertions(+), 19 deletions(-)
 delete mode 100644 src/Components/Blazor/Blazor.Version.props

diff --git a/Directory.Build.props b/Directory.Build.props
index 2fe19bde83..e7d54c9ddc 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -84,8 +84,8 @@
     <RuntimeInstallerBaseName>aspnetcore-runtime</RuntimeInstallerBaseName>
     <TargetingPackInstallerBaseName>aspnetcore-targeting-pack</TargetingPackInstallerBaseName>
 
-    <!-- Used to only produce targeting pack installers/packages once per major.minor. -->
-    <IsTargetingPackBuilding Condition="'$(AspNetCorePatchVersion)' != '0' OR '$(DotNetBuildFromSource)' == 'true'">false</IsTargetingPackBuilding>
+    <!-- This branch will never build the targeting pack. -->
+    <IsTargetingPackBuilding>false</IsTargetingPackBuilding>
 
     <!--
       Archives and installers using this prefix are intended for internal-use only.
diff --git a/Directory.Build.targets b/Directory.Build.targets
index db3cea59f1..074b8c1c38 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -105,9 +105,8 @@
     <Compile Include="$(SharedSourceRoot)ReferenceAssemblyInfo.cs" LinkBase="Properties" />
   </ItemGroup>
 
-  <PropertyGroup Condition="'$(Language)' == 'C#'">
+  <PropertyGroup Condition="'$(Language)' == 'C#' AND '$(IsReferenceAssemblyProject)' == 'true'">
     <!-- Reference assemblies should always use Major.Minor.0.0 for assembly versions even during servicing. Only the package version should be updated. -->
-    <!-- Pinning the implementation assemblies at Major.Minor.0.0 as we figure out compiling against ref assemblies. -->
     <AssemblyVersion>$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).0.0</AssemblyVersion>
   </PropertyGroup>
 
diff --git a/eng/Versions.props b/eng/Versions.props
index b289cd7b39..f4ee39718f 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -7,13 +7,13 @@
 <Project>
   <PropertyGroup Label="Version settings">
     <AspNetCoreMajorVersion>3</AspNetCoreMajorVersion>
-    <AspNetCoreMinorVersion>1</AspNetCoreMinorVersion>
-    <AspNetCorePatchVersion>2</AspNetCorePatchVersion>
-    <PreReleasePreviewNumber>0</PreReleasePreviewNumber>
+    <AspNetCoreMinorVersion>2</AspNetCoreMinorVersion>
+    <AspNetCorePatchVersion>0</AspNetCorePatchVersion>
+    <PreReleasePreviewNumber>2</PreReleasePreviewNumber>
     <!--
         When StabilizePackageVersion is set to 'true', this branch will produce stable outputs for 'Shipping' packages
     -->
-    <StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">true</StabilizePackageVersion>
+    <StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
     <DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
     <IncludePreReleaseLabelInPackageVersion>true</IncludePreReleaseLabelInPackageVersion>
     <IncludePreReleaseLabelInPackageVersion Condition=" '$(DotNetFinalVersionKind)' == 'release' ">false</IncludePreReleaseLabelInPackageVersion>
diff --git a/src/Components/Blazor/Blazor.Version.props b/src/Components/Blazor/Blazor.Version.props
deleted file mode 100644
index 123a94c1d7..0000000000
--- a/src/Components/Blazor/Blazor.Version.props
+++ /dev/null
@@ -1,8 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <!-- Override version labels -->
-    <VersionPrefix>3.2.0</VersionPrefix>
-    <PreReleaseVersionLabel>preview1</PreReleaseVersionLabel>
-    <DotNetFinalVersionKind />
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/Components/Blazor/Directory.Build.props b/src/Components/Blazor/Directory.Build.props
index cf13978090..c48cf8a1a9 100644
--- a/src/Components/Blazor/Directory.Build.props
+++ b/src/Components/Blazor/Directory.Build.props
@@ -1,4 +1,3 @@
 <Project>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.props))\Directory.Build.props" />
-  <Import Project="Blazor.Version.props" />
 </Project>
diff --git a/src/ProjectTemplates/BlazorWasm.ProjectTemplates/Microsoft.AspNetCore.Blazor.Templates.csproj b/src/ProjectTemplates/BlazorWasm.ProjectTemplates/Microsoft.AspNetCore.Blazor.Templates.csproj
index 65457a000d..87dd8aaf45 100644
--- a/src/ProjectTemplates/BlazorWasm.ProjectTemplates/Microsoft.AspNetCore.Blazor.Templates.csproj
+++ b/src/ProjectTemplates/BlazorWasm.ProjectTemplates/Microsoft.AspNetCore.Blazor.Templates.csproj
@@ -3,8 +3,6 @@
     <BlazorProjectsRoot>$(RepoRoot)src\Components\Blazor\</BlazorProjectsRoot>
   </PropertyGroup>
 
-  <Import Project="$(BlazorProjectsRoot)Blazor.Version.props" />
-
   <PropertyGroup>
     <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
     <IsShippingPackage>true</IsShippingPackage>