Fix MSTest version under testing platform (#2630)

microsoft · Mar 25, 2024 · a4f58aa · a4f58aa
1 parent 3beee7a
commit a4f58aa
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 20 deletions.
diff --git 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/...ng.Platform/RepositoryVersion.cs.template → ...est.TestAdapter/MSTestVersion.cs.template b/...ng.Platform/RepositoryVersion.cs.template → ...est.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
diff --git 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
@@ -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
@@ -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/...TestAdapter/RepositoryVersion.cs.template → ...ting.Platform/PlatformVersion.cs.template b/...TestAdapter/RepositoryVersion.cs.template → ...ting.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}";
 }