Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 9 additions & 13 deletions .github/workflows/build-and-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,7 @@ on:
- master
env:
APP_NAME: Nano.Library
VERSION: 10.0.0-preview1
NUGET_HOST: https://api.nuget.org/v3/index.json
NUGET_APIKEY: ${{ secrets.NUGET_APIKEY }}
NUGET_HOST_PREVIEW: https://nuget.pkg.github.com/Nano-Core/index.json
NUGET_APIKEY_PREVIEW: ${{ secrets.GITHUB_TOKEN }}
VERSION: 10.0.0-preview2
jobs:
build-and-deploy:
runs-on: windows-latest
Expand Down Expand Up @@ -57,8 +53,8 @@ jobs:
if: github.ref == 'refs/heads/master'
run: |
dotnet nuget push "**/nupkgs/*.nupkg" `
--source ${{ env.NUGET_HOST }} `
--api-key ${{ env.NUGET_APIKEY }} `
--source https://api.nuget.org/v3/index.json `
--api-key ${{ secrets.NUGET_APIKEY }} `
--skip-duplicate;

if ($LastExitCode -ne 0)
Expand All @@ -70,8 +66,8 @@ jobs:
if: github.ref != 'refs/heads/master'
run: |
dotnet nuget push "**/nupkgs/*.nupkg" `
--source ${{ env.NUGET_HOST_PREVIEW }} `
--api-key ${{ env.NUGET_APIKEY_PREVIEW }} `
--source https://nuget.pkg.github.com/Nano-Core/index.json `
--api-key ${{ secrets.GITHUB_TOKEN }} `
--skip-duplicate;

if ($LastExitCode -ne 0)
Expand All @@ -80,15 +76,15 @@ jobs:
};

- name: GitHub Release
if: github.ref == 'refs/heads/master'
if: github.ref == 'refs/heads/master'
uses: ncipollo/release-action@v1
with:
tag: v${{ env.VERSION }}
tag: v${{ env.VERSION }}.${{ github.run_number }}
name: "Release ${{ env.VERSION }}"
body: |
Version: ${{ env.VERSION }}
Commit: ${{ github.sha }}
artifacts: "nupkgs/*"
artifacts: "**/nupkgs/*"
token: ${{ secrets.GITHUB_TOKEN }}
draft: false
prerelease: false
prerelease: ${{ contains(env.VERSION, '-') }}
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
<ItemGroup>
<None Include="..\LICENSE" Pack="true" Visible="false" PackagePath="" />
<None Include="..\icon.png" Pack="true" Visible="false" PackagePath="" />
<None Include="README.md" Pack="true" Visible="false" PackagePath="" />
<None Include="..\README.md" Pack="true" Visible="false" PackagePath="" />
</ItemGroup>

<ItemGroup>
Expand Down
7 changes: 1 addition & 6 deletions Nano.App/ApiClient/AccessTokenProvider.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,7 @@ await this.semaphore

try
{
if (this.accessToken == null)
{
this.accessToken = await factory(cancellationToken);
}

return this.accessToken;
return this.accessToken ??= await factory(cancellationToken);
Comment thread
vivet marked this conversation as resolved.
Dismissed
}
finally
{
Expand Down
4 changes: 2 additions & 2 deletions Nano.Eventing.RabbitMq/Nano.Eventing.RabbitMq.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

<ItemGroup>
<PackageReference Include="AspNetCore.HealthChecks.Rabbitmq" Version="9.0.0" />
<PackageReference Include="EasyNetQ" Version="8.1.2" />
<PackageReference Include="EasyNetQ" Version="8.1.3" />
<PackageReference Include="EasyNetQ.DI.Microsoft" Version="8.0.0-beta96" />
<PackageReference Include="EasyNetQ.Serialization.NewtonsoftJson" Version="8.1.2" />
<PackageReference Include="EasyNetQ.Serialization.NewtonsoftJson" Version="8.1.3" />
</ItemGroup>

<ItemGroup>
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -181,16 +181,16 @@ In the following table shows the different files and folder strucutre.
These packages are all-inclusive packages, where all other Nano packages are included. Easy to get started, but it's recommended to instead select only the
packages needed by your application, to avoid unnecessary depdendencies.

| Package | Downloads | |
| ---------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------- |
| [Nano.All](https://github.com/Nano-Core/Nano.Library/tree/master/Nano.All) | [![NuGet](https://img.shields.io/nuget/dt/Nano.All.svg)](https://www.nuget.org/packages/Nano.All/) | [![NuGet](https://img.shields.io/nuget/v/Nano.All.svg)](https://www.nuget.org/packages/Nano.All/) |
| [NanoCore](https://github.com/Nano-Core/Nano.Library/tree/master/NanoCore) | [![NuGet](https://img.shields.io/nuget/dt/NanoCore.svg)](https://www.nuget.org/packages/NanoCore/) | [![NuGet](https://img.shields.io/nuget/v/NanoCore.svg)](https://www.nuget.org/packages/NanoCore/) |
| Package | Downloads | |
| ---------- | --------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------- |
| Nano.All | [![NuGet](https://img.shields.io/nuget/dt/Nano.All.svg)](https://www.nuget.org/packages/Nano.All/) | [![NuGet](https://img.shields.io/nuget/v/Nano.All.svg)](https://www.nuget.org/packages/Nano.All/) |
| NanoCore | [![NuGet](https://img.shields.io/nuget/dt/NanoCore.svg)](https://www.nuget.org/packages/NanoCore/) | [![NuGet](https://img.shields.io/nuget/v/NanoCore.svg)](https://www.nuget.org/packages/NanoCore/) |

The next packages are application packages. Include only one matching the application type you want to create.

| Package | Type | Downloads | Latest Version |
| ---------------------------- | ----------------- | ------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------ |
| Nano.App | _`Transitive`_ | [![NuGet](https://img.shields.io/nuget/dt/Nano.App.svg)](https://www.nuget.org/packages/Nano.App/) 0 | [![NuGet](https://img.shields.io/nuget/v/Nano.App.svg)](https://www.nuget.org/packages/Nano.App/) |
| Nano.App | _`Transitive`_ | [![NuGet](https://img.shields.io/nuget/dt/Nano.App.svg)](https://www.nuget.org/packages/Nano.App/) | [![NuGet](https://img.shields.io/nuget/v/Nano.App.svg)](https://www.nuget.org/packages/Nano.App/) |
| Nano.App.Api | `Application` | [![NuGet](https://img.shields.io/nuget/dt/Nano.App.Api.svg)](https://www.nuget.org/packages/Nano.App.Api/) | [![NuGet](https://img.shields.io/nuget/v/Nano.App.Api.svg)](https://www.nuget.org/packages/Nano.App.Api/) |
| Nano.App.Console | `Application` | [![NuGet](https://img.shields.io/nuget/dt/Nano.App.Console.svg)](https://www.nuget.org/packages/Nano.App.Console/) | [![NuGet](https://img.shields.io/nuget/v/Nano.App.Console.svg)](https://www.nuget.org/packages/Nano.App.Console/) |
| Nano.App.Web | `Application` | [![NuGet](https://img.shields.io/nuget/dt/Nano.App.Web.svg)](https://www.nuget.org/packages/Nano.App.Web/) | [![NuGet](https://img.shields.io/nuget/v/Nano.App.Web.svg)](https://www.nuget.org/packages/Nano.App.Web/) |
Expand Down
Loading