Skip to content

Commit 4c3782a

Browse files
committed
Bump other .NET references to 8
1 parent 1e63131 commit 4c3782a

File tree

8 files changed

+29
-14
lines changed

8 files changed

+29
-14
lines changed

Directory.Packages.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
<PackageVersion Include="System.Diagnostics.Tools" Version="4.3.0" />
3535
<PackageVersion Include="System.Memory" Version="4.5.5" />
3636
<PackageVersion Include="System.Runtime.Loader" Version="4.3.0" />
37-
<PackageVersion Include="System.Text.Json" Version="7.0.3" />
38-
<PackageVersion Include="System.Threading.Tasks.Dataflow" Version="7.0.0" />
37+
<PackageVersion Include="System.Text.Json" Version="8.0.0" />
38+
<PackageVersion Include="System.Threading.Tasks.Dataflow" Version="8.0.0" />
3939
<PackageVersion Include="Validation" Version="2.5.51" />
4040
<PackageVersion Include="Xunit.Combinatorial" Version="1.6.24" />
4141
<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.3" />

azure-pipelines.yml

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,12 @@ resources:
2727
image: mcr.microsoft.com/dotnet/sdk:6.0-jammy
2828
- container: jammy70
2929
image: mcr.microsoft.com/dotnet/sdk:7.0-jammy
30-
- container: debian
30+
- container: jammy80
31+
image: mcr.microsoft.com/dotnet/sdk:8.0-jammy
32+
- container: debian70
3133
image: mcr.microsoft.com/dotnet/sdk:7.0
34+
- container: debian80
35+
image: mcr.microsoft.com/dotnet/sdk:8.0
3236

3337
variables:
3438
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
@@ -54,12 +58,22 @@ stages:
5458
matrix:
5559
Ubuntu_Focal:
5660
containerImage: focal
61+
testCake: true
5762
Ubuntu_Jammy_60:
5863
containerImage: jammy60
64+
testCake: true
5965
Ubuntu_Jammy_70:
6066
containerImage: jammy70
61-
Debian:
62-
containerImage: debian
67+
testCake: true
68+
Ubuntu_Jammy_80:
69+
containerImage: jammy80
70+
testCake: false
71+
Debian_70:
72+
containerImage: debian70
73+
testCake: true
74+
Debian_80:
75+
containerImage: debian80
76+
testCake: false
6377
pool:
6478
vmImage: ubuntu-22.04
6579
container: $[ variables['containerImage'] ]
@@ -105,10 +119,10 @@ stages:
105119
clean: true
106120
submodules: true # keep the warnings quiet about the wiki not being enlisted
107121
- task: UseDotNet@2
108-
displayName: Install .NET 7.0.401 SDK
122+
displayName: Install .NET 8.0.100 SDK
109123
inputs:
110124
packageType: sdk
111-
version: 7.0.401
125+
version: 8.0.100
112126
- script: dotnet --info
113127
displayName: Show dotnet SDK info
114128
- bash: |
@@ -122,7 +136,7 @@ stages:
122136
dotnet build -c Release
123137
displayName: Build in Release mode
124138
- script: |
125-
dotnet run -c Release -f net7.0 -- --filter *GetVersionBenchmarks* --artifacts $(Build.ArtifactStagingDirectory)/benchmarks/packed/$(imageName)
139+
dotnet run -c Release -f net8.0 -- --filter *GetVersionBenchmarks* --artifacts $(Build.ArtifactStagingDirectory)/benchmarks/packed/$(imageName)
126140
workingDirectory: test/Nerdbank.GitVersioning.Benchmarks
127141
displayName: Run benchmarks (packed)
128142
- bash: |
@@ -139,7 +153,7 @@ stages:
139153
git unpack-objects < .git/objects/pack/*.pack
140154
displayName: Unpack Git repositories
141155
- script: |
142-
dotnet run -c Release -f net7.0 -- --filter '*GetVersionBenchmarks*' --artifacts $(Build.ArtifactStagingDirectory)/benchmarks/unpacked/$(imageName)
156+
dotnet run -c Release -f net8.0 -- --filter '*GetVersionBenchmarks*' --artifacts $(Build.ArtifactStagingDirectory)/benchmarks/unpacked/$(imageName)
143157
workingDirectory: test/Nerdbank.GitVersioning.Benchmarks
144158
displayName: Run benchmarks (unpacked)
145159
- task: PublishBuildArtifacts@1

azure-pipelines/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- template: install-dependencies.yml
2424
- pwsh: |
2525
Invoke-WebRequest -Uri "https://dot.net/v1/dotnet-install.ps1" -OutFile dotnet-install.ps1
26-
& .\dotnet-install.ps1 -Architecture x86 -Version 7.0.401 -InstallDir "C:\Program Files (x86)\dotnet\" -NoPath -Verbose
26+
& .\dotnet-install.ps1 -Architecture x86 -Version 8.0.100 -InstallDir "C:\Program Files (x86)\dotnet\" -NoPath -Verbose
2727
displayName: ⚙ Install 32-bit .NET SDK and runtimes
2828
2929
- template: dotnet.yml

azure-pipelines/xplattest-pipeline.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ steps:
6363
6464
dotnet cake
6565
displayName: Consume Cake.GitVersioning
66+
condition: and(succeeded(), ne(variables.testCake, 'false'))
6667
failOnStderr: true
6768

6869
- script: >

test/Nerdbank.GitVersioning.Benchmarks/GetVersionBenchmarks.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
namespace Nerdbank.GitVersioning.Benchmarks
1111
{
12-
[SimpleJob(RuntimeMoniker.Net70)]
12+
[SimpleJob(RuntimeMoniker.Net80)]
1313
[SimpleJob(RuntimeMoniker.Net472, baseline: true)]
1414
public class GetVersionBenchmarks
1515
{

test/Nerdbank.GitVersioning.Benchmarks/Nerdbank.GitVersioning.Benchmarks.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net7.0</TargetFrameworks>
4+
<TargetFrameworks>net8.0</TargetFrameworks>
55
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net472</TargetFrameworks>
66
<OutputType>Exe</OutputType>
77
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>

test/Nerdbank.GitVersioning.Tests/MSBuildExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ internal static void LoadMSBuild()
2525
if (IntPtr.Size == 4)
2626
{
2727
// 32-bit .NET runtime requires special code to find the x86 SDK (where MSBuild is).
28-
MSBuildLocator.RegisterMSBuildPath(@"C:\Program Files (x86)\dotnet\sdk\7.0.401");
28+
MSBuildLocator.RegisterMSBuildPath(@"C:\Program Files (x86)\dotnet\sdk\8.0.100");
2929
}
3030
else
3131
{

test/Nerdbank.GitVersioning.Tests/Nerdbank.GitVersioning.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net7.0</TargetFrameworks>
3+
<TargetFrameworks>net8.0</TargetFrameworks>
44
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('Windows'))">$(TargetFrameworks);net472</TargetFrameworks>
55
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
66
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>

0 commit comments

Comments
 (0)