diff --git a/Akka.Logger.Serilog.sln b/Akka.Logger.Serilog.sln index b0f5705..688ba0e 100644 --- a/Akka.Logger.Serilog.sln +++ b/Akka.Logger.Serilog.sln @@ -15,7 +15,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{489D8D37 build.fsx = build.fsx build.ps1 = build.ps1 build.sh = build.sh - src\common.props = src\common.props + src\Directory.Build.props = src\Directory.Build.props + src\Directory.Packages.props = src\Directory.Packages.props EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Examples", "Examples", "{28CDBE4C-053C-4CD4-B5D2-4DF529922916}" diff --git a/build-system/windows-release.yaml b/build-system/windows-release.yaml index b1e1e80..fea33f1 100644 --- a/build-system/windows-release.yaml +++ b/build-system/windows-release.yaml @@ -40,7 +40,7 @@ steps: displayName: 'FAKE Build' inputs: filename: build.cmd - arguments: 'All SignClientUser=$(signingUsername) SignClientSecret=$(signingPassword) nugetpublishurl=https://www.nuget.org/api/v2/package nugetkey=$(nugetKey)' + arguments: 'All SignClientUser=$(signingUsername) SignClientSecret=$(signingPassword) nugetpublishurl=https://api.nuget.org/v3/index.json nugetkey=$(nugetKey)' - task: GitHubRelease@0 displayName: 'GitHub release (create)' diff --git a/build.fsx b/build.fsx index 3a50e82..7d03f00 100644 --- a/build.fsx +++ b/build.fsx @@ -58,8 +58,8 @@ Target "Clean" (fun _ -> ) Target "AssemblyInfo" (fun _ -> - XmlPokeInnerText "./src/common.props" "//Project/PropertyGroup/VersionPrefix" releaseNotes.AssemblyVersion - XmlPokeInnerText "./src/common.props" "//Project/PropertyGroup/PackageReleaseNotes" (releaseNotes.Notes |> String.concat "\n") + XmlPokeInnerText "./src/Directory.Build.props" "//Project/PropertyGroup/VersionPrefix" releaseNotes.AssemblyVersion + XmlPokeInnerText "./src/Directory.Build.props" "//Project/PropertyGroup/PackageReleaseNotes" (releaseNotes.Notes |> String.concat "\n") ) Target "Build" (fun _ -> @@ -203,6 +203,7 @@ Target "CreateNuget" (fun _ -> let projects = !! "src/**/*.csproj" -- "src/**/*Tests.csproj" // Don't publish unit tests -- "src/**/*Tests*.csproj" + -- "src/**/Examples/**/*.csproj" // Don't publish samples let runSingleProject project = DotNetCli.Pack @@ -210,38 +211,40 @@ Target "CreateNuget" (fun _ -> { p with Project = project Configuration = configuration - AdditionalArgs = ["--include-symbols --no-build"] + AdditionalArgs = ["--no-build -p:IncludeSymbols=true -p:SymbolPackageFormat=snupkg"] VersionSuffix = overrideVersionSuffix project - OutputPath = outputNuGet }) + OutputPath = "\"" + outputNuGet + "\"" }) projects |> Seq.iter (runSingleProject) ) Target "PublishNuget" (fun _ -> - let projects = !! "./bin/nuget/*.nupkg" -- "./bin/nuget/*.symbols.nupkg" - let apiKey = getBuildParamOrDefault "nugetkey" "" - let source = getBuildParamOrDefault "nugetpublishurl" "" - let symbolSource = getBuildParamOrDefault "symbolspublishurl" "" - let shouldPublishSymbolsPackages = not (symbolSource = "") - - if (not (source = "") && not (apiKey = "") && shouldPublishSymbolsPackages) then - let runSingleProject project = - DotNetCli.RunCommand - (fun p -> - { p with - TimeOut = TimeSpan.FromMinutes 10. }) - (sprintf "nuget push %s --api-key %s --source %s --symbol-source %s" project apiKey source symbolSource) - - projects |> Seq.iter (runSingleProject) - else if (not (source = "") && not (apiKey = "") && not shouldPublishSymbolsPackages) then - let runSingleProject project = - DotNetCli.RunCommand - (fun p -> - { p with - TimeOut = TimeSpan.FromMinutes 10. }) - (sprintf "nuget push %s --api-key %s --source %s" project apiKey source) - - projects |> Seq.iter (runSingleProject) + let shouldPushNugetPackages = hasBuildParam "nugetkey" + if not shouldPushNugetPackages then () + else + let apiKey = getBuildParam "nugetkey" + let sourceUrl = getBuildParamOrDefault "nugetpublishurl" "https://api.nuget.org/v3/index.json" + + let rec publishPackage retryLeft packageFile = + tracefn "Pushing %s Attempts left: %d" (FullName packageFile) retryLeft + let tracing = ProcessHelper.enableProcessTracing + try + try + ProcessHelper.enableProcessTracing <- false + DotNetCli.RunCommand + (fun p -> + { p with + TimeOut = TimeSpan.FromMinutes 10. }) + (sprintf "nuget push %s --api-key %s --source %s --no-service-endpoint" packageFile apiKey sourceUrl) + with exn -> + if (retryLeft > 0) then (publishPackage (retryLeft-1) packageFile) + finally + ProcessHelper.enableProcessTracing <- tracing + + printfn "Pushing nuget packages" + let normalPackages = !! (outputNuGet @@ "*.nupkg") |> Seq.sortBy(fun x -> x.ToLower()) + for package in normalPackages do + publishPackage 3 package ) //-------------------------------------------------------------------------------- diff --git a/docs/images/icon.png b/docs/images/icon.png index 86698cd..c0f0ca9 100644 Binary files a/docs/images/icon.png and b/docs/images/icon.png differ diff --git a/src/Akka.Logger.Serilog.Tests.Performance/Akka.Logger.Serilog.Tests.Performance.csproj b/src/Akka.Logger.Serilog.Tests.Performance/Akka.Logger.Serilog.Tests.Performance.csproj index 8ceb0e1..3a8fdd6 100644 --- a/src/Akka.Logger.Serilog.Tests.Performance/Akka.Logger.Serilog.Tests.Performance.csproj +++ b/src/Akka.Logger.Serilog.Tests.Performance/Akka.Logger.Serilog.Tests.Performance.csproj @@ -1,7 +1,4 @@  - - - Exe false diff --git a/src/Akka.Logger.Serilog.Tests/Akka.Logger.Serilog.Tests.csproj b/src/Akka.Logger.Serilog.Tests/Akka.Logger.Serilog.Tests.csproj index dccb8a7..7fd6bec 100644 --- a/src/Akka.Logger.Serilog.Tests/Akka.Logger.Serilog.Tests.csproj +++ b/src/Akka.Logger.Serilog.Tests/Akka.Logger.Serilog.Tests.csproj @@ -1,20 +1,19 @@ - - $(NetFrameworkTestVersion);$(NetCoreTestVersion) Exe Akka.Logger.Serilog.Tests.Generator.Program + false - - - - - - - + + + + + + + diff --git a/src/Akka.Logger.Serilog.Tests/Generator/Program.cs b/src/Akka.Logger.Serilog.Tests/Generator/Program.cs index 95ba130..10f722b 100644 --- a/src/Akka.Logger.Serilog.Tests/Generator/Program.cs +++ b/src/Akka.Logger.Serilog.Tests/Generator/Program.cs @@ -21,7 +21,7 @@ public static async Task Main(string[] args) var sink = new TestSink(); Log.Logger = new LoggerConfiguration() - .WriteTo.ColoredConsole() + .WriteTo.Console() .WriteTo.Sink(sink) .MinimumLevel.Debug() .CreateLogger(); diff --git a/src/Akka.Logger.Serilog.Tests/SerilogFormattingSpecs.cs b/src/Akka.Logger.Serilog.Tests/SerilogFormattingSpecs.cs index 84ffc02..0f8ee05 100644 --- a/src/Akka.Logger.Serilog.Tests/SerilogFormattingSpecs.cs +++ b/src/Akka.Logger.Serilog.Tests/SerilogFormattingSpecs.cs @@ -33,7 +33,7 @@ public SerilogFormattingSpecs(ITestOutputHelper helper) : base(Config, output: h _serilogLogger = new LoggerConfiguration() .WriteTo.Sink(_sink) - .WriteTo.ColoredConsole() + .WriteTo.Console() .MinimumLevel.Information() .CreateLogger(); diff --git a/src/Akka.Logger.Serilog/Akka.Logger.Serilog.csproj b/src/Akka.Logger.Serilog/Akka.Logger.Serilog.csproj index 6c2cb4b..3efb833 100644 --- a/src/Akka.Logger.Serilog/Akka.Logger.Serilog.csproj +++ b/src/Akka.Logger.Serilog/Akka.Logger.Serilog.csproj @@ -1,16 +1,20 @@  - - - $(NetStandardLibVersion) Serilog logging adapter for Akka.NET. true + icon.png + README.md - - + + + + + + + \ No newline at end of file diff --git a/src/common.props b/src/Directory.Build.props similarity index 62% rename from src/common.props rename to src/Directory.Build.props index 843e36f..6ce25d2 100644 --- a/src/common.props +++ b/src/Directory.Build.props @@ -1,22 +1,19 @@ akka;actors;actor model;Akka;concurrency;serilog - Copyright © 2013-2021 Akka.NET Team + Copyright © 2013-2023 Akka.NET Team Akka.NET Team - Updated to [Akka.NET v1.5.0-beta5](https://github.com/akkadotnet/akka.net/releases/tag/1.5.0-beta5) - 1.5.0 - http://getakka.net/images/akkalogo.png + [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 https://github.com/akkadotnet/Akka.Logger.Serilog - https://github.com/akkadotnet/Akka.Logger.Serilog/blob/master/LICENSE + Apache-2.0 $(NoWarn);CS1591 10 - 2.5.0 - 2.5.0 - 17.7.2 - 2.0.1 1.5.12 + 1.5.12.1 netcoreapp3.1 net471 netstandard2.0 @@ -31,6 +28,6 @@ snupkg - + \ No newline at end of file diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props new file mode 100644 index 0000000..5227b9a --- /dev/null +++ b/src/Directory.Packages.props @@ -0,0 +1,28 @@ + + + true + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Examples/Akka.Hosting.LoggingDemo/Akka.Hosting.LoggingDemo.csproj b/src/Examples/Akka.Hosting.LoggingDemo/Akka.Hosting.LoggingDemo.csproj index 6c16d5b..08aad03 100644 --- a/src/Examples/Akka.Hosting.LoggingDemo/Akka.Hosting.LoggingDemo.csproj +++ b/src/Examples/Akka.Hosting.LoggingDemo/Akka.Hosting.LoggingDemo.csproj @@ -7,9 +7,9 @@ - - - + + +