Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 5 additions & 14 deletions build-system/azure-pipeline.template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
20 changes: 7 additions & 13 deletions build-system/windows-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 6 additions & 0 deletions global.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"sdk": {
"rollForward": "latestMinor",
"version": "8.0.101"
}
}
2 changes: 1 addition & 1 deletion src/Akka.Logger.Serilog/Akka.Logger.Serilog.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>$(NetStandardLibVersion)</TargetFramework>
<TargetFrameworks>$(NetStandardLibVersion);net6.0</TargetFrameworks>
<Description>Serilog logging adapter for Akka.NET.</Description>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageIcon>icon.png</PackageIcon>
Expand Down
9 changes: 4 additions & 5 deletions src/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@
<PackageTags>akka;actors;actor model;Akka;concurrency;serilog</PackageTags>
<Copyright>Copyright © 2013-2023 Akka.NET Team</Copyright>
<Authors>Akka.NET Team</Authors>
<PackageReleaseNotes>[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)</PackageReleaseNotes>
<VersionPrefix>1.5.12</VersionPrefix>
<PackageReleaseNotes>[Update Akka.Hosting to 1.5.12.1](https://github.com/akkadotnet/Akka.Hosting/releases/tag/1.5.12.1)</PackageReleaseNotes>
<VersionPrefix>1.5.12.1</VersionPrefix>
<PackageProjectUrl>https://github.com/akkadotnet/Akka.Logger.Serilog</PackageProjectUrl>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
<NoWarn>$(NoWarn);CS1591</NoWarn>
Expand All @@ -14,7 +13,7 @@
<PropertyGroup>
<AkkaVersion>1.5.22</AkkaVersion>
<AkkaHostingVersion>1.5.13</AkkaHostingVersion>
<NetCoreTestVersion>netcoreapp3.1</NetCoreTestVersion>
<NetCoreTestVersion>net8.0</NetCoreTestVersion>
<NetFrameworkTestVersion>net471</NetFrameworkTestVersion>
<NetStandardLibVersion>netstandard2.0</NetStandardLibVersion>
</PropertyGroup>
Expand All @@ -30,4 +29,4 @@
<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
</ItemGroup>
</Project>
</Project>