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

Merge pull request #4928 from larsbrubaker/master

Browse source 
attempting to fix command line build
This commit is contained in:
Lars Brubaker 2020-12-07 08:17:57 -08:00 • committed by GitHub
commit ab458869ea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 53 additions and 21 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>
<ItemGroup>
<PackageReference Include="System.Management" Version="4.5.0" />
<PackageReference Include="System.Management" Version="5.0.0" />
</ItemGroup>
</Project>

4
MatterControl.Common/MatterControl.Common.csproj
View file

@ -12,4 +12,8 @@
<ProjectReference Include="..\Submodules\agg-sharp\Gui\Gui.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Update="StyleCop.Analyzers" Version="1.1.118" />
</ItemGroup>
</Project>

4
MatterControl.MeshOperations/MatterControl.MeshOperations.csproj
View file

@ -16,4 +16,8 @@
<ProjectReference Include="..\Submodules\geometry3Sharp\geometry3Sharp.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Update="StyleCop.Analyzers" Version="1.1.118" />
</ItemGroup>
</Project>

4
MatterControl.OpenGL/MatterControl.OpenGL.csproj
View file

@ -20,4 +20,8 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<PackageReference Update="StyleCop.Analyzers" Version="1.1.118" />
</ItemGroup>
</Project>

10
MatterControl.Printing/MatterControl.Printing.csproj
View file

@ -8,7 +8,11 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Win32.Registry" Version="4.7.0" />
<PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.0" />
</ItemGroup>
<ItemGroup>
@ -22,4 +26,8 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<PackageReference Update="StyleCop.Analyzers" Version="1.1.118" />
</ItemGroup>
</Project>

8
MatterControl.csproj
View file

@ -139,16 +139,16 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="CsvHelper">
<Version>15.0.5</Version>
<Version>18.0.0</Version>
</PackageReference>
<PackageReference Include="Microsoft.AspNet.WebApi.Client">
<Version>5.2.6</Version>
<Version>5.2.7</Version>
</PackageReference>
<PackageReference Include="Mindscape.Raygun4Net">
<Version>5.6.0</Version>
<Version>5.12.0</Version>
</PackageReference>
<PackageReference Include="SocketIoClientDotNet">
<Version>0.9.13</Version>
<Version>1.0.2-beta1</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

2
MatterControlLib/DesignTools/Primitives/WedgeObject3D.cs
View file

@ -101,7 +101,7 @@ namespace MatterHackers.MatterControl.DesignTools
if (Round)
{
var range = 360 / 4;
var range = 360 / 4.0;
for (int i = 1; i < RoundSegments - 1; i++)
{
var angle = range / (RoundSegments - 1) * i;

22
MatterControlLib/MatterControlLib.csproj
View file

@ -86,19 +86,23 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="AngleSharp" Version="0.9.11" />
<PackageReference Include="CsvHelper" Version="15.0.5" />
<PackageReference Include="AngleSharp" Version="0.14.0" />
<PackageReference Include="CsvHelper" Version="18.0.0" />
<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.15.2" />
<PackageReference Include="MIConvexHull" Version="1.1.19.1019" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="2.1.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.1.1" />
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Include="System.ComponentModel.Annotations" Version="4.5.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
<PackageReference Include="Zeroconf" Version="3.0.30" />
<PackageReference Include="Zeroconf" Version="3.4.2" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.0" />
</ItemGroup>
<ItemGroup>
@ -110,4 +114,8 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>
<PackageReference Update="StyleCop.Analyzers" Version="1.1.118" />
</ItemGroup>
</Project>

4
MatterControlLib/PartPreviewWindow/View3D/View3DWidget.cs
View file

@ -34,7 +34,7 @@ using System.Text.RegularExpressions;
using System.Threading;
using System.Threading.Tasks;
using AngleSharp.Dom;
using AngleSharp.Parser.Html;
using AngleSharp.Html.Parser;
using MatterHackers.Agg;
using MatterHackers.Agg.Platform;
using MatterHackers.Agg.UI;
@ -1187,7 +1187,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
// Parse HTML into something usable for the scene
var parser = new HtmlParser();
var document = parser.Parse(html);
var document = parser.ParseDocument(html);
// TODO: This needs to become much smarter. Ideally it would inject a yet to be built Object3D for HTML
// snippets which could initially infer the content to use but would allow for interactive selection.

6
MatterHackers.gsSlicer/MatterControl.gsSlicer.csproj
View file

@ -15,7 +15,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
</ItemGroup>
<ItemGroup>
@ -29,4 +29,8 @@
<ProjectReference Include="..\Submodules\gsSlicer\gsSlicer.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Update="StyleCop.Analyzers" Version="1.1.118" />
</ItemGroup>
</Project>

2
Submodules/MatterSlice

@ -1 +1 @@
Subproject commit 8aaf1fd744c1d2bc746fc39700068aee3986939f
Subproject commit a5725d2dc145c449153cb36a63122fcf400743c3

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit 4c6ca8001a805181efcfd1a993e682ba051d5c34
Subproject commit 92fe29faa9cfd6dd5e4f908701b690da1cd1e161

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

@ -41,7 +41,7 @@
<PlatformTarget>AnyCPU</PlatformTarget>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="NUnit" Version="3.11.0" />
<PackageReference Include="NUnit.ApplicationDomain" Version="11.1.0" />
<PackageReference Include="NUnit3TestAdapter">

2
Tests/MatterControl.Tests/MatterControl.Tests.csproj
View file

@ -161,7 +161,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="C5" Version="2.5.3" />
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="NUnit" Version="3.11.0" />
<PackageReference Include="NUnit.ApplicationDomain" Version="11.1.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.12.0" />