-
Notifications
You must be signed in to change notification settings - Fork 357
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #131 from miketoupin/main
Upgraded from .Net6 to .Net8, including Dockerfiles and Nuget dependendencies
- Loading branch information
Showing
16 changed files
with
114 additions
and
183 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,18 +1,14 @@ | ||
<Project Sdk="Microsoft.NET.Sdk"> | ||
|
||
<PropertyGroup> | ||
<OutputType>Exe</OutputType> | ||
<TargetFramework>net6.0</TargetFramework> | ||
<TargetFramework>net8.0</TargetFramework> | ||
</PropertyGroup> | ||
|
||
<ItemGroup> | ||
<PackageReference Include="BenchmarkDotNet" Version="0.13.1" /> | ||
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.0" /> | ||
<PackageReference Include="BenchmarkDotNet" Version="0.13.12" /> | ||
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.1" /> | ||
</ItemGroup> | ||
|
||
<ItemGroup> | ||
<ProjectReference Include="..\OWSData\OWSData.csproj" /> | ||
<ProjectReference Include="..\OWSPublicAPI\OWSPublicAPI.csproj" /> | ||
</ItemGroup> | ||
|
||
</Project> | ||
</Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
31 changes: 12 additions & 19 deletions
31
src/OWSCharacterPersistence/OWSCharacterPersistence.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,52 +1,45 @@ | ||
<Project Sdk="Microsoft.NET.Sdk.Web"> | ||
|
||
<PropertyGroup> | ||
<TargetFramework>net6.0</TargetFramework> | ||
<TargetFramework>net8.0</TargetFramework> | ||
<UserSecretsId>f3bb93df-33d8-4372-b1d5-43a2c186459a</UserSecretsId> | ||
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS> | ||
<DockerComposeProjectPath>..\docker-compose.dcproj</DockerComposeProjectPath> | ||
</PropertyGroup> | ||
|
||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'"> | ||
<DocumentationFile>OWSCharacterPersistence.xml</DocumentationFile> | ||
</PropertyGroup> | ||
|
||
<ItemGroup> | ||
<None Include="..\.dockerignore" Link=".dockerignore"> | ||
<DependentUpon>$(DockerDefaultDockerfile)</DependentUpon> | ||
</None> | ||
</ItemGroup> | ||
|
||
<ItemGroup> | ||
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="5.0.2" /> | ||
<PackageReference Include="SimpleInjector" Version="5.4.1" /> | ||
<PackageReference Include="SimpleInjector.Integration.AspNetCore.Mvc" Version="5.4.0" /> | ||
<PackageReference Include="Serilog.AspNetCore" Version="7.0.0" /> | ||
<PackageReference Include="Serilog.Enrichers.ClientInfo" Version="1.3.0" /> | ||
<PackageReference Include="SimpleInjector" Version="5.4.4" /> | ||
<PackageReference Include="SimpleInjector.Integration.AspNetCore.Mvc" Version="5.5.0" /> | ||
<PackageReference Include="Serilog.AspNetCore" Version="8.0.1" /> | ||
<PackageReference Include="Serilog.Enrichers.ClientInfo" Version="2.0.3" /> | ||
<PackageReference Include="Serilog.Enrichers.CorrelationId" Version="3.0.1" /> | ||
<PackageReference Include="Serilog.Enrichers.Environment" Version="2.2.0" /> | ||
<PackageReference Include="Serilog.Enrichers.Environment" Version="2.3.0" /> | ||
<PackageReference Include="Serilog.Exceptions" Version="8.4.0" /> | ||
<PackageReference Include="Serilog.Extensions.Hosting" Version="7.0.0" /> | ||
<PackageReference Include="Serilog.Formatting.Elasticsearch" Version="9.0.2" /> | ||
<PackageReference Include="Serilog.Settings.Configuration" Version="7.0.0" /> | ||
<PackageReference Include="Serilog.Extensions.Hosting" Version="8.0.0" /> | ||
<PackageReference Include="Serilog.Formatting.Elasticsearch" Version="9.0.3" /> | ||
<PackageReference Include="Serilog.Settings.Configuration" Version="8.0.0" /> | ||
<PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" /> | ||
<PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" /> | ||
<PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" /> | ||
<PackageReference Include="Serilog.Sinks.Http" Version="8.0.0" /> | ||
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.5.0" /> | ||
<PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="6.5.0" /> | ||
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.5.0" /> | ||
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.5.0" /> | ||
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.0" /> | ||
</ItemGroup> | ||
|
||
<ItemGroup> | ||
<ProjectReference Include="..\OWSData\OWSData.csproj" /> | ||
<ProjectReference Include="..\OWSShared\OWSShared.csproj" /> | ||
</ItemGroup> | ||
|
||
<ItemGroup> | ||
<None Update="OWSCharacterPersistence.xml"> | ||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> | ||
</None> | ||
</ItemGroup> | ||
|
||
</Project> | ||
</Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,24 +1,20 @@ | ||
<Project Sdk="Microsoft.NET.Sdk"> | ||
|
||
<PropertyGroup> | ||
<TargetFramework>net6.0</TargetFramework> | ||
<TargetFramework>net8.0</TargetFramework> | ||
</PropertyGroup> | ||
|
||
<ItemGroup> | ||
<PackageReference Include="Dapper" Version="2.0.138" /> | ||
<PackageReference Include="Dapper.Transaction" Version="2.0.123" /> | ||
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.7" /> | ||
<PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="7.0.7" /> | ||
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.7" /> | ||
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.7" /> | ||
<PackageReference Include="MongoDB.Driver" Version="2.19.2" /> | ||
<PackageReference Include="MySql.Data" Version="8.0.33" /> | ||
<PackageReference Include="Npgsql" Version="7.0.4" /> | ||
<PackageReference Include="System.Data.SqlClient" Version="4.8.5" /> | ||
<PackageReference Include="Dapper" Version="2.1.28" /> | ||
<PackageReference Include="Dapper.Transaction" Version="2.1.24" /> | ||
<PackageReference Include="MongoDB.Driver" Version="2.23.1" /> | ||
<PackageReference Include="MySql.Data" Version="8.3.0" /> | ||
<PackageReference Include="Npgsql" Version="8.0.1" /> | ||
<PackageReference Include="System.Data.SqlClient" Version="4.8.6" /> | ||
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.1" /> | ||
<PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="8.0.1" /> | ||
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.1" /> | ||
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.1" /> | ||
</ItemGroup> | ||
|
||
<ItemGroup> | ||
<ProjectReference Include="..\OWSShared\OWSShared.csproj" /> | ||
</ItemGroup> | ||
|
||
</Project> | ||
</Project> |
13 changes: 5 additions & 8 deletions
13
src/OWSExternalLoginProviders/OWSExternalLoginProviders.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,14 +1,11 @@ | ||
<Project Sdk="Microsoft.NET.Sdk"> | ||
|
||
<PropertyGroup> | ||
<TargetFramework>net6.0</TargetFramework> | ||
<TargetFramework>net8.0</TargetFramework> | ||
</PropertyGroup> | ||
|
||
<ItemGroup> | ||
<PackageReference Include="IdentityModel" Version="6.1.0" /> | ||
<PackageReference Include="IdentityModel" Version="6.2.0" /> | ||
<PackageReference Include="IdentityModel.AspNetCore" Version="4.3.0" /> | ||
<PackageReference Include="Serilog" Version="2.12.0" /> | ||
<PackageReference Include="SimpleInjector" Version="5.4.1" /> | ||
<PackageReference Include="Serilog" Version="3.1.1" /> | ||
<PackageReference Include="SimpleInjector" Version="5.4.4" /> | ||
</ItemGroup> | ||
|
||
</Project> | ||
</Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,52 +1,45 @@ | ||
<Project Sdk="Microsoft.NET.Sdk.Web"> | ||
|
||
<PropertyGroup> | ||
<TargetFramework>net6.0</TargetFramework> | ||
<TargetFramework>net8.0</TargetFramework> | ||
<UserSecretsId>f2bb93df-33d8-4372-b1d5-43a2c186459a</UserSecretsId> | ||
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS> | ||
<DockerComposeProjectPath>..\docker-compose.dcproj</DockerComposeProjectPath> | ||
</PropertyGroup> | ||
|
||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'"> | ||
<DocumentationFile>OWSGlobalData.xml</DocumentationFile> | ||
</PropertyGroup> | ||
|
||
<ItemGroup> | ||
<None Include="..\.dockerignore" Link=".dockerignore"> | ||
<DependentUpon>$(DockerDefaultDockerfile)</DependentUpon> | ||
</None> | ||
</ItemGroup> | ||
|
||
<ItemGroup> | ||
<PackageReference Include="Serilog.AspNetCore" Version="7.0.0" /> | ||
<PackageReference Include="Serilog.Enrichers.ClientInfo" Version="1.3.0" /> | ||
<PackageReference Include="Serilog.AspNetCore" Version="8.0.1" /> | ||
<PackageReference Include="Serilog.Enrichers.ClientInfo" Version="2.0.3" /> | ||
<PackageReference Include="Serilog.Enrichers.CorrelationId" Version="3.0.1" /> | ||
<PackageReference Include="Serilog.Enrichers.Environment" Version="2.2.0" /> | ||
<PackageReference Include="Serilog.Exceptions" Version="8.4.0" /> | ||
<PackageReference Include="Serilog.Extensions.Hosting" Version="7.0.0" /> | ||
<PackageReference Include="Serilog.Formatting.Elasticsearch" Version="9.0.2" /> | ||
<PackageReference Include="Serilog.Settings.Configuration" Version="7.0.0" /> | ||
<PackageReference Include="Serilog.Extensions.Hosting" Version="8.0.0" /> | ||
<PackageReference Include="Serilog.Formatting.Elasticsearch" Version="9.0.3" /> | ||
<PackageReference Include="Serilog.Settings.Configuration" Version="8.0.0" /> | ||
<PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" /> | ||
<PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" /> | ||
<PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" /> | ||
<PackageReference Include="Serilog.Sinks.Http" Version="8.0.0" /> | ||
<PackageReference Include="SimpleInjector" Version="5.4.1" /> | ||
<PackageReference Include="SimpleInjector.Integration.AspNetCore.Mvc" Version="5.4.0" /> | ||
<PackageReference Include="SimpleInjector" Version="5.4.4" /> | ||
<PackageReference Include="SimpleInjector.Integration.AspNetCore.Mvc" Version="5.5.0" /> | ||
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" /> | ||
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.5.0" /> | ||
<PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="6.5.0" /> | ||
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.5.0" /> | ||
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.5.0" /> | ||
</ItemGroup> | ||
|
||
<ItemGroup> | ||
<ProjectReference Include="..\OWSData\OWSData.csproj" /> | ||
<ProjectReference Include="..\OWSShared\OWSShared.csproj" /> | ||
</ItemGroup> | ||
|
||
<ItemGroup> | ||
<None Update="OWSGlobaldata.xml"> | ||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> | ||
</None> | ||
</ItemGroup> | ||
|
||
</Project> | ||
</Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,32 +1,27 @@ | ||
<Project Sdk="Microsoft.NET.Sdk.Web"> | ||
|
||
<PropertyGroup> | ||
<TargetFramework>net6.0</TargetFramework> | ||
<TargetFramework>net8.0</TargetFramework> | ||
<StartupObject>OWSInstanceLauncher.Program</StartupObject> | ||
</PropertyGroup> | ||
|
||
<ItemGroup> | ||
<PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" /> | ||
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" /> | ||
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.7" /> | ||
<PackageReference Include="RabbitMQ.Client" Version="6.5.0" /> | ||
<PackageReference Include="Serilog.AspNetCore" Version="7.0.0" /> | ||
<PackageReference Include="Serilog.Enrichers.ClientInfo" Version="1.3.0" /> | ||
<PackageReference Include="RabbitMQ.Client" Version="6.8.1" /> | ||
<PackageReference Include="Serilog.AspNetCore" Version="8.0.1" /> | ||
<PackageReference Include="Serilog.Enrichers.ClientInfo" Version="2.0.3" /> | ||
<PackageReference Include="Serilog.Enrichers.CorrelationId" Version="3.0.1" /> | ||
<PackageReference Include="Serilog.Enrichers.Environment" Version="2.2.0" /> | ||
<PackageReference Include="Serilog.Enrichers.Environment" Version="2.3.0" /> | ||
<PackageReference Include="Serilog.Exceptions" Version="8.4.0" /> | ||
<PackageReference Include="Serilog.Extensions.Hosting" Version="7.0.0" /> | ||
<PackageReference Include="Serilog.Formatting.Elasticsearch" Version="9.0.2" /> | ||
<PackageReference Include="Serilog.Extensions.Hosting" Version="8.0.0" /> | ||
<PackageReference Include="Serilog.Formatting.Elasticsearch" Version="9.0.3" /> | ||
<PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" /> | ||
<PackageReference Include="Serilog.Sinks.Http" Version="8.0.0" /> | ||
<PackageReference Include="SimpleInjector" Version="5.4.1" /> | ||
<PackageReference Include="SimpleInjector.Integration.AspNetCore.Mvc" Version="5.4.0" /> | ||
<PackageReference Include="SimpleInjector.Integration.GenericHost" Version="5.4.0" /> | ||
<PackageReference Include="SimpleInjector" Version="5.4.4" /> | ||
<PackageReference Include="SimpleInjector.Integration.AspNetCore.Mvc" Version="5.5.0" /> | ||
<PackageReference Include="SimpleInjector.Integration.GenericHost" Version="5.5.0" /> | ||
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" /> | ||
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.0" /> | ||
</ItemGroup> | ||
|
||
<ItemGroup> | ||
<ProjectReference Include="..\OWSData\OWSData.csproj" /> | ||
<ProjectReference Include="..\OWSShared\OWSShared.csproj" /> | ||
</ItemGroup> | ||
|
||
</Project> | ||
</Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,55 +1,46 @@ | ||
<Project Sdk="Microsoft.NET.Sdk.Web"> | ||
|
||
<PropertyGroup> | ||
<TargetFramework>net6.0</TargetFramework> | ||
<TargetFramework>net8.0</TargetFramework> | ||
<UserSecretsId>e3bb93df-33d8-4372-b1d5-43a2c1864599</UserSecretsId> | ||
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS> | ||
<DockerComposeProjectPath>..\docker-compose.dcproj</DockerComposeProjectPath> | ||
</PropertyGroup> | ||
|
||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'"> | ||
<DocumentationFile>OWSInstanceManagement.xml</DocumentationFile> | ||
</PropertyGroup> | ||
|
||
<ItemGroup> | ||
<None Include="..\.dockerignore" Link=".dockerignore"> | ||
<DependentUpon>$(DockerDefaultDockerfile)</DependentUpon> | ||
</None> | ||
</ItemGroup> | ||
|
||
<ItemGroup> | ||
<PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" /> | ||
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.18.1" /> | ||
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="5.0.2" /> | ||
<PackageReference Include="RabbitMQ.Client" Version="6.5.0" /> | ||
<PackageReference Include="SimpleInjector" Version="5.4.1" /> | ||
<PackageReference Include="SimpleInjector.Integration.AspNetCore.Mvc" Version="5.4.0" /> | ||
<PackageReference Include="Serilog.AspNetCore" Version="7.0.0" /> | ||
<PackageReference Include="Serilog.Enrichers.ClientInfo" Version="1.3.0" /> | ||
<PackageReference Include="RabbitMQ.Client" Version="6.8.1" /> | ||
<PackageReference Include="SimpleInjector" Version="5.4.4" /> | ||
<PackageReference Include="SimpleInjector.Integration.AspNetCore.Mvc" Version="5.5.0" /> | ||
<PackageReference Include="Serilog.AspNetCore" Version="8.0.1" /> | ||
<PackageReference Include="Serilog.Enrichers.ClientInfo" Version="2.0.3" /> | ||
<PackageReference Include="Serilog.Enrichers.CorrelationId" Version="3.0.1" /> | ||
<PackageReference Include="Serilog.Enrichers.Environment" Version="2.2.0" /> | ||
<PackageReference Include="Serilog.Enrichers.Environment" Version="2.3.0" /> | ||
<PackageReference Include="Serilog.Exceptions" Version="8.4.0" /> | ||
<PackageReference Include="Serilog.Extensions.Hosting" Version="7.0.0" /> | ||
<PackageReference Include="Serilog.Formatting.Elasticsearch" Version="9.0.2" /> | ||
<PackageReference Include="Serilog.Settings.Configuration" Version="7.0.0" /> | ||
<PackageReference Include="Serilog.Extensions.Hosting" Version="8.0.0" /> | ||
<PackageReference Include="Serilog.Formatting.Elasticsearch" Version="9.0.3" /> | ||
<PackageReference Include="Serilog.Settings.Configuration" Version="8.0.0" /> | ||
<PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" /> | ||
<PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" /> | ||
<PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" /> | ||
<PackageReference Include="Serilog.Sinks.Http" Version="8.0.0" /> | ||
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.5.0" /> | ||
<PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="6.5.0" /> | ||
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.5.0" /> | ||
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.5.0" /> | ||
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.0" /> | ||
</ItemGroup> | ||
|
||
<ItemGroup> | ||
<ProjectReference Include="..\OWSData\OWSData.csproj" /> | ||
<ProjectReference Include="..\OWSShared\OWSShared.csproj" /> | ||
</ItemGroup> | ||
|
||
<ItemGroup> | ||
<None Update="OWSInstanceManagement.xml"> | ||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> | ||
</None> | ||
</ItemGroup> | ||
|
||
</Project> | ||
</Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.