diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml index 9da168a7..9280486b 100644 --- a/.github/workflows/build-and-deploy.yml +++ b/.github/workflows/build-and-deploy.yml @@ -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 @@ -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) @@ -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) @@ -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 \ No newline at end of file + prerelease: ${{ contains(env.VERSION, '-') }} \ No newline at end of file diff --git a/Directory.Build.props b/Directory.Build.props index 1bc51fcb..73a56341 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -58,7 +58,7 @@ - + diff --git a/Nano.App/ApiClient/AccessTokenProvider.cs b/Nano.App/ApiClient/AccessTokenProvider.cs index 12cad7a7..40e7f8ea 100644 --- a/Nano.App/ApiClient/AccessTokenProvider.cs +++ b/Nano.App/ApiClient/AccessTokenProvider.cs @@ -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); } finally { diff --git a/Nano.Eventing.RabbitMq/Nano.Eventing.RabbitMq.csproj b/Nano.Eventing.RabbitMq/Nano.Eventing.RabbitMq.csproj index 51531f4e..011a184b 100644 --- a/Nano.Eventing.RabbitMq/Nano.Eventing.RabbitMq.csproj +++ b/Nano.Eventing.RabbitMq/Nano.Eventing.RabbitMq.csproj @@ -2,9 +2,9 @@ - + - + diff --git a/README.md b/README.md index d1427d74..da0a5021 100644 --- a/README.md +++ b/README.md @@ -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/) |