Skip to content

Commit

Permalink
migrate build and test system to .NET 8 (#7008)
Browse files Browse the repository at this point in the history
* migrate build and test system to .NET 8

* fixed compile step

* upgraded Incrementalist

* update incrementalist on Linux
  • Loading branch information
Aaronontheweb authored Nov 22, 2023
1 parent f4f0077 commit c03ff1c
Show file tree
Hide file tree
Showing 11 changed files with 39 additions and 17 deletions.
4 changes: 2 additions & 2 deletions build-system/azure-pipeline.mntr-template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ jobs:
vmImage: ${{ parameters.vmImage }}
steps:
- task: UseDotNet@2
displayName: 'Use .NET 7 SDK 7.0.100'
displayName: 'Use .NET 8 SDK 8.0.100'
inputs:
version: 7.0.100
version: 8.0.100
- task: Bash@3
displayName: Linux / OSX Build
inputs:
Expand Down
4 changes: 2 additions & 2 deletions build-system/azure-pipeline.template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ jobs:
value: true
steps:
- task: UseDotNet@2
displayName: 'Use .NET 7 SDK 7.0.100'
displayName: 'Use .NET 8 SDK 8.0.100'
inputs:
version: 7.0.100
version: 8.0.100
- task: Bash@3
displayName: Linux / OSX Build
inputs:
Expand Down
4 changes: 2 additions & 2 deletions build-system/nightly-builds.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ variables:

steps:
- task: UseDotNet@2
displayName: 'Use .NET 7 SDK 7.0.100'
displayName: 'Use .NET 8 SDK 8.0.100'
inputs:
version: 7.0.100
version: 8.0.100
- task: BatchScript@1
displayName: 'FAKE Build'
inputs:
Expand Down
4 changes: 2 additions & 2 deletions build-system/pr-validation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@ jobs:
submodules: recursive # set to 'true' for a single level of submodules or 'recursive' to get submodules of submodules
persistCredentials: true
- task: UseDotNet@2
displayName: "Use .NET 7 SDK 7.0.100"
displayName: "Use .NET 8 SDK 8.0.100"
inputs:
version: 7.0.100
version: 8.0.100
- task: BatchScript@1
displayName: Windows Build
inputs:
Expand Down
4 changes: 2 additions & 2 deletions build-system/windows-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ variables:
value: akkadotnet/akka.net
steps:
- task: UseDotNet@2
displayName: 'Use .NET 7 SDK 7.0.100'
displayName: 'Use .NET 8 SDK 8.0.100'
inputs:
version: 7.0.100
version: 8.0.100
- task: BatchScript@1
displayName: 'FAKE Build'
inputs:
Expand Down
2 changes: 1 addition & 1 deletion build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ $NugetUrl = "https://dist.nuget.org/win-x86-commandline/v$NugetVersion/nuget.exe
$ProtobufVersion = "3.21.5"
$DocfxVersion = "2.59.4"

$IncrementalistVersion = "0.8.0";
$IncrementalistVersion = "0.9.0";

# Make sure tools folder exists
$PSScriptRoot = Split-Path $MyInvocation.MyCommand.Path -Parent
Expand Down
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ DOTNET_VERSION=5.0.101
DOTNET_INSTALLER_URL=https://dot.net/v1/dotnet-install.sh
DOTNET_CHANNEL=LTS
PROTOBUF_VERSION=3.21.5
INCREMENTALIST_VERSION=0.8.0
INCREMENTALIST_VERSION=0.9.0

# Define default arguments.
TARGET="Default"
Expand Down
26 changes: 24 additions & 2 deletions src/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<NBenchVersion>2.0.1</NBenchVersion>
<ProtobufVersion>3.25.0</ProtobufVersion>
<BenchmarkDotNetVersion>0.13.10</BenchmarkDotNetVersion>
<NetTestVersion>net7.0</NetTestVersion>
<NetTestVersion>net8.0</NetTestVersion>
<FsharpVersion>6.0.5</FsharpVersion>
<NetFrameworkTestVersion>net471</NetFrameworkTestVersion>
<NetStandardLibVersion>netstandard2.0</NetStandardLibVersion>
Expand All @@ -44,7 +44,29 @@
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
</PropertyGroup>
<PropertyGroup>
<PackageReleaseNotes>Placeholder for nightlies*</PackageReleaseNotes>
<PackageReleaseNotes>Akka.NET v1.5.14 is a maintenance release with several bug fixes.
[Streams: Ensure stream are closed on shutdown](https://github.com/akkadotnet/akka.net/pull/6935)
[Akka: Fix PeriodicTimer HashWheelTimerScheduler deadlock during start](https://github.com/akkadotnet/akka.net/pull/6949)
[Cluster: Old version of LeastShardAllocationStrategy is now deprecated](https://github.com/akkadotnet/akka.net/pull/6975)
[Query: Add a more descriptive ToString() values to Offset types](https://github.com/akkadotnet/akka.net/pull/6978)
Package dependency upgrades
[MNTR: Bump Akka.Multinode.TestAdapter to 1.5.13](https://github.com/akkadotnet/akka.net/pull/6926)
[Akka: Bump Polyfill to 1.28](https://github.com/akkadotnet/akka.net/pull/6936)
[Akka: Bump Google.Protobuf to 3.24.4](https://github.com/akkadotnet/akka.net/pull/6951)
[DData: Bump LightningDB to 0.16.0](https://github.com/akkadotnet/akka.net/pull/6960)
[Persistence: Bump Microsoft.Data.SQLite to 7.0.13](https://github.com/akkadotnet/akka.net/pull/6969)
If you want to see the [full set of changes made in Akka.NET v1.5.14, click here](https://github.com/akkadotnet/akka.net/milestone/96?closed=1).
| COMMITS | LOC+ | LOC- | AUTHOR |
|---------|------|------|---------------------|
| 11 | 25 | 21 | dependabot[bot] |
| 3 | 14 | 2 | Aaron Stannard |
| 3 | 114 | 369 | Simon Cropp |
| 2 | 36 | 31 | Gregorius Soedharmo |
| 1 | 41 | 43 | Lehonti Ramos |
| 1 | 38 | 0 | Yaroslav Paslavskiy |
| 1 | 3 | 0 | Sean Killeen |
| 1 | 227 | 25 | Drew |
| 1 | 1 | 1 | szaliszali |</PackageReleaseNotes>
</PropertyGroup>
<!-- SourceLink support for all Akka.NET projects -->
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/benchmark/Akka.Benchmarks/Akka.Benchmarks.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>$(NetTestVersion)</TargetFrameworks>
<TargetFrameworks>$(NetTestVersion);net6.0</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/benchmark/PingPong/PingPong.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>$(NetFrameworkTestVersion);$(NetTestVersion)</TargetFrameworks>
<TargetFrameworks>$(NetFrameworkTestVersion);$(NetTestVersion);net6.0</TargetFrameworks>
<ServerGarbageCollection>true</ServerGarbageCollection>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/benchmark/RemotePingPong/RemotePingPong.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<AssemblyTitle>RemotePingPong</AssemblyTitle>
<AssemblyName>RemotePingPong</AssemblyName>
<Authors>Akka.NET Team</Authors>
<TargetFrameworks>$(NetFrameworkTestVersion);$(NetTestVersion)</TargetFrameworks>
<TargetFrameworks>$(NetFrameworkTestVersion);$(NetTestVersion);net6.0</TargetFrameworks>
<OutputType>Exe</OutputType>
</PropertyGroup>

Expand Down

0 comments on commit c03ff1c

Please sign in to comment.