From 15e83eea13b3d2563ed70f8a78ddc044e83fa636 Mon Sep 17 00:00:00 2001 From: Aaron Stannard Date: Tue, 4 Jun 2024 14:40:06 -0500 Subject: [PATCH 1/4] upgraded to use `global.json` for setting .NET runtime versions --- build-system/azure-pipeline.template.yaml | 14 ++------------ build-system/windows-release.yaml | 15 ++------------- global.json | 6 ++++++ src/Directory.Build.props | 2 +- 4 files changed, 11 insertions(+), 26 deletions(-) create mode 100644 global.json diff --git a/build-system/azure-pipeline.template.yaml b/build-system/azure-pipeline.template.yaml index 34caeb8..6fa9034 100644 --- a/build-system/azure-pipeline.template.yaml +++ b/build-system/azure-pipeline.template.yaml @@ -13,19 +13,9 @@ jobs: vmImage: ${{ parameters.vmImage }} steps: - task: UseDotNet@2 - displayName: 'Use .NET 7 SDK' + displayName: 'Use .NET 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 + useGlobalJson: true - 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 diff --git a/build-system/windows-release.yaml b/build-system/windows-release.yaml index 4a848cf..32f4498 100644 --- a/build-system/windows-release.yaml +++ b/build-system/windows-release.yaml @@ -22,20 +22,9 @@ variables: steps: - 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 - + 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/Directory.Build.props b/src/Directory.Build.props index 804c596..58a5f78 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -14,7 +14,7 @@ 1.5.22 1.5.13 - netcoreapp3.1 + net8.0 net471 netstandard2.0 From 8f01c9ca3cc4118f8a585c80255731e5647eaea0 Mon Sep 17 00:00:00 2001 From: Aaron Stannard Date: Tue, 4 Jun 2024 14:41:11 -0500 Subject: [PATCH 2/4] added dual targeting for .NET 6 --- src/Akka.Logger.Serilog/Akka.Logger.Serilog.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From fa1c29b022e396bee5a4aa58600c828e29086919 Mon Sep 17 00:00:00 2001 From: Aaron Stannard Date: Tue, 4 Jun 2024 14:47:27 -0500 Subject: [PATCH 3/4] fixed AZDO yaml --- build-system/azure-pipeline.template.yaml | 1 + build-system/windows-release.yaml | 1 + src/Directory.Build.props | 7 +++---- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/build-system/azure-pipeline.template.yaml b/build-system/azure-pipeline.template.yaml index 6fa9034..6144f2a 100644 --- a/build-system/azure-pipeline.template.yaml +++ b/build-system/azure-pipeline.template.yaml @@ -15,6 +15,7 @@ jobs: - task: UseDotNet@2 displayName: 'Use .NET SDK' inputs: + packageType: sdk useGlobalJson: true - checkout: self # self represents the repo where the initial Pipelines YAML file was found clean: false # whether to fetch clean each time diff --git a/build-system/windows-release.yaml b/build-system/windows-release.yaml index 32f4498..8e5d8fa 100644 --- a/build-system/windows-release.yaml +++ b/build-system/windows-release.yaml @@ -24,6 +24,7 @@ steps: - task: UseDotNet@2 displayName: 'Use .NET SDK' inputs: + packageType: sdk useGlobalJson: true - task: BatchScript@1 displayName: 'FAKE Build' diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 58a5f78..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 @@ -30,4 +29,4 @@ - + \ No newline at end of file From dad79bcb01ee97f2dd02fe1479d46c738e1e8412 Mon Sep 17 00:00:00 2001 From: Aaron Stannard Date: Tue, 4 Jun 2024 14:53:44 -0500 Subject: [PATCH 4/4] have to checkout first before we can use `global.json` --- build-system/azure-pipeline.template.yaml | 8 ++++---- build-system/windows-release.yaml | 4 ++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/build-system/azure-pipeline.template.yaml b/build-system/azure-pipeline.template.yaml index 6144f2a..598858d 100644 --- a/build-system/azure-pipeline.template.yaml +++ b/build-system/azure-pipeline.template.yaml @@ -12,15 +12,15 @@ jobs: pool: vmImage: ${{ parameters.vmImage }} 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 SDK' inputs: packageType: sdk useGlobalJson: true - - 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 # 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 8e5d8fa..a57410d 100644 --- a/build-system/windows-release.yaml +++ b/build-system/windows-release.yaml @@ -21,6 +21,10 @@ 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 SDK' inputs: