nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #5411 from larsbrubaker/main

Browse source 
main
This commit is contained in:
Lars Brubaker 2022-12-14 13:45:30 -08:00 • committed by GitHub
commit 444d7a8d94
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 37 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Community.CsharpSqlite/Community.CsharpSqlite.csproj
View file

@ -16,7 +16,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="System.Management" Version="6.0.0" /> <PackageReference Include="System.Management" Version="7.0.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>

2
Launcher/Launcher.csproj
View file

@ -8,7 +8,7 @@
<AllowUnsafeBlocks>True</AllowUnsafeBlocks> <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.346202"> <PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.355802">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
</PackageReference> </PackageReference>
</ItemGroup> </ItemGroup>

4
MatterControl.Printing/MatterControl.Printing.csproj
View file

@ -12,8 +12,8 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" /> <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
<PackageReference Include="System.IO.Ports" Version="7.0.0-preview.5.22301.12" /> <PackageReference Include="System.IO.Ports" Version="7.0.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
MatterControl.SLA/MatterControl.SLA.csproj
View file

@ -12,7 +12,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" /> <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
MatterControl.Winforms/MatterControl.Winforms.csproj
View file

@ -28,7 +28,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" /> <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" /> <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.346202"> <PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.355802">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
</PackageReference> </PackageReference>
</ItemGroup> </ItemGroup>

8
MatterControl.csproj
View file

@ -93,20 +93,20 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="CsvHelper"> <PackageReference Include="CsvHelper">
<Version>29.0.0</Version> <Version>30.0.1</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.9" /> <PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.9" />
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" /> <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="Mindscape.Raygun4Net.NetCore" Version="6.4.3" /> <PackageReference Include="Mindscape.Raygun4Net.NetCore" Version="6.4.3" />
<PackageReference Include="ServiceWire" Version="5.5.1" /> <PackageReference Include="ServiceWire" Version="5.5.2" />
<PackageReference Include="SocketIoClientDotNet"> <PackageReference Include="SocketIoClientDotNet">
<Version>1.0.2-beta1</Version> <Version>1.0.2-beta1</Version>
</PackageReference> </PackageReference>
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" /> <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.346202"> <PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.355802">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
</PackageReference> </PackageReference>
<PackageReference Include="System.IO.Ports" Version="7.0.0-preview.5.22301.12" /> <PackageReference Include="System.IO.Ports" Version="7.0.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Remove="ConfigurationPage\ApplicationSettings\ThemeColorPanel.cs" /> <Compile Remove="ConfigurationPage\ApplicationSettings\ThemeColorPanel.cs" />

14
MatterControlLib/MatterControlLib.csproj
View file

@ -94,27 +94,27 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="AngleSharp" Version="0.17.1" /> <PackageReference Include="AngleSharp" Version="0.17.1" />
<PackageReference Include="CsvHelper" Version="29.0.0" /> <PackageReference Include="CsvHelper" Version="30.0.1" />
<PackageReference Include="Lucene.Net" Version="4.8.0-beta00005" /> <PackageReference Include="Lucene.Net" Version="4.8.0-beta00005" />
<PackageReference Include="Lucene.Net.Analysis.Common" Version="4.8.0-beta00005" /> <PackageReference Include="Lucene.Net.Analysis.Common" Version="4.8.0-beta00005" />
<PackageReference Include="Lucene.Net.QueryParser" Version="4.8.0-beta00005" /> <PackageReference Include="Lucene.Net.QueryParser" Version="4.8.0-beta00005" />
<PackageReference Include="Markdig" Version="0.30.4" /> <PackageReference Include="Markdig" Version="0.30.4" />
<PackageReference Include="MathParser.org-mXparser" Version="5.0.7" /> <PackageReference Include="MathParser.org-mXparser" Version="5.1.0" />
<PackageReference Include="MIConvexHull" Version="1.1.19.1019" /> <PackageReference Include="MIConvexHull" Version="1.1.19.1019" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" /> <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" /> <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
<PackageReference Include="PDFsharpNetStandard2" Version="1.51.4845" /> <PackageReference Include="PDFsharpNetStandard2" Version="1.51.4845" />
<PackageReference Include="QRCoder" Version="1.4.3" /> <PackageReference Include="QRCoder" Version="1.4.3" />
<PackageReference Include="SocketIOSharp" Version="2.0.3" /> <PackageReference Include="SocketIOSharp" Version="2.0.3" />
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" /> <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
<PackageReference Include="System.IO.Packaging" Version="6.0.0" /> <PackageReference Include="System.IO.Packaging" Version="7.0.0" />
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" /> <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
<PackageReference Include="Zeroconf" Version="3.6.11" /> <PackageReference Include="Zeroconf" Version="3.6.11" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" /> <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
MatterControlLib/RootSystemWindow.cs
View file

@ -200,7 +200,7 @@ namespace MatterHackers.MatterControl
// msGraph.Draw(MatterHackers.Agg.Transform.Affine.NewIdentity(), graphics2D); // msGraph.Draw(MatterHackers.Agg.Transform.Affine.NewIdentity(), graphics2D);
} }
public override void OnClosing(ClosingEventArgs eventArgs) public override void OnShouldClose(ShouldCloseEventArgs eventArgs)
{ {
if (this.HasBeenClosed) if (this.HasBeenClosed)
{ {

4
MatterControlLib/SetupWizard/StagedSetupWindow.cs
View file

@ -159,7 +159,7 @@ namespace MatterHackers.MatterControl
} }
} }
public override void OnClosing(ClosingEventArgs eventArgs) public override void OnShouldClose(ShouldCloseEventArgs eventArgs)
{ {
if (this.ActiveStage != null if (this.ActiveStage != null
&& !closeConfirmed) && !closeConfirmed)
@ -174,7 +174,7 @@ namespace MatterHackers.MatterControl
}); });
} }
base.OnClosing(eventArgs); base.OnShouldClose(eventArgs);
} }
private void ConditionalAbort(string message, Action exitConfirmedAction) private void ConditionalAbort(string message, Action exitConfirmedAction)

2
Plugins/MatterControl.PartSheet/MatterControl.PartSheet.csproj
View file

@ -16,7 +16,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="PDFsharpNetStandard2" Version="1.51.4845" /> <PackageReference Include="PDFsharpNetStandard2" Version="1.51.4845" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0" /> <PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
PrinterDriverInstaller/InfInstaller.csproj
View file

@ -8,7 +8,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" /> <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.346202"> <PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.355802">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
</PackageReference> </PackageReference>
</ItemGroup> </ItemGroup>

2
Submodules/MatterSlice

@ -1 +1 @@
Subproject commit 6f3ef82f9cad3ba1f1419c427336de60fbf6070e Subproject commit 5e8df4758b20789a14a54801c176717da9465275

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit bf1743f908241e19886562ba9752944763417896 Subproject commit 90fc0d026d710888e4ed65adc57c28f239334f09

9
Tests/MatterControl.AutomationTests/LibraryActionTests.cs
View file

@ -32,13 +32,14 @@ using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using MatterHackers.Agg.UI; using MatterHackers.Agg.UI;
using NUnit.Framework; using NUnit.Framework;
using TestInvoker;
namespace MatterHackers.MatterControl.Tests.Automation namespace MatterHackers.MatterControl.Tests.Automation
{ {
[TestFixture, Ignore("Product code still needs to be implemented"), Category("MatterControl.UI.Automation")] [TestFixture, Ignore("Product code still needs to be implemented"), Category("MatterControl.UI.Automation")]
public class LibraryActionTests public class LibraryActionTests
{ {
[Test] [Test, ChildProcessTest]
public async Task ClickOnExportButton() public async Task ClickOnExportButton()
{ {
await MatterControlUtilities.RunTest(testRunner => 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 /// Confirms the Export to Zip feature compresses and exports to a zip file and that file imports without issue
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[Test] [Test, ChildProcessTest]
public async Task ExportToZipImportFromZip() public async Task ExportToZipImportFromZip()
{ {
await MatterControlUtilities.RunTest(testRunner => await MatterControlUtilities.RunTest(testRunner =>
@ -117,7 +118,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
}, queueItemFolderToAdd: QueueTemplate.Three_Queue_Items); }, 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() public async Task QueueExportIsDisabledIfEmpty()
{ {
await MatterControlUtilities.RunTest(testRunner => 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() public async Task ClickCreatePartSheetButton()
{ {
await MatterControlUtilities.RunTest(testRunner => await MatterControlUtilities.RunTest(testRunner =>

8
Tests/MatterControl.AutomationTests/MatterControl.AutomationTests.csproj
View file

@ -14,11 +14,11 @@
<Authors>$(AssemblyName)</Authors> <Authors>$(AssemblyName)</Authors>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
<PackageReference Include="NUnit" Version="3.13.3" /> <PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" /> <PackageReference Include="NUnit3TestAdapter" Version="4.3.1" />
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.346202"> <PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.355802">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
</PackageReference> </PackageReference>
</ItemGroup> </ItemGroup>

8
Tests/MatterControl.Tests/MatterControl.Tests.csproj
View file

@ -39,11 +39,11 @@
<ProjectReference Include="..\..\Submodules\MatterSlice\MatterSliceLib\MatterSliceLib.csproj" /> <ProjectReference Include="..\..\Submodules\MatterSlice\MatterSliceLib\MatterSliceLib.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
<PackageReference Include="NUnit" Version="3.13.3" /> <PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" /> <PackageReference Include="NUnit3TestAdapter" Version="4.3.1" />
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.346202"> <PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.355802">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
</PackageReference> </PackageReference>
</ItemGroup> </ItemGroup>