Upgrade to .net7.0

Signed-off-by: virtual <1185513330@qq.com>
cocosip · Dec 19, 2022 · 3eeb00b · 3eeb00b
1 parent 6820e95
commit 3eeb00b
Show file tree

Hide file tree

Showing 12 changed files with 21 additions and 21 deletions.
diff --git a/DotCommon.sln b/DotCommon.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.28803.352
+# Visual Studio Version 17
+VisualStudioVersion = 17.4.33205.214
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotCommon", "src\DotCommon\DotCommon.csproj", "{5D5012F3-65B7-42FB-A2D8-6BEA1C45AC7F}"
 EndProject

diff --git a/common.props b/common.props
@@ -1,7 +1,7 @@
 <Project>
     <PropertyGroup>
         <LangVersion>latest</LangVersion>
-        <Version>5.0.0</Version>
+        <Version>5.1.0</Version>
         <Authors>virtual</Authors>
         <Product>DotCommon</Product>
         <PackageProjectUrl>https://github.com/cocosip/DotCommon</PackageProjectUrl>

diff --git a/samples/DotCommon.ConsoleTest/DotCommon.ConsoleTest.csproj b/samples/DotCommon.ConsoleTest/DotCommon.ConsoleTest.csproj
@@ -2,14 +2,14 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.1" />
-    <PackageReference Include="NLog.Extensions.Logging" Version="5.0.4" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0" />
-    <PackageReference Include="System.Text.Encodings.Web" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
+    <PackageReference Include="NLog.Extensions.Logging" Version="5.2.0" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0" />
+    <PackageReference Include="System.Text.Encodings.Web" Version="7.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...Common.ImageResizer.AspNetCore.Mvc.Demo/DotCommon.ImageResizer.AspNetCore.Mvc.Demo.csproj b/...Common.ImageResizer.AspNetCore.Mvc.Demo/DotCommon.ImageResizer.AspNetCore.Mvc.Demo.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/DotCommon.Caching/DotCommon.Caching.csproj b/src/DotCommon.Caching/DotCommon.Caching.csproj
@@ -12,7 +12,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="Nito.AsyncEx" Version="5.1.2" />
-		<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="6.0.1" />
+		<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="7.0.0" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/src/DotCommon.ImageResizer.AspNetCore.Mvc/DotCommon.ImageResizer.AspNetCore.Mvc.csproj b/src/DotCommon.ImageResizer.AspNetCore.Mvc/DotCommon.ImageResizer.AspNetCore.Mvc.csproj
@@ -3,7 +3,7 @@
 	<Import Project="..\..\common.props" />
 
 	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
+		<TargetFramework>net7.0</TargetFramework>
 		<AssemblyName>DotCommon.ImageResizer.AspNetCore.Mvc</AssemblyName>
 		<PackageId>DotCommon.ImageResizer.AspNetCore.Mvc</PackageId>
 		<RootNamespace>DotCommon</RootNamespace>

diff --git a/src/DotCommon.ImageUtility/DotCommon.ImageUtility.csproj b/src/DotCommon.ImageUtility/DotCommon.ImageUtility.csproj
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Drawing.Common" Version="6.0.0" />
+    <PackageReference Include="System.Drawing.Common" Version="7.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/DotCommon.Json4Net/DotCommon.Json4Net.csproj b/src/DotCommon.Json4Net/DotCommon.Json4Net.csproj
@@ -11,7 +11,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+		<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/src/DotCommon.ProtoBuf/DotCommon.ProtoBuf.csproj b/src/DotCommon.ProtoBuf/DotCommon.ProtoBuf.csproj
@@ -11,7 +11,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="protobuf-net" Version="3.1.22" />
+		<PackageReference Include="protobuf-net" Version="3.1.26" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/src/DotCommon.TextJson/DotCommon.TextJson.csproj b/src/DotCommon.TextJson/DotCommon.TextJson.csproj
@@ -11,7 +11,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="System.Text.Json" Version="6.0.6" />
+		<PackageReference Include="System.Text.Json" Version="7.0.1" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/src/DotCommon/DotCommon.csproj b/src/DotCommon/DotCommon.csproj
@@ -11,7 +11,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">

diff --git a/test/DotCommon.Test/DotCommon.Test.csproj b/test/DotCommon.Test/DotCommon.Test.csproj
@@ -1,20 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>    
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Moq" Version="4.18.2" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
-    <PackageReference Include="System.Text.Encodings.Web" Version="6.0.0" />
+    <PackageReference Include="Moq" Version="4.18.3" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+    <PackageReference Include="System.Text.Encodings.Web" Version="7.0.0" />
     <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="3.1.2">
+    <PackageReference Include="coverlet.collector" Version="3.2.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>