From d46b0bb794224a9245569439e3289b6f7bfe339e Mon Sep 17 00:00:00 2001 From: jagarg Date: Fri, 22 Dec 2017 14:05:38 +0530 Subject: [PATCH 1/4] File version update --- scripts/Build.ps1 | 13 +++++++++++-- scripts/SetBuildNumber.ps1 | 2 +- scripts/build/TestFx.targets | 2 +- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/scripts/Build.ps1 b/scripts/Build.ps1 index 1656d970fc..96fc74dbeb 100644 --- a/scripts/Build.ps1 +++ b/scripts/Build.ps1 @@ -22,6 +22,14 @@ Param( [Alias("vs")] [System.String] $VersionSuffix = "dev", + [Parameter(Mandatory=$false)] + [Alias("fvp")] + [System.String] $FileVersionPrefix = "14.0", + + [Parameter(Mandatory=$false)] + [Alias("fvs")] + [System.String] $FileVersionSuffix = "99.99", + [Parameter(Mandatory=$false)] [System.String] $Target = "Build", @@ -74,6 +82,7 @@ $TFB_Configuration = $Configuration $TFB_FrameworkVersion = $FrameworkVersion $TFB_AdapterVersion = $AdapterVersion $TFB_VersionSuffix = $VersionSuffix +$TFB_FileVersion = if ($FileVersionSuffix -ne '') { $FileVersionPrefix + "." + $FileVersionSuffix } else { $FileVersionPrefix } $TFB_SkipRestore = $SkipRestore $TFB_Clean = $Clean $TFB_ClearPackageCache = $ClearPackageCache @@ -249,8 +258,8 @@ function Invoke-Build([string] $solution, $hasVsixExtension = "false") $solutionFailureLog = Join-Path -path $solutionDir -childPath "msbuild.err" Write-Log " Building $solution..." - Write-Verbose "$msbuild /t:$Target /p:Configuration=$configuration /tv:$msbuildVersion /v:m /flp1:Summary`;Verbosity=diagnostic`;Encoding=UTF-8`;LogFile=$solutionSummaryLog /flp2:WarningsOnly`;Verbosity=diagnostic`;Encoding=UTF-8`;LogFile=$solutionWarningLog /flp3:ErrorsOnly`;Verbosity=diagnostic`;Encoding=UTF-8`;LogFile=$solutionFailureLog /p:IsLocalizedBuild=$TFB_IsLocalizedBuild /p:UpdateXlf=$TFB_UpdateXlf $solutionPath" - & $msbuild /t:$Target /p:Configuration=$configuration /tv:$msbuildVersion /v:m /flp1:Summary`;Verbosity=diagnostic`;Encoding=UTF-8`;LogFile=$solutionSummaryLog /flp2:WarningsOnly`;Verbosity=diagnostic`;Encoding=UTF-8`;LogFile=$solutionWarningLog /flp3:ErrorsOnly`;Verbosity=diagnostic`;Encoding=UTF-8`;LogFile=$solutionFailureLog /p:IsLocalizedBuild=$TFB_IsLocalizedBuild /p:UpdateXlf=$TFB_UpdateXlf $solutionPath + Write-Verbose "$msbuild /t:$Target /p:Configuration=$configuration /tv:$msbuildVersion /v:m /flp1:Summary`;Verbosity=diagnostic`;Encoding=UTF-8`;LogFile=$solutionSummaryLog /flp2:WarningsOnly`;Verbosity=diagnostic`;Encoding=UTF-8`;LogFile=$solutionWarningLog /flp3:ErrorsOnly`;Verbosity=diagnostic`;Encoding=UTF-8`;LogFile=$solutionFailureLog /p:IsLocalizedBuild=$TFB_IsLocalizedBuild /p:UpdateXlf=$TFB_UpdateXlf /p:BuildVersion=$TFB_FileVersion $solutionPath" + & $msbuild /t:$Target /p:Configuration=$configuration /tv:$msbuildVersion /v:m /flp1:Summary`;Verbosity=diagnostic`;Encoding=UTF-8`;LogFile=$solutionSummaryLog /flp2:WarningsOnly`;Verbosity=diagnostic`;Encoding=UTF-8`;LogFile=$solutionWarningLog /flp3:ErrorsOnly`;Verbosity=diagnostic`;Encoding=UTF-8`;LogFile=$solutionFailureLog /p:IsLocalizedBuild=$TFB_IsLocalizedBuild /p:UpdateXlf=$TFB_UpdateXlf /p:BuildVersion=$TFB_FileVersion $solutionPath if ($lastExitCode -ne 0) { throw "Build failed with an exit code of '$lastExitCode'." diff --git a/scripts/SetBuildNumber.ps1 b/scripts/SetBuildNumber.ps1 index 8b6a0bbd5f..97252bef6f 100644 --- a/scripts/SetBuildNumber.ps1 +++ b/scripts/SetBuildNumber.ps1 @@ -30,7 +30,7 @@ function Set_BuildNumber() Write-Verbose("Build number used: " + $buildNumber) # This sets the build number. - Write-Host("##vso[build.updatebuildnumber]$buildNumber") + Write-Host("##vso[task.setvariable variable=BuildVersionSuffix]$buildNumber") } Set_BuildNumber diff --git a/scripts/build/TestFx.targets b/scripts/build/TestFx.targets index 4849e11a2e..27f2ec02eb 100644 --- a/scripts/build/TestFx.targets +++ b/scripts/build/TestFx.targets @@ -86,7 +86,7 @@ 0.1 14.0 $(MajorVersion).0.0 - $(MajorVersion).$(TFBuildNumber) + $(MajorVersion).$(TFBuildNumber) From 47e999c07cb1739d12d046930856798702877a95 Mon Sep 17 00:00:00 2001 From: jagarg Date: Fri, 22 Dec 2017 15:04:56 +0530 Subject: [PATCH 2/4] Moving to 15.6 --- scripts/Build.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/Build.ps1 b/scripts/Build.ps1 index 96fc74dbeb..88de96a9aa 100644 --- a/scripts/Build.ps1 +++ b/scripts/Build.ps1 @@ -24,7 +24,7 @@ Param( [Parameter(Mandatory=$false)] [Alias("fvp")] - [System.String] $FileVersionPrefix = "14.0", + [System.String] $FileVersionPrefix = "15.6", [Parameter(Mandatory=$false)] [Alias("fvs")] From 397a74c7ebf8be3f26e8441a44b9eadf11c3d00f Mon Sep 17 00:00:00 2001 From: jagarg Date: Tue, 26 Dec 2017 18:21:15 +0530 Subject: [PATCH 3/4] PR comments --- scripts/Build.ps1 | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/scripts/Build.ps1 b/scripts/Build.ps1 index 88de96a9aa..b6ad7093bb 100644 --- a/scripts/Build.ps1 +++ b/scripts/Build.ps1 @@ -23,12 +23,10 @@ Param( [System.String] $VersionSuffix = "dev", [Parameter(Mandatory=$false)] - [Alias("fvp")] - [System.String] $FileVersionPrefix = "15.6", + [System.String] $BuildVersionPrefix = "14.0", [Parameter(Mandatory=$false)] - [Alias("fvs")] - [System.String] $FileVersionSuffix = "99.99", + [System.String] $BuildVersionSuffix = "99.99", [Parameter(Mandatory=$false)] [System.String] $Target = "Build", @@ -82,7 +80,7 @@ $TFB_Configuration = $Configuration $TFB_FrameworkVersion = $FrameworkVersion $TFB_AdapterVersion = $AdapterVersion $TFB_VersionSuffix = $VersionSuffix -$TFB_FileVersion = if ($FileVersionSuffix -ne '') { $FileVersionPrefix + "." + $FileVersionSuffix } else { $FileVersionPrefix } +$TFB_BuildVersion = if ($BuildVersionSuffix -ne '') { $BuildVersionPrefix + "." + $BuildVersionSuffix } else { $BuildVersionPrefix } $TFB_SkipRestore = $SkipRestore $TFB_Clean = $Clean $TFB_ClearPackageCache = $ClearPackageCache @@ -258,8 +256,8 @@ function Invoke-Build([string] $solution, $hasVsixExtension = "false") $solutionFailureLog = Join-Path -path $solutionDir -childPath "msbuild.err" Write-Log " Building $solution..." - Write-Verbose "$msbuild /t:$Target /p:Configuration=$configuration /tv:$msbuildVersion /v:m /flp1:Summary`;Verbosity=diagnostic`;Encoding=UTF-8`;LogFile=$solutionSummaryLog /flp2:WarningsOnly`;Verbosity=diagnostic`;Encoding=UTF-8`;LogFile=$solutionWarningLog /flp3:ErrorsOnly`;Verbosity=diagnostic`;Encoding=UTF-8`;LogFile=$solutionFailureLog /p:IsLocalizedBuild=$TFB_IsLocalizedBuild /p:UpdateXlf=$TFB_UpdateXlf /p:BuildVersion=$TFB_FileVersion $solutionPath" - & $msbuild /t:$Target /p:Configuration=$configuration /tv:$msbuildVersion /v:m /flp1:Summary`;Verbosity=diagnostic`;Encoding=UTF-8`;LogFile=$solutionSummaryLog /flp2:WarningsOnly`;Verbosity=diagnostic`;Encoding=UTF-8`;LogFile=$solutionWarningLog /flp3:ErrorsOnly`;Verbosity=diagnostic`;Encoding=UTF-8`;LogFile=$solutionFailureLog /p:IsLocalizedBuild=$TFB_IsLocalizedBuild /p:UpdateXlf=$TFB_UpdateXlf /p:BuildVersion=$TFB_FileVersion $solutionPath + Write-Verbose "$msbuild /t:$Target /p:Configuration=$configuration /tv:$msbuildVersion /v:m /flp1:Summary`;Verbosity=diagnostic`;Encoding=UTF-8`;LogFile=$solutionSummaryLog /flp2:WarningsOnly`;Verbosity=diagnostic`;Encoding=UTF-8`;LogFile=$solutionWarningLog /flp3:ErrorsOnly`;Verbosity=diagnostic`;Encoding=UTF-8`;LogFile=$solutionFailureLog /p:IsLocalizedBuild=$TFB_IsLocalizedBuild /p:UpdateXlf=$TFB_UpdateXlf /p:BuildVersion=$TFB_BuildVersion $solutionPath" + & $msbuild /t:$Target /p:Configuration=$configuration /tv:$msbuildVersion /v:m /flp1:Summary`;Verbosity=diagnostic`;Encoding=UTF-8`;LogFile=$solutionSummaryLog /flp2:WarningsOnly`;Verbosity=diagnostic`;Encoding=UTF-8`;LogFile=$solutionWarningLog /flp3:ErrorsOnly`;Verbosity=diagnostic`;Encoding=UTF-8`;LogFile=$solutionFailureLog /p:IsLocalizedBuild=$TFB_IsLocalizedBuild /p:UpdateXlf=$TFB_UpdateXlf /p:BuildVersion=$TFB_BuildVersion $solutionPath if ($lastExitCode -ne 0) { throw "Build failed with an exit code of '$lastExitCode'." From 7677a28305ff26343e43f5765d0d9dc278d55cf7 Mon Sep 17 00:00:00 2001 From: jagarg Date: Tue, 26 Dec 2017 18:55:49 +0530 Subject: [PATCH 4/4] More PR comments --- scripts/Build.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/Build.ps1 b/scripts/Build.ps1 index b6ad7093bb..66637253d7 100644 --- a/scripts/Build.ps1 +++ b/scripts/Build.ps1 @@ -26,7 +26,7 @@ Param( [System.String] $BuildVersionPrefix = "14.0", [Parameter(Mandatory=$false)] - [System.String] $BuildVersionSuffix = "99.99", + [System.String] $BuildVersionSuffix = "9999.99", [Parameter(Mandatory=$false)] [System.String] $Target = "Build", @@ -80,7 +80,7 @@ $TFB_Configuration = $Configuration $TFB_FrameworkVersion = $FrameworkVersion $TFB_AdapterVersion = $AdapterVersion $TFB_VersionSuffix = $VersionSuffix -$TFB_BuildVersion = if ($BuildVersionSuffix -ne '') { $BuildVersionPrefix + "." + $BuildVersionSuffix } else { $BuildVersionPrefix } +$TFB_BuildVersion = $BuildVersionPrefix + "." + $BuildVersionSuffix $TFB_SkipRestore = $SkipRestore $TFB_Clean = $Clean $TFB_ClearPackageCache = $ClearPackageCache