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

Merge pull request #5365 from larsbrubaker/main

Browse source 
main
This commit is contained in:
Lars Brubaker 2022-08-30 14:58:34 -07:00 • committed by GitHub
commit 33b3b3948d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 26 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Launcher/Launcher.csproj
View file

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

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

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

7
MatterControl.csproj
View file

@ -72,7 +72,6 @@
<ProjectReference Include="MatterControlLib\MatterControlLib.csproj" />
<ProjectReference Include="PrinterDriverInstaller\InfInstaller.csproj" />
<ProjectReference Include="Submodules\agg-sharp\agg\Agg.csproj" />
<ProjectReference Include="Submodules\agg-sharp\Glfw\GlfwProvider.csproj" />
<ProjectReference Include="Submodules\agg-sharp\Gui\Gui.csproj" />
<ProjectReference Include="Submodules\agg-sharp\VectorMath\VectorMath.csproj" />
<ProjectReference Include="Submodules\MatterSlice\MatterSlice.csproj" />
@ -93,17 +92,17 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="CsvHelper">
<Version>27.2.1</Version>
<Version>28.0.1</Version>
</PackageReference>
<PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.9" />
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="Mindscape.Raygun4Net.NetCore" Version="6.4.3" />
<PackageReference Include="ServiceWire" Version="5.5.0" />
<PackageReference Include="ServiceWire" Version="5.5.1" />
<PackageReference Include="SocketIoClientDotNet">
<Version>1.0.2-beta1</Version>
</PackageReference>
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.3.330701">
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.336902">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="System.IO.Ports" Version="7.0.0-preview.5.22301.12" />

6
MatterControlLib/MatterControlLib.csproj
View file

@ -90,12 +90,12 @@
<ItemGroup>
<PackageReference Include="AngleSharp" Version="0.17.1" />
<PackageReference Include="CsvHelper" Version="27.2.1" />
<PackageReference Include="CsvHelper" Version="28.0.1" />
<PackageReference Include="Lucene.Net" 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="Markdig" Version="0.30.2" />
<PackageReference Include="MathParser.org-mXparser" Version="5.0.6" />
<PackageReference Include="Markdig" Version="0.30.3" />
<PackageReference Include="MathParser.org-mXparser" Version="5.0.7" />
<PackageReference Include="MIConvexHull" Version="1.1.19.1019" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />

2
PrinterDriverInstaller/InfInstaller.csproj
View file

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

2
Submodules/MatterSlice

@ -1 +1 @@
Subproject commit 54748bc6d030bb65593e17b76d320884a7747eb2
Subproject commit d58665f5c5a25ed2fae2a9418c6c56fe70a59fe8

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit 3be867c69f3fedc3dbee0874466743e75bc2062d
Subproject commit f52f803dc37a2eb3fe4ebe1b2507418d5d2db4ba

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

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

4
Tests/MatterControl.Tests/MatterControl.Tests.csproj
View file

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

16
Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs
View file

@ -329,14 +329,14 @@ namespace MatterHackers.MatterControl.Tests.Automation
{
SystemWindow systemWindow;
testRunner.GetWidgetByName("Hardware Tab", out systemWindow, 10);
testRunner.WaitforDraw(systemWindow)
testRunner.WaitFor(() => testRunner.NameExists("Start New Design"), 5)
// close the welcome message
.ClickByName("Start New Design")
.Delay(.5)
.Delay(1.5)
// and close the product tour offer
.ClickByName("Cancel Wizard Button");
//testRunner.Delay(1);
testRunner.Delay(1);
// If testing is to be reliable, that dialog really shouldn't be showing now.
// NOTE: This may fail rarely still. Happened once with OrthographicZoomToSelectionWide.
Assert.IsFalse(testRunner.NamedWidgetExists("Cancel Wizard Button"));
@ -822,8 +822,14 @@ namespace MatterHackers.MatterControl.Tests.Automation
public static AutomationRunner NavigateToLibraryHome(this AutomationRunner testRunner)
{
return testRunner.EnsureContentMenuOpen()
.ClickByName("Bread Crumb Button Home")
testRunner.EnsureContentMenuOpen();
while (!testRunner.NameExists("Bread Crumb Button Home", .2))
{
testRunner.ClickByName("Library Up Button")
.Delay();
}
return testRunner.ClickByName("Bread Crumb Button Home")
.Delay(.5);
}