From 76f81babfde22298f9bd2c67339e5c741b649651 Mon Sep 17 00:00:00 2001 From: LarsBrubaker Date: Sun, 27 Jan 2019 17:23:40 -0800 Subject: [PATCH] upgrading nunit --- .../Community.CsharpSqlite.csproj | 2 ++ Launcher/Launcher.csproj | 15 +++++++++++++++ Launcher/packages.config | 5 +++++ .../MatterControl.OpenGL.csproj | 5 +++++ .../MatterControl.Printing.csproj | 2 ++ .../MatterControl.Winforms.csproj | 17 +++++++++++++++++ MatterControl.Winforms/packages.config | 5 +++++ MatterControl.csproj | 6 ++++++ MatterControlLib/MatterControlLib.csproj | 2 ++ PluginSystem/MatterControlPluginSystem.csproj | 5 +++++ PrinterDriverInstaller/InfInstaller.csproj | 15 +++++++++++++++ PrinterDriverInstaller/packages.config | 5 +++++ Submodules/MatterSlice | 2 +- Submodules/agg-sharp | 2 +- .../MatterControl.AutomationTests.csproj | 5 ++++- .../MatterControl.Tests.csproj | 4 ++-- 16 files changed, 92 insertions(+), 5 deletions(-) create mode 100644 Launcher/packages.config create mode 100644 MatterControl.Winforms/packages.config create mode 100644 PrinterDriverInstaller/packages.config diff --git a/Community.CsharpSqlite/Community.CsharpSqlite.csproj b/Community.CsharpSqlite/Community.CsharpSqlite.csproj index 71c40fc79..200187385 100644 --- a/Community.CsharpSqlite/Community.CsharpSqlite.csproj +++ b/Community.CsharpSqlite/Community.CsharpSqlite.csproj @@ -15,6 +15,8 @@ + + diff --git a/Launcher/Launcher.csproj b/Launcher/Launcher.csproj index 24379e8b0..f0bc629b1 100644 --- a/Launcher/Launcher.csproj +++ b/Launcher/Launcher.csproj @@ -1,5 +1,7 @@  + + Release AnyCPU @@ -18,6 +20,8 @@ 2.0 v4.7.1 + + True @@ -42,13 +46,24 @@ false + + ..\packages\NUnit.3.11.0\lib\net45\nunit.framework.dll + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + \ No newline at end of file diff --git a/Launcher/packages.config b/Launcher/packages.config new file mode 100644 index 000000000..a2a1f67bc --- /dev/null +++ b/Launcher/packages.config @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/MatterControl.OpenGL/MatterControl.OpenGL.csproj b/MatterControl.OpenGL/MatterControl.OpenGL.csproj index 580b5c186..f98e72754 100644 --- a/MatterControl.OpenGL/MatterControl.OpenGL.csproj +++ b/MatterControl.OpenGL/MatterControl.OpenGL.csproj @@ -6,6 +6,11 @@ true + + + + + diff --git a/MatterControl.Printing/MatterControl.Printing.csproj b/MatterControl.Printing/MatterControl.Printing.csproj index c5670ca4e..32860a391 100644 --- a/MatterControl.Printing/MatterControl.Printing.csproj +++ b/MatterControl.Printing/MatterControl.Printing.csproj @@ -8,6 +8,8 @@ + + diff --git a/MatterControl.Winforms/MatterControl.Winforms.csproj b/MatterControl.Winforms/MatterControl.Winforms.csproj index 7e53c0caf..d97dc9321 100644 --- a/MatterControl.Winforms/MatterControl.Winforms.csproj +++ b/MatterControl.Winforms/MatterControl.Winforms.csproj @@ -1,5 +1,7 @@  + + Debug @@ -12,6 +14,8 @@ v4.7.1 512 true + + true @@ -33,6 +37,9 @@ AnyCPU + + ..\packages\NUnit.3.11.0\lib\net45\nunit.framework.dll + @@ -100,5 +107,15 @@ InspectForm.cs + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + \ No newline at end of file diff --git a/MatterControl.Winforms/packages.config b/MatterControl.Winforms/packages.config new file mode 100644 index 000000000..a2a1f67bc --- /dev/null +++ b/MatterControl.Winforms/packages.config @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/MatterControl.csproj b/MatterControl.csproj index 109f2499e..39b161084 100644 --- a/MatterControl.csproj +++ b/MatterControl.csproj @@ -133,6 +133,12 @@ 5.6.0 + + 3.11.0 + + + 3.12.0 + \ No newline at end of file diff --git a/MatterControlLib/MatterControlLib.csproj b/MatterControlLib/MatterControlLib.csproj index 87469627e..e235ae04f 100644 --- a/MatterControlLib/MatterControlLib.csproj +++ b/MatterControlLib/MatterControlLib.csproj @@ -90,6 +90,8 @@ + + diff --git a/PluginSystem/MatterControlPluginSystem.csproj b/PluginSystem/MatterControlPluginSystem.csproj index 0f876713d..89c2d335b 100644 --- a/PluginSystem/MatterControlPluginSystem.csproj +++ b/PluginSystem/MatterControlPluginSystem.csproj @@ -5,6 +5,11 @@ MatterHackers Inc. + + + + + diff --git a/PrinterDriverInstaller/InfInstaller.csproj b/PrinterDriverInstaller/InfInstaller.csproj index 2443f8a54..e0cb86853 100644 --- a/PrinterDriverInstaller/InfInstaller.csproj +++ b/PrinterDriverInstaller/InfInstaller.csproj @@ -1,5 +1,7 @@  + + Debug AnyCPU @@ -18,6 +20,8 @@ 2.0 v4.7.1 + + True @@ -43,6 +47,9 @@ + + ..\packages\NUnit.3.11.0\lib\net45\nunit.framework.dll + @@ -53,6 +60,14 @@ + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + \ No newline at end of file diff --git a/PrinterDriverInstaller/packages.config b/PrinterDriverInstaller/packages.config new file mode 100644 index 000000000..a2a1f67bc --- /dev/null +++ b/PrinterDriverInstaller/packages.config @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/Submodules/MatterSlice b/Submodules/MatterSlice index 30d9e5156..6255d2b5e 160000 --- a/Submodules/MatterSlice +++ b/Submodules/MatterSlice @@ -1 +1 @@ -Subproject commit 30d9e51561341dfbde153475425c3c0458d28eb1 +Subproject commit 6255d2b5e0e17930db124efa20473710ebd369f7 diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index 278d33e00..045286c0b 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit 278d33e00eb69c7a27c62998c41e1308f12d7f01 +Subproject commit 045286c0b438e8af0fc102b53202bd8ca61d60a1 diff --git a/Tests/MatterControl.AutomationTests/MatterControl.AutomationTests.csproj b/Tests/MatterControl.AutomationTests/MatterControl.AutomationTests.csproj index b9876b320..de4067ede 100644 --- a/Tests/MatterControl.AutomationTests/MatterControl.AutomationTests.csproj +++ b/Tests/MatterControl.AutomationTests/MatterControl.AutomationTests.csproj @@ -42,8 +42,11 @@ - + + + 3.12.0 + diff --git a/Tests/MatterControl.Tests/MatterControl.Tests.csproj b/Tests/MatterControl.Tests/MatterControl.Tests.csproj index 7c0499f5e..2050ad8b4 100644 --- a/Tests/MatterControl.Tests/MatterControl.Tests.csproj +++ b/Tests/MatterControl.Tests/MatterControl.Tests.csproj @@ -155,9 +155,9 @@ - + - +