dotnet-campus · walterlv · Aug 9, 2023 · Aug 5, 2023 · Aug 5, 2023 · Aug 9, 2023
diff --git a/.github/workflows/NuGet-tag-publish.yml b/.github/workflows/NuGet-tag-publish.yml
@@ -12,6 +12,14 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: |
+          3.1.x
+          5.0.x
+          6.0.x
+          7.0.x
 
     - name: Install dotnet tool
       run: dotnet tool update -g dotnetCampus.TagToVersion

diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml
@@ -9,7 +9,15 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: |
+          3.1.x
+          5.0.x
+          6.0.x
+          7.0.x
+
     - name: Build with dotnet
       run: dotnet build --configuration Release
 

diff --git a/CopyAfterCompileTool/CopyAfterCompileTool/CopyAfterCompileTool.csproj b/CopyAfterCompileTool/CopyAfterCompileTool/CopyAfterCompileTool.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup>

diff --git a/...leTool/CopyAfterCompileToolTests/CopyAfterCompileToolDemo/CopyAfterCompileToolDemo.csproj b/...leTool/CopyAfterCompileToolTests/CopyAfterCompileToolDemo/CopyAfterCompileToolDemo.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -8,7 +8,7 @@
     <RepositoryUrl>https://github.com/dotnet-campus/dotnetcampus.DotNETBuildSDK</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <PackageProjectUrl>https://github.com/dotnet-campus/dotnetcampus.DotNETBuildSDK</PackageProjectUrl>
-    <Copyright>Copyright © 2021 dotnet campus, All Rights Reserved.</Copyright>
+    <Copyright>Copyright © 2021-2023 dotnet campus, All Rights Reserved.</Copyright>
     <Description>提供dotnet打包方法</Description>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
   </PropertyGroup>

diff --git a/GitLab/GitLabCodeFormatBot/GitLabCodeFormatBot.csproj b/GitLab/GitLabCodeFormatBot/GitLabCodeFormatBot.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
 
     <PackAsTool>true</PackAsTool>
     <ToolCommandName>AutomateFormatCodeAndCreateGitLabMergeRequest</ToolCommandName>

diff --git a/GitLab/GitLabMergeRequestCreator/GitLabMergeRequestCreator.csproj b/GitLab/GitLabMergeRequestCreator/GitLabMergeRequestCreator.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
 
     <PackAsTool>true</PackAsTool>
     <ToolCommandName>CreateGitLabMergeRequest</ToolCommandName>

diff --git a/PublishFolderCleaner/PublishFolderCleaner.NuGet/PublishFolderCleaner.NuGet.csproj b/PublishFolderCleaner/PublishFolderCleaner.NuGet/PublishFolderCleaner.NuGet.csproj
@@ -2,14 +2,14 @@
 
   <PropertyGroup>
     <!-- 发布应用用到 AppHost 不包括 .NET 45 等框架版本 -->
-    <TargetFrameworks>net5.0;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net7.0;netcoreapp3.1</TargetFrameworks>
     <PackageId>dotnetCampus.PublishFolderCleaner</PackageId>
     <IncludeBuildOutput>false</IncludeBuildOutput>
     <DevelopmentToolPath>..\PublishFolderCleaner\bin\$(Configuration)\</DevelopmentToolPath>
     <Description>本工具提供 NuGet 包，可以在安装完成之后，发布应用将让发布文件夹下只包含一个 exe 和一个 lib 文件夹。此 exe 即是入口可执行文件，而 lib 文件夹就是原本的发布文件夹下的其他的文件</Description>
   </PropertyGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net5.0' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
     <!-- 用于设置项目构建顺序 -->
     <!-- 必须等待 PublishFolderCleaner 构建完成之后才能构建此项目 -->
     <ProjectReference Include="..\PublishFolderCleaner\PublishFolderCleaner.csproj" ReferenceOutputAssembly="false" />

diff --git a/PublishFolderCleaner/PublishFolderCleaner/PublishFolderCleaner.csproj b/PublishFolderCleaner/PublishFolderCleaner/PublishFolderCleaner.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 

diff --git a/RegexReplaceTask/RegexReplaceTask.csproj b/RegexReplaceTask/RegexReplaceTask.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <PackAsTool>true</PackAsTool>

diff --git a/RunWithConfigValueTask/RunWithConfigValueTask.csproj b/RunWithConfigValueTask/RunWithConfigValueTask.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <PackAsTool>true</PackAsTool>
     <ToolCommandName>RunWithConfigValueTask</ToolCommandName>
     <AssemblyName>dotnetCampus.RunWithConfigValueTask</AssemblyName>

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

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

diff --git a/XmlComparerTool/XmlComparer/XmlComparer.csproj b/XmlComparerTool/XmlComparer/XmlComparer.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net45;net5.0</TargetFrameworks>
+    <TargetFrameworks>net45;net7.0</TargetFrameworks>
     <RootNamespace>dotnetCampus.Comparison</RootNamespace>
     <Nullable>enable</Nullable>
     <AssemblyName>dotnetCampus.Comparison.XmlComparer</AssemblyName>