From 6bc5c444dc01a10804266ddf76ff8a0436a20925 Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Wed, 30 Nov 2022 17:36:17 -0800 Subject: [PATCH] fixing include files, updating nuget --- .../Community.CsharpSqlite.csproj | 2 +- Launcher/Launcher.csproj | 2 +- .../MatterControl.Printing.csproj | 4 ++-- MatterControl.SLA/MatterControl.SLA.csproj | 2 +- .../MatterControl.Winforms.csproj | 2 +- MatterControl.csproj | 8 ++++---- MatterControlLib/MatterControlLib.csproj | 14 +++++++------- .../MatterControl.PartSheet.csproj | 2 +- PrinterDriverInstaller/InfInstaller.csproj | 2 +- Submodules/MatterSlice | 2 +- Submodules/agg-sharp | 2 +- .../LibraryActionTests.cs | 9 +++++---- .../MatterControl.AutomationTests.csproj | 8 ++++---- .../MatterControl.Tests/MatterControl.Tests.csproj | 8 ++++---- 14 files changed, 34 insertions(+), 33 deletions(-) diff --git a/Community.CsharpSqlite/Community.CsharpSqlite.csproj b/Community.CsharpSqlite/Community.CsharpSqlite.csproj index 367becdcb..8a2a19d5f 100644 --- a/Community.CsharpSqlite/Community.CsharpSqlite.csproj +++ b/Community.CsharpSqlite/Community.CsharpSqlite.csproj @@ -16,7 +16,7 @@ - + diff --git a/Launcher/Launcher.csproj b/Launcher/Launcher.csproj index 9fac6662c..2cf96e379 100644 --- a/Launcher/Launcher.csproj +++ b/Launcher/Launcher.csproj @@ -8,7 +8,7 @@ True - + all diff --git a/MatterControl.Printing/MatterControl.Printing.csproj b/MatterControl.Printing/MatterControl.Printing.csproj index 86322eb9e..325d0d563 100644 --- a/MatterControl.Printing/MatterControl.Printing.csproj +++ b/MatterControl.Printing/MatterControl.Printing.csproj @@ -12,8 +12,8 @@ - - + + diff --git a/MatterControl.SLA/MatterControl.SLA.csproj b/MatterControl.SLA/MatterControl.SLA.csproj index 3a3070505..bbebd1a80 100644 --- a/MatterControl.SLA/MatterControl.SLA.csproj +++ b/MatterControl.SLA/MatterControl.SLA.csproj @@ -12,7 +12,7 @@ - + diff --git a/MatterControl.Winforms/MatterControl.Winforms.csproj b/MatterControl.Winforms/MatterControl.Winforms.csproj index f85b3ff07..727791770 100644 --- a/MatterControl.Winforms/MatterControl.Winforms.csproj +++ b/MatterControl.Winforms/MatterControl.Winforms.csproj @@ -28,7 +28,7 @@ - + all diff --git a/MatterControl.csproj b/MatterControl.csproj index 341609bb4..a78759050 100644 --- a/MatterControl.csproj +++ b/MatterControl.csproj @@ -93,20 +93,20 @@ - 29.0.0 + 30.0.1 - + 1.0.2-beta1 - + all - + diff --git a/MatterControlLib/MatterControlLib.csproj b/MatterControlLib/MatterControlLib.csproj index 880bf10c1..535a39703 100644 --- a/MatterControlLib/MatterControlLib.csproj +++ b/MatterControlLib/MatterControlLib.csproj @@ -94,27 +94,27 @@ - + - + - - - + + + - + - + diff --git a/Plugins/MatterControl.PartSheet/MatterControl.PartSheet.csproj b/Plugins/MatterControl.PartSheet/MatterControl.PartSheet.csproj index 88bc2f07a..be560a8a8 100644 --- a/Plugins/MatterControl.PartSheet/MatterControl.PartSheet.csproj +++ b/Plugins/MatterControl.PartSheet/MatterControl.PartSheet.csproj @@ -16,7 +16,7 @@ - + diff --git a/PrinterDriverInstaller/InfInstaller.csproj b/PrinterDriverInstaller/InfInstaller.csproj index 9aa6366c1..1bc0a2ca9 100644 --- a/PrinterDriverInstaller/InfInstaller.csproj +++ b/PrinterDriverInstaller/InfInstaller.csproj @@ -8,7 +8,7 @@ - + all diff --git a/Submodules/MatterSlice b/Submodules/MatterSlice index 6f3ef82f9..0d610d656 160000 --- a/Submodules/MatterSlice +++ b/Submodules/MatterSlice @@ -1 +1 @@ -Subproject commit 6f3ef82f9cad3ba1f1419c427336de60fbf6070e +Subproject commit 0d610d6567ce643cf8481c42c7028a4d58c507d6 diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index bf1743f90..bd8fded90 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit bf1743f908241e19886562ba9752944763417896 +Subproject commit bd8fded90fb758b6b80817cf2e966ee2f058e5ac diff --git a/Tests/MatterControl.AutomationTests/LibraryActionTests.cs b/Tests/MatterControl.AutomationTests/LibraryActionTests.cs index 77794b0e2..f4397f201 100644 --- a/Tests/MatterControl.AutomationTests/LibraryActionTests.cs +++ b/Tests/MatterControl.AutomationTests/LibraryActionTests.cs @@ -32,13 +32,14 @@ using System.Threading; using System.Threading.Tasks; using MatterHackers.Agg.UI; using NUnit.Framework; +using TestInvoker; namespace MatterHackers.MatterControl.Tests.Automation { [TestFixture, Ignore("Product code still needs to be implemented"), Category("MatterControl.UI.Automation")] public class LibraryActionTests { - [Test] + [Test, ChildProcessTest] public async Task ClickOnExportButton() { await MatterControlUtilities.RunTest(testRunner => @@ -64,7 +65,7 @@ namespace MatterHackers.MatterControl.Tests.Automation /// Confirms the Export to Zip feature compresses and exports to a zip file and that file imports without issue /// /// - [Test] + [Test, ChildProcessTest] public async Task ExportToZipImportFromZip() { await MatterControlUtilities.RunTest(testRunner => @@ -117,7 +118,7 @@ namespace MatterHackers.MatterControl.Tests.Automation }, queueItemFolderToAdd: QueueTemplate.Three_Queue_Items); } - [Test, Ignore("Test now works as expected but product does not implement expected functionality")] + [Test, ChildProcessTest, Ignore("Test now works as expected but product does not implement expected functionality")] public async Task QueueExportIsDisabledIfEmpty() { await MatterControlUtilities.RunTest(testRunner => @@ -142,7 +143,7 @@ namespace MatterHackers.MatterControl.Tests.Automation }); } - [Test, Ignore("Not Finished")] + [Test, ChildProcessTest, Ignore("Not Finished")] public async Task ClickCreatePartSheetButton() { await MatterControlUtilities.RunTest(testRunner => diff --git a/Tests/MatterControl.AutomationTests/MatterControl.AutomationTests.csproj b/Tests/MatterControl.AutomationTests/MatterControl.AutomationTests.csproj index e5bc80097..e977c8735 100644 --- a/Tests/MatterControl.AutomationTests/MatterControl.AutomationTests.csproj +++ b/Tests/MatterControl.AutomationTests/MatterControl.AutomationTests.csproj @@ -14,11 +14,11 @@ $(AssemblyName) - - + + - - + + all diff --git a/Tests/MatterControl.Tests/MatterControl.Tests.csproj b/Tests/MatterControl.Tests/MatterControl.Tests.csproj index b14ae3a9b..46aef034e 100644 --- a/Tests/MatterControl.Tests/MatterControl.Tests.csproj +++ b/Tests/MatterControl.Tests/MatterControl.Tests.csproj @@ -39,11 +39,11 @@ - - + + - - + + all