From a4f58aa03c7fdb19c6f8e1ca74cdc905d15147f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amaury=20Lev=C3=A9?= <amauryleve@microsoft.com>
Date: Mon, 25 Mar 2024 16:25:55 +0100
Subject: [PATCH] Fix MSTest version under testing platform (#2630)

---
 .../MSTest.TestAdapter.csproj                 | 29 +++++++++++++++++++
 .../MSTestVersion.cs.template}                |  4 +--
 .../MSTest.TestAdapter/RepositoryVersion.cs   | 10 -------
 .../TestingPlatformAdapter/MSTestExtension.cs |  2 +-
 .../Helpers/AppVersion.cs                     |  2 +-
 .../Microsoft.Testing.Platform.csproj         | 10 +++----
 .../PlatformVersion.cs.template}              |  2 +-
 7 files changed, 39 insertions(+), 20 deletions(-)
 rename src/{Platform/Microsoft.Testing.Platform/RepositoryVersion.cs.template => Adapter/MSTest.TestAdapter/MSTestVersion.cs.template} (72%)
 delete mode 100644 src/Adapter/MSTest.TestAdapter/RepositoryVersion.cs
 rename src/{Adapter/MSTest.TestAdapter/RepositoryVersion.cs.template => Platform/Microsoft.Testing.Platform/PlatformVersion.cs.template} (88%)

diff --git a/src/Adapter/MSTest.TestAdapter/MSTest.TestAdapter.csproj b/src/Adapter/MSTest.TestAdapter/MSTest.TestAdapter.csproj
index 1249d8cf90..4dc6f7f4e0 100644
--- a/src/Adapter/MSTest.TestAdapter/MSTest.TestAdapter.csproj
+++ b/src/Adapter/MSTest.TestAdapter/MSTest.TestAdapter.csproj
@@ -84,6 +84,35 @@
     </None>
   </ItemGroup>
 
+  <!-- Insert the MSTestVersion.cs -->
+  <PropertyGroup>
+    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="**/*.cs" Exclude="**/*.user; **/*.*proj; **/*.sln; **/*.vssscc" />
+  </ItemGroup>
+  <Target Name="InsertMSTestVersion" BeforeTargets="PrepareForBuild" >
+    <ItemGroup>
+      <Compile Include="$(Compile);$(IntermediateOutputPath)/MSTestVersion.cs" />
+    </ItemGroup>
+  </Target>
+
+  <!-- Version templating -->
+  <ItemGroup>
+    <PackageReference Include="Microsoft.DotNet.Build.Tasks.Templating" Version="$(MicrosoftDotNetBuildTasksTemplatingPackageVersion)" AllowExplicitReference="true" PrivateAssets="All" IsImplicitlyDefined="true" />
+  </ItemGroup>
+  <Target Name="GenerateMSTestVersionSourceFile" AfterTargets="PrepareForBuild" >
+    <PropertyGroup>
+      <_TemplateProperties>Version=$(Version)</_TemplateProperties>
+    </PropertyGroup>
+    <ItemGroup>
+      <_TemplateCsproj Include="$(MSBuildProjectDirectory)/MSTestVersion.cs.template" Destination="$(IntermediateOutputPath)/MSTestVersion.cs" />
+    </ItemGroup>
+    <GenerateFileFromTemplate TemplateFile="%(_TemplateCsproj.Identity)" OutputPath="%(_TemplateCsproj.Destination)" Properties="$(_TemplateProperties)">
+      <Output TaskParameter="ResolvedOutputPath" ItemName="FileWrites" />
+    </GenerateFileFromTemplate>
+  </Target>
+
   <!-- SDK bottom import -->
   <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Condition=" '$(OS)' == 'Windows_NT' " />
   <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" Condition=" '$(OS)' != 'Windows_NT' " />
diff --git a/src/Platform/Microsoft.Testing.Platform/RepositoryVersion.cs.template b/src/Adapter/MSTest.TestAdapter/MSTestVersion.cs.template
similarity index 72%
rename from src/Platform/Microsoft.Testing.Platform/RepositoryVersion.cs.template
rename to src/Adapter/MSTest.TestAdapter/MSTestVersion.cs.template
index 0e6c063cf7..41b1cc07d8 100644
--- a/src/Platform/Microsoft.Testing.Platform/RepositoryVersion.cs.template
+++ b/src/Adapter/MSTest.TestAdapter/MSTestVersion.cs.template
@@ -4,7 +4,7 @@
 /// <summary>
 /// Repository version, created at build time.
 /// </summary>
-internal static class RepositoryVersion
+internal static class MSTestVersion
 {
-    public const string Version = "${Version}";
+    public const string SemanticVersion = "${Version}";
 }
diff --git a/src/Adapter/MSTest.TestAdapter/RepositoryVersion.cs b/src/Adapter/MSTest.TestAdapter/RepositoryVersion.cs
deleted file mode 100644
index a5733d48cd..0000000000
--- a/src/Adapter/MSTest.TestAdapter/RepositoryVersion.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-/// <summary>
-/// Repository version, created at build time.
-/// </summary>
-internal static class RepositoryVersion
-{
-    public const string Version = "3.3.0-dev";
-}
diff --git a/src/Adapter/MSTest.TestAdapter/TestingPlatformAdapter/MSTestExtension.cs b/src/Adapter/MSTest.TestAdapter/TestingPlatformAdapter/MSTestExtension.cs
index 69e46ff7a6..986b890d49 100644
--- a/src/Adapter/MSTest.TestAdapter/TestingPlatformAdapter/MSTestExtension.cs
+++ b/src/Adapter/MSTest.TestAdapter/TestingPlatformAdapter/MSTestExtension.cs
@@ -12,7 +12,7 @@ internal sealed class MSTestExtension : IExtension
 
     public string DisplayName => "MSTest";
 
-    public string Version => RepositoryVersion.Version;
+    public string Version => MSTestVersion.SemanticVersion;
 
     public string Description => "MSTest Framework for Microsoft Testing Platform";
 
diff --git a/src/Platform/Microsoft.Testing.Platform/Helpers/AppVersion.cs b/src/Platform/Microsoft.Testing.Platform/Helpers/AppVersion.cs
index 5c18b43b4e..311d0c9e24 100644
--- a/src/Platform/Microsoft.Testing.Platform/Helpers/AppVersion.cs
+++ b/src/Platform/Microsoft.Testing.Platform/Helpers/AppVersion.cs
@@ -5,5 +5,5 @@ namespace Microsoft.Testing.Platform.Helpers;
 
 internal static class AppVersion
 {
-    public static readonly string DefaultSemVer = RepositoryVersion.Version;
+    public static readonly string DefaultSemVer = PlatformVersion.Version;
 }
diff --git a/src/Platform/Microsoft.Testing.Platform/Microsoft.Testing.Platform.csproj b/src/Platform/Microsoft.Testing.Platform/Microsoft.Testing.Platform.csproj
index d780b0e5ec..403dab8b11 100644
--- a/src/Platform/Microsoft.Testing.Platform/Microsoft.Testing.Platform.csproj
+++ b/src/Platform/Microsoft.Testing.Platform/Microsoft.Testing.Platform.csproj
@@ -8,16 +8,16 @@
     <SuppressLicenseValidation>true</SuppressLicenseValidation>
   </PropertyGroup>
 
-  <!-- Insert the RepositoryVersion.cs -->
+  <!-- Insert the PlatformVersion.cs -->
   <PropertyGroup>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="**/*.cs" Exclude="**/*.user; **/*.*proj; **/*.sln; **/*.vssscc" />
   </ItemGroup>
-  <Target Name="InsertRepositoryVersion" BeforeTargets="PrepareForBuild" >
+  <Target Name="InsertPlatformVersion" BeforeTargets="PrepareForBuild" >
     <ItemGroup>
-      <Compile Include="$(Compile);$(IntermediateOutputPath)/RepositoryVersion.cs" />
+      <Compile Include="$(Compile);$(IntermediateOutputPath)/PlatformVersion.cs" />
     </ItemGroup>
   </Target>
 
@@ -106,12 +106,12 @@ This package provides the core platform and the .NET implementation of the proto
   <ItemGroup>
     <PackageReference Include="Microsoft.DotNet.Build.Tasks.Templating" Version="$(MicrosoftDotNetBuildTasksTemplatingPackageVersion)" AllowExplicitReference="true" PrivateAssets="All" IsImplicitlyDefined="true" />
   </ItemGroup>
-  <Target Name="GenerateRepositoryVersionSourceFile" AfterTargets="PrepareForBuild" >
+  <Target Name="GeneratePlatformVersionSourceFile" AfterTargets="PrepareForBuild" >
     <PropertyGroup>
       <_TemplateProperties>Version=$(Version)</_TemplateProperties>
     </PropertyGroup>
     <ItemGroup>
-      <_TemplateCsproj Include="$(MSBuildProjectDirectory)/RepositoryVersion.cs.template" Destination="$(IntermediateOutputPath)/RepositoryVersion.cs" />
+      <_TemplateCsproj Include="$(MSBuildProjectDirectory)/PlatformVersion.cs.template" Destination="$(IntermediateOutputPath)/PlatformVersion.cs" />
     </ItemGroup>
     <GenerateFileFromTemplate TemplateFile="%(_TemplateCsproj.Identity)" OutputPath="%(_TemplateCsproj.Destination)" Properties="$(_TemplateProperties)">
       <Output TaskParameter="ResolvedOutputPath" ItemName="FileWrites" />
diff --git a/src/Adapter/MSTest.TestAdapter/RepositoryVersion.cs.template b/src/Platform/Microsoft.Testing.Platform/PlatformVersion.cs.template
similarity index 88%
rename from src/Adapter/MSTest.TestAdapter/RepositoryVersion.cs.template
rename to src/Platform/Microsoft.Testing.Platform/PlatformVersion.cs.template
index 0e6c063cf7..5d1b0fd719 100644
--- a/src/Adapter/MSTest.TestAdapter/RepositoryVersion.cs.template
+++ b/src/Platform/Microsoft.Testing.Platform/PlatformVersion.cs.template
@@ -4,7 +4,7 @@
 /// <summary>
 /// Repository version, created at build time.
 /// </summary>
-internal static class RepositoryVersion
+internal static class PlatformVersion
 {
     public const string Version = "${Version}";
 }