From 3b97fbff21a474dffa9c1a53e51d07e70147e296 Mon Sep 17 00:00:00 2001 From: Medeni Baykal <433724+Haplois@users.noreply.github.com> Date: Tue, 23 Nov 2021 13:54:08 +0100 Subject: [PATCH] Added internal versioning --- ...icrosoft.TestPlatform.AdapterUtilities.dll | Bin 28552 -> 0 bytes eng/Versions.props | 4 +- scripts/Build.ps1 | 21 +++++- scripts/SetBuildNumber.ps1 | 36 ---------- scripts/vsts-prebuild.ps1 | 66 ++++++++++++++++++ ...STest.Internal.TestFx.Documentation.nuspec | 4 ++ src/Package/MSTest.TestAdapter.nuspec | 4 ++ src/Package/MSTest.TestAdapter.symbols.nuspec | 5 ++ src/Package/MSTest.TestFramework.nuspec | 4 ++ .../MSTest.TestFramework.symbols.nuspec | 4 ++ 10 files changed, 108 insertions(+), 40 deletions(-) delete mode 100644 TestAssets/Microsoft.TestPlatform.AdapterUtilities.dll delete mode 100644 scripts/SetBuildNumber.ps1 create mode 100644 scripts/vsts-prebuild.ps1 diff --git a/TestAssets/Microsoft.TestPlatform.AdapterUtilities.dll b/TestAssets/Microsoft.TestPlatform.AdapterUtilities.dll deleted file mode 100644 index d3cade32a355d6d101bcf82e5b1957630c7a36d4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 28552 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 YBChwQ!PgU7weR+INw1saAc4^T0xATZtN;K2 diff --git a/eng/Versions.props b/eng/Versions.props index eb52eaddac..0e36d9567f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,8 +2,8 @@ - 6.0.0 - beta + 2.2.9 + preview false 17.1.0-preview-20211118-01 diff --git a/scripts/Build.ps1 b/scripts/Build.ps1 index 857377a9f5..e532fe1d69 100644 --- a/scripts/Build.ps1 +++ b/scripts/Build.ps1 @@ -77,6 +77,23 @@ $TFB_Full = $Full $TFB_Official = $Official $TFB_UpdateXlf = $UpdateXlf $TFB_IsLocalizedBuild = $IsLocalizedBuild -or $TFB_Official +$TPB_BRANCH = "LOCALBRANCH" +$TPB_COMMIT = "LOCALBUILD" +try { + $TPB_BRANCH = $env:BUILD_SOURCEBRANCH -replace "^refs/heads/" + if ([string]::IsNullOrWhiteSpace($TPB_BRANCH)) { + $TPB_BRANCH = git -C "." rev-parse --abbrev-ref HEAD + } +} +catch { } + +try { + $TPB_COMMIT = $env:BUILD_SOURCEVERSION + if ([string]::IsNullOrWhiteSpace($TPB_COMMIT)) { + $TPB_COMMIT = git -C "." rev-parse HEAD + } +} +catch { } $TFB_Solutions = @( "TestFx.sln" @@ -272,8 +289,8 @@ function Create-NugetPackages { $version = $version + "-" + $versionSuffix } - Write-Verbose "$nugetExe pack $stagingDir\$file -OutputDirectory $packageOutDir -Version $version -Properties Version=$version``;Srcroot=$env:TF_SRC_DIR``;Packagesroot=$env:TF_PACKAGES_DIR``;TestPlatformVersion=$TestPlatformVersion``;NOWARN=`"NU5127,NU5128,NU5129`"" - & $nugetExe pack $stagingDir\$file -OutputDirectory $packageOutDir -Version $version -Properties Version=$version`;Srcroot=$env:TF_SRC_DIR`;Packagesroot=$env:TF_PACKAGES_DIR`;TestPlatformVersion=$TestPlatformVersion`;NOWARN="NU5127,NU5128,NU5129" + Write-Verbose "$nugetExe pack $stagingDir\$file -OutputDirectory $packageOutDir -Version $version -Properties Version=$version``;Srcroot=$env:TF_SRC_DIR``;Packagesroot=$env:TF_PACKAGES_DIR``;TestPlatformVersion=$TestPlatformVersion``;NOWARN=`"NU5127,NU5128,NU5129`"``;BranchName=$TPB_BRANCH``;CommitId=$TPB_COMMIT" + & $nugetExe pack $stagingDir\$file -OutputDirectory $packageOutDir -Version $version -Properties Version=$version`;Srcroot=$env:TF_SRC_DIR`;Packagesroot=$env:TF_PACKAGES_DIR`;TestPlatformVersion=$TestPlatformVersion`;NOWARN="NU5127,NU5128,NU5129"`;BranchName=$TPB_BRANCH`;CommitId=$TPB_COMMIT if ($lastExitCode -ne 0) { throw "Nuget pack failed with an exit code of '$lastExitCode'." } diff --git a/scripts/SetBuildNumber.ps1 b/scripts/SetBuildNumber.ps1 deleted file mode 100644 index 97252bef6f..0000000000 --- a/scripts/SetBuildNumber.ps1 +++ /dev/null @@ -1,36 +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. - -# Script to set the build number for official builds. -# We follow the following algorithm to set the build number: -# 1. We get the delta in terms of months from the first release date to the current UTC time. -# 2. We get the current day of the month.
-# 3. We also get the revision number for the current build. -# 4. The build number is
. - -[CmdletBinding(PositionalBinding=$false)] -Param( - [Parameter(Mandatory=$true)] - [Alias("bn")] - [System.String] $DefinitionBuildNumber -) - -$TFB_DefinitionBuildNumber = $DefinitionBuildNumber -$TFB_FirstReleaseDate = [DateTime](Get-Date -Year 2016 -Month 05 -Day 01) - -function Set_BuildNumber() -{ - $currentDate = [System.DateTime]::UTCNow - - # The default build number would be of the format $(date:yyyymmdd)$(rev:.rr) - $revisionNumber = $TFB_DefinitionBuildNumber.Split(".")[1] - - $monthDiff = ($currentDate.Month - $TFB_FirstReleaseDate.Month) + 12*($currentDate.Year - $TFB_FirstReleaseDate.Year) - $buildNumber = $monthDiff.ToString() + $currentDate.ToString("dd") + "." + $revisionNumber - Write-Verbose("Build number used: " + $buildNumber) - - # This sets the build number. - Write-Host("##vso[task.setvariable variable=BuildVersionSuffix]$buildNumber") -} - -Set_BuildNumber diff --git a/scripts/vsts-prebuild.ps1 b/scripts/vsts-prebuild.ps1 new file mode 100644 index 0000000000..a552919d83 --- /dev/null +++ b/scripts/vsts-prebuild.ps1 @@ -0,0 +1,66 @@ +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT license. See LICENSE file in the project root for full license information. + +# Sets variables which are used across the build tasks. + +param ( + [Parameter(Mandatory)] + [string] $IsRtmBuild +) + +$TPB_ROOT_DIR = (Get-Item (Split-Path $MyInvocation.MyCommand.Path)).Parent.FullName +$TPB_ENG_DIR = Join-Path $TPB_ROOT_DIR "eng" +$TPB_VERSION_PREFIX = ([xml](Get-Content $TPB_ENG_DIR\Versions.props)).Project.PropertyGroup.VersionPrefix +$TPB_RELEASE_VERSION_LABEL = ([xml](Get-Content $TPB_ENG_DIR\Versions.props)).Project.PropertyGroup.PreReleaseVersionLabel +$TPB_BUILD_NUMBER = IF ($env:BUILD_BUILDNUMBER -ne $null) { $env:BUILD_BUILDNUMBER -replace "\.", "-" } ELSE { "LOCAL" } +$TPB_NUGET_VERSION_SUFFIX = "$TPB_RELEASE_VERSION_LABEL-$TPB_BUILD_NUMBER" +$TPB_PACKAGE_VERSION = "$TPB_VERSION_PREFIX-$TPB_NUGET_VERSION_SUFFIX" +$TPB_BUILD_VERSION_SUFFIX = "0.0" +$TFB_FIRST_RELEASE_DATE = [DateTime](Get-Date -Year 2016 -Month 05 -Day 01) +$TPB_BRANCH = "LOCALBRANCH" +try { + $TPB_BRANCH = $env:BUILD_SOURCEBRANCH -replace "^refs/heads/" + if ([string]::IsNullOrWhiteSpace($TPB_BRANCH)) { + $TPB_BRANCH = git -C "." rev-parse --abbrev-ref HEAD + } +} +catch { } + +# Set TPB_BUILD_VERSION_SUFFIX +if($TPB_BUILD_NUMBER -ne "LOCAL") +{ + $currentDate = [System.DateTime]::UTCNow + + # The default build number would be of the format $(date:yyyymmdd)$(rev:-rr) + $revisionNumber = $TPB_BUILD_NUMBER.Split("-")[1] + + $monthDiff = ($currentDate.Month - $TFB_FIRST_RELEASE_DATE.Month) + 12*($currentDate.Year - $TFB_FIRST_RELEASE_DATE.Year) + $TPB_BUILD_VERSION_SUFFIX = $monthDiff.ToString() + $currentDate.ToString("dd") + "." + $revisionNumber +} + +# Set RTM configuration +if ($IsRtmBuild -eq "true") { + $TPB_PACKAGE_VERSION = "$TPB_VERSION_PREFIX" + $TPB_NUGET_VERSION_SUFFIX = "''" +} + +# Dump variables +Get-ChildItem variable:TP* | Format-Table + +# Validate RTM config +if ($IsRtmBuild -eq "true" -and (-not $TPB_BRANCH.StartsWith("rel/"))) { + throw "An RTM build can only be started from a release branch, ``$TPB_BRANCH`` is invalid!" +} + +if ($IsRtmBuild -eq "true" -and ($TPB_RELEASE_VERSION_LABEL -ne "release" -and $TPB_RELEASE_VERSION_LABEL -ne "servicing")) { + throw "An RTM build cannot be based on a ``$TPB_RELEASE_VERSION_LABEL`` build!" +} + +# Publish CI variables +Write-Host "##vso[task.setvariable variable=TestAdapterNugetVersion;]$TPB_VERSION_PREFIX" +Write-Host "##vso[task.setvariable variable=TestFrameworkNugetVersion;]$TPB_VERSION_PREFIX" +Write-Host "##vso[task.setvariable variable=NugetVersionSuffix;]$TPB_NUGET_VERSION_SUFFIX" + +Write-Host "##vso[task.setvariable variable=BuildVersionPrefix;]14.0" +Write-Host("##vso[task.setvariable variable=BuildVersionSuffix]$TPB_BUILD_VERSION_SUFFIX") +Write-Host "##vso[task.setvariable variable=PackageVersion;]$TPB_PACKAGE_VERSION" \ No newline at end of file diff --git a/src/Package/MSTest.Internal.TestFx.Documentation.nuspec b/src/Package/MSTest.Internal.TestFx.Documentation.nuspec index e9d521e80d..730e214e56 100644 --- a/src/Package/MSTest.Internal.TestFx.Documentation.nuspec +++ b/src/Package/MSTest.Internal.TestFx.Documentation.nuspec @@ -16,6 +16,10 @@ Icon.png © Microsoft Corporation. All rights reserved. MSTest TestFramework MSTestV2 + diff --git a/src/Package/MSTest.TestAdapter.nuspec b/src/Package/MSTest.TestAdapter.nuspec index 98bae47865..bcfc2dc1a3 100644 --- a/src/Package/MSTest.TestAdapter.nuspec +++ b/src/Package/MSTest.TestAdapter.nuspec @@ -23,6 +23,10 @@ Icon.png © Microsoft Corporation. All rights reserved. MSTest TestFramework TestAdapter VisualStudio Unittest MSTestV2 Microsoft + diff --git a/src/Package/MSTest.TestAdapter.symbols.nuspec b/src/Package/MSTest.TestAdapter.symbols.nuspec index d5f3940e22..7daa72ffa9 100644 --- a/src/Package/MSTest.TestAdapter.symbols.nuspec +++ b/src/Package/MSTest.TestAdapter.symbols.nuspec @@ -23,6 +23,11 @@ Icon.png © Microsoft Corporation. All rights reserved. MSTest TestFramework TestAdapter VisualStudio Unittest MSTestV2 Microsoft + + diff --git a/src/Package/MSTest.TestFramework.nuspec b/src/Package/MSTest.TestFramework.nuspec index a071a50440..ca53c5a3c8 100644 --- a/src/Package/MSTest.TestFramework.nuspec +++ b/src/Package/MSTest.TestFramework.nuspec @@ -26,6 +26,10 @@ Icon.png © Microsoft Corporation. All rights reserved. MSTest TestFramework Unittest MSTestV2 Microsoft Test Testing TDD Framework + diff --git a/src/Package/MSTest.TestFramework.symbols.nuspec b/src/Package/MSTest.TestFramework.symbols.nuspec index 4b28269ceb..e3813dd0a2 100644 --- a/src/Package/MSTest.TestFramework.symbols.nuspec +++ b/src/Package/MSTest.TestFramework.symbols.nuspec @@ -25,6 +25,10 @@ Icon.png © Microsoft Corporation. All rights reserved. MSTest TestFramework Unittest MSTestV2 Microsoft Test Testing TDD Framework +