Change XHarness versioning to match branches (#1021)

Co-authored-by: Alexander Köplinger <alex.koeplinger@outlook.com>
dotnet · May 3, 2023 · aa434d0 · aa434d0
1 parent 72283e9
commit aa434d0
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -46,7 +46,7 @@ To install the latest version of the tool run (in bash):
 dotnet tool install Microsoft.DotNet.XHarness.CLI                                                   \
     --global                                                                                        \
     --add-source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json \
-    --version "1.0.0-prerelease*"
+    --version "8.0.0-prerelease*"
 ```
 
 Or run (in PowerShell):
@@ -55,7 +55,7 @@ Or run (in PowerShell):
 dotnet tool install Microsoft.DotNet.XHarness.CLI                                                   `
     --global                                                                                        `
     --add-source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json `
-    --version "1.0.0-prerelease*"
+    --version "8.0.0-prerelease*"
 ```
 
 You can get a specific version from [the dotnet-eng feed](https://dev.azure.com/dnceng/public/_packaging?_a=package&feed=dotnet-eng&view=versions&package=Microsoft.DotNet.XHarness.CLI&protocolType=NuGet) where it is published.

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -137,7 +137,7 @@ stages:
               displayName: Build and run tests
               condition: succeeded()
 
-            - publish: $(Build.SourcesDirectory)/artifacts/packages/$(_BuildConfig)/Shipping/Microsoft.DotNet.XHarness.CLI.1.0.0-ci.nupkg
+            - publish: $(Build.SourcesDirectory)/artifacts/packages/$(_BuildConfig)/Shipping/Microsoft.DotNet.XHarness.CLI.8.0.0-ci.nupkg
               artifact: Microsoft.DotNet.XHarness.CLI.$(_BuildConfig)
               displayName: Publish XHarness CLI for Helix Testing
               condition: and(succeeded(), eq(variables['_BuildConfig'], 'Debug'))

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <VersionPrefix>1.0.0</VersionPrefix>
+    <VersionPrefix>8.0.0</VersionPrefix>
     <PreReleaseVersionLabel>prerelease</PreReleaseVersionLabel>
   </PropertyGroup>
 </Project>
diff --git a/tests/integration-tests/Helix.SDK.configuration.props b/tests/integration-tests/Helix.SDK.configuration.props
@@ -17,7 +17,7 @@
     <DotNetCliVersion>8.0.100</DotNetCliVersion>
 
     <!-- Pick up the nupkg from this repo for testing purposes -->
-    <MicrosoftDotNetXHarnessCLIVersion>1.0.0-ci</MicrosoftDotNetXHarnessCLIVersion>
+    <MicrosoftDotNetXHarnessCLIVersion>$(VersionPrefix)-ci</MicrosoftDotNetXHarnessCLIVersion>
 
     <!-- Upload the diagnostics.json with other results -->
     <IsPosixShell Condition=" '$(IsPosixShell)' != 'false' ">true</IsPosixShell>
@@ -28,7 +28,7 @@
   <!-- For non-ci local runs -->
   <PropertyGroup Condition=" '$(AGENT_JOBNAME)' == '' ">
     <EnableAzurePipelinesReporter>false</EnableAzurePipelinesReporter>
-    <MicrosoftDotNetXHarnessCLIVersion>1.0.0-dev</MicrosoftDotNetXHarnessCLIVersion>
+    <MicrosoftDotNetXHarnessCLIVersion>$(VersionPrefix)-dev</MicrosoftDotNetXHarnessCLIVersion>
   </PropertyGroup>
 
   <PropertyGroup>

diff --git a/tools/Install-XHarness.ps1 b/tools/Install-XHarness.ps1
@@ -12,7 +12,7 @@ param (
 
 $ErrorActionPreference = "Stop"
 
-$xharness_version = "1.0.0-prerelease.$Version"
+$xharness_version = "8.0.0-prerelease.$Version"
 
 # Install .NET
 Write-Host "Getting dotnet-install.ps1.." -ForegroundColor Cyan

diff --git a/tools/install-xharness.sh b/tools/install-xharness.sh
@@ -25,7 +25,7 @@ while [[ $# -gt 0 ]]; do
     shift
 done
 
-xharness_version="1.0.0-prerelease.$version"
+xharness_version="8.0.0-prerelease.$version"
 
 here=$(pwd)
 dotnet_install="$here/dotnet-install.sh"

diff --git a/tools/run-e2e-test.ps1 b/tools/run-e2e-test.ps1
@@ -45,7 +45,7 @@ if (-not(Test-Path -Path $TestProject -PathType Leaf)) {
 if ($SkipBuild) {
     Write-Host -ForegroundColor Cyan "> Skipping build"
 } else {
-    Write-Host -ForegroundColor Cyan "> Building Microsoft.DotNet.XHarness.CLI.1.0.0-dev.nupkg"
+    Write-Host -ForegroundColor Cyan "> Building Microsoft.DotNet.XHarness.CLI NuGet package"
 
     Remove-Item -Recurse -ErrorAction SilentlyContinue "$repoRoot\artifacts\tmp\Debug\Microsoft.DotNet.XHarness.CLI"
     Remove-Item -Recurse -ErrorAction SilentlyContinue "$repoRoot\artifacts\artifacts\packages"

diff --git a/tools/run-e2e-test.sh b/tools/run-e2e-test.sh
@@ -79,7 +79,7 @@ done
 set -e
 
 if [ "true" != "$skip_build" ]; then
-  highlight "> Building Microsoft.DotNet.XHarness.CLI.1.0.0-dev.nupkg"
+  highlight "> Building Microsoft.DotNet.XHarness.CLI NuGet package"
   rm -rf "$repo_root/artifacts/tmp/Debug/Microsoft.DotNet.XHarness.CLI" "$repo_root/artifacts/packages"
   "$repo_root/build.sh" -build -pack --projects "$repo_root/src/Microsoft.DotNet.XHarness.CLI/Microsoft.DotNet.XHarness.CLI.csproj"
 else