Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

v2.4.3 (#21) #22

Merged
merged 1 commit into from
Nov 15, 2023
Merged

v2.4.3 (#21) #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 7 additions & 2 deletions .github/workflows/dotnet.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions src/BOG.DropZone.Client/BOG.DropZone.Client.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Authors>John J Schultz</Authors>
<Company>Bits of Genius</Company>
<Description>A client for calling the BOG.DropZone API, which supports optional encryption.</Description>
Expand All @@ -15,9 +15,9 @@
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
<PackageIconUrl></PackageIconUrl>
<Version>2.4.2</Version>
<AssemblyVersion>2.4.2.0</AssemblyVersion>
<FileVersion>2.4.2.0</FileVersion>
<Version>2.4.3</Version>
<AssemblyVersion>2.4.3.0</AssemblyVersion>
<FileVersion>2.4.3.0</FileVersion>
<Copyright>(c) 2017-2023, John J Schultz</Copyright>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageIcon>parachute.png</PackageIcon>
Expand Down
8 changes: 4 additions & 4 deletions src/BOG.DropZone.Common/BOG.DropZone.Common.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Authors>John J Schultz</Authors>
<Company>Bits of Genius</Company>
Expand All @@ -12,9 +12,9 @@
<RepositoryUrl>https://github.com/rambotech/BOG.DropZone</RepositoryUrl>
<RepositoryType>GIT</RepositoryType>
<PackageTags>RestAPI aspnetcore netstandard2</PackageTags>
<Version>2.4.2</Version>
<AssemblyVersion>2.4.2.0</AssemblyVersion>
<FileVersion>2.4.2.0</FileVersion>
<Version>2.4.3</Version>
<AssemblyVersion>2.4.3.0</AssemblyVersion>
<FileVersion>2.4.3.0</FileVersion>
<Copyright>(c) 2018-2023, John J Schultz</Copyright>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageIcon>parachute.png</PackageIcon>
Expand Down
8 changes: 4 additions & 4 deletions src/BOG.DropZone.Test/BOG.DropZone.Test/BOG.DropZone.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageProjectUrl>https://github.com/rambotech/BOG.DropZone</PackageProjectUrl>
<PackageLicenseUrl></PackageLicenseUrl>
Expand All @@ -13,9 +13,9 @@
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
<PackageIconUrl></PackageIconUrl>
<Version>2.4.0</Version>
<AssemblyVersion>2.4.0.0</AssemblyVersion>
<FileVersion>2.4.0.0</FileVersion>
<Version>2.4.3</Version>
<AssemblyVersion>2.4.3.0</AssemblyVersion>
<FileVersion>2.4.3.0</FileVersion>
<Copyright>(c) 2017-2023, John J Schultz</Copyright>
<Description>A console app to test and serve as an example of usage for BOG.DropZone.Client.</Description>
<PackageIcon>parachute.png</PackageIcon>
Expand Down
16 changes: 8 additions & 8 deletions src/BOG.DropZone/BOG.DropZone.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RuntimeIdentifiers>win10-x64</RuntimeIdentifiers>
<RuntimeIdentifiers>osx-x64</RuntimeIdentifiers>
<RuntimeIdentifiers>linux-x64</RuntimeIdentifiers>
<RuntimeIdentifiers>linux-arm</RuntimeIdentifiers>
<!-- <PublishSingleFile>true</PublishSingleFile> -->
<Version>2.4.2</Version>
<AssemblyVersion>2.4.2.0</AssemblyVersion>
<Version>2.4.3</Version>
<AssemblyVersion>2.4.3.0</AssemblyVersion>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
Expand All @@ -21,7 +21,7 @@

<PropertyGroup>
<PublishWithAspNetCoreTargetManifest>false</PublishWithAspNetCoreTargetManifest>
<FileVersion>2.4.2.0</FileVersion>
<FileVersion>2.4.3.0</FileVersion>
<Authors>John J Schultz</Authors>
<Company />
<Description>A standalone interapplication communication point</Description>
Expand All @@ -39,11 +39,11 @@
<ItemGroup>
<PackageReference Include="BOG.SwissArmyKnife" Version="1.8.0" />
<PackageReference Include="LettuceEncrypt" Version="1.3.0" />
<PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.9" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.4" />
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="7.0.0" />
<PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.PlatformAbstractions" Version="1.1.0" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="7.0.9" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="7.0.11" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.5.0" />
Expand Down
7 changes: 7 additions & 0 deletions src/BOG.DropZone/Helpers/SwaggerConsumesAttribute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,18 @@ namespace BOG.DropZone.Helpers
[AttributeUsage(AttributeTargets.Method)]
public class SwaggerConsumesAttribute : Attribute
{
/// <summary>
///
/// </summary>
/// <param name="contentTypes"></param>
public SwaggerConsumesAttribute(params string[] contentTypes)
{
this.ContentTypes = contentTypes;
}

/// <summary>
///
/// </summary>
public IEnumerable<string> ContentTypes { get; }
}
}
2 changes: 1 addition & 1 deletion src/BOG.DropZone/Startup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
});

Expand Down
2 changes: 1 addition & 1 deletion src/BOG.DropZone/Views/Shared/_Layout.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<li><a asp-area="" asp-controller="Home" asp-action="Content">Administration</a></li>
<li><a asp-area="" asp-controller="Home" asp-action="Privacy">Privacy</a></li>
<li><a asp-area="" asp-controller="Home" asp-action="About">About</a></li>
<li><a href="/swagger">Swagger UI</a></li>
<li><a href="/swagger" target="_blank">Swagger UI</a></li>
</ul>
</div>
</div>
Expand Down
3 changes: 3 additions & 0 deletions src/ReleaseNotes.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
8 changes: 4 additions & 4 deletions src/global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}
}