diff --git a/Directory.Build.props b/Directory.Build.props
index 8d0e407b01..045a8917ff 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -37,6 +37,16 @@
0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7
+
+
+ alpha
+
+
+ 1.0.0
+
+
$(CopyrightMicrosoft)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 22295c7adf..890bec9ac2 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -17,9 +17,5 @@
https://dev.azure.com/devdiv/DevDiv/_git/vs-code-coverage
766fbe6747db12e9e1ce4fd233946db99bd2fb08
-
- https://github.com/microsoft/testanywhere
- 0787bef4335997b316090bf2b95213e4fb3db003
-
diff --git a/eng/Versions.props b/eng/Versions.props
index 84b70a72d5..97a35a0046 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -9,7 +9,5 @@
10.0.0-beta.24606.6
17.14.0-preview.25111.3
-
- 1.0.0-alpha.25107.2
diff --git a/src/Adapter/MSTest.Engine/MSTest.Engine.csproj b/src/Adapter/MSTest.Engine/MSTest.Engine.csproj
index 9fee56b5c7..1f19b9202b 100644
--- a/src/Adapter/MSTest.Engine/MSTest.Engine.csproj
+++ b/src/Adapter/MSTest.Engine/MSTest.Engine.csproj
@@ -5,15 +5,14 @@
Microsoft.Testing.Framework
+
License.txt
-
- 1.0.0
- alpha
+ $(MSTestEngineVersionPrefix)
+ $(MSTestEnginePreReleaseVersionLabel)
true
$(NoWarn);CS1591
+ true
diff --git a/src/Analyzers/MSTest.SourceGeneration/MSTest.SourceGeneration.csproj b/src/Analyzers/MSTest.SourceGeneration/MSTest.SourceGeneration.csproj
index e6206b247a..96fac5b926 100644
--- a/src/Analyzers/MSTest.SourceGeneration/MSTest.SourceGeneration.csproj
+++ b/src/Analyzers/MSTest.SourceGeneration/MSTest.SourceGeneration.csproj
@@ -12,13 +12,13 @@
Microsoft.Testing.Framework.SourceGeneration
+
License.txt
-
- 1.0.0
- alpha
+
+ $(MSTestEngineVersionPrefix)
+ $(MSTestEnginePreReleaseVersionLabel)
true
+ true
diff --git a/src/Package/MSTest.Sdk/MSTest.Sdk.csproj b/src/Package/MSTest.Sdk/MSTest.Sdk.csproj
index 21f72c2b41..a9207301b1 100644
--- a/src/Package/MSTest.Sdk/MSTest.Sdk.csproj
+++ b/src/Package/MSTest.Sdk/MSTest.Sdk.csproj
@@ -1,4 +1,4 @@
-
+
netstandard2.0
@@ -35,7 +35,14 @@
- <_TemplateProperties>MSTestEngineVersion=$(MSTestEngineVersion);MSTestVersion=$(Version);MicrosoftTestingPlatformVersion=$(Version.Replace('$(VersionPrefix)', '$(TestingPlatformVersionPrefix)'));MicrosoftNETTestSdkVersion=$(MicrosoftNETTestSdkVersion);MicrosoftTestingExtensionsCodeCoverageVersion=$(MicrosoftTestingExtensionsCodeCoverageVersion);MicrosoftPlaywrightVersion=$(MicrosoftPlaywrightVersion);AspireHostingTestingVersion=$(AspireHostingTestingVersion);MicrosoftTestingExtensionsFakesVersion=$(MicrosoftTestingExtensionsFakesVersion)
+
+ <_MSTestEnginePreReleaseVersionLabel>$(MSTestEnginePreReleaseVersionLabel)
+ <_MSTestEnginePreReleaseVersionLabel Condition="'$(ContinuousIntegrationBuild)' == 'true' and '$(OfficialBuild)' != 'true'">ci
+ <_MSTestEnginePreReleaseVersionLabel Condition="'$(ContinuousIntegrationBuild)' != 'true' and '$(OfficialBuild)' != 'true'">dev
+ <_MSTestEngineVersionSuffix>$(_MSTestEnginePreReleaseVersionLabel)$(_BuildNumberLabels)
+ <_MSTestEngineVersion>$(MSTestEngineVersionPrefix)
+ <_MSTestEngineVersion Condition="'$(_MSTestEngineVersionSuffix)' != ''">$(_MSTestEngineVersion)-$(_MSTestEngineVersionSuffix)
+ <_TemplateProperties>MSTestEngineVersion=$(_MSTestEngineVersion);MSTestVersion=$(Version);MicrosoftTestingPlatformVersion=$(Version.Replace('$(VersionPrefix)', '$(TestingPlatformVersionPrefix)'));MicrosoftNETTestSdkVersion=$(MicrosoftNETTestSdkVersion);MicrosoftTestingExtensionsCodeCoverageVersion=$(MicrosoftTestingExtensionsCodeCoverageVersion);MicrosoftPlaywrightVersion=$(MicrosoftPlaywrightVersion);AspireHostingTestingVersion=$(AspireHostingTestingVersion);MicrosoftTestingExtensionsFakesVersion=$(MicrosoftTestingExtensionsFakesVersion)
-
-
@@ -36,8 +34,6 @@
-
-
diff --git a/test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/Helpers/AcceptanceTestBase.cs b/test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/Helpers/AcceptanceTestBase.cs
index a6077ee287..49429f20a8 100644
--- a/test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/Helpers/AcceptanceTestBase.cs
+++ b/test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/Helpers/AcceptanceTestBase.cs
@@ -49,10 +49,9 @@ static AcceptanceTestBase()
var cpmPropFileDoc = XDocument.Load(Path.Combine(RootFinder.Find(), "Directory.Packages.props"));
MicrosoftNETTestSdkVersion = cpmPropFileDoc.Descendants("MicrosoftNETTestSdkVersion").Single().Value;
- var versionsPropsFileDoc = XDocument.Load(Path.Combine(RootFinder.Find(), "eng", "Versions.props"));
MSTestVersion = ExtractVersionFromPackage(Constants.ArtifactsPackagesShipping, "MSTest.TestFramework.");
MicrosoftTestingPlatformVersion = ExtractVersionFromPackage(Constants.ArtifactsPackagesShipping, "Microsoft.Testing.Platform.");
- MSTestEngineVersion = ExtractVersionFromXmlFile(versionsPropsFileDoc, "MSTestEngineVersion");
+ MSTestEngineVersion = ExtractVersionFromPackage(Constants.ArtifactsPackagesShipping, "MSTest.Engine.");
}
protected static TFixture AssetFixture { get; private set; } = default!;
@@ -195,12 +194,4 @@ private static string ExtractVersionFromPackage(string rootFolder, string packag
string packageFullName = Path.GetFileName(matches[0]);
return packageFullName.Substring(packagePrefixName.Length, packageFullName.Length - packagePrefixName.Length - NuGetPackageExtensionName.Length);
}
-
- private static string ExtractVersionFromXmlFile(XDocument versionPropsXmlDocument, string entryName)
- {
- XElement[] matches = versionPropsXmlDocument.Descendants(entryName).ToArray();
- return matches.Length != 1
- ? throw new InvalidOperationException($"Was expecting to find a single entry for '{entryName}' but found {matches.Length}.")
- : matches[0].Value;
- }
}