From 4e4a12f2e7f4db31673a454d4fa3c400c809e7c8 Mon Sep 17 00:00:00 2001 From: afunc233 Date: Sun, 14 Nov 2021 02:12:08 +0800 Subject: [PATCH 1/4] =?UTF-8?q?net6.0=20=E7=BC=96=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj | 2 +- src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj | 2 +- src/Shared/HandyControlDemo_Code/HandyControlDemo_Code.csproj | 2 +- .../HandyControlDemo_Shared/Tools/Helper/VersionHelper.cs | 2 ++ 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj b/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj index 9aaf0808..2eb1c132 100644 --- a/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj +++ b/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj @@ -3,7 +3,7 @@ WinExe HandyControlDemo HandyControlDemo - netcoreapp3.0;netcoreapp3.1;net45;net451;net452;net46;net461;net462;net47;net471;net472;net48;net5.0-windows + netcoreapp3.0;netcoreapp3.1;net45;net451;net452;net46;net461;net462;net47;net471;net472;net48;net5.0-windows;net6.0-windows ..\..\Shared\HandyControlDemo_Shared\Resources\Img\icon.ico 0108;MSB3026;MSB3061 NETSDK1138 diff --git a/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj b/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj index 218a6f01..1881b318 100644 --- a/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj +++ b/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj @@ -2,7 +2,7 @@ HandyControl HandyControl - netcoreapp3.0;netcoreapp3.1;net45;net451;net452;net46;net461;net462;net47;net471;net472;net48;net5.0-windows + netcoreapp3.0;netcoreapp3.1;net45;net451;net452;net46;net461;net462;net47;net471;net472;net48;net5.0-windows;net6.0-windows Contains some simple and commonly used WPF controls HandyControl snupkg diff --git a/src/Shared/HandyControlDemo_Code/HandyControlDemo_Code.csproj b/src/Shared/HandyControlDemo_Code/HandyControlDemo_Code.csproj index 9e3731c4..237b3fcf 100644 --- a/src/Shared/HandyControlDemo_Code/HandyControlDemo_Code.csproj +++ b/src/Shared/HandyControlDemo_Code/HandyControlDemo_Code.csproj @@ -3,7 +3,7 @@ true HandyControlDemoCode HandyControlDemoCode - netcoreapp3.0;netcoreapp3.1;net40;net45;net451;net452;net46;net461;net462;net47;net471;net472;net48;net5.0-windows + netcoreapp3.0;netcoreapp3.1;net40;net45;net451;net452;net46;net461;net462;net47;net471;net472;net48;net5.0-windows;net6.0-windows MSB3026;MSB3061 NETSDK1138 diff --git a/src/Shared/HandyControlDemo_Shared/Tools/Helper/VersionHelper.cs b/src/Shared/HandyControlDemo_Shared/Tools/Helper/VersionHelper.cs index b5fe3372..84bbed1c 100644 --- a/src/Shared/HandyControlDemo_Shared/Tools/Helper/VersionHelper.cs +++ b/src/Shared/HandyControlDemo_Shared/Tools/Helper/VersionHelper.cs @@ -32,6 +32,8 @@ namespace HandyControlDemo.Tools var netVersion = "NET 48"; #elif NET5_0 var netVersion = "NET 50"; +#elif NET6_0 + var netVersion = "NET 60"; #elif NETCOREAPP3_0 var netVersion = "CORE 30"; #elif NETCOREAPP3_1 From de21909def30d5516c527499a9a798bbef68a570 Mon Sep 17 00:00:00 2001 From: afunc233 Date: Sun, 14 Nov 2021 02:49:13 +0800 Subject: [PATCH 2/4] Modify build.cake --- build/build.cake | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/build/build.cake b/build/build.cake index 34b6f839..cca3a628 100644 --- a/build/build.cake +++ b/build/build.cake @@ -107,6 +107,13 @@ Task("Build") OutputDirectory = "lib/net5.0" }; + var settingsNet60 = new DotNetCoreBuildSettings + { + Configuration = "Release", + Framework = "net6.0-windows", + OutputDirectory = "lib/net6.0" + }; + DotNetCoreBuild("../src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj", settingsNet40); DotNetCoreBuild("../src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj", settingsNet45); DotNetCoreBuild("../src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj", settingsNet451); @@ -121,6 +128,7 @@ Task("Build") DotNetCoreBuild("../src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj", settingsCore30); DotNetCoreBuild("../src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj", settingsCore31); DotNetCoreBuild("../src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj", settingsNet50); + DotNetCoreBuild("../src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj", settingsNet60); }); RunTarget(target); \ No newline at end of file From 9f5942104677af46acd0a85571bd865dd13022f8 Mon Sep 17 00:00:00 2001 From: afunc233 Date: Sun, 14 Nov 2021 02:54:58 +0800 Subject: [PATCH 3/4] Modify build.yml --- .github/workflows/build.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d9212433..de4f707b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,6 +7,13 @@ jobs: - name: checkout uses: actions/checkout@master + - name: Install .NET 60 + uses: actions/setup-dotnet@v1 + with: + dotnet-version: '6.0' + include-prerelease: True + + - name: build shell: pwsh run: | From a450f26616a68643b8ff863b3bffec4da8dc2bde Mon Sep 17 00:00:00 2001 From: afunc233 Date: Sun, 14 Nov 2021 02:56:21 +0800 Subject: [PATCH 4/4] Modify build.yml --- .github/workflows/build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index de4f707b..67771560 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,10 +8,10 @@ jobs: uses: actions/checkout@master - name: Install .NET 60 - uses: actions/setup-dotnet@v1 - with: - dotnet-version: '6.0' - include-prerelease: True + uses: actions/setup-dotnet@v1 + with: + dotnet-version: '6.0' + include-prerelease: True - name: build