diff --git a/build-system/azure-pipeline.template.yaml b/build-system/azure-pipeline.template.yaml index 34caeb8..598858d 100644 --- a/build-system/azure-pipeline.template.yaml +++ b/build-system/azure-pipeline.template.yaml @@ -12,24 +12,15 @@ jobs: pool: vmImage: ${{ parameters.vmImage }} steps: - - task: UseDotNet@2 - displayName: 'Use .NET 7 SDK' - inputs: - version: 7.x - - task: UseDotNet@2 - displayName: 'Use .NET Core Runtime 6' - inputs: - packageType: runtime - version: 6.x - - task: UseDotNet@2 - displayName: 'Use .NET Core Runtime 3' - inputs: - packageType: runtime - version: 3.x - checkout: self # self represents the repo where the initial Pipelines YAML file was found clean: false # whether to fetch clean each time 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 SDK' + inputs: + packageType: sdk + useGlobalJson: true # Linux or macOS - task: Bash@3 displayName: Linux / OSX Build diff --git a/build-system/windows-release.yaml b/build-system/windows-release.yaml index 4a848cf..a57410d 100644 --- a/build-system/windows-release.yaml +++ b/build-system/windows-release.yaml @@ -21,21 +21,15 @@ variables: value: akkadotnet/Akka.Logger.Serilog #replace this steps: +- checkout: self # self represents the repo where the initial Pipelines YAML file was found + clean: false # whether to fetch clean each time + 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.x' + displayName: 'Use .NET SDK' inputs: - version: 7.0.x -- task: UseDotNet@2 - displayName: 'Use .NET Core Runtime 6.0.x' - inputs: - packageType: runtime - version: 6.0.x -- task: UseDotNet@2 - displayName: 'Use .NET Core Runtime 3.1.x' - inputs: - packageType: runtime - version: 3.1.x - + packageType: sdk + useGlobalJson: true - task: BatchScript@1 displayName: 'FAKE Build' inputs: diff --git a/global.json b/global.json new file mode 100644 index 0000000..0cfe4c8 --- /dev/null +++ b/global.json @@ -0,0 +1,6 @@ +{ + "sdk": { + "rollForward": "latestMinor", + "version": "8.0.101" + } +} \ No newline at end of file diff --git a/src/Akka.Logger.Serilog/Akka.Logger.Serilog.csproj b/src/Akka.Logger.Serilog/Akka.Logger.Serilog.csproj index 3efb833..8b7e163 100644 --- a/src/Akka.Logger.Serilog/Akka.Logger.Serilog.csproj +++ b/src/Akka.Logger.Serilog/Akka.Logger.Serilog.csproj @@ -1,6 +1,6 @@  - $(NetStandardLibVersion) + $(NetStandardLibVersion);net6.0 Serilog logging adapter for Akka.NET. true icon.png diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 804c596..e682cdc 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -3,9 +3,8 @@ akka;actors;actor model;Akka;concurrency;serilog Copyright © 2013-2023 Akka.NET Team Akka.NET Team - [Update Akka.NET to 1.5.12](https://github.com/akkadotnet/akka.net/releases/tag/1.5.12) -[Fix Serilog message output bug](https://github.com/akkadotnet/Akka.Logger.Serilog/pull/255) - 1.5.12 + [Update Akka.Hosting to 1.5.12.1](https://github.com/akkadotnet/Akka.Hosting/releases/tag/1.5.12.1) + 1.5.12.1 https://github.com/akkadotnet/Akka.Logger.Serilog Apache-2.0 $(NoWarn);CS1591 @@ -14,7 +13,7 @@ 1.5.22 1.5.13 - netcoreapp3.1 + net8.0 net471 netstandard2.0 @@ -30,4 +29,4 @@ - + \ No newline at end of file