diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 12e9519..d142ee5 100644
--- 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 b/BlendInteractive.ActionQueue.sln
similarity index 76%
rename from Blend.ActionQueue.sln
rename to BlendInteractive.ActionQueue.sln
index 53b466b..628f979 100644
--- a/Blend.ActionQueue.sln
+++ b/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
new file mode 100644
index 0000000..7375650
Binary files /dev/null and b/icon.png differ
diff --git a/src/Blend.ActionQueue/Blend.ActionQueue.csproj b/src/Blend.ActionQueue/Blend.ActionQueue.csproj
deleted file mode 100644
index aaa4620..0000000
--- a/src/Blend.ActionQueue/Blend.ActionQueue.csproj
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
- netstandard2.0
- 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.
- 1.0.0
- Initial Release
- 1.0.0.0
- 1.0.0.0
- Blend Interactive
- https://github.com/blendinteractive/Blend.ActionQueue
- https://github.com/blendinteractive/Blend.ActionQueue.git
- git
-
-
-
diff --git a/src/Blend.ActionQueue/AbstractActionQueue.cs b/src/BlendInteractive.ActionQueue/AbstractActionQueue.cs
similarity index 97%
rename from src/Blend.ActionQueue/AbstractActionQueue.cs
rename to src/BlendInteractive.ActionQueue/AbstractActionQueue.cs
index cff5d38..d549692 100644
--- a/src/Blend.ActionQueue/AbstractActionQueue.cs
+++ b/src/BlendInteractive.ActionQueue/AbstractActionQueue.cs
@@ -2,7 +2,7 @@
using System.Collections.Concurrent;
using System.Threading;
-namespace Blend.ActionQueue
+namespace BlendInteractive.ActionQueue
{
public abstract class AbstractActionQueue
{
diff --git a/src/BlendInteractive.ActionQueue/BlendInteractive.ActionQueue.csproj b/src/BlendInteractive.ActionQueue/BlendInteractive.ActionQueue.csproj
new file mode 100644
index 0000000..0ca843a
--- /dev/null
+++ b/src/BlendInteractive.ActionQueue/BlendInteractive.ActionQueue.csproj
@@ -0,0 +1,50 @@
+
+
+ netstandard2.0
+
+ BlendInteractive.ActionQueue
+ 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.
+
+ 1.0.1
+ 1.0.1
+ 1.0.1.0
+ 1.0.1.0
+
+ Blend Interactive
+ Blend Interactive
+
+ https://github.com/blendinteractive/Blend.ActionQueue
+ https://github.com/blendinteractive/Blend.ActionQueue.git
+ git
+
+ true
+ icon.png
+ License
+ README.md
+
+
+ Initial Release
+
+ true
+ snupkg
+
+
+
+
+
+
+
+
+ True
+
+
+
+ True
+
+
+
+ True
+
+
+
+
diff --git a/tests/Blend.ActionQueue.Tests/Basics.cs b/tests/BlendInteractive.ActionQueue.Tests/Basics.cs
similarity index 98%
rename from tests/Blend.ActionQueue.Tests/Basics.cs
rename to tests/BlendInteractive.ActionQueue.Tests/Basics.cs
index 28b9151..a754f08 100644
--- a/tests/Blend.ActionQueue.Tests/Basics.cs
+++ b/tests/BlendInteractive.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/tests/Blend.ActionQueue.Tests/Blend.ActionQueue.Tests.csproj b/tests/BlendInteractive.ActionQueue.Tests/BlendInteractive.ActionQueue.Tests.csproj
similarity index 68%
rename from tests/Blend.ActionQueue.Tests/Blend.ActionQueue.Tests.csproj
rename to tests/BlendInteractive.ActionQueue.Tests/BlendInteractive.ActionQueue.Tests.csproj
index 2914832..8aef74a 100644
--- a/tests/Blend.ActionQueue.Tests/Blend.ActionQueue.Tests.csproj
+++ b/tests/BlendInteractive.ActionQueue.Tests/BlendInteractive.ActionQueue.Tests.csproj
@@ -1,7 +1,7 @@
-
+
- netcoreapp3.1
+ net6.0
false
@@ -14,7 +14,7 @@
-
+
diff --git a/tests/Blend.ActionQueue.Tests/Examples/ExampleGenericQueue.cs b/tests/BlendInteractive.ActionQueue.Tests/Examples/ExampleGenericQueue.cs
similarity index 95%
rename from tests/Blend.ActionQueue.Tests/Examples/ExampleGenericQueue.cs
rename to tests/BlendInteractive.ActionQueue.Tests/Examples/ExampleGenericQueue.cs
index 852642e..54d4500 100644
--- a/tests/Blend.ActionQueue.Tests/Examples/ExampleGenericQueue.cs
+++ b/tests/BlendInteractive.ActionQueue.Tests/Examples/ExampleGenericQueue.cs
@@ -1,6 +1,6 @@
using System;
-namespace Blend.ActionQueue.Tests.Examples
+namespace BlendInteractive.ActionQueue.Tests.Examples
{
///
/// This is an example message type where the `Action` to execute is provided in the constructor.
diff --git a/tests/Blend.ActionQueue.Tests/Examples/ExampleTests.cs b/tests/BlendInteractive.ActionQueue.Tests/Examples/ExampleTests.cs
similarity index 92%
rename from tests/Blend.ActionQueue.Tests/Examples/ExampleTests.cs
rename to tests/BlendInteractive.ActionQueue.Tests/Examples/ExampleTests.cs
index 7580661..03328da 100644
--- a/tests/Blend.ActionQueue.Tests/Examples/ExampleTests.cs
+++ b/tests/BlendInteractive.ActionQueue.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 b/tests/BlendInteractive.ActionQueue.Tests/TestAction.cs
similarity index 95%
rename from tests/Blend.ActionQueue.Tests/TestAction.cs
rename to tests/BlendInteractive.ActionQueue.Tests/TestAction.cs
index 3c403bd..4b7cc0b 100644
--- a/tests/Blend.ActionQueue.Tests/TestAction.cs
+++ b/tests/BlendInteractive.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/tests/Blend.ActionQueue.Tests/TestActionQueue.cs b/tests/BlendInteractive.ActionQueue.Tests/TestActionQueue.cs
similarity index 94%
rename from tests/Blend.ActionQueue.Tests/TestActionQueue.cs
rename to tests/BlendInteractive.ActionQueue.Tests/TestActionQueue.cs
index 0708615..33a7c19 100644
--- a/tests/Blend.ActionQueue.Tests/TestActionQueue.cs
+++ b/tests/BlendInteractive.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
{