Skip to content

Commit

Permalink
migrate to .net8
Browse files Browse the repository at this point in the history
  • Loading branch information
devhl-labs committed Nov 24, 2023
1 parent 1332a75 commit 8e82bf4
Show file tree
Hide file tree
Showing 6 changed files with 119 additions and 22 deletions.
77 changes: 77 additions & 0 deletions src/CocApi.Cache/CocApi - Backup.Cache.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<Authors>devhl</Authors>
<Product />
<Description>Caches response from the Clash of Clans API.</Description>
<Version>2.10.0</Version>
<AssemblyVersion>2.0.0.0</AssemblyVersion>
<FileVersion>2.0.0.0</FileVersion>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<PackageProjectUrl>https://discord.gg/AT4wJNq</PackageProjectUrl>
<PackageId>CocApi.Cache</PackageId>
<Copyright>2021</Copyright>
<PackageLicenseExpression></PackageLicenseExpression>
<PackageIcon>Barbarian King.png</PackageIcon>
<RepositoryUrl>https://github.com/devhl-labs/CocApi.git</RepositoryUrl>
<PackageTags>ClashOfClans SuperCell devhl</PackageTags>
<PackageReleaseNotes>Updated CocApi</PackageReleaseNotes>
<ApplicationIcon />
<AssemblyName>CocApi.Cache</AssemblyName>
<RootNamespace>CocApi.Cache</RootNamespace>
<Company />
<PackageLicenseFile>LICENSE.md</PackageLicenseFile>
<Title>CocApi.Cache</Title>
</PropertyGroup>

<ItemGroup>
<Compile Remove="jsonconverterattribute.cs" />
<Compile Remove="SCDateTimeConverterAttribute.cs" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.5">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.5" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="7.0.0" />
<PackageReference Include="ScheduledServices" Version="1.3.3" />
<PackageReference Include="System.Net.Http" Version="4.3.4" />
</ItemGroup>

<ItemGroup>
<None Include="..\..\.editorconfig" Link=".editorconfig" />
<None Include="..\..\Barbarian King.png" Pack="true" PackagePath="">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="..\..\LICENSE.md">
<Pack>True</Pack>
<PackagePath></PackagePath>
</None>
</ItemGroup>

<ItemGroup>
<None Update="CocApiDatabase.db">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="CocApiDatabase.sqlite">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="MyDatabase.sqlite">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\CocApi.Rest\CocApi.Rest.csproj" />
<ProjectReference Include="..\CocApi\CocApi.csproj" />
</ItemGroup>



</Project>
12 changes: 6 additions & 6 deletions src/CocApi.Cache/CocApi.Cache.csproj
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>
<Nullable>enable</Nullable>
<Authors>devhl</Authors>
<Product />
Expand Down Expand Up @@ -32,14 +32,14 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.5">
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.5" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="7.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
<PackageReference Include="ScheduledServices" Version="1.3.3" />
<PackageReference Include="System.Net.Http" Version="4.3.4" />
</ItemGroup>
Expand Down
20 changes: 20 additions & 0 deletions src/CocApi.Rest.Test/CocApi - Backup.Rest.Test.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<AssemblyName>CocApi.Rest.Test</AssemblyName>
<RootNamespace>CocApi.Rest.Test</RootNamespace>
<TargetFramework>net8.0</TargetFramework>
<IsPackable>false</IsPackable>
<Nullable>enable</Nullable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="xunit" Version="2.6.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\CocApi.Rest\CocApi.Rest.csproj" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/CocApi.Rest/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ Authentication schemes defined for the API:

## Build
- SDK version: 2.10.0
- Build date: 2023-11-23T19:28:35.143999400-05:00[America/New_York]
- Build date: 2023-11-23T20:18:16.259280100-05:00[America/New_York]
- Build package: org.openapitools.codegen.languages.CSharpClientCodegen

## Api Information
Expand Down
28 changes: 14 additions & 14 deletions src/CocApi.Test/CocApi.Test.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,29 +2,29 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<nullable>enable</nullable>
<UserSecretsId>ead207ab-4248-4d97-8ab6-2009093d6413</UserSecretsId>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.5">
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="7.0.11" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.4" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.0" />
<PackageReference Include="Polly.Extensions.Http" Version="3.0.0" />
<PackageReference Include="Serilog" Version="2.12.0" />
<PackageReference Include="Serilog.Extensions.Hosting" Version="7.0.0" />
<PackageReference Include="Serilog.Settings.Configuration" Version="7.0.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
<PackageReference Include="Serilog" Version="3.1.1" />
<PackageReference Include="Serilog.Extensions.Hosting" Version="8.0.0" />
<PackageReference Include="Serilog.Settings.Configuration" Version="8.0.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="5.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/CocApi/CocApi.csproj
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>
<AssemblyName>CocApi</AssemblyName>
<PackageId>CocApi</PackageId>
<OutputType>Library</OutputType>
Expand Down

0 comments on commit 8e82bf4

Please sign in to comment.