From 6afe70416ea188ca9951bb8775b1cf958364f148 Mon Sep 17 00:00:00 2001 From: Gregory Paidis <115458417+gregory-paidis-sonarsource@users.noreply.github.com> Date: Tue, 3 Sep 2024 15:35:17 +0200 Subject: [PATCH] SCAN4NET-34 Change version to 9.0.0-rc (#2170) --- AssemblyInfo.Shared.cs | 2 +- .../dotnet-sonarscanner.nuspec | 2 +- scripts/generate-packages.ps1 | 2 +- scripts/promote-project-version.ps1 | 4 ++-- scripts/version/ChangeVersion.proj | 2 +- scripts/version/Version.props | 6 +++--- scripts/version/set-version.ps1 | 17 ++++++++++++++--- 7 files changed, 23 insertions(+), 12 deletions(-) diff --git a/AssemblyInfo.Shared.cs b/AssemblyInfo.Shared.cs index 6d12db91b..c1b78d64e 100644 --- a/AssemblyInfo.Shared.cs +++ b/AssemblyInfo.Shared.cs @@ -24,7 +24,7 @@ [assembly: AssemblyVersion("9.0.0")] [assembly: AssemblyFileVersion("9.0.0.0")] -[assembly: AssemblyInformationalVersion("Version:9.0.0.0 Branch:not-set Sha1:not-set")] +[assembly: AssemblyInformationalVersion("Version:9.0.0-rc.0 Branch:not-set Sha1:not-set")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("SonarSource and Microsoft")] [assembly: AssemblyCopyright("Copyright © SonarSource and Microsoft 2015-2023")] diff --git a/nuspec/netcoreglobaltool/dotnet-sonarscanner.nuspec b/nuspec/netcoreglobaltool/dotnet-sonarscanner.nuspec index 16f399bb4..9ff877f1a 100644 --- a/nuspec/netcoreglobaltool/dotnet-sonarscanner.nuspec +++ b/nuspec/netcoreglobaltool/dotnet-sonarscanner.nuspec @@ -2,7 +2,7 @@ dotnet-sonarscanner - 9.0.0 + 9.0.0-rc SonarScanner for .NET SonarSource,Microsoft https://redirect.sonarsource.com/doc/msbuild-sq-runner.html diff --git a/scripts/generate-packages.ps1 b/scripts/generate-packages.ps1 index 7ea607745..bf5b28bd3 100644 --- a/scripts/generate-packages.ps1 +++ b/scripts/generate-packages.ps1 @@ -1,7 +1,7 @@ param ($sourcesDirectory) [xml]$versionProps = Get-Content "$env:BUILD_SOURCESDIRECTORY\scripts\version\Version.props" -$leakPeriodVersion = $versionProps.Project.PropertyGroup.MainVersion +$leakPeriodVersion = $versionProps.Project.PropertyGroup.MainVersion + $versionProps.Project.PropertyGroup.PrereleaseSuffix $artifactsFolder = "$env:BUILD_SOURCESDIRECTORY\\build" $version = $leakPeriodVersion + '.' + $env:BUILD_BUILDID diff --git a/scripts/promote-project-version.ps1 b/scripts/promote-project-version.ps1 index 4eb2cf157..2fae28244 100644 --- a/scripts/promote-project-version.ps1 +++ b/scripts/promote-project-version.ps1 @@ -2,9 +2,9 @@ $versionFilePath = "$env:BUILD_SOURCESDIRECTORY\scripts\version\Version.props" Write-Host "Reading the Sonar project version from '${versionFilePath}' ..." -# Read the version from the file +# Read the version and the prerelease suffix (if any) from the file [xml]$versionProps = Get-Content "$versionFilePath" -$sonarProjectVersion = $versionProps.Project.PropertyGroup.MainVersion +$sonarProjectVersion = $versionProps.Project.PropertyGroup.MainVersion + $versionProps.Project.PropertyGroup.PrereleaseSuffix Write-Host "Sonar project version is '${sonarProjectVersion}'" # Set the variable to it can be used by other tasks Write-Host "##vso[task.setvariable variable=SONAR_PROJECT_VERSION]$sonarProjectVersion" diff --git a/scripts/version/ChangeVersion.proj b/scripts/version/ChangeVersion.proj index 8d441e3ea..31a49e9a1 100644 --- a/scripts/version/ChangeVersion.proj +++ b/scripts/version/ChangeVersion.proj @@ -25,7 +25,7 @@ (?<=<version>)([^<]*) - $(MainVersion) + $(MainVersion)$(PrereleaseSuffix) 1 diff --git a/scripts/version/Version.props b/scripts/version/Version.props index 848608f92..2082c80c7 100644 --- a/scripts/version/Version.props +++ b/scripts/version/Version.props @@ -2,11 +2,11 @@ 9.0.0 0 + -rc not-set not-set - $(MainVersion).$(BuildNumber) $(MainVersion) - $(FullVersion) - Version:$(FullVersion) Branch:$(BranchName) Sha1:$(Sha1) + $(MainVersion).$(BuildNumber) + Version:$(MainVersion)$(PreReleaseSuffix).$(BuildNumber) Branch:$(BranchName) Sha1:$(Sha1) \ No newline at end of file diff --git a/scripts/version/set-version.ps1 b/scripts/version/set-version.ps1 index 818b9b63a..cd81a6660 100644 --- a/scripts/version/set-version.ps1 +++ b/scripts/version/set-version.ps1 @@ -7,9 +7,13 @@ This script allows to set the specified version in all required files. [CmdletBinding()] Param( - [Parameter(Mandatory = $True, Position = 1)] + [Parameter(Mandatory = $True)] [ValidatePattern("^\d{1,3}\.\d{1,3}\.\d{1,3}$")] - [string]$version + [string]$version, + + [Parameter(Mandatory = $False)] + [ValidatePattern("^alpha|beta|rc$")] # see https://learn.microsoft.com/en-us/nuget/concepts/package-versioning?tabs=semver20sort#pre-release-versions + [string]$prereleaseSuffix = "" ) Set-StrictMode -version 2.0 @@ -22,6 +26,13 @@ function Set-VersionForDotNet() { $versionPropsFile = Resolve-Path "Version.props" $xml = [xml](Get-Content $versionPropsFile) $xml.Project.PropertyGroup.MainVersion = $version + if (-not [string]::IsNullOrWhiteSpace($prereleaseSuffix)) { + $xml.Project.PropertyGroup.PrereleaseSuffix = "-" + $prereleaseSuffix + } + else { + $xml.Project.PropertyGroup.PrereleaseSuffix = "" + } + $xml.Save($versionPropsFile) msbuild "ChangeVersion.proj" Test-ExitCode "ERROR: Change version FAILED." @@ -37,7 +48,7 @@ try { if ($fixedVersion.EndsWith(".0")) { $fixedVersion = $version.Substring(0, $version.Length - 2) } - + Set-VersionForDotNet exit 0