diff --git a/AutoUpdate/CKAN-autoupdate.csproj b/AutoUpdate/CKAN-autoupdate.csproj index 55cf555e7c..3fde9722c8 100644 --- a/AutoUpdate/CKAN-autoupdate.csproj +++ b/AutoUpdate/CKAN-autoupdate.csproj @@ -16,8 +16,7 @@ false 7 ..\assets\ckan.ico - net45 - v4.5 + net472 512 prompt 4 @@ -30,6 +29,7 @@ + @@ -52,17 +52,10 @@ - + - + diff --git a/Cmdline/CKAN-cmdline.csproj b/Cmdline/CKAN-cmdline.csproj index ecab63f86f..6ef904e5a6 100644 --- a/Cmdline/CKAN-cmdline.csproj +++ b/Cmdline/CKAN-cmdline.csproj @@ -14,11 +14,10 @@ true Debug;Release false - 7 - net45 + latest + net472 CKAN.CmdLine.MainClass ..\assets\ckan.ico - v4.5 512 prompt 4 @@ -26,9 +25,11 @@ - - + + + + diff --git a/ConsoleUI/CKAN-ConsoleUI.csproj b/ConsoleUI/CKAN-ConsoleUI.csproj index cf61fd57b0..fe5053f0e7 100644 --- a/ConsoleUI/CKAN-ConsoleUI.csproj +++ b/ConsoleUI/CKAN-ConsoleUI.csproj @@ -14,10 +14,9 @@ true Debug;Release false - 7 - net45 + latest + net472 ..\assets\ckan.ico - v4.5 512 prompt 4 @@ -26,6 +25,8 @@ + + diff --git a/Core/CKAN-core.csproj b/Core/CKAN-core.csproj index 3993d3ada0..c3bb0a5cda 100644 --- a/Core/CKAN-core.csproj +++ b/Core/CKAN-core.csproj @@ -14,7 +14,8 @@ true Debug;Release;Debug_NetCore;Release_NetCore false - 7 + latest + net472 @@ -24,7 +25,7 @@ - net45 + net472 @@ -38,17 +39,17 @@ - - - - + + + + + + + + - + - - - - @@ -75,6 +76,9 @@ PreserveNewest + + + diff --git a/Core/CkanTransaction.cs b/Core/CkanTransaction.cs index bbcf03946b..028992631b 100644 --- a/Core/CkanTransaction.cs +++ b/Core/CkanTransaction.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Transactions; using System.Reflection; using log4net; diff --git a/Core/Registry/Registry.cs b/Core/Registry/Registry.cs index e03a701fb5..16434863b0 100644 --- a/Core/Registry/Registry.cs +++ b/Core/Registry/Registry.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.IO; using System.Linq; diff --git a/GUI/App.config b/GUI/App.config index bd9d7e75a7..a776e59938 100644 --- a/GUI/App.config +++ b/GUI/App.config @@ -1,10 +1,10 @@ - + - - + + - \ No newline at end of file + diff --git a/GUI/CKAN-GUI.csproj b/GUI/CKAN-GUI.csproj index 0a4cf7974d..300ffbffad 100644 --- a/GUI/CKAN-GUI.csproj +++ b/GUI/CKAN-GUI.csproj @@ -1,9 +1,11 @@ - + CKAN-GUI ..\_build\out\$(AssemblyName)\$(Configuration)\bin\ ..\_build\out\$(AssemblyName)\$(Configuration)\obj\ + v4.7.2 + @@ -13,14 +15,13 @@ WinExe CKAN.GUI ..\assets\ckan.ico - v4.5 512 true true prompt 4 false - 7 + latest AnyCPU @@ -28,18 +29,26 @@ full false DEBUG;TRACE + false AnyCPU pdbonly true TRACE + false - - + + + 4.7.0 + + + + 4.3.0 + @@ -250,7 +259,7 @@ EditModSearchDetails.cs - UserControl + Component UserControl @@ -359,7 +368,7 @@ True - Resources.resx + Resources.zh-CN.resx True @@ -967,7 +976,6 @@ ..\..\Controls\ModInfoTabs\Metadata.cs - ..\..\Controls\ModInfoTabs\Relationships.cs @@ -1322,4 +1330,4 @@ - + \ No newline at end of file diff --git a/Netkan/CKAN-netkan.csproj b/Netkan/CKAN-netkan.csproj index 7d65873867..0cbcd963e4 100644 --- a/Netkan/CKAN-netkan.csproj +++ b/Netkan/CKAN-netkan.csproj @@ -4,6 +4,8 @@ NetKAN ..\_build\out\$(AssemblyName)\$(Configuration)\bin\ ..\_build\out\$(AssemblyName)\$(Configuration)\obj\ + v4.7.2 + @@ -14,14 +16,13 @@ CKAN.NetKAN CKAN.NetKAN.Program ..\assets\ckan.ico - v4.5 512 true true prompt 4 false - 7 + latest AnyCPU @@ -29,22 +30,30 @@ full false DEBUG;TRACE + false AnyCPU pdbonly true TRACE + false - - + + - - - - + + 4.7.0 + + + + + + + 4.3.0 + diff --git a/Netkan/app.config b/Netkan/app.config index b3e81a4228..a776e59938 100644 --- a/Netkan/app.config +++ b/Netkan/app.config @@ -1,10 +1,10 @@ - + - + - - + + - \ No newline at end of file + diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj index 01a614d6bf..251248d885 100644 --- a/Tests/Tests.csproj +++ b/Tests/Tests.csproj @@ -15,7 +15,8 @@ true Debug;Release;Debug_NetCore;Release_NetCore false - 7 + latest + net472 @@ -25,7 +26,7 @@ - net45 + net472 @@ -42,15 +43,17 @@ - - - - + + + + + + - + - + @@ -69,10 +72,15 @@ + + + + + - + @@ -87,6 +95,10 @@ PreserveNewest + + + + diff --git a/build.cake b/build.cake index a7a1ce85c1..8b6323eded 100644 --- a/build.cake +++ b/build.cake @@ -8,7 +8,7 @@ using System.Text.RegularExpressions; using Semver; var buildNetCore = "net5.0"; -var buildNetFramework = "net45"; +var buildNetFramework = "net472"; var target = Argument("target", "Default"); var configuration = Argument("configuration", "Debug");