From 9e102182c8f2fd655235f3b3476ba31b9d587b2c Mon Sep 17 00:00:00 2001
From: Davis Goodin <dagood@microsoft.com>
Date: Thu, 16 Jan 2020 16:11:37 -0600
Subject: [PATCH 1/7] Remove date number from dev build version

---
 eng/Versions.props | 2 --
 1 file changed, 2 deletions(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index a7236af4e4b8a0..1cc023e59c9a21 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -6,8 +6,6 @@
     <MajorVersion>5</MajorVersion>
     <MinorVersion>0</MinorVersion>
     <PatchVersion>0</PatchVersion>
-    <!-- Always use shipping version instead of dummy version -->
-    <DotNetUseShippingVersions>true</DotNetUseShippingVersions>
     <PreReleaseVersionLabel>alpha</PreReleaseVersionLabel>
     <PreReleaseVersionIteration>1</PreReleaseVersionIteration>
     <!-- Enable to remove prerelease label. -->

From 642d09bea1276c636d2ec4fdd4f96b21f10f15b1 Mon Sep 17 00:00:00 2001
From: Davis Goodin <dagood@microsoft.com>
Date: Thu, 16 Jan 2020 18:48:51 -0600
Subject: [PATCH 2/7] Set Library assembly version back to 5.0.0.0

---
 src/libraries/Directory.Build.props | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props
index e0a2a43c9a8384..2a8e90cb3fbda8 100644
--- a/src/libraries/Directory.Build.props
+++ b/src/libraries/Directory.Build.props
@@ -4,6 +4,10 @@
   </PropertyGroup>
   <Import Project="..\..\Directory.Build.props" />
 
+  <PropertyGroup>
+    <AssemblyVersion>5.0.0.0</AssemblyVersion>
+  </PropertyGroup>
+
   <PropertyGroup>
     <ToolSetCommonDirectory>$(RepoRoot)artifacts\toolset\Common\</ToolSetCommonDirectory>
     <IsSourceProject>$([System.Text.RegularExpressions.Regex]::IsMatch($(MSBuildProjectDirectory), 'src%24'))</IsSourceProject>

From 0e70f8f208d6027c729fe79d3aa3d3dfca4f1c8e Mon Sep 17 00:00:00 2001
From: Santiago Fernandez Madero <safern@microsoft.com>
Date: Tue, 21 Jan 2020 17:38:28 -0800
Subject: [PATCH 3/7] Use default assembly version in versions.props and fix
 package testing

---
 eng/Version.Details.xml             | 6 +++---
 eng/Versions.props                  | 2 +-
 src/libraries/Directory.Build.props | 4 ----
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 04b91797c2028a..baede09aeecd80 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -4,9 +4,9 @@
       <Uri>https://github.com/dotnet/corefx</Uri>
       <Sha>5cee7c97d602f294e27c582d4dab81ec388f1d7b</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App" Version="5.0.0-alpha.1.19563.6">
-      <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>8743c312a9d1ce4035140046d44bb959c44f194f</Sha>
+    <Dependency Name="Microsoft.NETCore.App" Version="5.0.0-alpha.1.20071.1">
+      <Uri>https://github.com/dotnet/runtime</Uri>
+      <Sha>86bfd8d46b3817e2a027b23d829cd0d035cd8ad6</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NETCore.DotNetHost" Version="5.0.0-alpha.1.19563.6">
       <Uri>https://github.com/dotnet/core-setup</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 1cc023e59c9a21..88000489fae80e 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -41,7 +41,7 @@
     <MicrosoftDotNetRemoteExecutorVersion>5.0.0-beta.20063.2</MicrosoftDotNetRemoteExecutorVersion>
     <MicrosoftDotNetVersionToolsTasksVersion>5.0.0-beta.20063.2</MicrosoftDotNetVersionToolsTasksVersion>
     <!-- Installer dependencies -->
-    <MicrosoftNETCoreAppVersion>5.0.0-alpha.1.19562.8</MicrosoftNETCoreAppVersion>
+    <MicrosoftNETCoreAppVersion>5.0.0-alpha.1.20071.1</MicrosoftNETCoreAppVersion>
     <MicrosoftNETCoreDotNetHostVersion>5.0.0-alpha.1.19563.6</MicrosoftNETCoreDotNetHostVersion>
     <MicrosoftNETCoreDotNetHostPolicyVersion>5.0.0-alpha.1.19563.6</MicrosoftNETCoreDotNetHostPolicyVersion>
     <MicrosoftExtensionsDependencyModelVersion>2.1.0</MicrosoftExtensionsDependencyModelVersion>
diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props
index 2a8e90cb3fbda8..e0a2a43c9a8384 100644
--- a/src/libraries/Directory.Build.props
+++ b/src/libraries/Directory.Build.props
@@ -4,10 +4,6 @@
   </PropertyGroup>
   <Import Project="..\..\Directory.Build.props" />
 
-  <PropertyGroup>
-    <AssemblyVersion>5.0.0.0</AssemblyVersion>
-  </PropertyGroup>
-
   <PropertyGroup>
     <ToolSetCommonDirectory>$(RepoRoot)artifacts\toolset\Common\</ToolSetCommonDirectory>
     <IsSourceProject>$([System.Text.RegularExpressions.Regex]::IsMatch($(MSBuildProjectDirectory), 'src%24'))</IsSourceProject>

From 785b157ee8ef1e5e2575890542701e937a2e9b93 Mon Sep 17 00:00:00 2001
From: Santiago Fernandez Madero <safern@microsoft.com>
Date: Wed, 22 Jan 2020 11:06:12 -0800
Subject: [PATCH 4/7] Add missed change to define AssemblyVersion to match
 MajorVersion.MinorVersion.0.0 in the root

---
 eng/Versions.props | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/eng/Versions.props b/eng/Versions.props
index 88000489fae80e..3610af187ef714 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -8,6 +8,9 @@
     <PatchVersion>0</PatchVersion>
     <PreReleaseVersionLabel>alpha</PreReleaseVersionLabel>
     <PreReleaseVersionIteration>1</PreReleaseVersionIteration>
+
+    <!-- Set assembly version to align with Major and Minor version -->
+    <AssemblyVersion>$(MajorVersion).$(MinorVersion).0.0</AssemblyVersion>
     <!-- Enable to remove prerelease label. -->
     <StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
     <DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>

From 4665892492e9aef720a2a96e16c88e61f213492d Mon Sep 17 00:00:00 2001
From: Santiago Fernandez Madero <safern@microsoft.com>
Date: Wed, 22 Jan 2020 14:22:57 -0800
Subject: [PATCH 5/7] Don't change AssemblyVersions in installer, leave as it
 was

---
 eng/Versions.props                       | 3 ++-
 src/installer/Directory.Build.props      | 3 +++
 src/installer/test/Directory.Build.props | 4 ++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index 3610af187ef714..13cb197adb897e 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -9,7 +9,8 @@
     <PreReleaseVersionLabel>alpha</PreReleaseVersionLabel>
     <PreReleaseVersionIteration>1</PreReleaseVersionIteration>
 
-    <!-- Set assembly version to align with Major and Minor version -->
+    <!-- Set assembly version to align with major and minor version,
+         as for the patches and revisions should be manually updated per assembly if it is serviced. -->
     <AssemblyVersion>$(MajorVersion).$(MinorVersion).0.0</AssemblyVersion>
     <!-- Enable to remove prerelease label. -->
     <StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
diff --git a/src/installer/Directory.Build.props b/src/installer/Directory.Build.props
index 9670824f2a1285..51579dc628b5c3 100644
--- a/src/installer/Directory.Build.props
+++ b/src/installer/Directory.Build.props
@@ -13,6 +13,9 @@
   <PropertyGroup>
     <ArcadeSdkMSBuildProjectDir>$([System.IO.Path]::GetDirectoryName('$(ArcadeSdkBuildTasksAssembly)'))\..\</ArcadeSdkMSBuildProjectDir>
     <ArcadeSdkSignProject>$(ArcadeSdkMSBuildProjectDir)Sign.proj</ArcadeSdkSignProject>
+
+    <!-- Clear AssemblyVersion as we need to align with the NuGet conventions, when empty arcade will do that for us. -->
+    <AssemblyVersion />
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(MSBuildProjectExtension)' == '.csproj'">
diff --git a/src/installer/test/Directory.Build.props b/src/installer/test/Directory.Build.props
index fe4a7edd5f93b5..3f79b988dbbc44 100644
--- a/src/installer/test/Directory.Build.props
+++ b/src/installer/test/Directory.Build.props
@@ -10,6 +10,10 @@
     <InternalNupkgCacheDir>$(ArtifactsObjDir)ExtraNupkgsForTestRestore\</InternalNupkgCacheDir>
     <TestArchitectures>$(TargetArchitecture)</TestArchitectures>
     <TestInfraTargetFramework>$(NetCoreAppCurrent)</TestInfraTargetFramework>
+
+    <!-- Default AssemblyVersion for test projects. We need to set it as it is set for all projects
+         in Versions.props to match our product version scheme -->
+    <AssemblyVersion>1.0.0.0</AssemblyVersion>
   </PropertyGroup>
 
   <PropertyGroup>

From 35babe30290563e7c5fc499e9355e8188781965b Mon Sep 17 00:00:00 2001
From: Santiago Fernandez Madero <safern@microsoft.com>
Date: Wed, 22 Jan 2020 16:32:45 -0800
Subject: [PATCH 6/7] Fix installer tests

---
 src/installer/test/Assets/TestProjects/Directory.Build.props | 4 ++++
 src/installer/test/Directory.Build.props                     | 4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/installer/test/Assets/TestProjects/Directory.Build.props b/src/installer/test/Assets/TestProjects/Directory.Build.props
index 06b429ead4e00a..b06ee303512ef7 100644
--- a/src/installer/test/Assets/TestProjects/Directory.Build.props
+++ b/src/installer/test/Assets/TestProjects/Directory.Build.props
@@ -4,6 +4,10 @@
   <PropertyGroup>
     <RestorePackagesPath>$(TestRestorePackagesPath)</RestorePackagesPath>
     <RestoreNoCache>true</RestoreNoCache>
+
+    <!-- Default AssemblyVersion for test projects. We need to set it as it is set for all projects
+         in Versions.props to match our product version scheme and test projects are sensitive to assembly versions -->
+    <AssemblyVersion>1.0.0.0</AssemblyVersion>
   </PropertyGroup>
 
 </Project>
diff --git a/src/installer/test/Directory.Build.props b/src/installer/test/Directory.Build.props
index 3f79b988dbbc44..fe4a7edd5f93b5 100644
--- a/src/installer/test/Directory.Build.props
+++ b/src/installer/test/Directory.Build.props
@@ -10,10 +10,6 @@
     <InternalNupkgCacheDir>$(ArtifactsObjDir)ExtraNupkgsForTestRestore\</InternalNupkgCacheDir>
     <TestArchitectures>$(TargetArchitecture)</TestArchitectures>
     <TestInfraTargetFramework>$(NetCoreAppCurrent)</TestInfraTargetFramework>
-
-    <!-- Default AssemblyVersion for test projects. We need to set it as it is set for all projects
-         in Versions.props to match our product version scheme -->
-    <AssemblyVersion>1.0.0.0</AssemblyVersion>
   </PropertyGroup>
 
   <PropertyGroup>

From 45252885808cbb9173814cee436cb026861b6dc5 Mon Sep 17 00:00:00 2001
From: Santiago Fernandez Madero <safern@microsoft.com>
Date: Thu, 23 Jan 2020 16:02:40 -0800
Subject: [PATCH 7/7] Move AssemblyVersion for installer test assets to right
 place

---
 src/installer/test/Assets/TestProjects/Directory.Build.props | 4 ----
 src/installer/test/Assets/TestUtils/TestProjects.props       | 5 +++++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/installer/test/Assets/TestProjects/Directory.Build.props b/src/installer/test/Assets/TestProjects/Directory.Build.props
index b06ee303512ef7..06b429ead4e00a 100644
--- a/src/installer/test/Assets/TestProjects/Directory.Build.props
+++ b/src/installer/test/Assets/TestProjects/Directory.Build.props
@@ -4,10 +4,6 @@
   <PropertyGroup>
     <RestorePackagesPath>$(TestRestorePackagesPath)</RestorePackagesPath>
     <RestoreNoCache>true</RestoreNoCache>
-
-    <!-- Default AssemblyVersion for test projects. We need to set it as it is set for all projects
-         in Versions.props to match our product version scheme and test projects are sensitive to assembly versions -->
-    <AssemblyVersion>1.0.0.0</AssemblyVersion>
   </PropertyGroup>
 
 </Project>
diff --git a/src/installer/test/Assets/TestUtils/TestProjects.props b/src/installer/test/Assets/TestUtils/TestProjects.props
index e75ada59052337..97993c19cf9774 100644
--- a/src/installer/test/Assets/TestUtils/TestProjects.props
+++ b/src/installer/test/Assets/TestUtils/TestProjects.props
@@ -15,6 +15,11 @@
       win-x86 tests that assumed a win-x64 app host RID based on the runner SDK.
     -->
     <AppHostRuntimeIdentifier>$(TestTargetRid)</AppHostRuntimeIdentifier>
+
+
+    <!-- Default AssemblyVersion for test projects. We need to set it as it is set for all projects
+         in Versions.props to match our product version scheme and test projects are sensitive to assembly versions -->
+    <AssemblyVersion>1.0.0.0</AssemblyVersion>
   </PropertyGroup>
 
 </Project>