Export symbol packages (#325)

akkadotnet · Sep 25, 2023 · 81c129d · 81c129d
1 parent fd67772
commit 81c129d
Show file tree

Hide file tree

Showing 14 changed files with 82 additions and 97 deletions.
diff --git a/Akka.Persistence.Sql.sln b/Akka.Persistence.Sql.sln
@@ -3,14 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.4.33110.190
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{79D71264-186B-4F62-8930-35DD9ECCAF3B}"
-	ProjectSection(SolutionItems) = preProject
-		build.cmd = build.cmd
-		build.fsx = build.fsx
-		build.ps1 = build.ps1
-		build.sh = build.sh
-	EndProjectSection
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Akka.Persistence.Sql.Tests", "src\Akka.Persistence.Sql.Tests\Akka.Persistence.Sql.Tests.csproj", "{6EA372D5-DB48-48E7-839A-2E9D18D6CE79}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Akka.Persistence.Sql", "src\Akka.Persistence.Sql\Akka.Persistence.Sql.csproj", "{D10C2941-AD62-4E17-8C2C-4917D4C82B07}"
@@ -25,6 +17,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_", "_", "{20C26B2D-59EA-42
 		serve-docs.ps1 = serve-docs.ps1
 		src\Directory.Build.props = src\Directory.Build.props
 		src\Directory.Packages.props = src\Directory.Packages.props
+		build.cmd = build.cmd
+		build.fsx = build.fsx
+		build.ps1 = build.ps1
+		build.sh = build.sh
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build-system", "build-system", "{7537908B-6A42-4E34-889F-6004A97D4987}"
@@ -144,7 +140,6 @@ Global
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{6AE959E1-440C-4407-B080-64B1018A96A3} = {3E392F73-EB03-4148-BC60-A1F734486190}
-		{7537908B-6A42-4E34-889F-6004A97D4987} = {79D71264-186B-4F62-8930-35DD9ECCAF3B}
 		{7B03FDD2-45CC-4F83-B23F-66B4EE82437A} = {C59D2898-1994-4C40-B152-1798060051ED}
 		{FD78AE77-C95F-4D5D-90EC-923935BAC580} = {C59D2898-1994-4C40-B152-1798060051ED}
 		{CFDAF69C-0E6F-48A4-8434-995090175EAD} = {C4AC49FF-9ECF-4D38-A201-1105BBF7E628}
@@ -153,6 +148,7 @@ Global
 		{4ACEF3FD-F5B4-4C07-B85A-AD4D6AB68F4D} = {C59D2898-1994-4C40-B152-1798060051ED}
 		{1BE5B28E-0AB1-44BC-A5E8-5D352B42ACCF} = {3E392F73-EB03-4148-BC60-A1F734486190}
 		{043A8917-5931-40FC-A093-21BB0AB56875} = {42F8143A-03CA-41DA-B24D-33193ABB252C}
+		{7537908B-6A42-4E34-889F-6004A97D4987} = {20C26B2D-59EA-421C-9F64-BFFCE3D96260}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {B99E6BB8-642A-4A68-86DF-69567CBA700A}

diff --git a/build-system/windows-release.yaml b/build-system/windows-release.yaml
@@ -29,7 +29,7 @@ steps:
   displayName: 'FAKE Build'
   inputs:
     filename: build.cmd
-    arguments: 'nuget nugetpublishurl=https://www.nuget.org/api/v2/package nugetkey=$(nugetKey)'
+    arguments: 'nuget 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
@@ -162,21 +162,32 @@ Target "CreateNuget" (fun _ ->
 )
 
 Target "PublishNuget" (fun _ ->
-    let projects = !! "./bin/nuget/*.nupkg"
-    let apiKey = getBuildParamOrDefault "nugetkey" ""
-    let source = getBuildParamOrDefault "nugetpublishurl" ""
-    let symbolSource = source
-    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" 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
diff --git a/...istence.Sql.Data.Compatibility.Tests/Akka.Persistence.Sql.Data.Compatibility.Tests.csproj b/...istence.Sql.Data.Compatibility.Tests/Akka.Persistence.Sql.Data.Compatibility.Tests.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>$(NetCoreTestVersion)</TargetFramework>
-    <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 

diff --git a/src/Akka.Persistence.Sql.HelperLib/Akka.Persistence.Sql.HelperLib.csproj b/src/Akka.Persistence.Sql.HelperLib/Akka.Persistence.Sql.HelperLib.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetStandardLibVersion)</TargetFrameworks>
+    <TargetFramework>$(NetStandardLibVersion)</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 

diff --git a/src/Akka.Persistence.Sql.Hosting.Tests/Akka.Persistence.Sql.Hosting.Tests.csproj b/src/Akka.Persistence.Sql.Hosting.Tests/Akka.Persistence.Sql.Hosting.Tests.csproj
@@ -3,8 +3,6 @@
     <PropertyGroup>
         <TargetFramework>$(NetCoreTestVersion)</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
-
         <IsPackable>false</IsPackable>
     </PropertyGroup>
 
@@ -15,8 +13,14 @@
         <PackageReference Include="FluentAssertions" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" />
         <PackageReference Include="xunit" />
-        <PackageReference Include="xunit.runner.visualstudio" />
-        <PackageReference Include="coverlet.collector" />
+        <PackageReference Include="xunit.runner.visualstudio">
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+            <PrivateAssets>all</PrivateAssets>
+        </PackageReference>
+        <PackageReference Include="coverlet.collector">
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+            <PrivateAssets>all</PrivateAssets>
+        </PackageReference>
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/Akka.Persistence.Sql.Hosting/Akka.Persistence.Sql.Hosting.csproj b/src/Akka.Persistence.Sql.Hosting/Akka.Persistence.Sql.Hosting.csproj
@@ -2,7 +2,6 @@
 
     <PropertyGroup>
         <TargetFramework>$(NetStandardLibVersion)</TargetFramework>
-        <Nullable>enable</Nullable>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/src/Akka.Persistence.Sql.TagTableMigration/Akka.Persistence.Sql.TagTableMigration.csproj b/src/Akka.Persistence.Sql.TagTableMigration/Akka.Persistence.Sql.TagTableMigration.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <TargetFramework>$(NetCoreTestVersion)</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 

diff --git a/src/Akka.Persistence.Sql.Tests.Common/Akka.Persistence.Sql.Tests.Common.csproj b/src/Akka.Persistence.Sql.Tests.Common/Akka.Persistence.Sql.Tests.Common.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <TargetFramework>$(NetCoreTestVersion)</TargetFramework>
     <IsPackable>false</IsPackable>
-    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Akka.Persistence.Sql/Akka.Persistence.Sql.csproj b/src/Akka.Persistence.Sql/Akka.Persistence.Sql.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Description>An Akka Persistence Module for SQL Databases using Linq2Db.</Description>
-    <TargetFrameworks>$(NetStandardLibVersion)</TargetFrameworks>
+    <TargetFramework>$(NetStandardLibVersion)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -4,62 +4,30 @@
   <PropertyGroup>
     <Copyright>Copyright © 2013-2023 Akka.NET Team</Copyright>
     <Authors>Akka.NET Team</Authors>
-    <PackageIcon>akkalogo.png</PackageIcon>
-    <PackageProjectUrl>https://github.com/akkadotnet/Akka.Persistence.Sql</PackageProjectUrl>
-    <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
-    <PackageReadmeFile>README.md</PackageReadmeFile>
-    <PackageTags>akka;actors;actor model;Akka;concurrency;persistence;sql</PackageTags>
   </PropertyGroup>
 
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
+    <Nullable>enable</Nullable>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
   </PropertyGroup>
 
   <PropertyGroup>
     <NetStandardLibVersion>netstandard2.0</NetStandardLibVersion>
     <NetCoreTestVersion>net7.0</NetCoreTestVersion>
-
-    <AkkaVersion>1.5.13</AkkaVersion>
-    <AkkaHostingVersion>1.5.12.1</AkkaHostingVersion>
-
-    <Linq2DbVersion>5.1.1</Linq2DbVersion>
-    <LanguageExtVersion>4.4.4</LanguageExtVersion>
-    <FluentMigratorVersion>3.3.2</FluentMigratorVersion>
-
-    <AkkaSqlServerVersion>1.5.4</AkkaSqlServerVersion>
-    <SqlClientVersion>5.1.1</SqlClientVersion>
-    <SqlManagementObjectsVersion>170.13.0</SqlManagementObjectsVersion>
-
-    <AkkaSqliteVersion>1.5.13</AkkaSqliteVersion>
-    <SqliteVersion>1.0.117</SqliteVersion>
-    <MicrosoftSqliteVersion>7.0.11</MicrosoftSqliteVersion>
-
-    <AkkaPostgreSqlVersion>1.5.4.1</AkkaPostgreSqlVersion>
-    <PostgreSqlVersion>7.0.6</PostgreSqlVersion>
-
-    <AkkaMySqlVersion>1.5.4.1</AkkaMySqlVersion>
-    <MySqlVersion>8.1.0</MySqlVersion>
-
-    <AkkaRedisVersion>1.5.0</AkkaRedisVersion>
-    <RedisInsideVersion>3.3.0</RedisInsideVersion>
-
-    <TestSdkVersion>17.7.2</TestSdkVersion>
-    <BenchmarkDotNetVersion>0.13.8</BenchmarkDotNetVersion>
-    <DockerDotNetVersion>3.125.15</DockerDotNetVersion>
-    <FluentAssertionVersion>5.10.3</FluentAssertionVersion>
-    <JetBrainsDotMemoryVersion>3.2.20220510</JetBrainsDotMemoryVersion>
-    <XunitVersion>2.5.0</XunitVersion>
-    <XunitRunnerVersion>2.5.1</XunitRunnerVersion>
-    <CoverletVersion>3.2.0</CoverletVersion>
-    <NBenchVersion>1.2.2</NBenchVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <None Include="$(MSBuildThisFileDirectory)\..\docs\images\akkalogo.png" Pack="true" Visible="false" PackagePath="\" />
+    <None Include="$(MSBuildThisFileDirectory)\..\docs\images\icon.png" Pack="true" Visible="false" PackagePath="\" />
     <None Include="$(MSBuildThisFileDirectory)\..\README.md" Pack="true" Visible="false" PackagePath="\" />
   </ItemGroup>
 
+  <!-- GitHub SourceLink -->
+  <ItemGroup>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
+  </ItemGroup>
+
+  <!-- NuGet package properties -->
   <PropertyGroup>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
@@ -69,5 +37,11 @@
 
     <!-- Optional: Build symbol package (.snupkg) to distribute the PDB containing Source Link -->
     <IncludeSymbols>true</IncludeSymbols>
+
+    <PackageIcon>icon.png</PackageIcon>
+    <PackageProjectUrl>https://github.com/akkadotnet/Akka.Persistence.Sql</PackageProjectUrl>
+    <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
+    <PackageTags>akka;actors;actor model;Akka;concurrency;persistence;sql</PackageTags>
   </PropertyGroup>
 </Project>
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
@@ -1,6 +1,11 @@
 <Project>
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+    <AkkaVersion>1.5.13</AkkaVersion>
+    <AkkaHostingVersion>1.5.12.1</AkkaHostingVersion>
+    <FluentMigratorVersion>3.3.2</FluentMigratorVersion>
+    <SqliteVersion>1.0.117</SqliteVersion>
+    <MicrosoftSqliteVersion>7.0.11</MicrosoftSqliteVersion>
   </PropertyGroup>
   <!-- Akka dependencies -->
   <ItemGroup>
@@ -16,7 +21,6 @@
     <PackageVersion Include="Akka.Persistence.Query" Version="$(AkkaVersion)" />
     <PackageVersion Include="Akka.Serialization.Hyperion" Version="$(AkkaVersion)" />
     <PackageVersion Include="Akka.Streams" Version="$(AkkaVersion)" />
-    <PackageVersion Include="Microsoft.Data.Sqlite" Version="7.0.11" />
   </ItemGroup>
   <!-- App dependencies -->
   <ItemGroup>
@@ -25,50 +29,51 @@
     <PackageVersion Include="System.Reactive.Linq" Version="5.0.0" />
     <PackageVersion Include="Microsoft.Bcl.HashCode" Version="1.1.1" />
     <PackageVersion Include="CommandLineParser" Version="2.9.1" />
-    <PackageVersion Include="LanguageExt.Core" Version="$(LanguageExtVersion)" />
-    <PackageVersion Include="linq2db" Version="$(Linq2DbVersion)" />
+    <PackageVersion Include="LanguageExt.Core" Version="4.4.4" />
+    <PackageVersion Include="linq2db" Version="5.1.1" />
     <PackageVersion Include="FluentMigrator" Version="$(FluentMigratorVersion)" />
     <PackageVersion Include="FluentMigrator.Runner" Version="$(FluentMigratorVersion)" />
   </ItemGroup>
   <!-- SQL Server dependencies -->
   <ItemGroup>
-    <PackageVersion Include="Akka.Persistence.SqlServer" Version="$(AkkaSqlServerVersion)" />
-    <PackageVersion Include="Microsoft.Data.SqlClient" Version="$(SqlClientVersion)" />
-    <PackageVersion Include="Microsoft.SqlServer.SqlManagementObjects" Version="$(SqlManagementObjectsVersion)" />
+    <PackageVersion Include="Akka.Persistence.SqlServer" Version="1.5.4" />
+    <PackageVersion Include="Microsoft.Data.SqlClient" Version="5.1.1" />
+    <PackageVersion Include="Microsoft.SqlServer.SqlManagementObjects" Version="170.13.0" />
   </ItemGroup>
   <!-- Sqlite dependencies -->
   <ItemGroup>
-    <PackageVersion Include="Akka.Persistence.Sqlite" Version="$(AkkaSqliteVersion)" />
+    <PackageVersion Include="Akka.Persistence.Sqlite" Version="$(AkkaVersion)" />
     <PackageVersion Include="System.Data.SQLite" Version="$(SqliteVersion)" />
     <PackageVersion Include="System.Data.SQLite.Core" Version="$(SqliteVersion)" />
+    <PackageVersion Include="Microsoft.Data.Sqlite" Version="$(MicrosoftSqliteVersion)" />
     <PackageVersion Include="Microsoft.Data.Sqlite.Core" Version="$(MicrosoftSqliteVersion)" />
   </ItemGroup>
   <!-- PostgreSql dependencies -->
   <ItemGroup>
-    <PackageVersion Include="Akka.Persistence.PostgreSql" Version="$(AkkaPostgreSqlVersion)" />
-    <PackageVersion Include="Npgsql" Version="$(PostgreSqlVersion)" />
+    <PackageVersion Include="Akka.Persistence.PostgreSql" Version="1.5.4.1" />
+    <PackageVersion Include="Npgsql" Version="7.0.6" />
   </ItemGroup>
   <!-- Redis dependencies -->
   <ItemGroup>
-    <PackageVersion Include="Akka.Persistence.Redis" Version="$(AkkaRedisVersion)" />
-    <PackageVersion Include="redis-inside" Version="$(RedisInsideVersion)" />
+    <PackageVersion Include="Akka.Persistence.Redis" Version="1.5.0" />
+    <PackageVersion Include="redis-inside" Version="3.3.0" />
   </ItemGroup>
   <!-- MySql dependencies -->
   <ItemGroup>
-    <PackageVersion Include="Akka.Persistence.MySql" Version="$(AkkaMySqlVersion)" />
-    <PackageVersion Include="MySql.Data" Version="$(MySqlVersion)" />
+    <PackageVersion Include="Akka.Persistence.MySql" Version="1.5.4.1" />
+    <PackageVersion Include="MySql.Data" Version="8.1.0" />
   </ItemGroup>
   <!-- Test dependencies -->
   <ItemGroup>
     <PackageVersion Include="Akka.Hosting.TestKit" Version="$(AkkaHostingVersion)" />
-    <PackageVersion Include="BenchmarkDotNet" Version="$(BenchmarkDotNetVersion)" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
-    <PackageVersion Include="Docker.DotNet" Version="$(DockerDotNetVersion)" />
-    <PackageVersion Include="FluentAssertions" Version="$(FluentAssertionVersion)" />
-    <PackageVersion Include="JetBrains.dotMemoryUnit" Version="$(JetBrainsDotMemoryVersion)" />
-    <PackageVersion Include="xunit" Version="$(XunitVersion)" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="$(XunitRunnerVersion)" />
-    <PackageVersion Include="coverlet.collector" Version="$(CoverletVersion)" />
+    <PackageVersion Include="BenchmarkDotNet" Version="0.13.8" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <PackageVersion Include="Docker.DotNet" Version="3.125.15" />
+    <PackageVersion Include="FluentAssertions" Version="5.10.3" />
+    <PackageVersion Include="JetBrains.dotMemoryUnit" Version="3.2.20220510" />
+    <PackageVersion Include="xunit" Version="2.4.5" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" />
+    <PackageVersion Include="coverlet.collector" Version="3.2.0" />
   </ItemGroup>
   <!-- SourceLink support for all Akka.NET projects -->
   <ItemGroup>

diff --git a/src/Examples/HoconConfiguration/HoconConfiguration.csproj b/src/Examples/HoconConfiguration/HoconConfiguration.csproj
@@ -4,7 +4,6 @@
         <OutputType>Exe</OutputType>
         <TargetFramework>net6.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
         <IsPackable>false</IsPackable>
     </PropertyGroup>