Skip to content

Commit 1972ce2

Browse files
ArkatufusArkatufus
authored
Modernize solution, fix package symbol upload (#261)
1 parent 4ac3e16 commit 1972ce2

File tree

12 files changed

+91
-62
lines changed

12 files changed

+91
-62
lines changed

‎Akka.Logger.Serilog.sln‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{489D8D37
1515
build.fsx = build.fsx
1616
build.ps1 = build.ps1
1717
build.sh = build.sh
18-
src\common.props = src\common.props
18+
src\Directory.Build.props = src\Directory.Build.props
19+
src\Directory.Packages.props = src\Directory.Packages.props
1920
EndProjectSection
2021
EndProject
2122
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Examples", "Examples", "{28CDBE4C-053C-4CD4-B5D2-4DF529922916}"

‎build-system/windows-release.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ steps:
4040
displayName: 'FAKE Build'
4141
inputs:
4242
filename: build.cmd
43-
arguments: 'All SignClientUser=$(signingUsername) SignClientSecret=$(signingPassword) nugetpublishurl=https://www.nuget.org/api/v2/package nugetkey=$(nugetKey)'
43+
arguments: 'All SignClientUser=$(signingUsername) SignClientSecret=$(signingPassword) nugetpublishurl=https://api.nuget.org/v3/index.json nugetkey=$(nugetKey)'
4444

4545
- task: GitHubRelease@0
4646
displayName: 'GitHub release (create)'

‎build.fsx‎

Lines changed: 31 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ Target "Clean" (fun _ ->
5858
)
5959

6060
Target "AssemblyInfo" (fun _ ->
61-
XmlPokeInnerText "./src/common.props" "//Project/PropertyGroup/VersionPrefix" releaseNotes.AssemblyVersion
62-
XmlPokeInnerText "./src/common.props" "//Project/PropertyGroup/PackageReleaseNotes" (releaseNotes.Notes |> String.concat "\n")
61+
XmlPokeInnerText "./src/Directory.Build.props" "//Project/PropertyGroup/VersionPrefix" releaseNotes.AssemblyVersion
62+
XmlPokeInnerText "./src/Directory.Build.props" "//Project/PropertyGroup/PackageReleaseNotes" (releaseNotes.Notes |> String.concat "\n")
6363
)
6464

6565
Target "Build" (fun _ ->
@@ -203,45 +203,48 @@ Target "CreateNuget" (fun _ ->
203203
let projects = !! "src/**/*.csproj"
204204
-- "src/**/*Tests.csproj" // Don't publish unit tests
205205
-- "src/**/*Tests*.csproj"
206+
-- "src/**/Examples/**/*.csproj" // Don't publish samples
206207

207208
let runSingleProject project =
208209
DotNetCli.Pack
209210
(fun p ->
210211
{ p with
211212
Project = project
212213
Configuration = configuration
213-
AdditionalArgs = ["--include-symbols --no-build"]
214+
AdditionalArgs = ["--no-build -p:IncludeSymbols=true -p:SymbolPackageFormat=snupkg"]
214215
VersionSuffix = overrideVersionSuffix project
215-
OutputPath = outputNuGet })
216+
OutputPath = "\"" + outputNuGet + "\"" })
216217

217218
projects |> Seq.iter (runSingleProject)
218219
)
219220

220221
Target "PublishNuget" (fun _ ->
221-
let projects = !! "./bin/nuget/*.nupkg" -- "./bin/nuget/*.symbols.nupkg"
222-
let apiKey = getBuildParamOrDefault "nugetkey" ""
223-
let source = getBuildParamOrDefault "nugetpublishurl" ""
224-
let symbolSource = getBuildParamOrDefault "symbolspublishurl" ""
225-
let shouldPublishSymbolsPackages = not (symbolSource = "")
226-
227-
if (not (source = "") && not (apiKey = "") && shouldPublishSymbolsPackages) then
228-
let runSingleProject project =
229-
DotNetCli.RunCommand
230-
(fun p ->
231-
{ p with
232-
TimeOut = TimeSpan.FromMinutes 10. })
233-
(sprintf "nuget push %s --api-key %s --source %s --symbol-source %s" project apiKey source symbolSource)
234-
235-
projects |> Seq.iter (runSingleProject)
236-
else if (not (source = "") && not (apiKey = "") && not shouldPublishSymbolsPackages) then
237-
let runSingleProject project =
238-
DotNetCli.RunCommand
239-
(fun p ->
240-
{ p with
241-
TimeOut = TimeSpan.FromMinutes 10. })
242-
(sprintf "nuget push %s --api-key %s --source %s" project apiKey source)
243-
244-
projects |> Seq.iter (runSingleProject)
222+
let shouldPushNugetPackages = hasBuildParam "nugetkey"
223+
if not shouldPushNugetPackages then ()
224+
else
225+
let apiKey = getBuildParam "nugetkey"
226+
let sourceUrl = getBuildParamOrDefault "nugetpublishurl" "https://api.nuget.org/v3/index.json"
227+
228+
let rec publishPackage retryLeft packageFile =
229+
tracefn "Pushing %s Attempts left: %d" (FullName packageFile) retryLeft
230+
let tracing = ProcessHelper.enableProcessTracing
231+
try
232+
try
233+
ProcessHelper.enableProcessTracing <- false
234+
DotNetCli.RunCommand
235+
(fun p ->
236+
{ p with
237+
TimeOut = TimeSpan.FromMinutes 10. })
238+
(sprintf "nuget push %s --api-key %s --source %s --no-service-endpoint" packageFile apiKey sourceUrl)
239+
with exn ->
240+
if (retryLeft > 0) then (publishPackage (retryLeft-1) packageFile)
241+
finally
242+
ProcessHelper.enableProcessTracing <- tracing
243+
244+
printfn "Pushing nuget packages"
245+
let normalPackages = !! (outputNuGet @@ "*.nupkg") |> Seq.sortBy(fun x -> x.ToLower())
246+
for package in normalPackages do
247+
publishPackage 3 package
245248
)
246249

247250
//--------------------------------------------------------------------------------

‎docs/images/icon.png‎

6.93 KB
Loading

‎src/Akka.Logger.Serilog.Tests.Performance/Akka.Logger.Serilog.Tests.Performance.csproj‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<Import Project="..\common.props" />
3-
4-
52
<PropertyGroup>
63
<OutputType>Exe</OutputType>
74
<IsPackable>false</IsPackable>

‎src/Akka.Logger.Serilog.Tests/Akka.Logger.Serilog.Tests.csproj‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<Import Project="..\common.props" />
3-
42
<PropertyGroup>
53
<TargetFrameworks>$(NetFrameworkTestVersion);$(NetCoreTestVersion)</TargetFrameworks>
64
<OutputType>Exe</OutputType>
75
<StartupObject>Akka.Logger.Serilog.Tests.Generator.Program</StartupObject>
6+
<IsPackable>false</IsPackable>
87
</PropertyGroup>
98

109
<ItemGroup>
11-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
12-
<PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVersion)" />
13-
<PackageReference Include="xunit" Version="$(XunitVersion)" />
14-
<PackageReference Include="Akka.TestKit.Xunit2" Version="$(AkkaVersion)" />
15-
<PackageReference Include="Akka.Cluster" Version="$(AkkaVersion)" />
16-
<PackageReference Include="FluentAssertions" Version="6.12.0" />
17-
<PackageReference Include="Serilog.Sinks.ColoredConsole" Version="3.0.1" />
10+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
11+
<PackageReference Include="xunit.runner.visualstudio" />
12+
<PackageReference Include="xunit" />
13+
<PackageReference Include="Akka.TestKit.Xunit2" />
14+
<PackageReference Include="Akka.Cluster" />
15+
<PackageReference Include="FluentAssertions" />
16+
<PackageReference Include="Serilog.Sinks.Console" />
1817
</ItemGroup>
1918

2019
<ItemGroup>

‎src/Akka.Logger.Serilog.Tests/Generator/Program.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public static async Task Main(string[] args)
2121

2222
var sink = new TestSink();
2323
Log.Logger = new LoggerConfiguration()
24-
.WriteTo.ColoredConsole()
24+
.WriteTo.Console()
2525
.WriteTo.Sink(sink)
2626
.MinimumLevel.Debug()
2727
.CreateLogger();

‎src/Akka.Logger.Serilog.Tests/SerilogFormattingSpecs.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public SerilogFormattingSpecs(ITestOutputHelper helper) : base(Config, output: h
3333

3434
_serilogLogger = new LoggerConfiguration()
3535
.WriteTo.Sink(_sink)
36-
.WriteTo.ColoredConsole()
36+
.WriteTo.Console()
3737
.MinimumLevel.Information()
3838
.CreateLogger();
3939

‎src/Akka.Logger.Serilog/Akka.Logger.Serilog.csproj‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,20 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<Import Project="..\common.props" />
3-
4-
52
<PropertyGroup>
63
<TargetFramework>$(NetStandardLibVersion)</TargetFramework>
74
<Description>Serilog logging adapter for Akka.NET.</Description>
85
<GenerateDocumentationFile>true</GenerateDocumentationFile>
6+
<PackageIcon>icon.png</PackageIcon>
7+
<PackageReadmeFile>README.md</PackageReadmeFile>
98
</PropertyGroup>
109

1110
<ItemGroup>
12-
<PackageReference Include="Serilog" Version="2.12.0" />
13-
<PackageReference Include="Akka" Version="$(AkkaVersion)" />
11+
<PackageReference Include="Serilog" />
12+
<PackageReference Include="Akka" />
1413
</ItemGroup>
1514

15+
<ItemGroup>
16+
<None Include="../../README.md" Pack="true" PackagePath="\" />
17+
<None Include="../../docs/images/icon.png" Pack="true" PackagePath="\" />
18+
</ItemGroup>
19+
1620
</Project>

‎src/common.props‎ renamed to ‎src/Directory.Build.props‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,19 @@
11
<Project>
22
<PropertyGroup>
33
<PackageTags>akka;actors;actor model;Akka;concurrency;serilog</PackageTags>
4-
<Copyright>Copyright © 2013-2021 Akka.NET Team</Copyright>
4+
<Copyright>Copyright © 2013-2023 Akka.NET Team</Copyright>
55
<Authors>Akka.NET Team</Authors>
6-
<PackageReleaseNotes>Updated to [Akka.NET v1.5.0-beta5](https://github.com/akkadotnet/akka.net/releases/tag/1.5.0-beta5)</PackageReleaseNotes>
7-
<VersionPrefix>1.5.0</VersionPrefix>
8-
<PackageIconUrl>http://getakka.net/images/akkalogo.png</PackageIconUrl>
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>
99
<PackageProjectUrl>https://github.com/akkadotnet/Akka.Logger.Serilog</PackageProjectUrl>
10-
<PackageLicenseUrl>https://github.com/akkadotnet/Akka.Logger.Serilog/blob/master/LICENSE</PackageLicenseUrl>
10+
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
1111
<NoWarn>$(NoWarn);CS1591</NoWarn>
1212
<LangVersion>10</LangVersion>
1313
</PropertyGroup>
1414
<PropertyGroup>
15-
<XunitVersion>2.5.0</XunitVersion>
16-
<XunitRunnerVersion>2.5.0</XunitRunnerVersion>
17-
<TestSdkVersion>17.7.2</TestSdkVersion>
18-
<NBenchVersion>2.0.1</NBenchVersion>
1915
<AkkaVersion>1.5.12</AkkaVersion>
16+
<AkkaHostingVersion>1.5.12.1</AkkaHostingVersion>
2017
<NetCoreTestVersion>netcoreapp3.1</NetCoreTestVersion>
2118
<NetFrameworkTestVersion>net471</NetFrameworkTestVersion>
2219
<NetStandardLibVersion>netstandard2.0</NetStandardLibVersion>
@@ -31,6 +28,6 @@
3128
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
3229
</PropertyGroup>
3330
<ItemGroup>
34-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
31+
<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
3532
</ItemGroup>
3633
</Project>

0 commit comments

Comments
 (0)