Nuget build/publish updates

Moved to `BlendInteractive.` prefix. Fixed up packaging. Added automated signing / publishing.
blendinteractive · Sep 24, 2022 · ecb2e44 · ecb2e44
1 parent a977973
commit ecb2e44
Show file tree

Hide file tree

Showing 12 changed files with 92 additions and 51 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -1,36 +1,43 @@
-name: Update NuGet
+name: Build and Publish
 
-on: [push]
+on: workflow_dispatch
 
 jobs:
   build:
-    runs-on: windows-latest
+    runs-on: ubuntu-latest
 
-    name: Publish Nuget Package
+    name: Build and Publish Nuget Package
     steps:
       - uses: actions/checkout@master
-      - name: Setup .NET Core 2.1
-        uses: actions/setup-dotnet@v1
+      - name: Setup dotnet
+        uses: actions/setup-dotnet@v2
         with:
-          dotnet-version: 2.1.x
-      - name: Setup .NET Core 3.1
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: 3.1.x
-      - name: Setup .NET Core 5.0
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: 5.0.x
-      - name: Run Tests
-        run:
-          dotnet test "./tests/Blend.ActionQueue.Tests/Blend.ActionQueue.Tests.csproj"
+          dotnet-version: | 
+            2.1.x
+            3.1.x
+            5.0.x
+            6.0.x
       - name: Build Package
-        run:           
-          dotnet build -c Release "./src/Blend.ActionQueue/Blend.ActionQueue.csproj"
+        run:
+          dotnet build -c Release ./src/BlendInteractive.ActionQueue/BlendInteractive.ActionQueue.csproj /p:ContinuousIntegrationBuild=true
       - name: Package Release
         run:           
-          dotnet pack -c Release --no-build -o out "./src/Blend.ActionQueue/Blend.ActionQueue.csproj"
-      - name: Publish Nuget to GitHub registry
-        run: ls .\out\*.nupkg | foreach { dotnet nuget push $_ -s https://nuget.pkg.github.com/blendinteractive/index.json -k $env:GITHUB_TOKEN }
+          dotnet pack -c Release --no-build -o out ./src/BlendInteractive.ActionQueue/BlendInteractive.ActionQueue.csproj
+      - name: Retrieve and decode signing cert
+        run: echo "$CERTIFICATE_BASE64" | base64 --decode > ./cert.p12
+        env:
+          CERTIFICATE_BASE64: ${{ secrets.CERTIFICATE_BASE64 }}
+      - name: Sign package
+        run: dotnet nuget sign ./out/*.nupkg --certificate-path ./cert.p12 --timestamper http://ts.ssl.com --certificate-password "$CERT_PASSWORD"
+        env:
+          CERT_PASSWORD: ${{ secrets.CERT_PASSWORD }}
+      - name: Clean up signing cert
+        run: rm ./cert.p12
+      - name: Publish package to Github registry
+        run: dotnet nuget push ./out/*.nupkg -k "$GITHUB_AUTH_TOKEN" -s 'https://nuget.pkg.github.com/blendinteractive/index.json'
+        env:
+          GITHUB_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }} 
+      - name: Publish package to Nuget public registry
+        run: dotnet nuget push ./out/*.nupkg -k "$NUGET_AUTH_TOKEN" -s 'https://api.nuget.org/v3/index.json'
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} 
+          NUGET_AUTH_TOKEN: ${{ secrets.NUGET_API_KEY }} 
diff --git a/Blend.ActionQueue.sln → BlendInteractive.ActionQueue.sln b/Blend.ActionQueue.sln → BlendInteractive.ActionQueue.sln
@@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.30907.101
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blend.ActionQueue", "src\Blend.ActionQueue\Blend.ActionQueue.csproj", "{F8A723BE-F1BA-4235-AAC7-2FA98B002792}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlendInteractive.ActionQueue", "src\BlendInteractive.ActionQueue\BlendInteractive.ActionQueue.csproj", "{F8A723BE-F1BA-4235-AAC7-2FA98B002792}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blend.ActionQueue.Tests", "tests\Blend.ActionQueue.Tests\Blend.ActionQueue.Tests.csproj", "{87835CBE-2C94-4D91-A7F3-8881FB0E730A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlendInteractive.ActionQueue.Tests", "tests\BlendInteractive.ActionQueue.Tests\BlendInteractive.ActionQueue.Tests.csproj", "{87835CBE-2C94-4D91-A7F3-8881FB0E730A}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/icon.png b/icon.png
diff --git a/src/Blend.ActionQueue/Blend.ActionQueue.csproj b/src/Blend.ActionQueue/Blend.ActionQueue.csproj
diff --git a/src/Blend.ActionQueue/AbstractActionQueue.cs → ...active.ActionQueue/AbstractActionQueue.cs b/src/Blend.ActionQueue/AbstractActionQueue.cs → ...active.ActionQueue/AbstractActionQueue.cs
@@ -2,7 +2,7 @@
 using System.Collections.Concurrent;
 using System.Threading;
 
-namespace Blend.ActionQueue
+namespace BlendInteractive.ActionQueue
 {
     public abstract class AbstractActionQueue<T>
     {

diff --git a/src/BlendInteractive.ActionQueue/BlendInteractive.ActionQueue.csproj b/src/BlendInteractive.ActionQueue/BlendInteractive.ActionQueue.csproj
@@ -0,0 +1,50 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+
+    <PackageId>BlendInteractive.ActionQueue</PackageId>
+    <Description>A simple, non-durable queue for when you need something like a message queue, but with minimal setup, for small, low-volume messages or actions where persistence is not a requirement.</Description>
+
+    <Version>1.0.1</Version>
+    <PackageVersion>1.0.1</PackageVersion>
+    <AssemblyVersion>1.0.1.0</AssemblyVersion>
+    <FileVersion>1.0.1.0</FileVersion>
+
+    <Authors>Blend Interactive</Authors>
+    <Company>Blend Interactive</Company>
+
+    <PackageProjectUrl>https://github.com/blendinteractive/Blend.ActionQueue</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/blendinteractive/Blend.ActionQueue.git</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
+
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    <PackageIcon>icon.png</PackageIcon>
+  	<PackageLicenseFile>License</PackageLicenseFile>
+	  <PackageReadmeFile>README.md</PackageReadmeFile>
+    <PackageIconUrl />
+
+    <PackageReleaseNotes>Initial Release</PackageReleaseNotes>
+
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
+  </ItemGroup>
+
+   <ItemGroup>
+    <None Include="..\..\License">
+      <Pack>True</Pack>
+      <PackagePath></PackagePath>
+    </None>
+    <None Include="..\..\README.md">
+      <Pack>True</Pack>
+      <PackagePath></PackagePath>
+    </None>
+    <None Include="..\..\icon.png">
+      <Pack>True</Pack>
+      <PackagePath></PackagePath>
+    </None>
+  </ItemGroup>
+</Project>
diff --git a/tests/Blend.ActionQueue.Tests/Basics.cs → ...ndInteractive.ActionQueue.Tests/Basics.cs b/tests/Blend.ActionQueue.Tests/Basics.cs → ...ndInteractive.ActionQueue.Tests/Basics.cs
@@ -3,7 +3,7 @@
 using System.Threading;
 using Xunit;
 
-namespace Blend.ActionQueue.Tests
+namespace BlendInteractive.ActionQueue.Tests
 {
     public class Basics
     {

diff --git a/...ueue.Tests/Blend.ActionQueue.Tests.csproj → ...BlendInteractive.ActionQueue.Tests.csproj b/...ueue.Tests/Blend.ActionQueue.Tests.csproj → ...BlendInteractive.ActionQueue.Tests.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Blend.ActionQueue\Blend.ActionQueue.csproj" />
+    <ProjectReference Include="..\..\src\BlendInteractive.ActionQueue\BlendInteractive.ActionQueue.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/...eue.Tests/Examples/ExampleGenericQueue.cs → ...eue.Tests/Examples/ExampleGenericQueue.cs b/...eue.Tests/Examples/ExampleGenericQueue.cs → ...eue.Tests/Examples/ExampleGenericQueue.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Blend.ActionQueue.Tests.Examples
+namespace BlendInteractive.ActionQueue.Tests.Examples
 {
     /// <summary>
     /// This is an example message type where the `Action` to execute is provided in the constructor.

diff --git a/...ctionQueue.Tests/Examples/ExampleTests.cs → ...ctionQueue.Tests/Examples/ExampleTests.cs b/...ctionQueue.Tests/Examples/ExampleTests.cs → ...ctionQueue.Tests/Examples/ExampleTests.cs
@@ -1,7 +1,7 @@
 using System.Threading;
 using Xunit;
 
-namespace Blend.ActionQueue.Tests.Examples
+namespace BlendInteractive.ActionQueue.Tests.Examples
 {
     public class ExampleTests
     {

diff --git a/tests/Blend.ActionQueue.Tests/TestAction.cs → ...teractive.ActionQueue.Tests/TestAction.cs b/tests/Blend.ActionQueue.Tests/TestAction.cs → ...teractive.ActionQueue.Tests/TestAction.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Threading;
 
-namespace Blend.ActionQueue.Tests
+namespace BlendInteractive.ActionQueue.Tests
 {
     public class TestAction
     {

diff --git a/...lend.ActionQueue.Tests/TestActionQueue.cs → ...tive.ActionQueue.Tests/TestActionQueue.cs b/...lend.ActionQueue.Tests/TestActionQueue.cs → ...tive.ActionQueue.Tests/TestActionQueue.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Threading;
 
-namespace Blend.ActionQueue.Tests
+namespace BlendInteractive.ActionQueue.Tests
 {
     public class TestActionQueue : AbstractActionQueue<TestAction>
     {