diff --git a/AutoUpdate/App.config b/AutoUpdate/App.config index 082fa6c073..e0f9780e6c 100644 --- a/AutoUpdate/App.config +++ b/AutoUpdate/App.config @@ -1,7 +1,7 @@  - + - - \ No newline at end of file + + diff --git a/AutoUpdate/CKAN-autoupdate.csproj b/AutoUpdate/CKAN-autoupdate.csproj index c630e4b7bd..3c656bcbfb 100644 --- a/AutoUpdate/CKAN-autoupdate.csproj +++ b/AutoUpdate/CKAN-autoupdate.csproj @@ -1,5 +1,5 @@  - + Debug @@ -11,8 +11,6 @@ ..\assets\ckan.ico v4.5 512 - true - true ..\_build\out\$(AssemblyName)\$(Configuration)\bin\ ..\_build\out\$(AssemblyName)\$(Configuration)\obj\ diff --git a/CHANGELOG.md b/CHANGELOG.md index e0c343a586..34e88a3afd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,7 +15,6 @@ All notable changes to this project will be documented in this file. ## Internal - [Netkan] Add author to list of required properties in CKAN.schema (#3111 by: DasSkelett; reviewed: HebaruSan) -- [Build] Cleanup project, update builds, fixes (#3108 by: Olympic1; reviewed: HebaruSan, DasSkelett) ## v1.28.0-PRE1 (Drake) diff --git a/CKAN.sln b/CKAN.sln index d733f4d59a..70e64f7f44 100644 --- a/CKAN.sln +++ b/CKAN.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.30225.117 +# Visual Studio 15 +VisualStudioVersion = 15.0.27004.2008 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CKAN-core", "Core\CKAN-core.csproj", "{3B9AEA22-FA3B-4E43-9283-EABDD81CF271}" EndProject @@ -19,58 +19,58 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "Tests\Tests.csproj EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug_NetCore|Any CPU = Debug_NetCore|Any CPU Debug|Any CPU = Debug|Any CPU - Release_NetCore|Any CPU = Release_NetCore|Any CPU Release|Any CPU = Release|Any CPU + Debug_NetCore|Any CPU = Debug_NetCore|Any CPU + Release_NetCore|Any CPU = Release_NetCore|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {3B9AEA22-FA3B-4E43-9283-EABDD81CF271}.Debug_NetCore|Any CPU.ActiveCfg = Debug_NetCore|Any CPU - {3B9AEA22-FA3B-4E43-9283-EABDD81CF271}.Debug_NetCore|Any CPU.Build.0 = Debug_NetCore|Any CPU {3B9AEA22-FA3B-4E43-9283-EABDD81CF271}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3B9AEA22-FA3B-4E43-9283-EABDD81CF271}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3B9AEA22-FA3B-4E43-9283-EABDD81CF271}.Release_NetCore|Any CPU.ActiveCfg = Release_NetCore|Any CPU - {3B9AEA22-FA3B-4E43-9283-EABDD81CF271}.Release_NetCore|Any CPU.Build.0 = Release_NetCore|Any CPU {3B9AEA22-FA3B-4E43-9283-EABDD81CF271}.Release|Any CPU.ActiveCfg = Release|Any CPU {3B9AEA22-FA3B-4E43-9283-EABDD81CF271}.Release|Any CPU.Build.0 = Release|Any CPU - {E5B1C768-349E-4DAF-A134-56E4ECF1EEEF}.Debug_NetCore|Any CPU.ActiveCfg = Debug|Any CPU + {3B9AEA22-FA3B-4E43-9283-EABDD81CF271}.Debug_NetCore|Any CPU.ActiveCfg = Debug_NetCore|Any CPU + {3B9AEA22-FA3B-4E43-9283-EABDD81CF271}.Debug_NetCore|Any CPU.Build.0 = Debug_NetCore|Any CPU + {3B9AEA22-FA3B-4E43-9283-EABDD81CF271}.Release_NetCore|Any CPU.ActiveCfg = Release_NetCore|Any CPU + {3B9AEA22-FA3B-4E43-9283-EABDD81CF271}.Release_NetCore|Any CPU.Build.0 = Release_NetCore|Any CPU {E5B1C768-349E-4DAF-A134-56E4ECF1EEEF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E5B1C768-349E-4DAF-A134-56E4ECF1EEEF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E5B1C768-349E-4DAF-A134-56E4ECF1EEEF}.Release_NetCore|Any CPU.ActiveCfg = Release|Any CPU {E5B1C768-349E-4DAF-A134-56E4ECF1EEEF}.Release|Any CPU.ActiveCfg = Release|Any CPU {E5B1C768-349E-4DAF-A134-56E4ECF1EEEF}.Release|Any CPU.Build.0 = Release|Any CPU - {E97D81F6-85E2-4F1F-906D-BE21766602E5}.Debug_NetCore|Any CPU.ActiveCfg = Debug|Any CPU + {E5B1C768-349E-4DAF-A134-56E4ECF1EEEF}.Debug_NetCore|Any CPU.ActiveCfg = Debug|Any CPU + {E5B1C768-349E-4DAF-A134-56E4ECF1EEEF}.Release_NetCore|Any CPU.ActiveCfg = Release|Any CPU {E97D81F6-85E2-4F1F-906D-BE21766602E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E97D81F6-85E2-4F1F-906D-BE21766602E5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E97D81F6-85E2-4F1F-906D-BE21766602E5}.Release_NetCore|Any CPU.ActiveCfg = Release|Any CPU {E97D81F6-85E2-4F1F-906D-BE21766602E5}.Release|Any CPU.ActiveCfg = Release|Any CPU {E97D81F6-85E2-4F1F-906D-BE21766602E5}.Release|Any CPU.Build.0 = Release|Any CPU - {DA5C7023-9A3B-4204-AE2F-BBA6C388B436}.Debug_NetCore|Any CPU.ActiveCfg = Debug|Any CPU - {DA5C7023-9A3B-4204-AE2F-BBA6C388B436}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DA5C7023-9A3B-4204-AE2F-BBA6C388B436}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DA5C7023-9A3B-4204-AE2F-BBA6C388B436}.Release_NetCore|Any CPU.ActiveCfg = Release|Any CPU - {DA5C7023-9A3B-4204-AE2F-BBA6C388B436}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DA5C7023-9A3B-4204-AE2F-BBA6C388B436}.Release|Any CPU.Build.0 = Release|Any CPU - {A79F9D54-315C-472B-928F-713A5860B2BE}.Debug_NetCore|Any CPU.ActiveCfg = Debug|Any CPU + {E97D81F6-85E2-4F1F-906D-BE21766602E5}.Debug_NetCore|Any CPU.ActiveCfg = Debug|Any CPU + {E97D81F6-85E2-4F1F-906D-BE21766602E5}.Release_NetCore|Any CPU.ActiveCfg = Release|Any CPU {A79F9D54-315C-472B-928F-713A5860B2BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A79F9D54-315C-472B-928F-713A5860B2BE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A79F9D54-315C-472B-928F-713A5860B2BE}.Release_NetCore|Any CPU.ActiveCfg = Release|Any CPU {A79F9D54-315C-472B-928F-713A5860B2BE}.Release|Any CPU.ActiveCfg = Release|Any CPU {A79F9D54-315C-472B-928F-713A5860B2BE}.Release|Any CPU.Build.0 = Release|Any CPU - {4336F356-33DB-442A-BF74-5E89AF47A5B9}.Debug_NetCore|Any CPU.ActiveCfg = Debug|Any CPU + {A79F9D54-315C-472B-928F-713A5860B2BE}.Debug_NetCore|Any CPU.ActiveCfg = Debug|Any CPU + {A79F9D54-315C-472B-928F-713A5860B2BE}.Release_NetCore|Any CPU.ActiveCfg = Release|Any CPU {4336F356-33DB-442A-BF74-5E89AF47A5B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4336F356-33DB-442A-BF74-5E89AF47A5B9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4336F356-33DB-442A-BF74-5E89AF47A5B9}.Release_NetCore|Any CPU.ActiveCfg = Release|Any CPU {4336F356-33DB-442A-BF74-5E89AF47A5B9}.Release|Any CPU.ActiveCfg = Release|Any CPU {4336F356-33DB-442A-BF74-5E89AF47A5B9}.Release|Any CPU.Build.0 = Release|Any CPU - {4F41255E-8BC1-465B-82D5-1C5665BC099A}.Debug_NetCore|Any CPU.ActiveCfg = Debug_NetCore|Any CPU - {4F41255E-8BC1-465B-82D5-1C5665BC099A}.Debug_NetCore|Any CPU.Build.0 = Debug_NetCore|Any CPU + {4336F356-33DB-442A-BF74-5E89AF47A5B9}.Debug_NetCore|Any CPU.ActiveCfg = Debug|Any CPU + {4336F356-33DB-442A-BF74-5E89AF47A5B9}.Release_NetCore|Any CPU.ActiveCfg = Release|Any CPU {4F41255E-8BC1-465B-82D5-1C5665BC099A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4F41255E-8BC1-465B-82D5-1C5665BC099A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4F41255E-8BC1-465B-82D5-1C5665BC099A}.Release_NetCore|Any CPU.ActiveCfg = Release_NetCore|Any CPU - {4F41255E-8BC1-465B-82D5-1C5665BC099A}.Release_NetCore|Any CPU.Build.0 = Release_NetCore|Any CPU {4F41255E-8BC1-465B-82D5-1C5665BC099A}.Release|Any CPU.ActiveCfg = Release|Any CPU {4F41255E-8BC1-465B-82D5-1C5665BC099A}.Release|Any CPU.Build.0 = Release|Any CPU + {4F41255E-8BC1-465B-82D5-1C5665BC099A}.Debug_NetCore|Any CPU.ActiveCfg = Debug_NetCore|Any CPU + {4F41255E-8BC1-465B-82D5-1C5665BC099A}.Debug_NetCore|Any CPU.Build.0 = Debug_NetCore|Any CPU + {4F41255E-8BC1-465B-82D5-1C5665BC099A}.Release_NetCore|Any CPU.ActiveCfg = Release_NetCore|Any CPU + {4F41255E-8BC1-465B-82D5-1C5665BC099A}.Release_NetCore|Any CPU.Build.0 = Release_NetCore|Any CPU + {DA5C7023-9A3B-4204-AE2F-BBA6C388B436}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DA5C7023-9A3B-4204-AE2F-BBA6C388B436}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DA5C7023-9A3B-4204-AE2F-BBA6C388B436}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DA5C7023-9A3B-4204-AE2F-BBA6C388B436}.Release|Any CPU.Build.0 = Release|Any CPU + {DA5C7023-9A3B-4204-AE2F-BBA6C388B436}.Debug_NetCore|Any CPU.ActiveCfg = Debug|Any CPU + {DA5C7023-9A3B-4204-AE2F-BBA6C388B436}.Release_NetCore|Any CPU.ActiveCfg = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/CKAN.sln.DotSettings b/CKAN.sln.DotSettings new file mode 100644 index 0000000000..71e395edea --- /dev/null +++ b/CKAN.sln.DotSettings @@ -0,0 +1,18 @@ + + DO_NOT_SHOW + DO_NOT_SHOW + <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> + False + Not Implemented + True + True + 207, 157, 50 + True + HACK + (?<=\W|^)(?<TAG>HACK)(\W|$)(.*) + Question + True + BUG + Warning + True + TODO \ No newline at end of file diff --git a/Cmdline/CKAN-cmdline.csproj b/Cmdline/CKAN-cmdline.csproj index 5893726fdd..1ddff77a06 100644 --- a/Cmdline/CKAN-cmdline.csproj +++ b/Cmdline/CKAN-cmdline.csproj @@ -1,5 +1,5 @@  - + Debug @@ -12,8 +12,6 @@ ..\assets\ckan.ico v4.5 512 - true - true ..\_build\out\$(AssemblyName)\$(Configuration)\bin\ ..\_build\out\$(AssemblyName)\$(Configuration)\obj\ @@ -37,15 +35,24 @@ 4 7 + + true + - - - - - - + + ..\_build\lib\nuget\CommandLineParser.1.9.71\lib\net45\CommandLine.dll + + + ..\_build\lib\nuget\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll + + + ..\_build\lib\nuget\log4net.2.0.8\lib\net45-full\log4net.dll + + + ..\_build\lib\nuget\Autofac.4.9.4\lib\net45\Autofac.dll + @@ -66,8 +73,8 @@ - + @@ -84,12 +91,9 @@ + - - {DA5C7023-9A3B-4204-AE2F-BBA6C388B436} - CKAN-ConsoleUI - {3B9AEA22-FA3B-4E43-9283-EABDD81CF271} CKAN-core @@ -98,6 +102,10 @@ {A79F9D54-315C-472B-928F-713A5860B2BE} CKAN-GUI + + {DA5C7023-9A3B-4204-AE2F-BBA6C388B436} + CKAN-ConsoleUI + @@ -109,4 +117,4 @@ - \ No newline at end of file + diff --git a/Cmdline/app.config b/Cmdline/app.config index 5035d4fa63..8747823324 100644 --- a/Cmdline/app.config +++ b/Cmdline/app.config @@ -1,6 +1,6 @@ - + - \ No newline at end of file + diff --git a/Cmdline/packages.config b/Cmdline/packages.config new file mode 100644 index 0000000000..5d5cbeee5c --- /dev/null +++ b/Cmdline/packages.config @@ -0,0 +1,6 @@ + + + + + + diff --git a/ConsoleUI/App.config b/ConsoleUI/App.config index bd9d7e75a7..d0ea98a26c 100644 --- a/ConsoleUI/App.config +++ b/ConsoleUI/App.config @@ -1,10 +1,12 @@ - + - - - + + + + + - - + + - \ No newline at end of file + diff --git a/ConsoleUI/CKAN-ConsoleUI.csproj b/ConsoleUI/CKAN-ConsoleUI.csproj index 1579fb0fba..945f65aea6 100644 --- a/ConsoleUI/CKAN-ConsoleUI.csproj +++ b/ConsoleUI/CKAN-ConsoleUI.csproj @@ -1,5 +1,5 @@  - + Debug @@ -11,8 +11,21 @@ ..\assets\ckan.ico v4.5 512 - true - true + false + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.0 + false + true ..\_build\out\$(AssemblyName)\$(Configuration)\bin\ ..\_build\out\$(AssemblyName)\$(Configuration)\obj\ @@ -38,11 +51,16 @@ $(OutputPath)$(AssemblyName).xml 7 + + true + - - - - + + ..\_build\lib\nuget\log4net.2.0.8\lib\net45-full\log4net.dll + + + ..\_build\lib\nuget\Autofac.4.9.4\lib\net45\Autofac.dll + @@ -61,7 +79,6 @@ - @@ -75,20 +92,21 @@ True - Settings.settings True + Settings.settings + + - - + @@ -105,11 +123,34 @@ + SettingsSingleFileGenerator Settings.Designer.cs + + + False + Microsoft .NET Framework 4 %28x86 and x64%29 + true + + + False + .NET Framework 3.5 SP1 Client Profile + false + + + False + .NET Framework 3.5 SP1 + false + + + False + Windows Installer 4.5 + true + + {3B9AEA22-FA3B-4E43-9283-EABDD81CF271} @@ -126,4 +167,4 @@ - \ No newline at end of file + diff --git a/ConsoleUI/InstallScreen.cs b/ConsoleUI/InstallScreen.cs index b48667c56d..31a0a44902 100644 --- a/ConsoleUI/InstallScreen.cs +++ b/ConsoleUI/InstallScreen.cs @@ -93,7 +93,7 @@ public override void Run(Action process = null) } catch (FileExistsKraken ex) { if (ex.owningModule != null) { RaiseMessage($"{ex.installingModule} tried to install {ex.filename}, but {ex.owningModule} has already installed it."); - RaiseMessage($"Please report this problem at https://github.com/KSP-CKAN/NetKAN/issues/new/choose"); + RaiseMessage($"Please report this problem at https://github.com/KSP-CKAN/NetKAN/issues/new"); } else { RaiseMessage($"{ex.installingModule} tried to install {ex.filename}, but it is already installed."); RaiseMessage($"Please manually uninstall the mod that owns this file to install {ex.installingModule}."); diff --git a/ConsoleUI/packages.config b/ConsoleUI/packages.config new file mode 100644 index 0000000000..f651f6c5fc --- /dev/null +++ b/ConsoleUI/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/Core/CKAN-core.csproj b/Core/CKAN-core.csproj index 106116e83f..d0f6660f9f 100644 --- a/Core/CKAN-core.csproj +++ b/Core/CKAN-core.csproj @@ -1,45 +1,69 @@  - - {3B9AEA22-FA3B-4E43-9283-EABDD81CF271} - Library - CKAN CKAN - false - true - true - ..\_build\out\$(AssemblyName)\$(Configuration)\bin\ - ..\_build\out\$(AssemblyName)\$(Configuration)\obj\ - Debug;Release;Debug_NetCore;Release_NetCore + ..\_build\out\$(AssemblyName)\obj + + + - netstandard2.0 + netstandard2.0 - net45 + net45 + + + {3B9AEA22-FA3B-4E43-9283-EABDD81CF271} + CKAN + ..\_build\out\$(AssemblyName)\$(Configuration)\bin + false + + true portable - false - 7 + true - 7 + + + + Properties\GlobalAssemblyVersionInfo.cs + + + Properties\GlobalAssemblyInfo.cs + + + + + + + - + + + + + + + + + + + @@ -49,33 +73,11 @@ - - - - - - - - - - - Properties\GlobalAssemblyVersionInfo.cs - - - Properties\GlobalAssemblyInfo.cs - - - - - - - - PreserveNewest - - + + - \ No newline at end of file + diff --git a/Core/Net/Repo.cs b/Core/Net/Repo.cs index 97f74b8e21..515ffb907b 100644 --- a/Core/Net/Repo.cs +++ b/Core/Net/Repo.cs @@ -370,7 +370,7 @@ private static List UpdateRegistryFromTarGz(string path, out SortedD using (GZipInputStream gzipStream = new GZipInputStream(inputStream)) { // Create a handle for the tar stream. - using (TarInputStream tarStream = new TarInputStream(gzipStream, Encoding.UTF8)) + using (TarInputStream tarStream = new TarInputStream(gzipStream)) { // Walk the archive, looking for .ckan files. const string filter = @"\.ckan$"; diff --git a/Core/log4net.xml b/Core/log4net.xml deleted file mode 100644 index 0f72ef438e..0000000000 --- a/Core/log4net.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/GUI/App.config b/GUI/App.config index bd9d7e75a7..9b21b5a140 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 5b18e9056c..1d8c7cf4c6 100644 --- a/GUI/CKAN-GUI.csproj +++ b/GUI/CKAN-GUI.csproj @@ -1,5 +1,5 @@  - + Debug @@ -11,10 +11,23 @@ ..\assets\ckan.ico v4.5 512 - true - true + false ..\_build\out\$(AssemblyName)\$(Configuration)\bin\ ..\_build\out\$(AssemblyName)\$(Configuration)\obj\ + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.0 + false + true AnyCPU @@ -36,15 +49,26 @@ 4 7 + + true + - - - - - - + + ..\_build\lib\nuget\Autofac.4.9.4\lib\net45\Autofac.dll + + + ..\_build\lib\nuget\ini-parser.3.4.0\lib\net20\INIFileParser.dll + + + ..\_build\lib\nuget\log4net.2.0.8\lib\net45-full\log4net.dll + + + ..\_build\lib\nuget\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll + + + @@ -212,12 +236,8 @@ ManageMods.cs - - Component - - - Component - + + Component @@ -258,9 +278,7 @@ Form - - Form - + Form @@ -594,11 +612,34 @@ + SettingsSingleFileGenerator Settings.Designer.cs + + + False + Microsoft .NET Framework 4 %28x86 and x64%29 + true + + + False + .NET Framework 3.5 SP1 Client Profile + false + + + False + .NET Framework 3.5 SP1 + false + + + False + Windows Installer 4.5 + true + + {3B9AEA22-FA3B-4E43-9283-EABDD81CF271} @@ -609,10 +650,22 @@ PreserveNewest + + + + + + + + + + + + - \ No newline at end of file + diff --git a/GUI/Controls/ManageMods.cs b/GUI/Controls/ManageMods.cs index 9dcbdbf887..637e0710ca 100644 --- a/GUI/Controls/ManageMods.cs +++ b/GUI/Controls/ManageMods.cs @@ -1076,8 +1076,7 @@ private void _UpdateModsList(Dictionary old_modules = null) mainModList.Modules = new ReadOnlyCollection( mainModList.full_list_of_mod_rows.Values.Select(row => row.Tag as GUIMod).ToList()); - // C# 7.0: Executes the task and discards it - _ = UpdateChangeSetAndConflicts(Main.Instance.CurrentInstance, registry); + UpdateChangeSetAndConflicts(Main.Instance.CurrentInstance, registry); Main.Instance.Wait.AddLogMessage(Properties.Resources.MainModListUpdatingFilters); diff --git a/GUI/Model/GUIMod.cs b/GUI/Model/GUIMod.cs index a18c2569c1..459cb1747c 100644 --- a/GUI/Model/GUIMod.cs +++ b/GUI/Model/GUIMod.cs @@ -40,8 +40,7 @@ public CkanModule SelectedMod } Main.Instance.ManageMods.MarkModForInstall(Identifier, selectedMod == null); - // C# 7.0: Executes the task and discards it - _ = Main.Instance.ManageMods.UpdateChangeSetAndConflicts( + Main.Instance.ManageMods.UpdateChangeSetAndConflicts( Main.Instance.Manager.CurrentInstance, RegistryManager.Instance(Main.Instance.Manager.CurrentInstance).registry ); diff --git a/GUI/Properties/Resources.de-DE.resx b/GUI/Properties/Resources.de-DE.resx index 975cc88eb8..02908fc569 100644 --- a/GUI/Properties/Resources.de-DE.resx +++ b/GUI/Properties/Resources.de-DE.resx @@ -203,7 +203,7 @@ Bitte versuche `ckan update` und probiere es erneut. Wenn dieses Problem wieder auftritt, dann ist es vielleicht ein Paketfehler. Bitte melde es unter: -https://github.com/KSP-CKAN/NetKAN/issues/new/choose +https://github.com/KSP-CKAN/NetKAN/issues/new Bitte gib die folgenden Informationen mit an: @@ -247,8 +247,8 @@ Einstellungen jetzt öffnen? Fehler bei der Installation! Ein unbekannter Fehler ist aufgetreten, bitte versuche es erneut! Falls die Fehlermeldung ein Download-Problem andeutet, versuche es bitte erneut. Andernfalls melde bitte den Fehler bei uns. -Wenn du ein Fehler mit den Mod-Metadaten vermutest: https://github.com/KSP-CKAN/NetKAN/issues/new/choose -Wenn du ein Fehler mit dem CKAN Client vermutest: https://github.com/KSP-CKAN/CKAN/issues/new/choose +Wenn du ein Fehler mit den Mod-Metadaten vermutest: https://github.com/KSP-CKAN/NetKAN/new/choose +Wenn du ein Fehler mit dem CKAN Client vermutest: https://github.com/KSP-CKAN/CKAN/new/choose Installation fehlgeschlagen! Modul {0} wird von mehr als einem verfügbaren Modul bereitgestellt, bitte wähle eine der folgenden Mods: CKAN kann die Erweiterung '{0}' nicht für dich installieren. diff --git a/GUI/Properties/Resources.resx b/GUI/Properties/Resources.resx index ab8aa2cbdb..631c5313e5 100644 --- a/GUI/Properties/Resources.resx +++ b/GUI/Properties/Resources.resx @@ -224,12 +224,12 @@ Do you really want to install it? Oh no! We tried to overwrite a file owned by another mod! Please try a `ckan update` and try again. -If this problem re-occurs, then it may be a packaging bug. +If this problem re-occurs, then it maybe a packaging bug. Please report it at: -https://github.com/KSP-CKAN/NetKAN/issues/new/choose +https://github.com/KSP-CKAN/NetKAN/issues/new -Please include the following information in your report: +Please including the following information in your report: File : {0} Installing Mod : {1} @@ -240,10 +240,10 @@ CKAN Version : {3} It looks like you're trying to install a mod which is already installed, or which conflicts with another mod which is already installed. -As a safety feature, CKAN will *never* overwrite or alter a file +As a safety feature, the CKAN will *never* overwrite or alter a file that it did not install itself. -If you wish to install {0} via CKAN, +If you wish to install {0} via the CKAN, then please manually uninstall the mod which owns: {1} diff --git a/GUI/Properties/Resources.zh-CN.resx b/GUI/Properties/Resources.zh-CN.resx index f35e5d5894..78a057f705 100644 --- a/GUI/Properties/Resources.zh-CN.resx +++ b/GUI/Properties/Resources.zh-CN.resx @@ -117,9 +117,28 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\..\assets\ckan.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\apply.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\ksp.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\search.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\settings.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a CKAN元数据 (*.ckan)|*.ckan 导出Mod列表 + ..\Resources\update.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\backward.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\filter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\forward.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\textClear.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\star.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\thumbup.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\info.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\smile.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\alert.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\arrow_forward.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\arrow_upward.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a 版本 {0} Build metadata file (buildID*.txt)|buildID*.txt 请输入新实例名称. @@ -206,7 +225,7 @@ 如果这个问题反复出现，可能时由于打包时出现bug. 请在此处报告: -https://github.com/KSP-CKAN/NetKAN/issues/new/choose +https://github.com/KSP-CKAN/NetKAN/issues/new 报告时请包括以下信息: diff --git a/GUI/packages.config b/GUI/packages.config new file mode 100644 index 0000000000..f9786188f8 --- /dev/null +++ b/GUI/packages.config @@ -0,0 +1,7 @@ + + + + + + + diff --git a/Netkan/CKAN-netkan.csproj b/Netkan/CKAN-netkan.csproj index ef5ec2136e..8bd024c8f3 100644 --- a/Netkan/CKAN-netkan.csproj +++ b/Netkan/CKAN-netkan.csproj @@ -1,5 +1,5 @@  - + Debug @@ -12,8 +12,6 @@ ..\assets\ckan.ico v4.5 512 - true - true ..\_build\out\$(AssemblyName)\$(Configuration)\bin\ ..\_build\out\$(AssemblyName)\$(Configuration)\obj\ @@ -37,18 +35,38 @@ 4 7 + + true + - - - - - - - - - - - + + ..\_build\lib\nuget\Autofac.4.9.4\lib\net45\Autofac.dll + + + ..\_build\lib\nuget\AWSSDK.Core.3.3.103.64\lib\net45\AWSSDK.Core.dll + + + ..\_build\lib\nuget\AWSSDK.SQS.3.3.102.31\lib\net45\AWSSDK.SQS.dll + + + ..\_build\lib\nuget\CommandLineParser.1.9.71\lib\net45\CommandLine.dll + + + ..\_build\lib\nuget\ICSharpCode.SharpZipLib.Patched.0.86.5.1\lib\net20\ICSharpCode.SharpZipLib.dll + True + + + ..\_build\lib\nuget\log4net.2.0.8\lib\net45-full\log4net.dll + + + ..\_build\lib\nuget\Namotion.Reflection.1.0.7\lib\net45\Namotion.Reflection.dll + + + ..\_build\lib\nuget\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll + + + ..\_build\lib\nuget\NJsonSchema.10.0.27\lib\net45\NJsonSchema.dll + @@ -59,7 +77,9 @@ Properties\GlobalAssemblyInfo.cs - + + Code + @@ -68,8 +88,8 @@ - + @@ -100,8 +120,8 @@ - + @@ -122,31 +142,31 @@ - - - + + + + + + - - - - - + - + + @@ -158,6 +178,7 @@ Always + @@ -166,13 +187,11 @@ - - PreserveNewest - + - \ No newline at end of file + diff --git a/Netkan/CmdLineOptions.cs b/Netkan/CmdLineOptions.cs index 22eb4f7537..01fbca5af4 100644 --- a/Netkan/CmdLineOptions.cs +++ b/Netkan/CmdLineOptions.cs @@ -7,16 +7,16 @@ namespace CKAN.NetKAN /// internal class CmdLineOptions { - [Option('v', "verbose", Default = false, HelpText = "Show more of what's going on when running")] + [Option('v', "verbose", DefaultValue = false, HelpText = "Show more of what's going on when running")] public bool Verbose { get; set; } - [Option('d', "debug", Default = false, HelpText = "Show debugging level messages. Implies verbose")] + [Option('d', "debug", DefaultValue = false, HelpText = "Show debugging level messages. Implies verbose")] public bool Debug { get; set; } [Option("debugger", HelpText = "Launch the debugger at start")] public bool Debugger { get; set; } - [Option("outputdir", Default = ".", HelpText = "Output directory")] + [Option("outputdir", DefaultValue = ".", HelpText = "Output directory")] public string OutputDir { get; set; } [Option("cachedir", HelpText = "Cache directory for downloaded mods")] @@ -25,13 +25,13 @@ internal class CmdLineOptions [Option("github-token", HelpText = "GitHub OAuth token for API access")] public string GitHubToken { get; set; } - [Option("net-useragent", Default = null, HelpText = "Set the default User-Agent string for HTTP requests")] + [Option("net-useragent", DefaultValue = null, HelpText = "Set the default User-Agent string for HTTP requests")] public string NetUserAgent { get; set; } - [Option("releases", Default = "1", HelpText = "Number of releases to inflate, or 'all'")] + [Option("releases", DefaultValue = "1", HelpText = "Number of releases to inflate, or 'all'")] public string Releases { get; set; } - [Option("skip-releases", Default = "0", HelpText = "Number of releases to skip / index of release to inflate.")] + [Option("skip-releases", DefaultValue = "0", HelpText = "Number of releases to skip / index of release to inflate.")] public string SkipReleases { get; set; } [Option("prerelease", HelpText = "Index GitHub prereleases")] @@ -49,7 +49,11 @@ internal class CmdLineOptions [Option("validate-ckan", HelpText = "Name of .ckan file to check for errors")] public string ValidateCkan { get; set; } - [Value(0, HelpText = "Name of .ckan file to process.")] + [Option("version", HelpText = "Display the netkan version number and exit")] + public bool Version { get; set; } + + // TODO: How do we mark this as required? + [ValueOption(0)] public string File { get; set; } } } diff --git a/Netkan/Program.cs b/Netkan/Program.cs index abed160712..b11de82084 100644 --- a/Netkan/Program.cs +++ b/Netkan/Program.cs @@ -5,7 +5,6 @@ using System.Net; using System.Text; using CommandLine; -using CommandLine.Text; using log4net; using log4net.Core; @@ -31,57 +30,21 @@ public static class Program public static int Main(string[] args) { - if (args.Any(i => i == "--debugger")) - { - Debugger.Launch(); - } - - var parser = new Parser(c => c.HelpWriter = null).ParseArguments(args); - parser.WithParsed(opt => Run(opt)); - parser.WithNotParsed(errs => - { - if (errs.IsVersion()) - { - Console.WriteLine(Meta.GetVersion(VersionFormat.Full)); - } - else - { - HelpText ht = HelpText.AutoBuild(parser, h => - { - h.AddDashesToOption = true; - h.AutoHelp = false; - h.Heading = $"NetKAN {Meta.GetVersion(VersionFormat.Full)}"; - h.Copyright = $"Copyright © 2014-{DateTime.Now.Year}"; - return HelpText.DefaultParsingErrorsHandler(parser, h); - }, e => e, true); - Console.WriteLine(ht); - } - }); - - return ExitOk; - } - - private static int Run(CmdLineOptions options) - { - Program.Options = options; try { - Logging.Initialize(); - - LogManager.GetRepository().Threshold = - Options.Verbose ? Level.Info - : Options.Debug ? Level.Debug - : Level.Warn; - - if (Options.NetUserAgent != null) - { - Net.UserAgentString = Options.NetUserAgent; - } + ProcessArgs(args); // Force-allow TLS 1.2 for HTTPS URLs, because GitHub requires it. // This is on by default in .NET 4.6, but not in 4.5. ServicePointManager.SecurityProtocol |= SecurityProtocolType.Tls12; + // If we see the --version flag, then display our build info + // and exit. + if (Options.Version) + { + Console.WriteLine(Meta.GetVersion(VersionFormat.Full)); + return ExitOk; + } // Make sure Curl is all set up Curl.Init(); @@ -184,6 +147,29 @@ private static ModuleVersion ParseHighestVersion(string val) return val == null ? null : new ModuleVersion(val); } + private static void ProcessArgs(string[] args) + { + if (args.Any(i => i == "--debugger")) + { + Debugger.Launch(); + } + + Options = new CmdLineOptions(); + Parser.Default.ParseArgumentsStrict(args, Options); + + Logging.Initialize(); + + LogManager.GetRepository().Threshold = + Options.Verbose ? Level.Info + : Options.Debug ? Level.Debug + : Level.Warn; + + if (Options.NetUserAgent != null) + { + Net.UserAgentString = Options.NetUserAgent; + } + } + private static Metadata ReadNetkan() { if (!Options.File.EndsWith(".netkan")) diff --git a/Netkan/app.config b/Netkan/app.config index b3e81a4228..3440d24dcf 100644 --- a/Netkan/app.config +++ b/Netkan/app.config @@ -1,10 +1,10 @@  - + - - + + - \ No newline at end of file + diff --git a/Netkan/log4net.xml b/Netkan/log4net.xml deleted file mode 100644 index 35ea61e87a..0000000000 --- a/Netkan/log4net.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Netkan/packages.config b/Netkan/packages.config new file mode 100644 index 0000000000..fc34eaf3bd --- /dev/null +++ b/Netkan/packages.config @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/Tests/Core/ModuleInstaller.cs b/Tests/Core/ModuleInstaller.cs index 7cc5e8a816..3629aec6c0 100644 --- a/Tests/Core/ModuleInstaller.cs +++ b/Tests/Core/ModuleInstaller.cs @@ -641,7 +641,7 @@ public void AllowsInstallsToShipsDirectories(string directory) var zip = ZipFile.Create(new MemoryStream()); zip.BeginUpdate(); zip.AddDirectory("ExampleShips"); - zip.Add(new ZipEntry("ExampleShips/AwesomeShip.craft") { Size = 0, CompressedSize = 0 }); + zip.Add(new ZipEntry("/ExampleShips/AwesomeShip.craft") { Size = 0, CompressedSize = 0 }); zip.CommitUpdate(); var mod = CkanModule.FromJson(string.Format(@" @@ -683,7 +683,7 @@ public void AllowInstallsToScenarios() zip.BeginUpdate(); zip.AddDirectory("saves"); zip.AddDirectory("saves/scenarios"); - zip.Add(new ZipEntry("saves/scenarios/AwesomeRace.sfs") { Size = 0, CompressedSize = 0 }); + zip.Add(new ZipEntry("/saves/scenarios/AwesomeRace.sfs") { Size = 0, CompressedSize = 0 }); zip.CommitUpdate(); var mod = CkanModule.FromJson(@" diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj index b33da22136..289a8b2484 100644 --- a/Tests/Tests.csproj +++ b/Tests/Tests.csproj @@ -1,52 +1,65 @@  - - {4F41255E-8BC1-465B-82D5-1C5665BC099A} - Library - Tests CKAN.Tests - false - true - true - true - ..\_build\out\$(AssemblyName)\$(Configuration)\bin\ - ..\_build\out\$(AssemblyName)\$(Configuration)\obj\ - Debug;Release;Debug_NetCore;Release_NetCore + ..\_build\out\$(AssemblyName)\obj\ + + + - netcoreapp3.1 + netcoreapp3.1 - net45 + net45 + + + {4F41255E-8BC1-465B-82D5-1C5665BC099A} + Tests + ..\_build\out\$(AssemblyName)\$(Configuration)\bin\ + false + + $(DefaultItemExcludes);NetKAN\**;GUI\** + true portable - false - 7 + true - 7 + + + + Properties\GlobalAssemblyVersionInfo.cs + + + Properties\GlobalAssemblyInfo.cs + + + - - + + - + - + + + + ..\lib\curlsharp-v0.5.1-2-gd2d5699\CurlSharp.dll @@ -58,21 +71,16 @@ + - + - - - Properties\GlobalAssemblyVersionInfo.cs - - - Properties\GlobalAssemblyInfo.cs - - + + @@ -81,14 +89,11 @@ - - - PreserveNewest - - + + - \ No newline at end of file + diff --git a/Tests/log4net.xml b/Tests/log4net.xml deleted file mode 100644 index 0f72ef438e..0000000000 --- a/Tests/log4net.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/build b/build index 5d7ade48cf..23570c53bb 100755 --- a/build +++ b/build @@ -19,7 +19,7 @@ if [ $# -gt 1 ]; then done fi -nugetVersion="5.6.0" +nugetVersion="5.4.0" useExperimental=false rootDir=$(dirname $0) scriptFile="$rootDir/build.cake" diff --git a/build.cake b/build.cake index 063b677643..88b1098e61 100644 --- a/build.cake +++ b/build.cake @@ -1,18 +1,15 @@ #addin "nuget:?package=Cake.SemVer&version=4.0.0" -#addin "nuget:?package=semver&version=2.0.6" -#addin "nuget:?package=Cake.Docker&version=0.11.0" -#tool "nuget:?package=ILRepack&version=2.0.18" -#tool "nuget:?package=NUnit.ConsoleRunner&version=3.11.1" +#addin "nuget:?package=semver&version=2.0.4" +#addin "nuget:?package=Cake.Docker&version=0.10.0" +#tool "nuget:?package=ILRepack&version=2.0.17" +#tool "nuget:?package=NUnit.ConsoleRunner&version=3.10.0" using System.Text.RegularExpressions; using Semver; -var buildNetCore = "netcoreapp3.1"; -var buildNetFramework = "net45"; - var target = Argument("target", "Default"); var configuration = Argument("configuration", "Debug"); -var buildFramework = configuration.EndsWith("NetCore") ? buildNetCore : buildNetFramework; +var buildFramework = configuration.EndsWith("NetCore") ? "netcoreapp3.1" : "net45"; var solution = Argument("solution", "CKAN.sln"); var rootDirectory = Context.Environment.WorkingDirectory; @@ -145,7 +142,7 @@ private void MakeIn(string dir, string args = null) Task("Restore-Nuget") .Description("Intermediate - Download dependencies with NuGet when building for .NET Framework.") - .WithCriteria(() => buildFramework == buildNetFramework) + .WithCriteria(() => buildFramework == "net45") .Does(() => { NuGetRestore(solution, new NuGetRestoreSettings @@ -159,7 +156,7 @@ Task("Build-DotNet") .Description("Intermediate - Call MSBuild/XBuild to build the CKAN.sln.") .IsDependentOn("Restore-Nuget") .IsDependentOn("Generate-GlobalAssemblyVersionInfo") - .WithCriteria(() => buildFramework == buildNetFramework) + .WithCriteria(() => buildFramework == "net45") .Does(() => { MSBuild(solution, settings => @@ -170,7 +167,7 @@ Task("Build-DotNet") Task("Restore-DotNetCore") .Description("Intermediate - Download dependencies with NuGet when building for .NET Core.") - .WithCriteria(() => buildFramework == buildNetCore) + .WithCriteria(() => buildFramework == "netcoreapp3.1") .Does(() => { DotNetCoreRestore(solution, new DotNetCoreRestoreSettings @@ -184,7 +181,7 @@ Task("Build-DotNetCore") .Description("Intermediate - Call .NET Core's MSBuild to build the ckan.dll.") .IsDependentOn("Restore-Dotnetcore") .IsDependentOn("Generate-GlobalAssemblyVersionInfo") - .WithCriteria(() => buildFramework == buildNetCore) + .WithCriteria(() => buildFramework == "netcoreapp3.1") .Does(() => { DotNetCoreBuild(solution, new DotNetCoreBuildSettings @@ -216,7 +213,7 @@ Task("Generate-GlobalAssemblyVersionInfo") Task("Repack-Ckan") .Description("Intermediate - Merge all the separate DLLs and EXEs to a single executable.") - .WithCriteria(() => buildFramework == buildNetFramework) + .WithCriteria(() => buildFramework == "net45") .IsDependentOn("Build-DotNet") .Does(() => { @@ -242,7 +239,7 @@ Task("Repack-Ckan") Task("Repack-Netkan") .Description("Intermediate - Merge all the separate DLLs and EXEs to a single executable.") - .WithCriteria(() => buildFramework == buildNetFramework) + .WithCriteria(() => buildFramework == "net45") .IsDependentOn("Build-DotNet") .Does(() => { @@ -272,7 +269,7 @@ Task("Test+Only") Task("Test-UnitTests+Only") .Description("Intermediate - Only run CKANs unit tests, without compiling beforehand.") .IsDependentOn("Test-UnitTests+Only-DotNetCore") - .WithCriteria(() => buildFramework == buildNetFramework) + .WithCriteria(() => buildFramework == "net45") .Does(() => { var where = Argument("where", null); @@ -299,7 +296,7 @@ Task("Test-UnitTests+Only") Task("Test-UnitTests+Only-DotNetCore") .Description("Intermediate - Only run CKANs unit tests using DotNetCoreTest, without compiling beforehand.") - .WithCriteria(() => buildFramework == buildNetCore) + .WithCriteria(() => buildFramework == "netcoreapp3.1") .Does(() => { var where = Argument("where", null); @@ -323,7 +320,7 @@ Task("Test-Executables+Only") Task("Test-CkanExecutable+Only") .Description("Intermediate - Only test the ckan.exe, without compiling beforhand.") - .WithCriteria(() => buildFramework == buildNetFramework) + .WithCriteria(() => buildFramework == "net45") .Does(() => { if (RunExecutable(ckanFile, "version").FirstOrDefault() != string.Format("v{0}", GetVersion())) @@ -332,7 +329,7 @@ Task("Test-CkanExecutable+Only") Task("Test-NetkanExecutable+Only") .Description("Intermediate - Only test the netkan.exe, without compiling beforhand.") - .WithCriteria(() => buildFramework == buildNetFramework) + .WithCriteria(() => buildFramework == "net45") .Does(() => { if (RunExecutable(netkanFile, "--version").FirstOrDefault() != string.Format("v{0}", GetVersion())) @@ -356,7 +353,7 @@ Setup(context => Warning($"Ignoring configuration argument: '{argConfiguration}'"); configuration = "Release"; - buildFramework = buildNetFramework; + buildFramework = "net45"; } else if (string.Equals(target, "Debug", StringComparison.OrdinalIgnoreCase)) { @@ -364,7 +361,7 @@ Setup(context => Warning($"Ignoring configuration argument: '{argConfiguration}'"); configuration = "Debug"; - buildFramework = buildNetFramework; + buildFramework = "net45"; } else if (string.Equals(target, "DLL", StringComparison.OrdinalIgnoreCase)) { @@ -373,7 +370,7 @@ Setup(context => else if (argConfiguration.StartsWith("Release")) configuration = "Release_NetCore"; - buildFramework = buildNetCore; + buildFramework = "netcoreapp3.1"; } }); diff --git a/build.ps1 b/build.ps1 index 7f8656d2e0..a80094bb65 100644 --- a/build.ps1 +++ b/build.ps1 @@ -17,7 +17,7 @@ if (($PSVersionTable.PSVersion -lt $minPSVer)) { } # Globals -$NugetVersion = "5.6.0" +$NugetVersion = "5.3.1" $UseExperimental = $false $RootDir = "${PSScriptRoot}" $ScriptFile = "${RootDir}/build.cake" diff --git a/packages.config b/packages.config index f6bd5a3886..e6cd1dbbfe 100644 --- a/packages.config +++ b/packages.config @@ -1,4 +1,4 @@ - +