upgraded to .net 7 and respective packages, all tests ok

zijianhuang · Nov 11, 2022 · c610b71 · c610b71
1 parent 075a715
commit c610b71
Show file tree

Hide file tree

Showing 12 changed files with 18 additions and 18 deletions.
diff --git a/Core3Mvc/Core3Mvc.csproj b/Core3Mvc/Core3Mvc.csproj
@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Fonlow.WebApiClientGenCore" Version="6.8.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.6" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Core3WebApi/Core3WebApi.csproj b/Core3WebApi/Core3WebApi.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -13,8 +13,8 @@
     <PackageReference Include="Fonlow.WebApiClientGenCore" Version="6.8.0" />
     <PackageReference Include="Fonlow.WebApiClientGenCore.Axios" Version="3.2.1" />
     <PackageReference Include="Fonlow.WebApiClientGenCore.Fetch" Version="3.2.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.6" />
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.6" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.0" />
+    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="7.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/CoreNG3/CoreNG3.csproj b/CoreNG3/CoreNG3.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
     <TypeScriptToolsVersion>Latest</TypeScriptToolsVersion>
     <IsPackable>false</IsPackable>
@@ -15,8 +15,8 @@
   <ItemGroup>
     <PackageReference Include="Fonlow.WebApiClientGenCore" Version="6.8.0" />
     <PackageReference Include="Fonlow.WebApiClientGenCore.NG2" Version="3.2.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.6" />
-    <PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="6.0.6" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="7.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/CoreWebApi.ClientApi/CoreWebApi.ClientApi.csproj b/CoreWebApi.ClientApi/CoreWebApi.ClientApi.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/CreateCoreNG3ClientApi.ps1 b/CreateCoreNG3ClientApi.ps1
@@ -1,6 +1,6 @@
 cd $PSScriptRoot
 #Make sure CodeGen.json is saved in format ANSI or UTF-8 without BOM, since ASP.NET Core 2.0 Web API will fail to deserialize POST Body that contains BOM.
-$path = "$PSScriptRoot\CoreNG3\bin\Debug\net6.0"
+$path = "$PSScriptRoot\CoreNG3\bin\Debug\net7.0"
 $procArgs = @{
     FilePath         = "dotnet.exe"
     ArgumentList     = "$path\CoreNG3.dll"

diff --git a/CreateMvc3ClientApi.ps1 b/CreateMvc3ClientApi.ps1
@@ -1,6 +1,6 @@
 cd $PSScriptRoot
 #Make sure CodeGen.json is saved in format ANSI or UTF-8 without BOM, since ASP.NET Core 2.0 Web API will fail to deserialize POST Body that contains BOM.
-$path = "$PSScriptRoot\Core3Mvc\bin\Debug\net6.0"
+$path = "$PSScriptRoot\Core3Mvc\bin\Debug\net7.0"
 $procArgs = @{
     FilePath         = "dotnet.exe"
     ArgumentList     = "$path\Core3Mvc.dll"

diff --git a/CreateWebApiClientApi3.ps1 b/CreateWebApiClientApi3.ps1
@@ -1,6 +1,6 @@
 cd $PSScriptRoot
 #Make sure CodeGen.json is saved in format ANSI or UTF-8 without BOM, since ASP.NET Core 2.0 Web API will fail to deserialize POST Body that contains BOM.
-$path = "$PSScriptRoot\Core3WebApi\bin\Debug\net6.0"
+$path = "$PSScriptRoot\Core3WebApi\bin\Debug\net7.0"
 $procArgs = @{
     FilePath         = "dotnet.exe"
     ArgumentList     = "$path\Core3WebApi.dll"

diff --git a/DemoWebApi.DemoDataCore/DemoWebApi.DemoDataCore.csproj b/DemoWebApi.DemoDataCore/DemoWebApi.DemoDataCore.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
 

diff --git a/StartCoreMvc.ps1 b/StartCoreMvc.ps1
@@ -1,6 +1,6 @@
 #Launch WebApi Website and POST a request for generating client APIs
 cd $PSScriptRoot
-$path = "$PSScriptRoot\Core3MVC\bin\Debug\net6.0"
+$path = "$PSScriptRoot\Core3MVC\bin\Debug\net7.0"
 $procArgs = @{
     FilePath         = "dotnet.exe"
     ArgumentList     = "$path\Core3MVC.dll"

diff --git a/StartCoreNG.ps1 b/StartCoreNG.ps1
@@ -1,6 +1,6 @@
 #Launch WebApi Website and POST a request for generating client APIs
 cd $PSScriptRoot
-$path = "$PSScriptRoot\CoreNG3\bin\Debug\net6.0"
+$path = "$PSScriptRoot\CoreNG3\bin\Debug\net7.0"
 $procArgs = @{
     FilePath         = "dotnet.exe"
     ArgumentList     = "$path\CoreNG3.dll"

diff --git a/StartCoreWebApi.ps1 b/StartCoreWebApi.ps1
@@ -1,6 +1,6 @@
 #Launch WebApi Website and POST a request for generating client APIs
 cd $PSScriptRoot
-$path = "$PSScriptRoot\Core3WebApi\bin\Debug\net6.0"
+$path = "$PSScriptRoot\Core3WebApi\bin\Debug\net7.0"
 $procArgs = @{
     FilePath         = "dotnet.exe"
     ArgumentList     = "$path\Core3WebApi.dll"

diff --git a/Tests/IntegrationTestsCore/IntegrationTestsCore.csproj b/Tests/IntegrationTestsCore/IntegrationTestsCore.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
 
@@ -29,7 +29,7 @@
   <ItemGroup>
     <PackageReference Include="Fonlow.DateOnlyExtensions" Version="1.2.0" />
     <PackageReference Include="Fonlow.Testing.ServiceCore" Version="2.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
     <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">