Merge pull request #95 from dotnet-campus/t/lindexi/dotnet

全面更新框架
dotnet-campus · Aug 9, 2023 · b88d8e2 · b88d8e2
2 parents ea5ea1f + eb2409c
commit b88d8e2
Show file tree

Hide file tree

Showing 12 changed files with 27 additions and 11 deletions.
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>net6.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>net6.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>net6.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>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
 
     <PackAsTool>true</PackAsTool>
     <ToolCommandName>CreateGitLabMergeRequest</ToolCommandName>

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