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

Feature/net8 #215

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Feature/net8 #215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e8c291
update identity server demo url
Nov 25, 2024
f826627
migrate packages
Nov 25, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/cd.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
- name: Setup .NET Core SDK
uses: actions/setup-dotnet@v1.8.1
with:
dotnet-version: 6.0.201
dotnet-version: 8.0.2
- name: dotnet build
run: dotnet build Esquio.sln -c $BUILD_CONFIG
- name: dotnet test [UnitTests]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_all_branches.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
- name: Setup .NET Core SDK
uses: actions/setup-dotnet@v1.8.1
with:
dotnet-version: 6.0.201
dotnet-version: 8.0.2
- name: dotnet build
run: dotnet build Esquio.sln -c $BUILD_CONFIG
- name: dotnet test [UnitTests]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_master.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
- name: Setup .NET Core SDK
uses: actions/setup-dotnet@v1.8.1
with:
dotnet-version: 6.0.201
dotnet-version: 8.0.2
- name: dotnet build
run: dotnet build Esquio.sln -c $BUILD_CONFIG
- name: dotnet test [UnitTests]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nightly.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
- name: Setup .NET Core SDK
uses: actions/setup-dotnet@v1.8.1
with:
dotnet-version: 6.0.201
dotnet-version: 8.0.2
- name: dotnet build
run: dotnet build Esquio.sln -c $BUILD_CONFIG
- name: dotnet test [UnitTests]
Expand Down
107 changes: 52 additions & 55 deletions Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,70 +7,67 @@
<EmbeddedFiles Include="$(GeneratedAssemblyInfoFile)"/>
</ItemGroup>
<ItemGroup>
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="$(NetTestSdk)" />
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.5.0" />
<PackageReference Update="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Update="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="6.0.1" />
<PackageReference Update="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.1" />
<PackageReference Update="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.1" />
<PackageReference Update="Microsoft.Authentication.WebAssembly.Msal" Version="6.0.1" />
<PackageReference Update="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="6.0.1" />
<PackageReference Update="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="6.0.1" />
<PackageReference Update="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.1" />
<PackageReference Update="Microsoft.AspNetCore.TestHost" Version="6.0.1" />
<PackageReference Update="Microsoft.ApplicationInsights" Version="2.20.0" />
<PackageReference Update="Microsoft.ApplicationInsights.AspNetCore" Version="2.20.0" />
<PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
<PackageReference Update="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
<PackageReference Update="Microsoft.Extensions.Logging" Version="6.0.0" />
<PackageReference Update="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
<PackageReference Update="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
<PackageReference Update="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
<PackageReference Update="Microsoft.Extensions.Configuration.AzureAppConfiguration" Version="4.5.1" />
<PackageReference Update="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
<PackageReference Update="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
<PackageReference Update="Microsoft.Extensions.Options" Version="6.0.0" />
<PackageReference Update="Microsoft.Extensions.Options.ConfigurationExtensions" Version="6.0.0" />
<PackageReference Update="Microsoft.Extensions.Primitives" Version="6.0.0" />
<PackageReference Update="Microsoft.Extensions.Caching.Memory" Version="6.0.0" />
<PackageReference Update="Microsoft.Extensions.Http" Version="6.0.0" />
<PackageReference Update="Microsoft.Extensions.Http.Polly" Version="6.0.1" />
<PackageReference Update="Microsoft.Extensions.Hosting" Version="6.0.0" />
<PackageReference Update="Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer" Version="5.0.0" />
<PackageReference Update="Microsoft.EntityFrameworkCore" Version="6.0.1" />
<PackageReference Update="Microsoft.EntityFrameworkCore.Design" Version="6.0.1" />
<PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="6.0.1" />
<PackageReference Update="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.1" />
<PackageReference Update="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.2" />
<PackageReference Update="Pomelo.EntityFrameworkCore.MySql" Version="6.0.1" />
<PackageReference Update="Azure.Identity" Version="1.5.0" />
<PackageReference Update="Microsoft.Data.SqlClient" Version="4.0.1" />


<PackageReference Update="System.Text.Json" Version="6.0.1" />
<PackageReference Update="System.Net.Http.Json" Version="6.0.0" />
<PackageReference Update="System.Diagnostics.DiagnosticSource" Version="6.0.0" />
<PackageReference Update="System.Threading.Tasks.Extensions" Version="4.5.4" />

<PackageReference Update="xunit" Version="2.4.1" />
<PackageReference Update="xunit.runner.visualstudio" Version="2.4.3" />
<PackageReference Update="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.0" />
<PackageReference Update="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.0" />
<PackageReference Update="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0" />
<PackageReference Update="Microsoft.Authentication.WebAssembly.Msal" Version="8.0.0" />
<PackageReference Update="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="8.0.0" />
<PackageReference Update="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="8.0.0" />
<PackageReference Update="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.0" />
<PackageReference Update="Microsoft.AspNetCore.TestHost" Version="8.0.0" />
<PackageReference Update="Microsoft.ApplicationInsights" Version="2.22.0" />
<PackageReference Update="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0" />
<PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
<PackageReference Update="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
<PackageReference Update="Microsoft.Extensions.Logging" Version="8.0.0" />
<PackageReference Update="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
<PackageReference Update="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
<PackageReference Update="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
<PackageReference Update="Microsoft.Extensions.Configuration.AzureAppConfiguration" Version="5.0.0" />
<PackageReference Update="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
<PackageReference Update="Microsoft.Extensions.Configuration.Binder" Version="8.0.0" />
<PackageReference Update="Microsoft.Extensions.Options" Version="8.0.0" />
<PackageReference Update="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
<PackageReference Update="Microsoft.Extensions.Primitives" Version="8.0.0" />
<PackageReference Update="Microsoft.Extensions.Caching.Memory" Version="8.0.0" />
<PackageReference Update="Microsoft.Extensions.Http" Version="8.0.0" />
<PackageReference Update="Microsoft.Extensions.Http.Polly" Version="8.0.0" />
<PackageReference Update="Microsoft.Extensions.Hosting" Version="8.0.0" />
<PackageReference Update="Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer" Version="5.1.0" />
<PackageReference Update="Microsoft.EntityFrameworkCore" Version="8.0.0" />
<PackageReference Update="Microsoft.EntityFrameworkCore.Design" Version="8.0.0" />
<PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="8.0.0" />
<PackageReference Update="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0" />
<PackageReference Update="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.0" />
<PackageReference Update="Pomelo.EntityFrameworkCore.MySql" Version="8.0.0" />
<PackageReference Update="Azure.Identity" Version="1.9.0" />
<PackageReference Update="Microsoft.Data.SqlClient" Version="5.1.1" />
<PackageReference Update="System.Text.Json" Version="8.0.0" />
<PackageReference Update="System.Net.Http.Json" Version="8.0.0" />
<PackageReference Update="System.Diagnostics.DiagnosticSource" Version="8.0.0" />
<PackageReference Update="System.Threading.Tasks.Extensions" Version="4.6.0" />
<PackageReference Update="xunit" Version="2.5.0" />
<PackageReference Update="xunit.runner.visualstudio" Version="2.5.0" />
<PackageReference Update="Respawn" Version="5.0.1" />
<PackageReference Update="Acheve.TestHost" Version="3.0.0" />
<PackageReference Update="FluentAssertions" Version="6.4.0" />
<PackageReference Update="FluentValidation" Version="10.3.6" />
<PackageReference Update="FluentValidation.AspNetCore" Version="10.1.0" />
<PackageReference Update="MediatR.Extensions.Microsoft.DependencyInjection" Version="10.0.1" />
<PackageReference Update="Hellang.Middleware.ProblemDetails" Version="6.3.0" />
<PackageReference Update="NSwag.MSBuild" Version="13.15.5"/>
<PackageReference Update="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Update="FluentAssertions" Version="6.11.0" />
<PackageReference Update="FluentValidation" Version="11.3.0" />
<PackageReference Update="FluentValidation.AspNetCore" Version="11.3.0" />
<PackageReference Update="MediatR.Extensions.Microsoft.DependencyInjection" Version="11.0.0" />
<PackageReference Update="Hellang.Middleware.ProblemDetails" Version="6.5.1" />
<PackageReference Update="NSwag.MSBuild" Version="13.20.0" />
<PackageReference Update="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Update="BlazorInputFile" Version="0.2.0" />
<PackageReference Update="BuildBundlerMinifier" Version="3.2.449" />
<PackageReference Update="IdentityModel" Version="6.0.0" />
<PackageReference Update="Serilog.Extensions.Logging" Version="3.1.0" />
<PackageReference Update="Serilog.Extensions.Logging" Version="3.0.1" />
<PackageReference Update="Serilog.Settings.Configuration" Version="3.3.0" />
<PackageReference Update="Serilog.Sinks.ApplicationInsights" Version="3.1.0" />
<PackageReference Update="Serilog.Sinks.Console" Version="4.0.1" />
<PackageReference Update="Swashbuckle.AspNetCore" Version="6.2.3" />
<PackageReference Update="McMaster.Extensions.CommandLineUtils" Version="4.0.0" />
<PackageReference Update="Swashbuckle.AspNetCore" Version="6.5.0" />
<PackageReference Update="McMaster.Extensions.CommandLineUtils" Version="2.5.0" />
<PackageReference Update="MiniProfiler.AspNetCore.Mvc" Version="4.2.22" />
<PackageReference Update="MiniProfiler.Shared" Version="4.2.22" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Esquio.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GettingStarted.AspNetCore.E
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GettingStarted.AspNetCore.Mvc.ApplicationInsights", "samples\GettingStarted.AspNetCore.Mvc.ApplicationInsights\GettingStarted.AspNetCore.Mvc.ApplicationInsights.csproj", "{66B38F31-F08A-4A66-BB5E-417594478003}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GettingStarted.AspNetCore.MinimalApi", "samples\GettingStarted.AspNetCore.MinimalApi\GettingStarted.AspNetCore.MinimalApi.csproj", "{9F4A1F42-296E-4757-95EF-93D3795274A3}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GettingStarted.AspNetCore.MinimalApi", "samples\GettingStarted.AspNetCore.MinimalApi\GettingStarted.AspNetCore.MinimalApi.csproj", "{9F4A1F42-296E-4757-95EF-93D3795274A3}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
22 changes: 11 additions & 11 deletions build/dependencies.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
<Project>
<PropertyGroup Label="SDK Versions">
<NetFrameworkVersion>net6.0</NetFrameworkVersion>
<NetFrameworkVersion>net8.0</NetFrameworkVersion>
<NetStandardVersion>netstandard21</NetStandardVersion>
<NetTestSdk>17.0.0</NetTestSdk>
<LangVersion>preview</LangVersion>
<GitHubSourceLink>1.1.1</GitHubSourceLink>
</PropertyGroup>

<PropertyGroup Label="Esquio Versions">
<esquio>6.0.0$(VersionSuffix)</esquio>
<esquioaspnetcore>6.0.0$(VersionSuffix)</esquioaspnetcore>
<esquioaspnetcoreapplicationinsightsprocessor>6.0.0$(VersionSuffix)</esquioaspnetcoreapplicationinsightsprocessor>
<esquioconfigurationstore>6.0.0$(VersionSuffix)</esquioconfigurationstore>
<esquiodatabasestore>6.0.0$(VersionSuffix)</esquiodatabasestore>
<esquioentityframeworkstore>6.0.0$(VersionSuffix)</esquioentityframeworkstore>
<esquiominiprofiler>6.0.0$(VersionSuffix)</esquiominiprofiler>
<esquiocli>6.0.0$(VersionSuffix)</esquiocli>
<esquiohttpstore>6.0.0$(VersionSuffix)</esquiohttpstore>
<esquioblazorwasm>6.0.0$(VersionSuffix)</esquioblazorwasm>
<esquio>8.0.0$(VersionSuffix)</esquio>
<esquioaspnetcore>8.0.0$(VersionSuffix)</esquioaspnetcore>
<esquioaspnetcoreapplicationinsightsprocessor>8.0.0$(VersionSuffix)</esquioaspnetcoreapplicationinsightsprocessor>
<esquioconfigurationstore>8.0.0$(VersionSuffix)</esquioconfigurationstore>
<esquiodatabasestore>8.0.0$(VersionSuffix)</esquiodatabasestore>
<esquioentityframeworkstore>8.0.0$(VersionSuffix)</esquioentityframeworkstore>
<esquiominiprofiler>8.0.0$(VersionSuffix)</esquiominiprofiler>
<esquiocli>8.0.0$(VersionSuffix)</esquiocli>
<esquiohttpstore>8.0.0$(VersionSuffix)</esquiohttpstore>
<esquioblazorwasm>8.0.0$(VersionSuffix)</esquioblazorwasm>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion build/docker-compose-demo-with-ui-mysql.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ services:
- Security__OpenId__ClientId=interactive.public
- Security__OpenId__Audience=api
- Security__OpenId__Scope=api
- Security__OpenId__Authority=https://demo.identityserver.io/
- Security__OpenId__Authority=https://demo.duendesoftware.com/
- Security__OpenId__ResponseType=code
- Security__OpenId__RequireHttpsMetadata=true
mysql:
Expand Down
2 changes: 1 addition & 1 deletion build/docker-compose-demo-with-ui-npgsql.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ services:
- Security__OpenId__ClientId=interactive.public
- Security__OpenId__Audience=api
- Security__OpenId__Scope=api
- Security__OpenId__Authority=https://demo.identityserver.io/
- Security__OpenId__Authority=https://demo.duendesoftware.com/
- Security__OpenId__ResponseType=code
- Security__OpenId__RequireHttpsMetadata=true
postgres:
Expand Down
2 changes: 1 addition & 1 deletion build/docker-compose-demo-with-ui-sqlserver-with-reference-images.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ services:
- Security__OpenId__ClientId=interactive.public
- Security__OpenId__Audience=api
- Security__OpenId__Scope=api
- Security__OpenId__Authority=https://demo.identityserver.io/
- Security__OpenId__Authority=https://demo.duendesoftware.com/
- Security__OpenId__ResponseType=code
- Security__OpenId__RequireHttpsMetadata=true
sqlserver:
Expand Down
2 changes: 1 addition & 1 deletion build/docker-compose-demo-with-ui-sqlserver.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ services:
- Security__OpenId__ClientId=interactive.public
- Security__OpenId__Audience=api
- Security__OpenId__Scope=api
- Security__OpenId__Authority=https://demo.identityserver.io/
- Security__OpenId__Authority=https://demo.duendesoftware.com/
- Security__OpenId__ResponseType=code
- Security__OpenId__RequireHttpsMetadata=true
sqlserver:
Expand Down
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"projects": [ "src", "tests", "samples"],
"sdk": {
"version": "6.0.201"
"version": "8.0.202"
}
}
8 changes: 4 additions & 4 deletions src/Esquio.UI.Api/Esquio.UI.Api.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@
<Folder Include="Infrastructure\Data\Migrations\SqlServer\" />
</ItemGroup>

<Target Name="CreateServicesFromControllers" AfterTargets="AfterBuild">
<Exec Condition="'$(OS)' == 'Windows_NT'" Command="$(NSwagExe_Net60) webapi2openapi /assembly:$(OutDir)$(ProjectName).dll /AspNetCore=true /ArrayType:System.Collections.ObjectModel.Collection /DefaultPropertyNameHandling:CamelCase /output:swagger.json /referencepaths: %USERPROFILE%\\.nuget\\packages" />
<Exec Condition="'$(OS)' == 'Unix'" Command="$(NSwagExe_Net60) webapi2swagger /assembly:$(OutDir)$(ProjectName).dll /AspNetCore=true /ArrayType:System.Collections.ObjectModel.Collection /DefaultPropertyNameHandling:CamelCase /output:swagger.json /referencepaths:$HOME/.nuget/packages" />
</Target>
<!--<Target Name="CreateServicesFromControllers" AfterTargets="AfterBuild">
<Exec Condition="'$(OS)' == 'Windows_NT'" Command="$(NSwagExe_Net80) webapi2openapi /assembly:$(OutDir)$(ProjectName).dll /AspNetCore=true /ArrayType:System.Collections.ObjectModel.Collection /DefaultPropertyNameHandling:CamelCase /output:swagger.json /referencepaths: %USERPROFILE%\\.nuget\\packages" />
<Exec Condition="'$(OS)' == 'Unix'" Command="$(NSwagExe_Net80) webapi2swagger /assembly:$(OutDir)$(ProjectName).dll /AspNetCore=true /ArrayType:System.Collections.ObjectModel.Collection /DefaultPropertyNameHandling:CamelCase /output:swagger.json /referencepaths:$HOME/.nuget/packages" />
</Target>-->

</Project>
5 changes: 3 additions & 2 deletions src/Esquio.UI.Api/Infrastructure/Behaviors/LoggerMediatRBehavior.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,10 @@ public LoggerMediatRBehavior(ILoggerFactory loggerFactory)
{
_loggerFactory = loggerFactory ?? throw new ArgumentNullException(nameof(loggerFactory));
}
public async Task<TResponse> Handle(TRequest request, CancellationToken cancellationToken, RequestHandlerDelegate<TResponse> next)

public async Task<TResponse> Handle(TRequest request, RequestHandlerDelegate<TResponse> next, CancellationToken cancellationToken)
{
var logger = _loggerFactory.CreateLogger<TRequest>();
var logger = _loggerFactory.CreateLogger<TRequest>();

Log.ExecutingCommand(logger, typeof(TRequest).Name);

Expand Down
2 changes: 1 addition & 1 deletion src/Esquio.UI.Host/appsettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"ClientId": "interactive.public",
"Audience": "api",
"Scope": "api",
"Authority": "https://demo.identityserver.io/",
"Authority": "https://demo.duendesoftware.com/",
"ResponseType": "code"
}
},
Expand Down
Loading