Skip to content

Commit 1d6d815

Browse files
upgraded to use global.json for setting .NET runtime versions (#287)
* upgraded to use `global.json` for setting .NET runtime versions * added dual targeting for .NET 6
1 parent 80152d9 commit 1d6d815

File tree

5 files changed

+23
-33
lines changed

5 files changed

+23
-33
lines changed

build-system/azure-pipeline.template.yaml

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,24 +12,15 @@ jobs:
1212
pool:
1313
vmImage: ${{ parameters.vmImage }}
1414
steps:
15-
- task: UseDotNet@2
16-
displayName: 'Use .NET 7 SDK'
17-
inputs:
18-
version: 7.x
19-
- task: UseDotNet@2
20-
displayName: 'Use .NET Core Runtime 6'
21-
inputs:
22-
packageType: runtime
23-
version: 6.x
24-
- task: UseDotNet@2
25-
displayName: 'Use .NET Core Runtime 3'
26-
inputs:
27-
packageType: runtime
28-
version: 3.x
2915
- checkout: self # self represents the repo where the initial Pipelines YAML file was found
3016
clean: false # whether to fetch clean each time
3117
submodules: recursive # set to 'true' for a single level of submodules or 'recursive' to get submodules of submodules
3218
persistCredentials: true
19+
- task: UseDotNet@2
20+
displayName: 'Use .NET SDK'
21+
inputs:
22+
packageType: sdk
23+
useGlobalJson: true
3324
# Linux or macOS
3425
- task: Bash@3
3526
displayName: Linux / OSX Build

build-system/windows-release.yaml

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,21 +21,15 @@ variables:
2121
value: akkadotnet/Akka.Logger.Serilog #replace this
2222

2323
steps:
24+
- checkout: self # self represents the repo where the initial Pipelines YAML file was found
25+
clean: false # whether to fetch clean each time
26+
submodules: recursive # set to 'true' for a single level of submodules or 'recursive' to get submodules of submodules
27+
persistCredentials: true
2428
- task: UseDotNet@2
25-
displayName: 'Use .NET 7 SDK 7.0.x'
29+
displayName: 'Use .NET SDK'
2630
inputs:
27-
version: 7.0.x
28-
- task: UseDotNet@2
29-
displayName: 'Use .NET Core Runtime 6.0.x'
30-
inputs:
31-
packageType: runtime
32-
version: 6.0.x
33-
- task: UseDotNet@2
34-
displayName: 'Use .NET Core Runtime 3.1.x'
35-
inputs:
36-
packageType: runtime
37-
version: 3.1.x
38-
31+
packageType: sdk
32+
useGlobalJson: true
3933
- task: BatchScript@1
4034
displayName: 'FAKE Build'
4135
inputs:

global.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"sdk": {
3+
"rollForward": "latestMinor",
4+
"version": "8.0.101"
5+
}
6+
}

src/Akka.Logger.Serilog/Akka.Logger.Serilog.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-
<TargetFramework>$(NetStandardLibVersion)</TargetFramework>
3+
<TargetFrameworks>$(NetStandardLibVersion);net6.0</TargetFrameworks>
44
<Description>Serilog logging adapter for Akka.NET.</Description>
55
<GenerateDocumentationFile>true</GenerateDocumentationFile>
66
<PackageIcon>icon.png</PackageIcon>

src/Directory.Build.props

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33
<PackageTags>akka;actors;actor model;Akka;concurrency;serilog</PackageTags>
44
<Copyright>Copyright © 2013-2023 Akka.NET Team</Copyright>
55
<Authors>Akka.NET Team</Authors>
6-
<PackageReleaseNotes>[Update Akka.NET to 1.5.12](https://github.com/akkadotnet/akka.net/releases/tag/1.5.12)
7-
[Fix Serilog message output bug](https://github.com/akkadotnet/Akka.Logger.Serilog/pull/255)</PackageReleaseNotes>
8-
<VersionPrefix>1.5.12</VersionPrefix>
6+
<PackageReleaseNotes>[Update Akka.Hosting to 1.5.12.1](https://github.com/akkadotnet/Akka.Hosting/releases/tag/1.5.12.1)</PackageReleaseNotes>
7+
<VersionPrefix>1.5.12.1</VersionPrefix>
98
<PackageProjectUrl>https://github.com/akkadotnet/Akka.Logger.Serilog</PackageProjectUrl>
109
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
1110
<NoWarn>$(NoWarn);CS1591</NoWarn>
@@ -14,7 +13,7 @@
1413
<PropertyGroup>
1514
<AkkaVersion>1.5.22</AkkaVersion>
1615
<AkkaHostingVersion>1.5.13</AkkaHostingVersion>
17-
<NetCoreTestVersion>netcoreapp3.1</NetCoreTestVersion>
16+
<NetCoreTestVersion>net8.0</NetCoreTestVersion>
1817
<NetFrameworkTestVersion>net471</NetFrameworkTestVersion>
1918
<NetStandardLibVersion>netstandard2.0</NetStandardLibVersion>
2019
</PropertyGroup>
@@ -30,4 +29,4 @@
3029
<ItemGroup>
3130
<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
3231
</ItemGroup>
33-
</Project>
32+
</Project>

0 commit comments

Comments
 (0)