.net 8

ladeak · Dec 5, 2023 · db755a7 · db755a7
1 parent ea63a2c
commit db755a7
Show file tree

Hide file tree

Showing 22 changed files with 16 additions and 269 deletions.
diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml
@@ -10,9 +10,9 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Setup .NET
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: '7.0.x'
+        dotnet-version: '8.0.x'
         include-prerelease: true
     - name: Set VERSION variable from tag
       run: echo "VERSION=${GITHUB_REF/refs\/tags\/v/}" >> $GITHUB_ENV

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -10,9 +10,9 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Setup .NET
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: '7.0.x'
+        dotnet-version: '8.0.x'
         include-prerelease: true
     - name: Install dependencies
       run: dotnet restore

diff --git a/JsonMergePatch.sln b/JsonMergePatch.sln
@@ -5,8 +5,6 @@ VisualStudioVersion = 17.0.31521.260
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JsonMergePatch.AspNetCore", "src\JsonMergePatch.AspNetCore\JsonMergePatch.AspNetCore.csproj", "{D539E41C-F89E-44C7-B2FD-ABE4E55942F1}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspNetCoreWebApi", "sample\AspNetCoreWebApi\AspNetCoreWebApi.csproj", "{910E8728-872B-43EF-994F-B67953874BCB}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JsonMergePatch.AspNetCore.Tests", "test\JsonMergePatch.Tests\JsonMergePatch.AspNetCore.Tests.csproj", "{7FD5D0AB-6388-4C97-896B-E648CADD86E8}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JsonMergePatch.Http", "src\JsonMergePatch.Http\JsonMergePatch.Http.csproj", "{C817634D-62FD-4958-A8BD-8661112891F6}"
@@ -39,10 +37,6 @@ Global
 		{D539E41C-F89E-44C7-B2FD-ABE4E55942F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D539E41C-F89E-44C7-B2FD-ABE4E55942F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D539E41C-F89E-44C7-B2FD-ABE4E55942F1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{910E8728-872B-43EF-994F-B67953874BCB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{910E8728-872B-43EF-994F-B67953874BCB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{910E8728-872B-43EF-994F-B67953874BCB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{910E8728-872B-43EF-994F-B67953874BCB}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7FD5D0AB-6388-4C97-896B-E648CADD86E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7FD5D0AB-6388-4C97-896B-E648CADD86E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7FD5D0AB-6388-4C97-896B-E648CADD86E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -88,7 +82,6 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{910E8728-872B-43EF-994F-B67953874BCB} = {0E750D74-69C7-433C-92C7-3F026083C255}
 		{1FE80A1A-9402-4953-9A7F-F01B1D0539B5} = {0E750D74-69C7-433C-92C7-3F026083C255}
 		{3592FF83-D9D6-473A-97CE-94FF0D7FE5F1} = {0E750D74-69C7-433C-92C7-3F026083C255}
 		{882E1027-9F66-4779-B85C-BC10C38E6816} = {0E750D74-69C7-433C-92C7-3F026083C255}

diff --git a/sample/AspNetCoreMinimal.Entities/AspNetCoreMinimal.Entities.csproj b/sample/AspNetCoreMinimal.Entities/AspNetCoreMinimal.Entities.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>
   </PropertyGroup>

diff --git a/sample/AspNetCoreMinimal/AspNetCoreMinimal.csproj b/sample/AspNetCoreMinimal/AspNetCoreMinimal.csproj
@@ -1,15 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\..\src\JsonMergePatch.AspNetCore\JsonMergePatch.AspNetCore.csproj" />
     <ProjectReference Include="..\AspNetCoreMinimal.Entities\AspNetCoreMinimal.Entities.csproj" />

diff --git a/sample/AspNetCoreMinimal/Program.cs b/sample/AspNetCoreMinimal/Program.cs
@@ -14,19 +14,9 @@
     options.InputFormatters.Insert(0, new JsonMergePatchInputReader(jsonOptions));
 });
 builder.Services.AddHttpClient();
-builder.Services.AddSwaggerGen(c =>
-{
-    c.SwaggerDoc("v1", new() { Title = "AspNetCoreMinimal", Version = "v1" });
-});
 
-var app = builder.Build();
 
-if (builder.Environment.IsDevelopment())
-{
-    app.UseDeveloperExceptionPage();
-    app.UseSwagger();
-    app.UseSwaggerUI(c => c.SwaggerEndpoint("/swagger/v1/swagger.json", "AspNetCoreMinimal v1"));
-}
+var app = builder.Build();
 
 app.UseHttpsRedirection();
 

diff --git a/sample/AspNetCoreWebApi/AspNetCoreWebApi.csproj b/sample/AspNetCoreWebApi/AspNetCoreWebApi.csproj
diff --git a/sample/AspNetCoreWebApi/Controllers/SampleController.cs b/sample/AspNetCoreWebApi/Controllers/SampleController.cs
diff --git a/sample/AspNetCoreWebApi/Program.cs b/sample/AspNetCoreWebApi/Program.cs
diff --git a/sample/AspNetCoreWebApi/Properties/launchSettings.json b/sample/AspNetCoreWebApi/Properties/launchSettings.json
diff --git a/sample/AspNetCoreWebApi/Startup.cs b/sample/AspNetCoreWebApi/Startup.cs
diff --git a/sample/AspNetCoreWebApi/appsettings.Development.json b/sample/AspNetCoreWebApi/appsettings.Development.json
diff --git a/sample/AspNetCoreWebApi/appsettings.json b/sample/AspNetCoreWebApi/appsettings.json
diff --git a/sample/ConsoleApp/ConsoleApp.csproj b/sample/ConsoleApp/ConsoleApp.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 

diff --git a/sample/ConsoleAppLibrary/ConsoleAppLibrary.csproj b/sample/ConsoleAppLibrary/ConsoleAppLibrary.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -12,7 +12,7 @@
     <IsPackable>true</IsPackable>
     <Description>LaDeak.JsonMergePatch libraries provide an implementation for Json Merge Patch, RFC7396. Library using C# source generators to generate the types required for serialization. The Http package provides extension methods for HTTP requests, while the AspNetCore package provides an InputReader implementation.</Description>
 
-    <MicrosoftCodeAnalysisCSharpVersion>3.11.0</MicrosoftCodeAnalysisCSharpVersion>
+    <MicrosoftCodeAnalysisCSharpVersion>4.8.0</MicrosoftCodeAnalysisCSharpVersion>
     <MicrosoftCodeAnalysisAnalyzersVersion>3.3.4</MicrosoftCodeAnalysisAnalyzersVersion>
   </PropertyGroup>
 

diff --git a/src/JsonMergePatch.AspNetCore/JsonMergePatch.AspNetCore.csproj b/src/JsonMergePatch.AspNetCore/JsonMergePatch.AspNetCore.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RootNamespace>LaDeak.JsonMergePatch.AspNetCore</RootNamespace>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/src/JsonMergePatch.Http/JsonMergePatch.Http.csproj b/src/JsonMergePatch.Http/JsonMergePatch.Http.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RootNamespace>LaDeak.JsonMergePatch.Http</RootNamespace>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/src/JsonMergePatch.SourceGenerator/JsonMergePatch.SourceGenerator.csproj b/src/JsonMergePatch.SourceGenerator/JsonMergePatch.SourceGenerator.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisCSharpVersion)" PrivateAssets="all" />
     <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="$(MicrosoftCodeAnalysisAnalyzersVersion)" PrivateAssets="all" />
   </ItemGroup>