From 746ce1c1af3bce42f29856b2899df7c774380a4a Mon Sep 17 00:00:00 2001 From: lindexi Date: Sat, 5 Aug 2023 10:47:55 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=85=A8=E9=9D=A2=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E6=A1=86=E6=9E=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 除了原有的 .NET Core 3.1 .NET6 的，其他都更新到 .NET 7 框架 --- .../CopyAfterCompileTool/CopyAfterCompileTool.csproj | 2 +- .../CopyAfterCompileToolDemo/CopyAfterCompileToolDemo.csproj | 2 +- Directory.Build.props | 2 +- GitLab/GitLabCodeFormatBot/GitLabCodeFormatBot.csproj | 2 +- .../GitLabMergeRequestCreator.csproj | 2 +- .../PublishFolderCleaner.NuGet.csproj | 4 ++-- .../PublishFolderCleaner/PublishFolderCleaner.csproj | 2 +- RegexReplaceTask/RegexReplaceTask.csproj | 2 +- RunWithConfigValueTask/RunWithConfigValueTask.csproj | 2 +- Tests/RegexReplaceTask.Tests/RegexReplaceTask.Tests.csproj | 2 +- .../RunWithConfigValueTask.Tests.csproj | 2 +- XmlComparerTool/XmlComparer/XmlComparer.csproj | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/CopyAfterCompileTool/CopyAfterCompileTool/CopyAfterCompileTool.csproj b/CopyAfterCompileTool/CopyAfterCompileTool/CopyAfterCompileTool.csproj index 79cd8a1..d0e96b4 100644 --- a/CopyAfterCompileTool/CopyAfterCompileTool/CopyAfterCompileTool.csproj +++ b/CopyAfterCompileTool/CopyAfterCompileTool/CopyAfterCompileTool.csproj @@ -2,7 +2,7 @@ Exe - net5.0 + net7.0 diff --git a/CopyAfterCompileTool/CopyAfterCompileToolTests/CopyAfterCompileToolDemo/CopyAfterCompileToolDemo.csproj b/CopyAfterCompileTool/CopyAfterCompileToolTests/CopyAfterCompileToolDemo/CopyAfterCompileToolDemo.csproj index 4e6b89f..e5c90ab 100644 --- a/CopyAfterCompileTool/CopyAfterCompileToolTests/CopyAfterCompileToolDemo/CopyAfterCompileToolDemo.csproj +++ b/CopyAfterCompileTool/CopyAfterCompileToolTests/CopyAfterCompileToolDemo/CopyAfterCompileToolDemo.csproj @@ -1,7 +1,7 @@ - net5.0 + net7.0 diff --git a/Directory.Build.props b/Directory.Build.props index 0585a99..21a15fe 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -8,7 +8,7 @@ https://github.com/dotnet-campus/dotnetcampus.DotNETBuildSDK git https://github.com/dotnet-campus/dotnetcampus.DotNETBuildSDK - Copyright © 2021 dotnet campus, All Rights Reserved. + Copyright © 2021-2023 dotnet campus, All Rights Reserved. 提供dotnet打包方法 MIT diff --git a/GitLab/GitLabCodeFormatBot/GitLabCodeFormatBot.csproj b/GitLab/GitLabCodeFormatBot/GitLabCodeFormatBot.csproj index b4a0ab8..e38ca49 100644 --- a/GitLab/GitLabCodeFormatBot/GitLabCodeFormatBot.csproj +++ b/GitLab/GitLabCodeFormatBot/GitLabCodeFormatBot.csproj @@ -2,7 +2,7 @@ Exe - net5.0 + net7.0 true AutomateFormatCodeAndCreateGitLabMergeRequest diff --git a/GitLab/GitLabMergeRequestCreator/GitLabMergeRequestCreator.csproj b/GitLab/GitLabMergeRequestCreator/GitLabMergeRequestCreator.csproj index 09c6166..bfbcd9e 100644 --- a/GitLab/GitLabMergeRequestCreator/GitLabMergeRequestCreator.csproj +++ b/GitLab/GitLabMergeRequestCreator/GitLabMergeRequestCreator.csproj @@ -2,7 +2,7 @@ Exe - net5.0 + net7.0 true CreateGitLabMergeRequest diff --git a/PublishFolderCleaner/PublishFolderCleaner.NuGet/PublishFolderCleaner.NuGet.csproj b/PublishFolderCleaner/PublishFolderCleaner.NuGet/PublishFolderCleaner.NuGet.csproj index b6c1a01..7c4e6b8 100644 --- a/PublishFolderCleaner/PublishFolderCleaner.NuGet/PublishFolderCleaner.NuGet.csproj +++ b/PublishFolderCleaner/PublishFolderCleaner.NuGet/PublishFolderCleaner.NuGet.csproj @@ -2,14 +2,14 @@ - net5.0;netcoreapp3.1 + net7.0;netcoreapp3.1 dotnetCampus.PublishFolderCleaner false ..\PublishFolderCleaner\bin\$(Configuration)\ 本工具提供 NuGet 包，可以在安装完成之后，发布应用将让发布文件夹下只包含一个 exe 和一个 lib 文件夹。此 exe 即是入口可执行文件，而 lib 文件夹就是原本的发布文件夹下的其他的文件 - + diff --git a/PublishFolderCleaner/PublishFolderCleaner/PublishFolderCleaner.csproj b/PublishFolderCleaner/PublishFolderCleaner/PublishFolderCleaner.csproj index 93b1f38..e728a9b 100644 --- a/PublishFolderCleaner/PublishFolderCleaner/PublishFolderCleaner.csproj +++ b/PublishFolderCleaner/PublishFolderCleaner/PublishFolderCleaner.csproj @@ -2,7 +2,7 @@ Exe - net5.0 + net7.0 false diff --git a/RegexReplaceTask/RegexReplaceTask.csproj b/RegexReplaceTask/RegexReplaceTask.csproj index 97e7de9..893d15f 100644 --- a/RegexReplaceTask/RegexReplaceTask.csproj +++ b/RegexReplaceTask/RegexReplaceTask.csproj @@ -2,7 +2,7 @@ Exe - net5.0 + net7.0 enable enable true diff --git a/RunWithConfigValueTask/RunWithConfigValueTask.csproj b/RunWithConfigValueTask/RunWithConfigValueTask.csproj index fcdf786..71996b0 100644 --- a/RunWithConfigValueTask/RunWithConfigValueTask.csproj +++ b/RunWithConfigValueTask/RunWithConfigValueTask.csproj @@ -2,7 +2,7 @@ Exe - net5.0 + net7.0 true RunWithConfigValueTask dotnetCampus.RunWithConfigValueTask diff --git a/Tests/RegexReplaceTask.Tests/RegexReplaceTask.Tests.csproj b/Tests/RegexReplaceTask.Tests/RegexReplaceTask.Tests.csproj index e1eb797..64d6695 100644 --- a/Tests/RegexReplaceTask.Tests/RegexReplaceTask.Tests.csproj +++ b/Tests/RegexReplaceTask.Tests/RegexReplaceTask.Tests.csproj @@ -1,7 +1,7 @@ - net5.0 + net7.0 false diff --git a/Tests/RunWithConfigValueTask.Tests/RunWithConfigValueTask.Tests.csproj b/Tests/RunWithConfigValueTask.Tests/RunWithConfigValueTask.Tests.csproj index d5d13e5..08c2643 100644 --- a/Tests/RunWithConfigValueTask.Tests/RunWithConfigValueTask.Tests.csproj +++ b/Tests/RunWithConfigValueTask.Tests/RunWithConfigValueTask.Tests.csproj @@ -1,7 +1,7 @@ - net5.0 + net7.0 false diff --git a/XmlComparerTool/XmlComparer/XmlComparer.csproj b/XmlComparerTool/XmlComparer/XmlComparer.csproj index d103ee1..d742192 100644 --- a/XmlComparerTool/XmlComparer/XmlComparer.csproj +++ b/XmlComparerTool/XmlComparer/XmlComparer.csproj @@ -1,7 +1,7 @@ - net45;net5.0 + net45;net7.0 dotnetCampus.Comparison enable dotnetCampus.Comparison.XmlComparer From 84393edeaead7cfb417b1f36c0ea15e95191ae97 Mon Sep 17 00:00:00 2001 From: lindexi Date: Sat, 5 Aug 2023 10:56:20 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9E=84=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/NuGet-tag-publish.yml | 8 ++++++++ .github/workflows/dotnetcore.yml | 10 +++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.github/workflows/NuGet-tag-publish.yml b/.github/workflows/NuGet-tag-publish.yml index 85df85c..7d47a92 100644 --- 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 index 6b3f85d..56aacc2 100644 --- 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