Bump other .NET references to 8

dotnet · Nov 15, 2023 · 369342c · 369342c
1 parent 1e63131
commit 369342c
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 13 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -34,8 +34,8 @@
  <PackageVersion Include="System.Diagnostics.Tools" Version="4.3.0" />
  <PackageVersion Include="System.Memory" Version="4.5.5" />
  <PackageVersion Include="System.Runtime.Loader" Version="4.3.0" />
- <PackageVersion Include="System.Text.Json" Version="7.0.3" />
- <PackageVersion Include="System.Threading.Tasks.Dataflow" Version="7.0.0" />
+ <PackageVersion Include="System.Text.Json" Version="8.0.0" />
+ <PackageVersion Include="System.Threading.Tasks.Dataflow" Version="8.0.0" />
  <PackageVersion Include="Validation" Version="2.5.51" />
  <PackageVersion Include="Xunit.Combinatorial" Version="1.6.24" />
  <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.3" />

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -27,8 +27,12 @@ resources:
  image: mcr.microsoft.com/dotnet/sdk:6.0-jammy
  - container: jammy70
  image: mcr.microsoft.com/dotnet/sdk:7.0-jammy
- - container: debian
+ - container: jammy80
+ image: mcr.microsoft.com/dotnet/sdk:8.0-jammy
+ - container: debian70
  image: mcr.microsoft.com/dotnet/sdk:7.0
+ - container: debian80
+ image: mcr.microsoft.com/dotnet/sdk:8.0
 
 variables:
  DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
@@ -54,12 +58,22 @@ stages:
  matrix:
  Ubuntu_Focal:
  containerImage: focal
+ testCake: true
  Ubuntu_Jammy_60:
  containerImage: jammy60
+ testCake: true
  Ubuntu_Jammy_70:
  containerImage: jammy70
- Debian:
- containerImage: debian
+ testCake: true
+ Ubuntu_Jammy_80:
+ containerImage: jammy80
+ testCake: false
+ Debian_70:
+ containerImage: debian70
+ testCake: true
+ Debian_80:
+ containerImage: debian80
+ testCake: false
  pool:
  vmImage: ubuntu-22.04
  container: $[ variables['containerImage'] ]
@@ -105,10 +119,10 @@ stages:
  clean: true
  submodules: true # keep the warnings quiet about the wiki not being enlisted
  - task: UseDotNet@2
- displayName: Install .NET 7.0.401 SDK
+ displayName: Install .NET 8.0.100 SDK
  inputs:
  packageType: sdk
- version: 7.0.401
+ version: 8.0.100
  - script: dotnet --info
  displayName: Show dotnet SDK info
  - bash: |
@@ -122,7 +136,7 @@ stages:
  dotnet build -c Release
  displayName: Build in Release mode
  - script: |
- dotnet run -c Release -f net7.0 -- --filter *GetVersionBenchmarks* --artifacts $(Build.ArtifactStagingDirectory)/benchmarks/packed/$(imageName)
+ dotnet run -c Release -f net8.0 -- --filter *GetVersionBenchmarks* --artifacts $(Build.ArtifactStagingDirectory)/benchmarks/packed/$(imageName)
  workingDirectory: test/Nerdbank.GitVersioning.Benchmarks
  displayName: Run benchmarks (packed)
  - bash: |
@@ -139,7 +153,7 @@ stages:
  git unpack-objects < .git/objects/pack/*.pack
  displayName: Unpack Git repositories
  - script: |
- dotnet run -c Release -f net7.0 -- --filter '*GetVersionBenchmarks*' --artifacts $(Build.ArtifactStagingDirectory)/benchmarks/unpacked/$(imageName)
+ dotnet run -c Release -f net8.0 -- --filter '*GetVersionBenchmarks*' --artifacts $(Build.ArtifactStagingDirectory)/benchmarks/unpacked/$(imageName)
  workingDirectory: test/Nerdbank.GitVersioning.Benchmarks
  displayName: Run benchmarks (unpacked)
  - task: PublishBuildArtifacts@1

diff --git a/azure-pipelines/build.yml b/azure-pipelines/build.yml
@@ -23,7 +23,7 @@ jobs:
  - template: install-dependencies.yml
  - pwsh: |
  Invoke-WebRequest -Uri "https://dot.net/v1/dotnet-install.ps1" -OutFile dotnet-install.ps1
- & .\dotnet-install.ps1 -Architecture x86 -Version 7.0.401 -InstallDir "C:\Program Files (x86)\dotnet\" -NoPath -Verbose
+ & .\dotnet-install.ps1 -Architecture x86 -Version 8.0.100 -InstallDir "C:\Program Files (x86)\dotnet\" -NoPath -Verbose
  displayName: ⚙ Install 32-bit .NET SDK and runtimes
 
  - template: dotnet.yml

diff --git a/azure-pipelines/xplattest-pipeline.yml b/azure-pipelines/xplattest-pipeline.yml
@@ -63,6 +63,7 @@ steps:
 
  dotnet cake
  displayName: Consume Cake.GitVersioning
+ condition: and(succeeded(), ne(variables.testCake, 'false'))
  failOnStderr: true
 
 - script: >

diff --git a/test/Nerdbank.GitVersioning.Benchmarks/Nerdbank.GitVersioning.Benchmarks.csproj b/test/Nerdbank.GitVersioning.Benchmarks/Nerdbank.GitVersioning.Benchmarks.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
  <PropertyGroup>
- <TargetFrameworks>net7.0</TargetFrameworks>
+ <TargetFrameworks>net8.0</TargetFrameworks>
  <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net472</TargetFrameworks>
  <OutputType>Exe</OutputType>
  <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

diff --git a/test/Nerdbank.GitVersioning.Tests/MSBuildExtensions.cs b/test/Nerdbank.GitVersioning.Tests/MSBuildExtensions.cs
@@ -25,7 +25,7 @@ internal static void LoadMSBuild()
  if (IntPtr.Size == 4)
  {
  // 32-bit .NET runtime requires special code to find the x86 SDK (where MSBuild is).
- MSBuildLocator.RegisterMSBuildPath(@"C:\Program Files (x86)\dotnet\sdk\7.0.401");
+ MSBuildLocator.RegisterMSBuildPath(@"C:\Program Files (x86)\dotnet\sdk\8.0.100");
  }
  else
  {

diff --git a/test/Nerdbank.GitVersioning.Tests/Nerdbank.GitVersioning.Tests.csproj b/test/Nerdbank.GitVersioning.Tests/Nerdbank.GitVersioning.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
- <TargetFrameworks>net7.0</TargetFrameworks>
+ <TargetFrameworks>net8.0</TargetFrameworks>
  <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('Windows'))">$(TargetFrameworks);net472</TargetFrameworks>
  <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
  <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>