From 589ace3c9fdfa0f1ea1640b82304a6a7ac597871 Mon Sep 17 00:00:00 2001
From: Vatsan Madhavan <vatsan.madhavan@microsoft.com>
Date: Thu, 16 Jan 2020 09:47:27 -0800
Subject: [PATCH] Centralize VersionPrefix information in Version.props (#2439)

---
 eng/Versions.props                                        | 8 ++++++++
 ...crosoft.DotNet.Wpf.ProjectTemplates.ArchNeutral.csproj | 2 +-
 .../Microsoft.NET.Sdk.WindowsDesktop.ArchNeutral.csproj   | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index 270618a6..063367f5 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -1,7 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
+    <!-- 
+      Primary version prefix for this repo - usually changes only once per major release
+    -->
     <VersionPrefix>4.8.1</VersionPrefix>
+    <!-- 
+      Version prefix used by a few projects like Project Templates
+      Revision portion of Major.Minor.Revision usually updated every release
+    -->
+    <TraditionalVersionPrefix>3.1.2</TraditionalVersionPrefix>
     <PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
     <DotNetUseShippingVersions>true</DotNetUseShippingVersions>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/Microsoft.DotNet.Wpf.ProjectTemplates.ArchNeutral.csproj b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/Microsoft.DotNet.Wpf.ProjectTemplates.ArchNeutral.csproj
index 6696b0b4..89f8efe5 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/Microsoft.DotNet.Wpf.ProjectTemplates.ArchNeutral.csproj
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/Microsoft.DotNet.Wpf.ProjectTemplates.ArchNeutral.csproj
@@ -3,7 +3,7 @@
     <ProjectGuid>{BFF6C118-3369-43B5-ACA6-D65ED00EEBE0}</ProjectGuid>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <Platforms>AnyCPU;x64</Platforms>
-    <VersionPrefix>3.1.2</VersionPrefix>
+    <VersionPrefix>$(TraditionalVersionPrefix)</VersionPrefix>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/packaging/Microsoft.NET.Sdk.WindowsDesktop/Microsoft.NET.Sdk.WindowsDesktop.ArchNeutral.csproj b/packaging/Microsoft.NET.Sdk.WindowsDesktop/Microsoft.NET.Sdk.WindowsDesktop.ArchNeutral.csproj
index cf4baf99..e5edf6e2 100644
--- a/packaging/Microsoft.NET.Sdk.WindowsDesktop/Microsoft.NET.Sdk.WindowsDesktop.ArchNeutral.csproj
+++ b/packaging/Microsoft.NET.Sdk.WindowsDesktop/Microsoft.NET.Sdk.WindowsDesktop.ArchNeutral.csproj
@@ -3,7 +3,7 @@
     <ProjectGuid>{440d06b8-e3de-4c0d-ad25-cd4f43d836e1}</ProjectGuid>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <Platforms>AnyCPU;x64</Platforms>
-    <VersionPrefix>3.1.2</VersionPrefix>
+    <VersionPrefix>$(TraditionalVersionPrefix)</VersionPrefix>
   </PropertyGroup>
 
   <PropertyGroup>