From b88d2bf726b75b2a534bee1a1e929d60bf00e288 Mon Sep 17 00:00:00 2001 From: Michael Kirschner Date: Fri, 26 May 2023 18:49:38 -0400 Subject: [PATCH] Add more core only (no WPF refs) tests to net6 slns pt3 (#14027) merging this - failure is flaky geom loading error. --- src/Dynamo.All.Net6.sln | 107 +++++++++++++++++- src/DynamoCore.net6.sln | 107 +++++++++++++++++- .../ProtoTestConsoleRunner.csproj | 11 +- .../AnalysisTests/AnalysisTests.csproj | 23 ++-- .../DynamoUtilitiesTests.csproj | 25 ++-- .../GeometryColorTests/DisplayTest.cs | 8 +- .../GeometryColorTests.csproj | 33 +++--- .../PackageManagerTests/PackageLoaderTests.cs | 2 +- .../PackageManagerClientTests.cs | 17 ++- .../PackageManagerTests.csproj | 27 +++-- .../TestServices/GeometricTestBase.cs | 11 +- 11 files changed, 304 insertions(+), 67 deletions(-) diff --git a/src/Dynamo.All.Net6.sln b/src/Dynamo.All.Net6.sln index de26a4549c0..11255c10e2b 100644 --- a/src/Dynamo.All.Net6.sln +++ b/src/Dynamo.All.Net6.sln @@ -109,6 +109,20 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProtoTestFx", "..\test\Engi EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProtoTest", "..\test\Engine\ProtoTest\ProtoTest.csproj", "{6E1177DB-5E4F-4E2E-82E7-902437E56AED}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Engine", "Engine", "{91C57567-DDF1-409A-880B-3A290A486AAC}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProtoTestConsoleRunner", "..\test\Engine\ProtoTestConsoleRunner\ProtoTestConsoleRunner.csproj", "{672BF8EC-1116-49F6-B253-DFCE5CF7D4C9}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{4CA0BC62-DCB3-456B-80D6-348247640BAB}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AnalysisTests", "..\test\Libraries\AnalysisTests\AnalysisTests.csproj", "{4A707244-154B-428F-B589-D65361F24401}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DynamoUtilitiesTests", "..\test\Libraries\DynamoUtilitiesTests\DynamoUtilitiesTests.csproj", "{AB735028-22B0-4083-9CC5-805C582818EA}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GeometryColorTests", "..\test\Libraries\GeometryColorTests\GeometryColorTests.csproj", "{F8D2E3E5-4505-4463-9367-2EB2629D7DCD}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PackageManagerTests", "..\test\Libraries\PackageManagerTests\PackageManagerTests.csproj", "{2A70F3B5-7AEA-42FE-8DD5-8427C28D0025}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -697,6 +711,86 @@ Global {6E1177DB-5E4F-4E2E-82E7-902437E56AED}.Release|NET60_Windows.Build.0 = Release|NET60_Windows {6E1177DB-5E4F-4E2E-82E7-902437E56AED}.Release|x64.ActiveCfg = Release|x64 {6E1177DB-5E4F-4E2E-82E7-902437E56AED}.Release|x64.Build.0 = Release|x64 + {672BF8EC-1116-49F6-B253-DFCE5CF7D4C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {672BF8EC-1116-49F6-B253-DFCE5CF7D4C9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {672BF8EC-1116-49F6-B253-DFCE5CF7D4C9}.Debug|NET60_Linux.ActiveCfg = Debug|NET60_Linux + {672BF8EC-1116-49F6-B253-DFCE5CF7D4C9}.Debug|NET60_Linux.Build.0 = Debug|NET60_Linux + {672BF8EC-1116-49F6-B253-DFCE5CF7D4C9}.Debug|NET60_Windows.ActiveCfg = Debug|NET60_Windows + {672BF8EC-1116-49F6-B253-DFCE5CF7D4C9}.Debug|NET60_Windows.Build.0 = Debug|NET60_Windows + {672BF8EC-1116-49F6-B253-DFCE5CF7D4C9}.Debug|x64.ActiveCfg = Debug|x64 + {672BF8EC-1116-49F6-B253-DFCE5CF7D4C9}.Debug|x64.Build.0 = Debug|x64 + {672BF8EC-1116-49F6-B253-DFCE5CF7D4C9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {672BF8EC-1116-49F6-B253-DFCE5CF7D4C9}.Release|Any CPU.Build.0 = Release|Any CPU + {672BF8EC-1116-49F6-B253-DFCE5CF7D4C9}.Release|NET60_Linux.ActiveCfg = Release|NET60_Linux + {672BF8EC-1116-49F6-B253-DFCE5CF7D4C9}.Release|NET60_Linux.Build.0 = Release|NET60_Linux + {672BF8EC-1116-49F6-B253-DFCE5CF7D4C9}.Release|NET60_Windows.ActiveCfg = Release|NET60_Windows + {672BF8EC-1116-49F6-B253-DFCE5CF7D4C9}.Release|NET60_Windows.Build.0 = Release|NET60_Windows + {672BF8EC-1116-49F6-B253-DFCE5CF7D4C9}.Release|x64.ActiveCfg = Release|x64 + {672BF8EC-1116-49F6-B253-DFCE5CF7D4C9}.Release|x64.Build.0 = Release|x64 + {4A707244-154B-428F-B589-D65361F24401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4A707244-154B-428F-B589-D65361F24401}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4A707244-154B-428F-B589-D65361F24401}.Debug|NET60_Linux.ActiveCfg = Debug|NET60_Linux + {4A707244-154B-428F-B589-D65361F24401}.Debug|NET60_Linux.Build.0 = Debug|NET60_Linux + {4A707244-154B-428F-B589-D65361F24401}.Debug|NET60_Windows.ActiveCfg = Debug|NET60_Windows + {4A707244-154B-428F-B589-D65361F24401}.Debug|NET60_Windows.Build.0 = Debug|NET60_Windows + {4A707244-154B-428F-B589-D65361F24401}.Debug|x64.ActiveCfg = Debug|x64 + {4A707244-154B-428F-B589-D65361F24401}.Debug|x64.Build.0 = Debug|x64 + {4A707244-154B-428F-B589-D65361F24401}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4A707244-154B-428F-B589-D65361F24401}.Release|Any CPU.Build.0 = Release|Any CPU + {4A707244-154B-428F-B589-D65361F24401}.Release|NET60_Linux.ActiveCfg = Release|NET60_Linux + {4A707244-154B-428F-B589-D65361F24401}.Release|NET60_Linux.Build.0 = Release|NET60_Linux + {4A707244-154B-428F-B589-D65361F24401}.Release|NET60_Windows.ActiveCfg = Release|NET60_Windows + {4A707244-154B-428F-B589-D65361F24401}.Release|NET60_Windows.Build.0 = Release|NET60_Windows + {4A707244-154B-428F-B589-D65361F24401}.Release|x64.ActiveCfg = Release|x64 + {4A707244-154B-428F-B589-D65361F24401}.Release|x64.Build.0 = Release|x64 + {AB735028-22B0-4083-9CC5-805C582818EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {AB735028-22B0-4083-9CC5-805C582818EA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {AB735028-22B0-4083-9CC5-805C582818EA}.Debug|NET60_Linux.ActiveCfg = Debug|NET60_Linux + {AB735028-22B0-4083-9CC5-805C582818EA}.Debug|NET60_Linux.Build.0 = Debug|NET60_Linux + {AB735028-22B0-4083-9CC5-805C582818EA}.Debug|NET60_Windows.ActiveCfg = Debug|NET60_Windows + {AB735028-22B0-4083-9CC5-805C582818EA}.Debug|NET60_Windows.Build.0 = Debug|NET60_Windows + {AB735028-22B0-4083-9CC5-805C582818EA}.Debug|x64.ActiveCfg = Debug|x64 + {AB735028-22B0-4083-9CC5-805C582818EA}.Debug|x64.Build.0 = Debug|x64 + {AB735028-22B0-4083-9CC5-805C582818EA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {AB735028-22B0-4083-9CC5-805C582818EA}.Release|Any CPU.Build.0 = Release|Any CPU + {AB735028-22B0-4083-9CC5-805C582818EA}.Release|NET60_Linux.ActiveCfg = Release|NET60_Linux + {AB735028-22B0-4083-9CC5-805C582818EA}.Release|NET60_Linux.Build.0 = Release|NET60_Linux + {AB735028-22B0-4083-9CC5-805C582818EA}.Release|NET60_Windows.ActiveCfg = Release|NET60_Windows + {AB735028-22B0-4083-9CC5-805C582818EA}.Release|NET60_Windows.Build.0 = Release|NET60_Windows + {AB735028-22B0-4083-9CC5-805C582818EA}.Release|x64.ActiveCfg = Release|x64 + {AB735028-22B0-4083-9CC5-805C582818EA}.Release|x64.Build.0 = Release|x64 + {F8D2E3E5-4505-4463-9367-2EB2629D7DCD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F8D2E3E5-4505-4463-9367-2EB2629D7DCD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F8D2E3E5-4505-4463-9367-2EB2629D7DCD}.Debug|NET60_Linux.ActiveCfg = Debug|NET60_Linux + {F8D2E3E5-4505-4463-9367-2EB2629D7DCD}.Debug|NET60_Linux.Build.0 = Debug|NET60_Linux + {F8D2E3E5-4505-4463-9367-2EB2629D7DCD}.Debug|NET60_Windows.ActiveCfg = Debug|NET60_Windows + {F8D2E3E5-4505-4463-9367-2EB2629D7DCD}.Debug|NET60_Windows.Build.0 = Debug|NET60_Windows + {F8D2E3E5-4505-4463-9367-2EB2629D7DCD}.Debug|x64.ActiveCfg = Debug|x64 + {F8D2E3E5-4505-4463-9367-2EB2629D7DCD}.Debug|x64.Build.0 = Debug|x64 + {F8D2E3E5-4505-4463-9367-2EB2629D7DCD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F8D2E3E5-4505-4463-9367-2EB2629D7DCD}.Release|Any CPU.Build.0 = Release|Any CPU + {F8D2E3E5-4505-4463-9367-2EB2629D7DCD}.Release|NET60_Linux.ActiveCfg = Release|NET60_Linux + {F8D2E3E5-4505-4463-9367-2EB2629D7DCD}.Release|NET60_Linux.Build.0 = Release|NET60_Linux + {F8D2E3E5-4505-4463-9367-2EB2629D7DCD}.Release|NET60_Windows.ActiveCfg = Release|NET60_Windows + {F8D2E3E5-4505-4463-9367-2EB2629D7DCD}.Release|NET60_Windows.Build.0 = Release|NET60_Windows + {F8D2E3E5-4505-4463-9367-2EB2629D7DCD}.Release|x64.ActiveCfg = Release|x64 + {F8D2E3E5-4505-4463-9367-2EB2629D7DCD}.Release|x64.Build.0 = Release|x64 + {2A70F3B5-7AEA-42FE-8DD5-8427C28D0025}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2A70F3B5-7AEA-42FE-8DD5-8427C28D0025}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2A70F3B5-7AEA-42FE-8DD5-8427C28D0025}.Debug|NET60_Linux.ActiveCfg = Debug|NET60_Linux + {2A70F3B5-7AEA-42FE-8DD5-8427C28D0025}.Debug|NET60_Linux.Build.0 = Debug|NET60_Linux + {2A70F3B5-7AEA-42FE-8DD5-8427C28D0025}.Debug|NET60_Windows.ActiveCfg = Debug|NET60_Windows + {2A70F3B5-7AEA-42FE-8DD5-8427C28D0025}.Debug|NET60_Windows.Build.0 = Debug|NET60_Windows + {2A70F3B5-7AEA-42FE-8DD5-8427C28D0025}.Debug|x64.ActiveCfg = Debug|x64 + {2A70F3B5-7AEA-42FE-8DD5-8427C28D0025}.Debug|x64.Build.0 = Debug|x64 + {2A70F3B5-7AEA-42FE-8DD5-8427C28D0025}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2A70F3B5-7AEA-42FE-8DD5-8427C28D0025}.Release|Any CPU.Build.0 = Release|Any CPU + {2A70F3B5-7AEA-42FE-8DD5-8427C28D0025}.Release|NET60_Linux.ActiveCfg = Release|NET60_Linux + {2A70F3B5-7AEA-42FE-8DD5-8427C28D0025}.Release|NET60_Linux.Build.0 = Release|NET60_Linux + {2A70F3B5-7AEA-42FE-8DD5-8427C28D0025}.Release|NET60_Windows.ActiveCfg = Release|NET60_Windows + {2A70F3B5-7AEA-42FE-8DD5-8427C28D0025}.Release|NET60_Windows.Build.0 = Release|NET60_Windows + {2A70F3B5-7AEA-42FE-8DD5-8427C28D0025}.Release|x64.ActiveCfg = Release|x64 + {2A70F3B5-7AEA-42FE-8DD5-8427C28D0025}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -728,9 +822,16 @@ Global {6CD0F0CF-8199-49F9-B0EA-0B9598B44419} = {5B9B5B6B-0BA7-4606-B8E5-70C958346D57} {9B4FDC96-E2F9-4B8F-894A-4294405D50E7} = {FA7BE306-A3B0-45FA-9D87-0C69E6932C13} {472084ED-1067-4B2C-8737-3839A6143EB2} = {5B9B5B6B-0BA7-4606-B8E5-70C958346D57} - {C70FE632-5500-4C57-B3D6-9B5574137551} = {5B9B5B6B-0BA7-4606-B8E5-70C958346D57} - {2235F7CA-AB25-4177-92BC-4B574D2D5DF6} = {5B9B5B6B-0BA7-4606-B8E5-70C958346D57} - {6E1177DB-5E4F-4E2E-82E7-902437E56AED} = {5B9B5B6B-0BA7-4606-B8E5-70C958346D57} + {C70FE632-5500-4C57-B3D6-9B5574137551} = {91C57567-DDF1-409A-880B-3A290A486AAC} + {2235F7CA-AB25-4177-92BC-4B574D2D5DF6} = {91C57567-DDF1-409A-880B-3A290A486AAC} + {6E1177DB-5E4F-4E2E-82E7-902437E56AED} = {91C57567-DDF1-409A-880B-3A290A486AAC} + {91C57567-DDF1-409A-880B-3A290A486AAC} = {5B9B5B6B-0BA7-4606-B8E5-70C958346D57} + {672BF8EC-1116-49F6-B253-DFCE5CF7D4C9} = {91C57567-DDF1-409A-880B-3A290A486AAC} + {4CA0BC62-DCB3-456B-80D6-348247640BAB} = {5B9B5B6B-0BA7-4606-B8E5-70C958346D57} + {4A707244-154B-428F-B589-D65361F24401} = {4CA0BC62-DCB3-456B-80D6-348247640BAB} + {AB735028-22B0-4083-9CC5-805C582818EA} = {4CA0BC62-DCB3-456B-80D6-348247640BAB} + {F8D2E3E5-4505-4463-9367-2EB2629D7DCD} = {4CA0BC62-DCB3-456B-80D6-348247640BAB} + {2A70F3B5-7AEA-42FE-8DD5-8427C28D0025} = {4CA0BC62-DCB3-456B-80D6-348247640BAB} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {89CB19C6-BF0A-4E6A-BFDA-79D143EAB59D} diff --git a/src/DynamoCore.net6.sln b/src/DynamoCore.net6.sln index c2572d7c747..d91c6240e8d 100644 --- a/src/DynamoCore.net6.sln +++ b/src/DynamoCore.net6.sln @@ -107,6 +107,20 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProtoTestFx", "..\test\Engi EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProtoTest", "..\test\Engine\ProtoTest\ProtoTest.csproj", "{6E1177DB-5E4F-4E2E-82E7-902437E56AED}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProtoTestConsoleRunner", "..\test\Engine\ProtoTestConsoleRunner\ProtoTestConsoleRunner.csproj", "{672BF8EC-1116-49F6-B253-DFCE5CF7D4C9}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Engine", "Engine", "{9739B26B-F223-458C-88AA-88D11E025EA0}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{9CE88661-B9BD-4587-962A-AE0648B34EDA}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AnalysisTests", "..\test\Libraries\AnalysisTests\AnalysisTests.csproj", "{4A707244-154B-428F-B589-D65361F24401}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DynamoUtilitiesTests", "..\test\Libraries\DynamoUtilitiesTests\DynamoUtilitiesTests.csproj", "{AB735028-22B0-4083-9CC5-805C582818EA}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GeometryColorTests", "..\test\Libraries\GeometryColorTests\GeometryColorTests.csproj", "{F8D2E3E5-4505-4463-9367-2EB2629D7DCD}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PackageManagerTests", "..\test\Libraries\PackageManagerTests\PackageManagerTests.csproj", "{2A70F3B5-7AEA-42FE-8DD5-8427C28D0025}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -679,6 +693,86 @@ Global {6E1177DB-5E4F-4E2E-82E7-902437E56AED}.Release|NET60_Windows.Build.0 = Release|NET60_Windows {6E1177DB-5E4F-4E2E-82E7-902437E56AED}.Release|x64.ActiveCfg = Release|x64 {6E1177DB-5E4F-4E2E-82E7-902437E56AED}.Release|x64.Build.0 = Release|x64 + {672BF8EC-1116-49F6-B253-DFCE5CF7D4C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {672BF8EC-1116-49F6-B253-DFCE5CF7D4C9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {672BF8EC-1116-49F6-B253-DFCE5CF7D4C9}.Debug|NET60_Linux.ActiveCfg = Debug|NET60_Linux + {672BF8EC-1116-49F6-B253-DFCE5CF7D4C9}.Debug|NET60_Linux.Build.0 = Debug|NET60_Linux + {672BF8EC-1116-49F6-B253-DFCE5CF7D4C9}.Debug|NET60_Windows.ActiveCfg = Debug|NET60_Windows + {672BF8EC-1116-49F6-B253-DFCE5CF7D4C9}.Debug|NET60_Windows.Build.0 = Debug|NET60_Windows + {672BF8EC-1116-49F6-B253-DFCE5CF7D4C9}.Debug|x64.ActiveCfg = Debug|x64 + {672BF8EC-1116-49F6-B253-DFCE5CF7D4C9}.Debug|x64.Build.0 = Debug|x64 + {672BF8EC-1116-49F6-B253-DFCE5CF7D4C9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {672BF8EC-1116-49F6-B253-DFCE5CF7D4C9}.Release|Any CPU.Build.0 = Release|Any CPU + {672BF8EC-1116-49F6-B253-DFCE5CF7D4C9}.Release|NET60_Linux.ActiveCfg = Release|NET60_Linux + {672BF8EC-1116-49F6-B253-DFCE5CF7D4C9}.Release|NET60_Linux.Build.0 = Release|NET60_Linux + {672BF8EC-1116-49F6-B253-DFCE5CF7D4C9}.Release|NET60_Windows.ActiveCfg = Release|NET60_Windows + {672BF8EC-1116-49F6-B253-DFCE5CF7D4C9}.Release|NET60_Windows.Build.0 = Release|NET60_Windows + {672BF8EC-1116-49F6-B253-DFCE5CF7D4C9}.Release|x64.ActiveCfg = Release|x64 + {672BF8EC-1116-49F6-B253-DFCE5CF7D4C9}.Release|x64.Build.0 = Release|x64 + {4A707244-154B-428F-B589-D65361F24401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4A707244-154B-428F-B589-D65361F24401}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4A707244-154B-428F-B589-D65361F24401}.Debug|NET60_Linux.ActiveCfg = Debug|NET60_Linux + {4A707244-154B-428F-B589-D65361F24401}.Debug|NET60_Linux.Build.0 = Debug|NET60_Linux + {4A707244-154B-428F-B589-D65361F24401}.Debug|NET60_Windows.ActiveCfg = Debug|NET60_Windows + {4A707244-154B-428F-B589-D65361F24401}.Debug|NET60_Windows.Build.0 = Debug|NET60_Windows + {4A707244-154B-428F-B589-D65361F24401}.Debug|x64.ActiveCfg = Debug|x64 + {4A707244-154B-428F-B589-D65361F24401}.Debug|x64.Build.0 = Debug|x64 + {4A707244-154B-428F-B589-D65361F24401}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4A707244-154B-428F-B589-D65361F24401}.Release|Any CPU.Build.0 = Release|Any CPU + {4A707244-154B-428F-B589-D65361F24401}.Release|NET60_Linux.ActiveCfg = Release|NET60_Linux + {4A707244-154B-428F-B589-D65361F24401}.Release|NET60_Linux.Build.0 = Release|NET60_Linux + {4A707244-154B-428F-B589-D65361F24401}.Release|NET60_Windows.ActiveCfg = Release|NET60_Windows + {4A707244-154B-428F-B589-D65361F24401}.Release|NET60_Windows.Build.0 = Release|NET60_Windows + {4A707244-154B-428F-B589-D65361F24401}.Release|x64.ActiveCfg = Release|x64 + {4A707244-154B-428F-B589-D65361F24401}.Release|x64.Build.0 = Release|x64 + {AB735028-22B0-4083-9CC5-805C582818EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {AB735028-22B0-4083-9CC5-805C582818EA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {AB735028-22B0-4083-9CC5-805C582818EA}.Debug|NET60_Linux.ActiveCfg = Debug|NET60_Linux + {AB735028-22B0-4083-9CC5-805C582818EA}.Debug|NET60_Linux.Build.0 = Debug|NET60_Linux + {AB735028-22B0-4083-9CC5-805C582818EA}.Debug|NET60_Windows.ActiveCfg = Debug|NET60_Windows + {AB735028-22B0-4083-9CC5-805C582818EA}.Debug|NET60_Windows.Build.0 = Debug|NET60_Windows + {AB735028-22B0-4083-9CC5-805C582818EA}.Debug|x64.ActiveCfg = Debug|x64 + {AB735028-22B0-4083-9CC5-805C582818EA}.Debug|x64.Build.0 = Debug|x64 + {AB735028-22B0-4083-9CC5-805C582818EA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {AB735028-22B0-4083-9CC5-805C582818EA}.Release|Any CPU.Build.0 = Release|Any CPU + {AB735028-22B0-4083-9CC5-805C582818EA}.Release|NET60_Linux.ActiveCfg = Release|NET60_Linux + {AB735028-22B0-4083-9CC5-805C582818EA}.Release|NET60_Linux.Build.0 = Release|NET60_Linux + {AB735028-22B0-4083-9CC5-805C582818EA}.Release|NET60_Windows.ActiveCfg = Release|NET60_Windows + {AB735028-22B0-4083-9CC5-805C582818EA}.Release|NET60_Windows.Build.0 = Release|NET60_Windows + {AB735028-22B0-4083-9CC5-805C582818EA}.Release|x64.ActiveCfg = Release|x64 + {AB735028-22B0-4083-9CC5-805C582818EA}.Release|x64.Build.0 = Release|x64 + {F8D2E3E5-4505-4463-9367-2EB2629D7DCD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F8D2E3E5-4505-4463-9367-2EB2629D7DCD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F8D2E3E5-4505-4463-9367-2EB2629D7DCD}.Debug|NET60_Linux.ActiveCfg = Debug|NET60_Linux + {F8D2E3E5-4505-4463-9367-2EB2629D7DCD}.Debug|NET60_Linux.Build.0 = Debug|NET60_Linux + {F8D2E3E5-4505-4463-9367-2EB2629D7DCD}.Debug|NET60_Windows.ActiveCfg = Debug|NET60_Windows + {F8D2E3E5-4505-4463-9367-2EB2629D7DCD}.Debug|NET60_Windows.Build.0 = Debug|NET60_Windows + {F8D2E3E5-4505-4463-9367-2EB2629D7DCD}.Debug|x64.ActiveCfg = Debug|x64 + {F8D2E3E5-4505-4463-9367-2EB2629D7DCD}.Debug|x64.Build.0 = Debug|x64 + {F8D2E3E5-4505-4463-9367-2EB2629D7DCD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F8D2E3E5-4505-4463-9367-2EB2629D7DCD}.Release|Any CPU.Build.0 = Release|Any CPU + {F8D2E3E5-4505-4463-9367-2EB2629D7DCD}.Release|NET60_Linux.ActiveCfg = Release|NET60_Linux + {F8D2E3E5-4505-4463-9367-2EB2629D7DCD}.Release|NET60_Linux.Build.0 = Release|NET60_Linux + {F8D2E3E5-4505-4463-9367-2EB2629D7DCD}.Release|NET60_Windows.ActiveCfg = Release|NET60_Windows + {F8D2E3E5-4505-4463-9367-2EB2629D7DCD}.Release|NET60_Windows.Build.0 = Release|NET60_Windows + {F8D2E3E5-4505-4463-9367-2EB2629D7DCD}.Release|x64.ActiveCfg = Release|x64 + {F8D2E3E5-4505-4463-9367-2EB2629D7DCD}.Release|x64.Build.0 = Release|x64 + {2A70F3B5-7AEA-42FE-8DD5-8427C28D0025}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2A70F3B5-7AEA-42FE-8DD5-8427C28D0025}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2A70F3B5-7AEA-42FE-8DD5-8427C28D0025}.Debug|NET60_Linux.ActiveCfg = Debug|NET60_Linux + {2A70F3B5-7AEA-42FE-8DD5-8427C28D0025}.Debug|NET60_Linux.Build.0 = Debug|NET60_Linux + {2A70F3B5-7AEA-42FE-8DD5-8427C28D0025}.Debug|NET60_Windows.ActiveCfg = Debug|NET60_Windows + {2A70F3B5-7AEA-42FE-8DD5-8427C28D0025}.Debug|NET60_Windows.Build.0 = Debug|NET60_Windows + {2A70F3B5-7AEA-42FE-8DD5-8427C28D0025}.Debug|x64.ActiveCfg = Debug|x64 + {2A70F3B5-7AEA-42FE-8DD5-8427C28D0025}.Debug|x64.Build.0 = Debug|x64 + {2A70F3B5-7AEA-42FE-8DD5-8427C28D0025}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2A70F3B5-7AEA-42FE-8DD5-8427C28D0025}.Release|Any CPU.Build.0 = Release|Any CPU + {2A70F3B5-7AEA-42FE-8DD5-8427C28D0025}.Release|NET60_Linux.ActiveCfg = Release|NET60_Linux + {2A70F3B5-7AEA-42FE-8DD5-8427C28D0025}.Release|NET60_Linux.Build.0 = Release|NET60_Linux + {2A70F3B5-7AEA-42FE-8DD5-8427C28D0025}.Release|NET60_Windows.ActiveCfg = Release|NET60_Windows + {2A70F3B5-7AEA-42FE-8DD5-8427C28D0025}.Release|NET60_Windows.Build.0 = Release|NET60_Windows + {2A70F3B5-7AEA-42FE-8DD5-8427C28D0025}.Release|x64.ActiveCfg = Release|x64 + {2A70F3B5-7AEA-42FE-8DD5-8427C28D0025}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -710,9 +804,16 @@ Global {6CD0F0CF-8199-49F9-B0EA-0B9598B44419} = {5B9B5B6B-0BA7-4606-B8E5-70C958346D57} {9B4FDC96-E2F9-4B8F-894A-4294405D50E7} = {FA7BE306-A3B0-45FA-9D87-0C69E6932C13} {472084ED-1067-4B2C-8737-3839A6143EB2} = {5B9B5B6B-0BA7-4606-B8E5-70C958346D57} - {C70FE632-5500-4C57-B3D6-9B5574137551} = {5B9B5B6B-0BA7-4606-B8E5-70C958346D57} - {2235F7CA-AB25-4177-92BC-4B574D2D5DF6} = {5B9B5B6B-0BA7-4606-B8E5-70C958346D57} - {6E1177DB-5E4F-4E2E-82E7-902437E56AED} = {5B9B5B6B-0BA7-4606-B8E5-70C958346D57} + {C70FE632-5500-4C57-B3D6-9B5574137551} = {9739B26B-F223-458C-88AA-88D11E025EA0} + {2235F7CA-AB25-4177-92BC-4B574D2D5DF6} = {9739B26B-F223-458C-88AA-88D11E025EA0} + {6E1177DB-5E4F-4E2E-82E7-902437E56AED} = {9739B26B-F223-458C-88AA-88D11E025EA0} + {672BF8EC-1116-49F6-B253-DFCE5CF7D4C9} = {9739B26B-F223-458C-88AA-88D11E025EA0} + {9739B26B-F223-458C-88AA-88D11E025EA0} = {5B9B5B6B-0BA7-4606-B8E5-70C958346D57} + {9CE88661-B9BD-4587-962A-AE0648B34EDA} = {5B9B5B6B-0BA7-4606-B8E5-70C958346D57} + {4A707244-154B-428F-B589-D65361F24401} = {9CE88661-B9BD-4587-962A-AE0648B34EDA} + {AB735028-22B0-4083-9CC5-805C582818EA} = {9CE88661-B9BD-4587-962A-AE0648B34EDA} + {F8D2E3E5-4505-4463-9367-2EB2629D7DCD} = {9CE88661-B9BD-4587-962A-AE0648B34EDA} + {2A70F3B5-7AEA-42FE-8DD5-8427C28D0025} = {9CE88661-B9BD-4587-962A-AE0648B34EDA} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {89CB19C6-BF0A-4E6A-BFDA-79D143EAB59D} diff --git a/test/Engine/ProtoTestConsoleRunner/ProtoTestConsoleRunner.csproj b/test/Engine/ProtoTestConsoleRunner/ProtoTestConsoleRunner.csproj index f99d5284111..e00af368b48 100644 --- a/test/Engine/ProtoTestConsoleRunner/ProtoTestConsoleRunner.csproj +++ b/test/Engine/ProtoTestConsoleRunner/ProtoTestConsoleRunner.csproj @@ -1,4 +1,4 @@ - + @@ -14,12 +14,9 @@ ProtoTestConsoleRunner.Program - - false - - - ProtoTestConsoleRunner.snk - + + + diff --git a/test/Libraries/AnalysisTests/AnalysisTests.csproj b/test/Libraries/AnalysisTests/AnalysisTests.csproj index c640f83e884..cb8bf61fb63 100644 --- a/test/Libraries/AnalysisTests/AnalysisTests.csproj +++ b/test/Libraries/AnalysisTests/AnalysisTests.csproj @@ -14,14 +14,23 @@ - - - - - - - + + + + + + + + + + + + + + + + {7858FA8C-475F-4B8E-B468-1F8200778CF8} diff --git a/test/Libraries/DynamoUtilitiesTests/DynamoUtilitiesTests.csproj b/test/Libraries/DynamoUtilitiesTests/DynamoUtilitiesTests.csproj index 11b1d3e79d9..92ce3889e55 100644 --- a/test/Libraries/DynamoUtilitiesTests/DynamoUtilitiesTests.csproj +++ b/test/Libraries/DynamoUtilitiesTests/DynamoUtilitiesTests.csproj @@ -11,17 +11,24 @@ - - - - - - - - - + + + + + + + + + + + + + + + + {B5F435CB-0D8A-40B1-A4F7-5ECB3CE792A9} diff --git a/test/Libraries/GeometryColorTests/DisplayTest.cs b/test/Libraries/GeometryColorTests/DisplayTest.cs index 0df0f0c838e..0771c471076 100644 --- a/test/Libraries/GeometryColorTests/DisplayTest.cs +++ b/test/Libraries/GeometryColorTests/DisplayTest.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; using Dynamo; using NUnit.Framework; @@ -21,11 +21,11 @@ public void RegressMagn9666_DisplayCrash() { RunModel(@"core\library\DisplayReturn.dyn"); var preview1 = GetPreviewValueInString("dc46358c-d71e-4764-9113-c7bc0dae8909"); - Assert.IsNotNullOrEmpty(preview1); - Assert.IsTrue(preview1.Contains("Sphere")); + Assert.That(preview1, Is.Not.Null.And.Not.Empty); + Assert.True(preview1.Contains("Sphere")); var preview2 = GetPreviewValueInString("79bc4023-4f01-4b11-823e-75e615ad534c"); - Assert.IsNotNullOrEmpty(preview2); + Assert.That(preview1, Is.Not.Null.And.Not.Empty); Assert.IsTrue(preview2.Contains("Point")); } } diff --git a/test/Libraries/GeometryColorTests/GeometryColorTests.csproj b/test/Libraries/GeometryColorTests/GeometryColorTests.csproj index 6dac6db0434..38cf29ad656 100644 --- a/test/Libraries/GeometryColorTests/GeometryColorTests.csproj +++ b/test/Libraries/GeometryColorTests/GeometryColorTests.csproj @@ -9,19 +9,26 @@ DisplayTests DisplayTests - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + {7858fa8c-475f-4b8e-b468-1f8200778cf8} diff --git a/test/Libraries/PackageManagerTests/PackageLoaderTests.cs b/test/Libraries/PackageManagerTests/PackageLoaderTests.cs index fb24ae6ba54..260076604ed 100644 --- a/test/Libraries/PackageManagerTests/PackageLoaderTests.cs +++ b/test/Libraries/PackageManagerTests/PackageLoaderTests.cs @@ -1085,7 +1085,7 @@ public void HasValidBuiltinPackagesAndDefaultPackagesPath() var defaultDirectory = pathManager.DefaultPackagesDirectory; // Assert - Assert.IsNotNullOrEmpty(builtinpackageLocation); + Assert.That(builtinpackageLocation,Is.Not.Null.Or.Empty); Assert.IsTrue(string.Equals(builtinpackageLocation, directory, StringComparison.OrdinalIgnoreCase)); Assert.AreNotEqual(defaultDirectory, directory); } diff --git a/test/Libraries/PackageManagerTests/PackageManagerClientTests.cs b/test/Libraries/PackageManagerTests/PackageManagerClientTests.cs index 0b21112fb77..bb70fe0b4cc 100644 --- a/test/Libraries/PackageManagerTests/PackageManagerClientTests.cs +++ b/test/Libraries/PackageManagerTests/PackageManagerClientTests.cs @@ -136,7 +136,7 @@ public void SuccessfullyGetPackageVersionHeaderByPackageId() Assert.AreEqual(result.version, version); } - [Test, ExpectedException(typeof(ApplicationException), ExpectedMessage = "The package does not exist")] + [Test] public void FailureOnGetPackageVersionHeaderByPackageId() { var mockGreg = new Mock(); @@ -148,7 +148,11 @@ public void FailureOnGetPackageVersionHeaderByPackageId() }); var client = new PackageManagerClient(mockGreg.Object, MockMaker.Empty(), string.Empty); - client.GetPackageVersionHeader(new PackageInfo(string.Empty, new Version())); + var e = Assert.Throws(() => + { + client.GetPackageVersionHeader(new PackageInfo(string.Empty, new Version())); + }); + Assert.AreEqual("The package does not exist", e.Message); } [Test] @@ -171,7 +175,7 @@ public void SuccessfullyGetPackageVersionHeaderByPackageName() Assert.AreEqual(result.version, version); } - [Test, ExpectedException(typeof(ApplicationException), ExpectedMessage = "The package does not exist")] + [Test] public void FailureOnGetPackageVersionHeaderByPackageName() { var mockGreg = new Mock(); @@ -183,7 +187,12 @@ public void FailureOnGetPackageVersionHeaderByPackageName() }); var client = new PackageManagerClient(mockGreg.Object, MockMaker.Empty(), string.Empty); - client.GetPackageVersionHeader(string.Empty, string.Empty); + var e = Assert.Throws(() => + { + client.GetPackageVersionHeader(string.Empty, string.Empty); + }); + Assert.AreEqual("The package does not exist",e.Message); + } #endregion diff --git a/test/Libraries/PackageManagerTests/PackageManagerTests.csproj b/test/Libraries/PackageManagerTests/PackageManagerTests.csproj index 0d22da486c4..aaf0b994848 100644 --- a/test/Libraries/PackageManagerTests/PackageManagerTests.csproj +++ b/test/Libraries/PackageManagerTests/PackageManagerTests.csproj @@ -9,17 +9,20 @@ PackageManagerTests PackageManagerTests - - - all - compile; build; native; contentfiles; analyzers; buildtransitive - - - + + + + + + + all + compile; build; native; contentfiles; analyzers; buildtransitive + + + + - - @@ -29,6 +32,12 @@ + + + + + + {47533b7c-0e1a-44a4-8511-b438645f052a} diff --git a/test/Libraries/TestServices/GeometricTestBase.cs b/test/Libraries/TestServices/GeometricTestBase.cs index d0cfcb90a8c..257f2fb6b75 100644 --- a/test/Libraries/TestServices/GeometricTestBase.cs +++ b/test/Libraries/TestServices/GeometricTestBase.cs @@ -1,17 +1,15 @@ +using Autodesk.DesignScript.Geometry; +using Autodesk.DesignScript.Interfaces; +using DynamoShapeManager; +using NUnit.Framework; using System; using System.Collections.Generic; using System.IO; using System.Reflection; -using Autodesk.DesignScript.Geometry; -using Autodesk.DesignScript.Interfaces; - -using DynamoShapeManager; namespace TestServices { -#if NETFRAMEWORK -using NUnit.Framework; public class GeometricTestBase { @@ -57,7 +55,6 @@ protected virtual TestSessionConfiguration GetTestSessionConfiguration() return new TestSessionConfiguration(); } } -#endif /// /// This is a temporary session class which is only used for nodes that are using Geometries. /// When ProtoGeometry is loaded, the static instance GeometryFactory will be constructed which