From b719e23a855f7ebb42976f5b9439f7a347965cca Mon Sep 17 00:00:00 2001 From: John J Schultz Date: Tue, 14 Nov 2023 21:41:34 -0500 Subject: [PATCH] v2.4.3 (#21) * v2.4.3: NET8 * version fixes and swagger UI to new browser tab --- .github/workflows/dotnet.yml | 9 +++++++-- .../BOG.DropZone.Client.csproj | 8 ++++---- .../BOG.DropZone.Common.csproj | 8 ++++---- .../BOG.DropZone.Test/BOG.DropZone.Test.csproj | 8 ++++---- src/BOG.DropZone/BOG.DropZone.csproj | 16 ++++++++-------- .../Helpers/SwaggerConsumesAttribute.cs | 7 +++++++ src/BOG.DropZone/Startup.cs | 2 +- src/BOG.DropZone/Views/Shared/_Layout.cshtml | 2 +- src/ReleaseNotes.txt | 3 +++ src/global.json | 8 ++++---- 10 files changed, 43 insertions(+), 28 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 3ea7dc8..659472a 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -2,11 +2,16 @@ # Includes NuGet package update for master branch. # 2023.04.05 -name: .NET +name: .NET build on: push: branches: [ "develop", "release", "master" ] + pull_request: + branches: [ "master" ] + paths-ignore: + - "README.md" + defaults: run: @@ -21,7 +26,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v3 with: - dotnet-version: 6.0.x + dotnet-version: 8.0.x - name: Restore dependencies run: dotnet restore - name: Build diff --git a/src/BOG.DropZone.Client/BOG.DropZone.Client.csproj b/src/BOG.DropZone.Client/BOG.DropZone.Client.csproj index be7e044..c254704 100644 --- a/src/BOG.DropZone.Client/BOG.DropZone.Client.csproj +++ b/src/BOG.DropZone.Client/BOG.DropZone.Client.csproj @@ -1,7 +1,7 @@  - net7.0 + net8.0 John J Schultz Bits of Genius A client for calling the BOG.DropZone API, which supports optional encryption. @@ -15,9 +15,9 @@ true false - 2.4.2 - 2.4.2.0 - 2.4.2.0 + 2.4.3 + 2.4.3.0 + 2.4.3.0 (c) 2017-2023, John J Schultz MIT parachute.png diff --git a/src/BOG.DropZone.Common/BOG.DropZone.Common.csproj b/src/BOG.DropZone.Common/BOG.DropZone.Common.csproj index efadc83..cecdc09 100644 --- a/src/BOG.DropZone.Common/BOG.DropZone.Common.csproj +++ b/src/BOG.DropZone.Common/BOG.DropZone.Common.csproj @@ -1,7 +1,7 @@  - net7.0 + net8.0 true John J Schultz Bits of Genius @@ -12,9 +12,9 @@ https://github.com/rambotech/BOG.DropZone GIT RestAPI aspnetcore netstandard2 - 2.4.2 - 2.4.2.0 - 2.4.2.0 + 2.4.3 + 2.4.3.0 + 2.4.3.0 (c) 2018-2023, John J Schultz MIT parachute.png diff --git a/src/BOG.DropZone.Test/BOG.DropZone.Test/BOG.DropZone.Test.csproj b/src/BOG.DropZone.Test/BOG.DropZone.Test/BOG.DropZone.Test.csproj index 6df3e52..eb32852 100644 --- a/src/BOG.DropZone.Test/BOG.DropZone.Test/BOG.DropZone.Test.csproj +++ b/src/BOG.DropZone.Test/BOG.DropZone.Test/BOG.DropZone.Test.csproj @@ -2,7 +2,7 @@ Exe - net7.0 + net8.0 MIT https://github.com/rambotech/BOG.DropZone @@ -13,9 +13,9 @@ true false - 2.4.0 - 2.4.0.0 - 2.4.0.0 + 2.4.3 + 2.4.3.0 + 2.4.3.0 (c) 2017-2023, John J Schultz A console app to test and serve as an example of usage for BOG.DropZone.Client. parachute.png diff --git a/src/BOG.DropZone/BOG.DropZone.csproj b/src/BOG.DropZone/BOG.DropZone.csproj index dd689b0..51fca18 100644 --- a/src/BOG.DropZone/BOG.DropZone.csproj +++ b/src/BOG.DropZone/BOG.DropZone.csproj @@ -1,14 +1,14 @@  - net7.0 + net8.0 win10-x64 osx-x64 linux-x64 linux-arm - 2.4.2 - 2.4.2.0 + 2.4.3 + 2.4.3.0 @@ -21,7 +21,7 @@ false - 2.4.2.0 + 2.4.3.0 John J Schultz A standalone interapplication communication point @@ -39,11 +39,11 @@ - - - + + + - + diff --git a/src/BOG.DropZone/Helpers/SwaggerConsumesAttribute.cs b/src/BOG.DropZone/Helpers/SwaggerConsumesAttribute.cs index 609eb74..cb26337 100644 --- a/src/BOG.DropZone/Helpers/SwaggerConsumesAttribute.cs +++ b/src/BOG.DropZone/Helpers/SwaggerConsumesAttribute.cs @@ -10,11 +10,18 @@ namespace BOG.DropZone.Helpers [AttributeUsage(AttributeTargets.Method)] public class SwaggerConsumesAttribute : Attribute { + /// + /// + /// + /// public SwaggerConsumesAttribute(params string[] contentTypes) { this.ContentTypes = contentTypes; } + /// + /// + /// public IEnumerable ContentTypes { get; } } } diff --git a/src/BOG.DropZone/Startup.cs b/src/BOG.DropZone/Startup.cs index bb6b9bf..7e2309b 100644 --- a/src/BOG.DropZone/Startup.cs +++ b/src/BOG.DropZone/Startup.cs @@ -179,7 +179,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env, IService app.Use((context, next) => { - context.Response.Headers.Add("X-Server-App", $"BOG.DropZone v{new AssemblyVersion().Version}"); + context.Response.Headers.Append("X-Server-App", $"BOG.DropZone v{new AssemblyVersion().Version}"); return next(); }); diff --git a/src/BOG.DropZone/Views/Shared/_Layout.cshtml b/src/BOG.DropZone/Views/Shared/_Layout.cshtml index c5d0868..aecdbf6 100644 --- a/src/BOG.DropZone/Views/Shared/_Layout.cshtml +++ b/src/BOG.DropZone/Views/Shared/_Layout.cshtml @@ -34,7 +34,7 @@
  • Administration
  • Privacy
  • About
    • -
  • Swagger UI
    • +
  • Swagger UI
    • diff --git a/src/ReleaseNotes.txt b/src/ReleaseNotes.txt index b0c6fca..748b87a 100644 --- a/src/ReleaseNotes.txt +++ b/src/ReleaseNotes.txt @@ -1,5 +1,8 @@ Release Notes: +2.4.3 -- 2023.11.14 +* Update to .NET 8 + 2.4.2 -- 2023.08.24 * Fix bug with validating metrics values. * Add swagger attributes. diff --git a/src/global.json b/src/global.json index 6d8ee1e..090008f 100644 --- a/src/global.json +++ b/src/global.json @@ -1,14 +1,14 @@ { "sdk": { - "version": "7.0.400" + "version": "8.0.100" }, "tools": { - "dotnet": "7.0.400" + "dotnet": "8.0.100" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.400", - "Microsoft.DotNet.Helix.Sdk": "7.0.400" + "Microsoft.DotNet.Arcade.Sdk": "8.0.100", + "Microsoft.DotNet.Helix.Sdk": "8.0.100" } }