From f36f9c7b9382946dfcc0f8f643f3449c488dec65 Mon Sep 17 00:00:00 2001
From: Andrei Borodin <andrei.borodin@microsoft.com>
Date: Thu, 21 Nov 2019 15:30:49 -0800
Subject: [PATCH 1/8] Attempting to not produce a prerelease versioned NuGet
 package.

---
 Source/MSBuildTools.Unity.NuGet/MSBuildForUnity.csproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/MSBuildTools.Unity.NuGet/MSBuildForUnity.csproj b/Source/MSBuildTools.Unity.NuGet/MSBuildForUnity.csproj
index 34918bf..b61c92f 100644
--- a/Source/MSBuildTools.Unity.NuGet/MSBuildForUnity.csproj
+++ b/Source/MSBuildTools.Unity.NuGet/MSBuildForUnity.csproj
@@ -35,12 +35,12 @@
     
     <Version>$(MajorVersion).$(MinorVersion).$(RevisionVersion)</Version>
     <!-- Version is based on Major.Minor.Revision as defined above, however, in a lab BUILD_BUILDID will be set so we pull in that as the pre-release version. -->
-    <Version Condition="'$(BUILD_BUILDID)' != ''">$(Version)-$(BUILD_BUILDID)</Version>
+    <Version Condition="'$(BUILD_BUILDID)' != '' && '$(BUILD_ISRELEASEBUILD)' == ''">$(Version)-$(BUILD_BUILDID)</Version>
 
     <PackageVersion>$(Version)</PackageVersion>
     <AssemblyVersion>$(MajorVersion).$(MinorVersion)</AssemblyVersion>
     <AssemblyFileVersion>$(AssemblyVersion).$(RevisionVersion).0</AssemblyFileVersion>
-    <AssemblyFileVersion Condition="'$(BUILD_BUILDID)' != ''">$(AssemblyVersion).$(RevisionVersion).$(BUILD_BUILDID)</AssemblyFileVersion>
+    <AssemblyFileVersion Condition="'$(BUILD_BUILDID)' != '' && '$(BUILD_ISRELEASEBUILD)' == ''">$(AssemblyVersion).$(RevisionVersion).$(BUILD_BUILDID)</AssemblyFileVersion>
   </PropertyGroup>
 
   <ItemGroup>

From 125a9cae333db00fafc2a4100f732a422bcf0d50 Mon Sep 17 00:00:00 2001
From: Andrei Borodin <andrei.borodin@microsoft.com>
Date: Thu, 21 Nov 2019 15:37:54 -0800
Subject: [PATCH 2/8] Fixing typo

---
 Source/MSBuildTools.Unity.NuGet/MSBuildForUnity.csproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/MSBuildTools.Unity.NuGet/MSBuildForUnity.csproj b/Source/MSBuildTools.Unity.NuGet/MSBuildForUnity.csproj
index b61c92f..19012c1 100644
--- a/Source/MSBuildTools.Unity.NuGet/MSBuildForUnity.csproj
+++ b/Source/MSBuildTools.Unity.NuGet/MSBuildForUnity.csproj
@@ -35,12 +35,12 @@
     
     <Version>$(MajorVersion).$(MinorVersion).$(RevisionVersion)</Version>
     <!-- Version is based on Major.Minor.Revision as defined above, however, in a lab BUILD_BUILDID will be set so we pull in that as the pre-release version. -->
-    <Version Condition="'$(BUILD_BUILDID)' != '' && '$(BUILD_ISRELEASEBUILD)' == ''">$(Version)-$(BUILD_BUILDID)</Version>
+    <Version Condition="'$(BUILD_BUILDID)' != '' And '$(BUILD_ISRELEASEBUILD)' == ''">$(Version)-$(BUILD_BUILDID)</Version>
 
     <PackageVersion>$(Version)</PackageVersion>
     <AssemblyVersion>$(MajorVersion).$(MinorVersion)</AssemblyVersion>
     <AssemblyFileVersion>$(AssemblyVersion).$(RevisionVersion).0</AssemblyFileVersion>
-    <AssemblyFileVersion Condition="'$(BUILD_BUILDID)' != '' && '$(BUILD_ISRELEASEBUILD)' == ''">$(AssemblyVersion).$(RevisionVersion).$(BUILD_BUILDID)</AssemblyFileVersion>
+    <AssemblyFileVersion Condition="'$(BUILD_BUILDID)' != '' And '$(BUILD_ISRELEASEBUILD)' == ''">$(AssemblyVersion).$(RevisionVersion).$(BUILD_BUILDID)</AssemblyFileVersion>
   </PropertyGroup>
 
   <ItemGroup>

From 64610171ea1e9fb0ef66288e6f5111f8a8388453 Mon Sep 17 00:00:00 2001
From: Andrei Borodin <andrei.borodin@microsoft.com>
Date: Thu, 21 Nov 2019 15:51:43 -0800
Subject: [PATCH 3/8] Trying to use current branch

---
 Source/MSBuildTools.Unity.NuGet/MSBuildForUnity.csproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/MSBuildTools.Unity.NuGet/MSBuildForUnity.csproj b/Source/MSBuildTools.Unity.NuGet/MSBuildForUnity.csproj
index 19012c1..144ce1c 100644
--- a/Source/MSBuildTools.Unity.NuGet/MSBuildForUnity.csproj
+++ b/Source/MSBuildTools.Unity.NuGet/MSBuildForUnity.csproj
@@ -35,12 +35,12 @@
     
     <Version>$(MajorVersion).$(MinorVersion).$(RevisionVersion)</Version>
     <!-- Version is based on Major.Minor.Revision as defined above, however, in a lab BUILD_BUILDID will be set so we pull in that as the pre-release version. -->
-    <Version Condition="'$(BUILD_BUILDID)' != '' And '$(BUILD_ISRELEASEBUILD)' == ''">$(Version)-$(BUILD_BUILDID)</Version>
+    <Version Condition="'$(BUILD_BUILDID)' != '' And '$(Build_SourceBranchName.StartsWith('stabilization/')' == 'false'">$(Version)-$(BUILD_BUILDID)</Version>
 
     <PackageVersion>$(Version)</PackageVersion>
     <AssemblyVersion>$(MajorVersion).$(MinorVersion)</AssemblyVersion>
     <AssemblyFileVersion>$(AssemblyVersion).$(RevisionVersion).0</AssemblyFileVersion>
-    <AssemblyFileVersion Condition="'$(BUILD_BUILDID)' != '' And '$(BUILD_ISRELEASEBUILD)' == ''">$(AssemblyVersion).$(RevisionVersion).$(BUILD_BUILDID)</AssemblyFileVersion>
+    <AssemblyFileVersion Condition="'$(BUILD_BUILDID)' != '' And '$(Build_SourceBranchName.StartsWith('stabilization/')'' == 'false')">$(AssemblyVersion).$(RevisionVersion).$(BUILD_BUILDID)</AssemblyFileVersion>
   </PropertyGroup>
 
   <ItemGroup>

From eb760d71b0981b324cb01d43aa9da026cb16bca1 Mon Sep 17 00:00:00 2001
From: Andrei Borodin <andrei.borodin@microsoft.com>
Date: Thu, 21 Nov 2019 15:52:00 -0800
Subject: [PATCH 4/8] Trying to use current branch

---
 Source/MSBuildTools.Unity.NuGet/MSBuildForUnity.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/MSBuildTools.Unity.NuGet/MSBuildForUnity.csproj b/Source/MSBuildTools.Unity.NuGet/MSBuildForUnity.csproj
index 144ce1c..b5d7a38 100644
--- a/Source/MSBuildTools.Unity.NuGet/MSBuildForUnity.csproj
+++ b/Source/MSBuildTools.Unity.NuGet/MSBuildForUnity.csproj
@@ -40,7 +40,7 @@
     <PackageVersion>$(Version)</PackageVersion>
     <AssemblyVersion>$(MajorVersion).$(MinorVersion)</AssemblyVersion>
     <AssemblyFileVersion>$(AssemblyVersion).$(RevisionVersion).0</AssemblyFileVersion>
-    <AssemblyFileVersion Condition="'$(BUILD_BUILDID)' != '' And '$(Build_SourceBranchName.StartsWith('stabilization/')'' == 'false')">$(AssemblyVersion).$(RevisionVersion).$(BUILD_BUILDID)</AssemblyFileVersion>
+    <AssemblyFileVersion Condition="'$(BUILD_BUILDID)' != '' And '$(Build_SourceBranchName.StartsWith('stabilization/')' == 'false')">$(AssemblyVersion).$(RevisionVersion).$(BUILD_BUILDID)</AssemblyFileVersion>
   </PropertyGroup>
 
   <ItemGroup>

From 249911b8972aceb0a404280529967a0f1c339928 Mon Sep 17 00:00:00 2001
From: Andrei Borodin <andrei.borodin@microsoft.com>
Date: Thu, 21 Nov 2019 15:54:20 -0800
Subject: [PATCH 5/8] Fixing typo

---
 Source/MSBuildTools.Unity.NuGet/MSBuildForUnity.csproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/MSBuildTools.Unity.NuGet/MSBuildForUnity.csproj b/Source/MSBuildTools.Unity.NuGet/MSBuildForUnity.csproj
index b5d7a38..3157006 100644
--- a/Source/MSBuildTools.Unity.NuGet/MSBuildForUnity.csproj
+++ b/Source/MSBuildTools.Unity.NuGet/MSBuildForUnity.csproj
@@ -35,12 +35,12 @@
     
     <Version>$(MajorVersion).$(MinorVersion).$(RevisionVersion)</Version>
     <!-- Version is based on Major.Minor.Revision as defined above, however, in a lab BUILD_BUILDID will be set so we pull in that as the pre-release version. -->
-    <Version Condition="'$(BUILD_BUILDID)' != '' And '$(Build_SourceBranchName.StartsWith('stabilization/')' == 'false'">$(Version)-$(BUILD_BUILDID)</Version>
+    <Version Condition="'$(BUILD_BUILDID)' != '' And !$(Build_SourceBranchName.StartsWith('stabilization/'))">$(Version)-$(BUILD_BUILDID)</Version>
 
     <PackageVersion>$(Version)</PackageVersion>
     <AssemblyVersion>$(MajorVersion).$(MinorVersion)</AssemblyVersion>
     <AssemblyFileVersion>$(AssemblyVersion).$(RevisionVersion).0</AssemblyFileVersion>
-    <AssemblyFileVersion Condition="'$(BUILD_BUILDID)' != '' And '$(Build_SourceBranchName.StartsWith('stabilization/')' == 'false')">$(AssemblyVersion).$(RevisionVersion).$(BUILD_BUILDID)</AssemblyFileVersion>
+    <AssemblyFileVersion Condition="'$(BUILD_BUILDID)' != '' And !$(Build_SourceBranchName.StartsWith('stabilization/'))">$(AssemblyVersion).$(RevisionVersion).$(BUILD_BUILDID)</AssemblyFileVersion>
   </PropertyGroup>
 
   <ItemGroup>

From 812abbe83ac457df524a4df0f28e5794547018d0 Mon Sep 17 00:00:00 2001
From: Andrei Borodin <andrei.borodin@microsoft.com>
Date: Thu, 21 Nov 2019 16:04:34 -0800
Subject: [PATCH 6/8] Fixed source branch parameter

---
 Source/MSBuildTools.Unity.NuGet/MSBuildForUnity.csproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/MSBuildTools.Unity.NuGet/MSBuildForUnity.csproj b/Source/MSBuildTools.Unity.NuGet/MSBuildForUnity.csproj
index 3157006..6f168df 100644
--- a/Source/MSBuildTools.Unity.NuGet/MSBuildForUnity.csproj
+++ b/Source/MSBuildTools.Unity.NuGet/MSBuildForUnity.csproj
@@ -35,12 +35,12 @@
     
     <Version>$(MajorVersion).$(MinorVersion).$(RevisionVersion)</Version>
     <!-- Version is based on Major.Minor.Revision as defined above, however, in a lab BUILD_BUILDID will be set so we pull in that as the pre-release version. -->
-    <Version Condition="'$(BUILD_BUILDID)' != '' And !$(Build_SourceBranchName.StartsWith('stabilization/'))">$(Version)-$(BUILD_BUILDID)</Version>
+    <Version Condition="'$(BUILD_BUILDID)' != '' And !$(BUILD_SOURCEBRANCH.StartsWith('refs/heads/stabilization/'))">$(Version)-$(BUILD_BUILDID)</Version>
 
     <PackageVersion>$(Version)</PackageVersion>
     <AssemblyVersion>$(MajorVersion).$(MinorVersion)</AssemblyVersion>
     <AssemblyFileVersion>$(AssemblyVersion).$(RevisionVersion).0</AssemblyFileVersion>
-    <AssemblyFileVersion Condition="'$(BUILD_BUILDID)' != '' And !$(Build_SourceBranchName.StartsWith('stabilization/'))">$(AssemblyVersion).$(RevisionVersion).$(BUILD_BUILDID)</AssemblyFileVersion>
+    <AssemblyFileVersion Condition="'$(BUILD_BUILDID)' != '' And !$(BUILD_SOURCEBRANCH.StartsWith('refs/heads/stabilization/'))">$(AssemblyVersion).$(RevisionVersion).$(BUILD_BUILDID)</AssemblyFileVersion>
   </PropertyGroup>
 
   <ItemGroup>

From cb7f40df90435af0d7d82de77e79945870f8f310 Mon Sep 17 00:00:00 2001
From: Andrei Borodin <andrei.borodin@microsoft.com>
Date: Thu, 21 Nov 2019 16:13:25 -0800
Subject: [PATCH 7/8] Update UPM to only increment if not a release branch

---
 AzurePipelines/Publish.UPM.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AzurePipelines/Publish.UPM.yml b/AzurePipelines/Publish.UPM.yml
index 4f757ea..905ed86 100644
--- a/AzurePipelines/Publish.UPM.yml
+++ b/AzurePipelines/Publish.UPM.yml
@@ -16,7 +16,7 @@ pool:
 steps:
 - task: Npm@1
 # Only update the version on master branch
-  condition: eq(variables['Build.SourceBranch'], 'refs/heads/master') 
+  condition: not(startsWith(variables['Build.SourceBranch'], 'refs/heads/stabilization/'))
   inputs:
     command: 'custom'
     customCommand: --no-git-tag-version version prerelease --preid=$(Build.BuildNumber)

From 1acda41162b992af53a4a49524127a56412c8786 Mon Sep 17 00:00:00 2001
From: Andrei Borodin <andrei.borodin@microsoft.com>
Date: Thu, 21 Nov 2019 16:18:03 -0800
Subject: [PATCH 8/8] Preparing for release of 0.8.1

---
 AzurePipelines/Publish.UPM.yml                              | 2 +-
 README.md                                                   | 4 ++--
 .../Assets/NewtonsoftDependency/NewtonsoftDependency.csproj | 2 +-
 Source/MSBuildTools.Unity.NuGet/MSBuildForUnity.csproj      | 6 +++---
 .../DependenciesProjectTemplate.g.props.template            | 2 +-
 .../MSBuildTemplates/MSBuildForUnity.Common.props.template  | 2 +-
 .../Packages/com.microsoft.msbuildforunity/package.json     | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/AzurePipelines/Publish.UPM.yml b/AzurePipelines/Publish.UPM.yml
index 905ed86..847f329 100644
--- a/AzurePipelines/Publish.UPM.yml
+++ b/AzurePipelines/Publish.UPM.yml
@@ -16,7 +16,7 @@ pool:
 steps:
 - task: Npm@1
 # Only update the version on master branch
-  condition: not(startsWith(variables['Build.SourceBranch'], 'refs/heads/stabilization/'))
+  condition: not(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'))
   inputs:
     command: 'custom'
     customCommand: --no-git-tag-version version prerelease --preid=$(Build.BuildNumber)
diff --git a/README.md b/README.md
index c0e6c79..79f396e 100644
--- a/README.md
+++ b/README.md
@@ -68,7 +68,7 @@ This scenario leverages the MSBuildForUnity [Project Builder](#msbuild-project-b
         ```
     - Add the following to the `dependencies` section of the file:
         ```json
-          "com.microsoft.msbuildforunity": "0.1.1-20190816.2.0"
+          "com.microsoft.msbuildforunity": "0.8.1"
         ```
 1. Create a "SDK style" MSBuild project (e.g. csproj) somewhere under your `Assets` directory of your Unity project that references the `MSBuildForUnity` NuGet package. Here is an example:
     ```xml
@@ -77,7 +77,7 @@ This scenario leverages the MSBuildForUnity [Project Builder](#msbuild-project-b
             <TargetFramework>netstandard2.0</TargetFramework>
         </PropertyGroup>
         <ItemGroup>
-            <PackageReference Include="MSBuildForUnity" Version="1.0.0">
+            <PackageReference Include="MSBuildForUnity" Version="0.8.1">
                 <PrivateAssets>all</PrivateAssets>
                 <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
             </PackageReference>
diff --git a/Samples/SimpleNuGetDependency.Unity/Assets/NewtonsoftDependency/NewtonsoftDependency.csproj b/Samples/SimpleNuGetDependency.Unity/Assets/NewtonsoftDependency/NewtonsoftDependency.csproj
index 3c3cb81..4f7cc1d 100644
--- a/Samples/SimpleNuGetDependency.Unity/Assets/NewtonsoftDependency/NewtonsoftDependency.csproj
+++ b/Samples/SimpleNuGetDependency.Unity/Assets/NewtonsoftDependency/NewtonsoftDependency.csproj
@@ -17,7 +17,7 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="MSBuildForUnity" Version="[0.8.0-*, 0.8.0]">
+    <PackageReference Include="MSBuildForUnity" Version="[0.8.1-*, 0.8.1]">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
diff --git a/Source/MSBuildTools.Unity.NuGet/MSBuildForUnity.csproj b/Source/MSBuildTools.Unity.NuGet/MSBuildForUnity.csproj
index 6f168df..d907f95 100644
--- a/Source/MSBuildTools.Unity.NuGet/MSBuildForUnity.csproj
+++ b/Source/MSBuildTools.Unity.NuGet/MSBuildForUnity.csproj
@@ -31,16 +31,16 @@
     <MinorVersion>8</MinorVersion>
 
     <!-- Revision (semver Patch) version is hard-coded and should be incremented when a bug fix is made.-->
-    <RevisionVersion>0</RevisionVersion>
+    <RevisionVersion>1</RevisionVersion>
     
     <Version>$(MajorVersion).$(MinorVersion).$(RevisionVersion)</Version>
     <!-- Version is based on Major.Minor.Revision as defined above, however, in a lab BUILD_BUILDID will be set so we pull in that as the pre-release version. -->
-    <Version Condition="'$(BUILD_BUILDID)' != '' And !$(BUILD_SOURCEBRANCH.StartsWith('refs/heads/stabilization/'))">$(Version)-$(BUILD_BUILDID)</Version>
+    <Version Condition="'$(BUILD_BUILDID)' != '' And !$(BUILD_SOURCEBRANCH.StartsWith('refs/heads/release/'))">$(Version)-$(BUILD_BUILDID)</Version>
 
     <PackageVersion>$(Version)</PackageVersion>
     <AssemblyVersion>$(MajorVersion).$(MinorVersion)</AssemblyVersion>
     <AssemblyFileVersion>$(AssemblyVersion).$(RevisionVersion).0</AssemblyFileVersion>
-    <AssemblyFileVersion Condition="'$(BUILD_BUILDID)' != '' And !$(BUILD_SOURCEBRANCH.StartsWith('refs/heads/stabilization/'))">$(AssemblyVersion).$(RevisionVersion).$(BUILD_BUILDID)</AssemblyFileVersion>
+    <AssemblyFileVersion Condition="'$(BUILD_BUILDID)' != '' And !$(BUILD_SOURCEBRANCH.StartsWith('refs/heads/release/'))">$(AssemblyVersion).$(RevisionVersion).$(BUILD_BUILDID)</AssemblyFileVersion>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/Source/MSBuildTools.Unity/Packages/com.microsoft.msbuildforunity/Editor/ProjectGenerator/MSBuildTemplates/DependenciesProjectTemplate.g.props.template b/Source/MSBuildTools.Unity/Packages/com.microsoft.msbuildforunity/Editor/ProjectGenerator/MSBuildTemplates/DependenciesProjectTemplate.g.props.template
index 57b9b24..0828ca0 100644
--- a/Source/MSBuildTools.Unity/Packages/com.microsoft.msbuildforunity/Editor/ProjectGenerator/MSBuildTemplates/DependenciesProjectTemplate.g.props.template
+++ b/Source/MSBuildTools.Unity/Packages/com.microsoft.msbuildforunity/Editor/ProjectGenerator/MSBuildTemplates/DependenciesProjectTemplate.g.props.template
@@ -20,7 +20,7 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="MSBuildForUnity" Version="[0.8.0-*, 0.8.0]">
+    <PackageReference Include="MSBuildForUnity" Version="[0.8.1-*, 0.8.1]">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
diff --git a/Source/MSBuildTools.Unity/Packages/com.microsoft.msbuildforunity/Editor/ProjectGenerator/MSBuildTemplates/MSBuildForUnity.Common.props.template b/Source/MSBuildTools.Unity/Packages/com.microsoft.msbuildforunity/Editor/ProjectGenerator/MSBuildTemplates/MSBuildForUnity.Common.props.template
index 5be133b..1061c0d 100644
--- a/Source/MSBuildTools.Unity/Packages/com.microsoft.msbuildforunity/Editor/ProjectGenerator/MSBuildTemplates/MSBuildForUnity.Common.props.template
+++ b/Source/MSBuildTools.Unity/Packages/com.microsoft.msbuildforunity/Editor/ProjectGenerator/MSBuildTemplates/MSBuildForUnity.Common.props.template
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <MSBuildForUnityVersion>0.8.0</MSBuildForUnityVersion>
+    <MSBuildForUnityVersion>0.8.1</MSBuildForUnityVersion>
     
     <MSBuildForUnityGeneratedOutputDirectory><!--GENERATED_OUTPUT_DIRECTORY_TOKEN--></MSBuildForUnityGeneratedOutputDirectory>
     <UnityProjectAssetsPath><!--UNITY_PROJECT_ASSETS_PATH_TOKEN--></UnityProjectAssetsPath>
diff --git a/Source/MSBuildTools.Unity/Packages/com.microsoft.msbuildforunity/package.json b/Source/MSBuildTools.Unity/Packages/com.microsoft.msbuildforunity/package.json
index 1e964d1..bff61f3 100644
--- a/Source/MSBuildTools.Unity/Packages/com.microsoft.msbuildforunity/package.json
+++ b/Source/MSBuildTools.Unity/Packages/com.microsoft.msbuildforunity/package.json
@@ -1,6 +1,6 @@
 {
     "name": "com.microsoft.msbuildforunity",
-    "version": "0.8.0",
+    "version": "0.8.1",
     "displayName": "MSBuild for Unity",
     "description": "MSBuildForUnity solves the problem of establishing clear dependency relationships between Unity project and other .NET components such as external (to Unity) C# projects, or NuGet packages. It creates a familiar to .NET developers project structure and ensures that the dependencies are resolved and brought into the Unity project as appropriate.",
     "unity": "2018.1",