Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions GCodeGenerator.Core.Tests/GCodeGenerator.Core.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.9.0" />
<PackageReference Include="MSTest.TestAdapter" Version="4.3.3" />
<PackageReference Include="MSTest.TestFramework" Version="4.3.3" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.10.0" />
<PackageReference Include="MSTest.TestAdapter" Version="4.4.0" />
<PackageReference Include="MSTest.TestFramework" Version="4.4.0" />
</ItemGroup>

<ItemGroup>
Expand Down
83 changes: 37 additions & 46 deletions GCodeGenerator.Core.Tests/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,32 +4,34 @@
"net10.0": {
"Microsoft.NET.Test.Sdk": {
"type": "Direct",
"requested": "[18.9.0, )",
"resolved": "18.9.0",
"contentHash": "xIzVXa/VpKXqDWzyC/5Hw8JbFY5u9k3Jc53CpcjBiOXvkQGio484LD9FNwOiGUSMDcYL3Rcw9sNgGi5WrswlPQ==",
"requested": "[18.10.0, )",
"resolved": "18.10.0",
"contentHash": "0CZZ688UBvpQFB9HKo7wrNJNVe+AOM4UtipgwpER3TTM+d2DDM6QyKkIJZTR3mpbn9/zFbZEtAgVIz4SPTjQZQ==",
"dependencies": {
"Microsoft.CodeCoverage": "18.9.0",
"Microsoft.TestPlatform.TestHost": "18.9.0"
"Microsoft.CodeCoverage": "18.10.0",
"Microsoft.TestPlatform.TestHost": "18.10.0"
}
},
"MSTest.TestAdapter": {
"type": "Direct",
"requested": "[4.3.3, )",
"resolved": "4.3.3",
"contentHash": "YxXA1YGqwcZ1UjZXHgeu65AWDR25PQ2lN5N5CYOhxftqOQh/FcgQk0Vz0nfHqLhqOGFI6g9uIfOWqAdobSNKSg==",
"requested": "[4.4.0, )",
"resolved": "4.4.0",
"contentHash": "xZdlCr2r/6XFOo67jcemJsfm46tTgXdqtnISFIuDUAJf5Yxk07XpTC9eMUErLdlYD8QM9zw07eOPre7+nTayUg==",
"dependencies": {
"MSTest.TestFramework": "4.3.3",
"Microsoft.Testing.Extensions.VSTestBridge": "2.3.3",
"Microsoft.Testing.Platform.MSBuild": "2.3.3"
"MSTest.TestFramework": "4.4.0",
"Microsoft.TestPlatform.ObjectModel": "18.9.0",
"Microsoft.Testing.Extensions.Telemetry": "2.4.0",
"Microsoft.Testing.Extensions.TrxReport.Abstractions": "2.4.0",
"Microsoft.Testing.Platform.MSBuild": "2.4.0"
}
},
"MSTest.TestFramework": {
"type": "Direct",
"requested": "[4.3.3, )",
"resolved": "4.3.3",
"contentHash": "Y4OSRh7VKV3nW+/vIqvfJ3sdLWfVJ9G11KpzynFAq3Bh/fpMaXt73v8GfL4mTz6pJ/ix3hcep4iy6qQNXt408w==",
"requested": "[4.4.0, )",
"resolved": "4.4.0",
"contentHash": "sfJzj3ntdU/GahJd2n+WQLgKqbV0RRMJVXtjRwRQLhblevlzLSDAOocOKANhfMaCEQ5dMt6348ztbVq/Ap60xA==",
"dependencies": {
"MSTest.Analyzers": "4.3.3"
"MSTest.Analyzers": "4.4.0"
}
},
"Clipper2": {
Expand All @@ -49,67 +51,56 @@
},
"Microsoft.CodeCoverage": {
"type": "Transitive",
"resolved": "18.9.0",
"contentHash": "MtegCIKGuG0r/LCdIjoR1HgzCGIUBhR3aNdbtQpts5vMXQuqBDZ2Jsd2uFKoHFM2XrQV6ZrDf3F5oLi3SLTp8w=="
"resolved": "18.10.0",
"contentHash": "zo1hqV+Nz6FlIwdc+aPfrvGzqfKAPPaZ6OPj1W8C0QQE2xH951AZwTUytL3K7XX8brVBUFd7MhrLDl3CtK3U/A=="
},
"Microsoft.Testing.Extensions.Telemetry": {
"type": "Transitive",
"resolved": "2.3.3",
"contentHash": "nY8ceQyPWB9TRE1WE5Oe/sks2e10SxgPv61vBHsFYpgCeDtNwhpMZwmL29GklO3/etTdOsLdrCmNr4zJWaR2fg==",
"resolved": "2.4.0",
"contentHash": "JeP1RFqBa11fWmBk8xEfZcMKr4rxWSyI6OZ+659V069CaMkTEOQBW2UdSSeNz3absOsygcn7JJkzerC4LGnZ9w==",
"dependencies": {
"Microsoft.ApplicationInsights": "2.23.0",
"Microsoft.Testing.Platform": "2.3.3"
"Microsoft.Testing.Platform": "[2.4.0, 3.0.0)"
}
},
"Microsoft.Testing.Extensions.TrxReport.Abstractions": {
"type": "Transitive",
"resolved": "2.3.3",
"contentHash": "dceVNxnfTEjKnrIreLcMfkgrzzBY8kgCCJX5NAv7Lq/6vPlTP4VB5zxKeuYy0yfCoBtWuPkLjUG6qtOBMfpypA==",
"resolved": "2.4.0",
"contentHash": "uRb+4qM42dFDg4kWJZ2kFEcwESNVCRZJjItp5vETorN3rSJGysP617LqYirOcrCYmxg+obPreHMM5JcsNDKtBw==",
"dependencies": {
"Microsoft.Testing.Platform": "2.3.3"
}
},
"Microsoft.Testing.Extensions.VSTestBridge": {
"type": "Transitive",
"resolved": "2.3.3",
"contentHash": "JLovZjH6K10YiHO/BcidsaSHo/M2DfOe9FDjxjFdV6aoHO6VYTTYlLBNcyLJSo20q5gDTmNvmxYVH39A942aJA==",
"dependencies": {
"Microsoft.TestPlatform.ObjectModel": "18.4.0",
"Microsoft.Testing.Extensions.Telemetry": "2.3.3",
"Microsoft.Testing.Extensions.TrxReport.Abstractions": "2.3.3",
"Microsoft.Testing.Platform": "2.3.3"
"Microsoft.Testing.Platform": "[2.4.0, 3.0.0)"
}
},
"Microsoft.Testing.Platform": {
"type": "Transitive",
"resolved": "2.3.3",
"contentHash": "ENbH4BQh9riXtOKc25KKITfiGGWhWMBJA7pZuNaF9zxzzSaVkp5AMeZxGQ6sXYaR6xb724NLz985Is6XIYqLSg=="
"resolved": "2.4.0",
"contentHash": "dp1N3P1ujb0ztwFgqz2o/ItEvq+pm19/AiA+Xq7Zpcy7oPMcxDBZLYGtf0LlU1MveEBJuKVjZhI+LnkfcH/0jQ=="
},
"Microsoft.Testing.Platform.MSBuild": {
"type": "Transitive",
"resolved": "2.3.3",
"contentHash": "iVAvNbZ5JPDZSrTcIrCDoCsAkzjDxwDEt2mDuMd8ng1P6e2P2NCd0g0BsoBVG+nJLSmK//V+yeEvjCa3E2fxHw==",
"resolved": "2.4.0",
"contentHash": "qr5M6h16YHMJLFDcWELFVMMpGte2BUmveBZKT5YoBV+bmuJRPu9bv/Zqke4yQuOEKRNxoAETrG5jr+/6Rnr3Hg==",
"dependencies": {
"Microsoft.Testing.Platform": "2.3.3"
"Microsoft.Testing.Platform": "[2.4.0, 3.0.0)"
}
},
"Microsoft.TestPlatform.ObjectModel": {
"type": "Transitive",
"resolved": "18.9.0",
"contentHash": "Fz/qXC52VXXopzHj7v2reCKcCqSxkTDCkEDfkNAH0vni/7qK/KLMiEYtRmnUanxO2F2g2zZZ60qCpxF0AF7URA=="
"resolved": "18.10.0",
"contentHash": "aXA7DDbnt6MYu3eLBEDksNdl09QxJ/PpMzrFcSxqEOk3RvRGJzhKI5mezVCEOcvveRhjfw/mvn6xVXC/rTaOog=="
},
"Microsoft.TestPlatform.TestHost": {
"type": "Transitive",
"resolved": "18.9.0",
"contentHash": "Oq+Pma/J86aZL72t71bcESvDszDsTjUfl6PIsuDdPoKTHZfNMhKamCfLD5fKx51W/u0KozXtJo2/3fnt0sgPxg==",
"resolved": "18.10.0",
"contentHash": "Spu6C7bgz1PmWN+Y7wS0PfGCw9Kwv5RvJbCwyQaEWjcwpMire+qYMrcZ7qk8agjy6nd0sdHLc3ugCSrGuSbZdw==",
"dependencies": {
"Microsoft.TestPlatform.ObjectModel": "18.9.0"
"Microsoft.TestPlatform.ObjectModel": "18.10.0"
}
},
"MSTest.Analyzers": {
"type": "Transitive",
"resolved": "4.3.3",
"contentHash": "cTcdSPIZ8WvchbC5DFmfHxrvVNZCtops+2W94le+Q+mx110Y9L9mqNVVc9flF35lFeL5GsY+rxGBylsjDk4+zg=="
"resolved": "4.4.0",
"contentHash": "8g2KL2LjsXXVywvQb0uWQBANOONVnRf6cTSbON9ar6gIw08oSBY7Z3PJlC8sHbqOVvCr7srrcWiKzb12SUoV2w=="
},
"netDxf": {
"type": "Transitive",
Expand Down
6 changes: 3 additions & 3 deletions GCodeGenerator.Tests/GCodeGenerator.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@

<ItemGroup>
<!-- Пункт 1.5: 18.x — поддержка net10.0 (17.8.0 — эпохи net481/net8). -->
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.9.0" />
<PackageReference Include="MSTest.TestAdapter" Version="4.3.3" />
<PackageReference Include="MSTest.TestFramework" Version="4.3.3" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.10.0" />
<PackageReference Include="MSTest.TestAdapter" Version="4.4.0" />
<PackageReference Include="MSTest.TestFramework" Version="4.4.0" />
</ItemGroup>

<ItemGroup>
Expand Down
95 changes: 43 additions & 52 deletions GCodeGenerator.Tests/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,32 +4,34 @@
"net10.0-windows7.0": {
"Microsoft.NET.Test.Sdk": {
"type": "Direct",
"requested": "[18.9.0, )",
"resolved": "18.9.0",
"contentHash": "xIzVXa/VpKXqDWzyC/5Hw8JbFY5u9k3Jc53CpcjBiOXvkQGio484LD9FNwOiGUSMDcYL3Rcw9sNgGi5WrswlPQ==",
"requested": "[18.10.0, )",
"resolved": "18.10.0",
"contentHash": "0CZZ688UBvpQFB9HKo7wrNJNVe+AOM4UtipgwpER3TTM+d2DDM6QyKkIJZTR3mpbn9/zFbZEtAgVIz4SPTjQZQ==",
"dependencies": {
"Microsoft.CodeCoverage": "18.9.0",
"Microsoft.TestPlatform.TestHost": "18.9.0"
"Microsoft.CodeCoverage": "18.10.0",
"Microsoft.TestPlatform.TestHost": "18.10.0"
}
},
"MSTest.TestAdapter": {
"type": "Direct",
"requested": "[4.3.3, )",
"resolved": "4.3.3",
"contentHash": "YxXA1YGqwcZ1UjZXHgeu65AWDR25PQ2lN5N5CYOhxftqOQh/FcgQk0Vz0nfHqLhqOGFI6g9uIfOWqAdobSNKSg==",
"requested": "[4.4.0, )",
"resolved": "4.4.0",
"contentHash": "xZdlCr2r/6XFOo67jcemJsfm46tTgXdqtnISFIuDUAJf5Yxk07XpTC9eMUErLdlYD8QM9zw07eOPre7+nTayUg==",
"dependencies": {
"MSTest.TestFramework": "4.3.3",
"Microsoft.Testing.Extensions.VSTestBridge": "2.3.3",
"Microsoft.Testing.Platform.MSBuild": "2.3.3"
"MSTest.TestFramework": "4.4.0",
"Microsoft.TestPlatform.ObjectModel": "18.9.0",
"Microsoft.Testing.Extensions.Telemetry": "2.4.0",
"Microsoft.Testing.Extensions.TrxReport.Abstractions": "2.4.0",
"Microsoft.Testing.Platform.MSBuild": "2.4.0"
}
},
"MSTest.TestFramework": {
"type": "Direct",
"requested": "[4.3.3, )",
"resolved": "4.3.3",
"contentHash": "Y4OSRh7VKV3nW+/vIqvfJ3sdLWfVJ9G11KpzynFAq3Bh/fpMaXt73v8GfL4mTz6pJ/ix3hcep4iy6qQNXt408w==",
"requested": "[4.4.0, )",
"resolved": "4.4.0",
"contentHash": "sfJzj3ntdU/GahJd2n+WQLgKqbV0RRMJVXtjRwRQLhblevlzLSDAOocOKANhfMaCEQ5dMt6348ztbVq/Ap60xA==",
"dependencies": {
"MSTest.Analyzers": "4.3.3"
"MSTest.Analyzers": "4.4.0"
}
},
"Autofac": {
Expand Down Expand Up @@ -70,72 +72,61 @@
},
"Microsoft.CodeCoverage": {
"type": "Transitive",
"resolved": "18.9.0",
"contentHash": "MtegCIKGuG0r/LCdIjoR1HgzCGIUBhR3aNdbtQpts5vMXQuqBDZ2Jsd2uFKoHFM2XrQV6ZrDf3F5oLi3SLTp8w=="
"resolved": "18.10.0",
"contentHash": "zo1hqV+Nz6FlIwdc+aPfrvGzqfKAPPaZ6OPj1W8C0QQE2xH951AZwTUytL3K7XX8brVBUFd7MhrLDl3CtK3U/A=="
},
"Microsoft.Testing.Extensions.Telemetry": {
"type": "Transitive",
"resolved": "2.3.3",
"contentHash": "nY8ceQyPWB9TRE1WE5Oe/sks2e10SxgPv61vBHsFYpgCeDtNwhpMZwmL29GklO3/etTdOsLdrCmNr4zJWaR2fg==",
"resolved": "2.4.0",
"contentHash": "JeP1RFqBa11fWmBk8xEfZcMKr4rxWSyI6OZ+659V069CaMkTEOQBW2UdSSeNz3absOsygcn7JJkzerC4LGnZ9w==",
"dependencies": {
"Microsoft.ApplicationInsights": "2.23.0",
"Microsoft.Testing.Platform": "2.3.3"
"Microsoft.Testing.Platform": "[2.4.0, 3.0.0)"
}
},
"Microsoft.Testing.Extensions.TrxReport.Abstractions": {
"type": "Transitive",
"resolved": "2.3.3",
"contentHash": "dceVNxnfTEjKnrIreLcMfkgrzzBY8kgCCJX5NAv7Lq/6vPlTP4VB5zxKeuYy0yfCoBtWuPkLjUG6qtOBMfpypA==",
"resolved": "2.4.0",
"contentHash": "uRb+4qM42dFDg4kWJZ2kFEcwESNVCRZJjItp5vETorN3rSJGysP617LqYirOcrCYmxg+obPreHMM5JcsNDKtBw==",
"dependencies": {
"Microsoft.Testing.Platform": "2.3.3"
}
},
"Microsoft.Testing.Extensions.VSTestBridge": {
"type": "Transitive",
"resolved": "2.3.3",
"contentHash": "JLovZjH6K10YiHO/BcidsaSHo/M2DfOe9FDjxjFdV6aoHO6VYTTYlLBNcyLJSo20q5gDTmNvmxYVH39A942aJA==",
"dependencies": {
"Microsoft.TestPlatform.ObjectModel": "18.4.0",
"Microsoft.Testing.Extensions.Telemetry": "2.3.3",
"Microsoft.Testing.Extensions.TrxReport.Abstractions": "2.3.3",
"Microsoft.Testing.Platform": "2.3.3"
"Microsoft.Testing.Platform": "[2.4.0, 3.0.0)"
}
},
"Microsoft.Testing.Platform": {
"type": "Transitive",
"resolved": "2.3.3",
"contentHash": "ENbH4BQh9riXtOKc25KKITfiGGWhWMBJA7pZuNaF9zxzzSaVkp5AMeZxGQ6sXYaR6xb724NLz985Is6XIYqLSg=="
"resolved": "2.4.0",
"contentHash": "dp1N3P1ujb0ztwFgqz2o/ItEvq+pm19/AiA+Xq7Zpcy7oPMcxDBZLYGtf0LlU1MveEBJuKVjZhI+LnkfcH/0jQ=="
},
"Microsoft.Testing.Platform.MSBuild": {
"type": "Transitive",
"resolved": "2.3.3",
"contentHash": "iVAvNbZ5JPDZSrTcIrCDoCsAkzjDxwDEt2mDuMd8ng1P6e2P2NCd0g0BsoBVG+nJLSmK//V+yeEvjCa3E2fxHw==",
"resolved": "2.4.0",
"contentHash": "qr5M6h16YHMJLFDcWELFVMMpGte2BUmveBZKT5YoBV+bmuJRPu9bv/Zqke4yQuOEKRNxoAETrG5jr+/6Rnr3Hg==",
"dependencies": {
"Microsoft.Testing.Platform": "2.3.3"
"Microsoft.Testing.Platform": "[2.4.0, 3.0.0)"
}
},
"Microsoft.TestPlatform.ObjectModel": {
"type": "Transitive",
"resolved": "18.9.0",
"contentHash": "Fz/qXC52VXXopzHj7v2reCKcCqSxkTDCkEDfkNAH0vni/7qK/KLMiEYtRmnUanxO2F2g2zZZ60qCpxF0AF7URA=="
"resolved": "18.10.0",
"contentHash": "aXA7DDbnt6MYu3eLBEDksNdl09QxJ/PpMzrFcSxqEOk3RvRGJzhKI5mezVCEOcvveRhjfw/mvn6xVXC/rTaOog=="
},
"Microsoft.TestPlatform.TestHost": {
"type": "Transitive",
"resolved": "18.9.0",
"contentHash": "Oq+Pma/J86aZL72t71bcESvDszDsTjUfl6PIsuDdPoKTHZfNMhKamCfLD5fKx51W/u0KozXtJo2/3fnt0sgPxg==",
"resolved": "18.10.0",
"contentHash": "Spu6C7bgz1PmWN+Y7wS0PfGCw9Kwv5RvJbCwyQaEWjcwpMire+qYMrcZ7qk8agjy6nd0sdHLc3ugCSrGuSbZdw==",
"dependencies": {
"Microsoft.TestPlatform.ObjectModel": "18.9.0"
"Microsoft.TestPlatform.ObjectModel": "18.10.0"
}
},
"Microsoft.Xaml.Behaviors.Wpf": {
"type": "Transitive",
"resolved": "1.1.142",
"contentHash": "c47wA/8GHiQ9w+O6+mdqrZhZrxHogx2/fSZyRKL9tz0k+ypoTiwOx6fID0X3jr5LnCazJbCk7KiAcL0zVnNgNA=="
"resolved": "1.1.158",
"contentHash": "TPQyXvLV/p4/RUeSqaEOUE2pBipFlvNVdrAsTd1qgNzBoIEN2UMJHwH0SrcUFVuDWqpZbphjXiZ/fGA9WnmbTg=="
},
"MSTest.Analyzers": {
"type": "Transitive",
"resolved": "4.3.3",
"contentHash": "cTcdSPIZ8WvchbC5DFmfHxrvVNZCtops+2W94le+Q+mx110Y9L9mqNVVc9flF35lFeL5GsY+rxGBylsjDk4+zg=="
"resolved": "4.4.0",
"contentHash": "8g2KL2LjsXXVywvQb0uWQBANOONVnRf6cTSbON9ar6gIw08oSBY7Z3PJlC8sHbqOVvCr7srrcWiKzb12SUoV2w=="
},
"netDxf": {
"type": "Transitive",
Expand All @@ -150,7 +141,7 @@
"ControlzEx": "[4.4.0, )",
"GCodeGenerator.Core": "[1.0.0, )",
"MahApps.Metro": "[2.4.11, )",
"Microsoft.Xaml.Behaviors.Wpf": "[1.1.142, )"
"Microsoft.Xaml.Behaviors.Wpf": "[1.1.158, )"
}
},
"gcodegenerator.core": {
Expand All @@ -165,9 +156,9 @@
"type": "Project",
"dependencies": {
"GCodeGenerator.Core": "[1.0.0, )",
"MSTest.TestAdapter": "[4.3.3, )",
"MSTest.TestFramework": "[4.3.3, )",
"Microsoft.NET.Test.Sdk": "[18.9.0, )"
"MSTest.TestAdapter": "[4.4.0, )",
"MSTest.TestFramework": "[4.4.0, )",
"Microsoft.NET.Test.Sdk": "[18.10.0, )"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion GCodeGenerator/GCodeGenerator.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
кроссплатформенность. Подробности — в CONTRIBUTING.md. -->
<PackageReference Include="ControlzEx" Version="4.4.0" />
<PackageReference Include="MahApps.Metro" Version="2.4.11" />
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.142" />
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.158" />
<!-- Пункт 1.3: MVVM-фреймворк (замена MugenMvvmToolkit). -->
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.2" />
</ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions GCodeGenerator/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@
},
"Microsoft.Xaml.Behaviors.Wpf": {
"type": "Direct",
"requested": "[1.1.142, )",
"resolved": "1.1.142",
"contentHash": "c47wA/8GHiQ9w+O6+mdqrZhZrxHogx2/fSZyRKL9tz0k+ypoTiwOx6fID0X3jr5LnCazJbCk7KiAcL0zVnNgNA=="
"requested": "[1.1.158, )",
"resolved": "1.1.158",
"contentHash": "TPQyXvLV/p4/RUeSqaEOUE2pBipFlvNVdrAsTd1qgNzBoIEN2UMJHwH0SrcUFVuDWqpZbphjXiZ/fGA9WnmbTg=="
},
"Clipper2": {
"type": "Transitive",
Expand Down
Loading