diff --git a/src/Dynamo.All.Net6.sln b/src/Dynamo.All.Net6.sln
index bb1384703da..efc4c07bf2c 100644
--- a/src/Dynamo.All.Net6.sln
+++ b/src/Dynamo.All.Net6.sln
@@ -154,6 +154,7 @@ EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DocumentationBrowserViewExtension", "DocumentationBrowserViewExtension\DocumentationBrowserViewExtension.csproj", "{BE6D0644-05AF-4580-8597-B95920CE923F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CoreNodeModelsWpf", "Libraries\CoreNodeModelsWpf\CoreNodeModelsWpf.csproj", "{F5932F7D-8E34-4787-80B8-E7F9D996EDFF}"
+EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WorkspaceDependencyViewExtension", "WorkspaceDependencyViewExtension\WorkspaceDependencyViewExtension.csproj", "{5E76AAB3-6302-473E-9655-081B53FB1419}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DynamoWPFCLI", "DynamoWPFCLI\DynamoWPFCLI.csproj", "{F7FD9395-35D5-474D-8AD1-9904817E70D3}"
@@ -172,6 +173,19 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "System", "System", "{F0BFEE
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IntegrationTests", "..\test\System\IntegrationTests\IntegrationTests.csproj", "{1254D922-643B-4F0B-82BD-E9E02399B040}"
EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GeometryUIWpf", "Libraries\GeometryUIWpf\GeometryUIWpf.csproj", "{C068DE76-0651-4F6C-8807-B90EF749D104}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DataBridgeTests", "..\test\Libraries\DataBridgeTests\DataBridgeTests.csproj", "{F0AF3C6E-0E59-4511-A057-79970EA9DC34}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WorkflowTests", "..\test\Libraries\WorkflowTests\WorkflowTests.csproj", "{CEA31792-BA09-431B-8ECE-E2F0354B2150}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommandLineTests", "..\test\Libraries\CommandLineTests\CommandLineTests.csproj", "{3E84B41E-F229-4BF7-8A0F-3D65BA2D00D1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUINodes", "..\test\TestUINodes\TestUINodes.csproj", "{ED1EA294-1BA1-45D6-A669-ECD2E24E21A9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitsUI", "Libraries\UnitsUI\UnitsUI.csproj", "{C67A7E80-73E6-4BBF-9D3F-DCD86CE306BE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CoreNodesTests", "..\test\Libraries\CoreNodesTests\CoreNodesTests.csproj", "{09EC17AF-24D2-4542-A913-0C27AE345C18}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PythonNodeModelsWpf", "Libraries\PythonNodeModelsWpf\PythonNodeModelsWpf.csproj", "{01DE9B06-0BCB-4D8A-862E-E8170F5D6B4F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DynamoServicesTests", "..\test\Libraries\NodeServicesTest\DynamoServicesTests.csproj", "{3E4278F7-60EC-491C-8094-B525C36A51A7}"
@@ -437,6 +451,34 @@ Global
{1254D922-643B-4F0B-82BD-E9E02399B040}.Debug|NET60_Windows.Build.0 = Debug|NET60_Windows
{1254D922-643B-4F0B-82BD-E9E02399B040}.Release|NET60_Windows.ActiveCfg = Release|NET60_Windows
{1254D922-643B-4F0B-82BD-E9E02399B040}.Release|NET60_Windows.Build.0 = Release|NET60_Windows
+ {C068DE76-0651-4F6C-8807-B90EF749D104}.Debug|NET60_Windows.ActiveCfg = Debug|NET60_Windows
+ {C068DE76-0651-4F6C-8807-B90EF749D104}.Debug|NET60_Windows.Build.0 = Debug|NET60_Windows
+ {C068DE76-0651-4F6C-8807-B90EF749D104}.Release|NET60_Windows.ActiveCfg = Release|NET60_Windows
+ {C068DE76-0651-4F6C-8807-B90EF749D104}.Release|NET60_Windows.Build.0 = Release|NET60_Windows
+ {F0AF3C6E-0E59-4511-A057-79970EA9DC34}.Debug|NET60_Windows.ActiveCfg = Debug|NET60_Windows
+ {F0AF3C6E-0E59-4511-A057-79970EA9DC34}.Debug|NET60_Windows.Build.0 = Debug|NET60_Windows
+ {F0AF3C6E-0E59-4511-A057-79970EA9DC34}.Release|NET60_Windows.ActiveCfg = Release|NET60_Windows
+ {F0AF3C6E-0E59-4511-A057-79970EA9DC34}.Release|NET60_Windows.Build.0 = Release|NET60_Windows
+ {CEA31792-BA09-431B-8ECE-E2F0354B2150}.Debug|NET60_Windows.ActiveCfg = Debug|NET60_Windows
+ {CEA31792-BA09-431B-8ECE-E2F0354B2150}.Debug|NET60_Windows.Build.0 = Debug|NET60_Windows
+ {CEA31792-BA09-431B-8ECE-E2F0354B2150}.Release|NET60_Windows.ActiveCfg = Release|NET60_Windows
+ {CEA31792-BA09-431B-8ECE-E2F0354B2150}.Release|NET60_Windows.Build.0 = Release|NET60_Windows
+ {3E84B41E-F229-4BF7-8A0F-3D65BA2D00D1}.Debug|NET60_Windows.ActiveCfg = Debug|NET60_Windows
+ {3E84B41E-F229-4BF7-8A0F-3D65BA2D00D1}.Debug|NET60_Windows.Build.0 = Debug|NET60_Windows
+ {3E84B41E-F229-4BF7-8A0F-3D65BA2D00D1}.Release|NET60_Windows.ActiveCfg = Release|NET60_Windows
+ {3E84B41E-F229-4BF7-8A0F-3D65BA2D00D1}.Release|NET60_Windows.Build.0 = Release|NET60_Windows
+ {ED1EA294-1BA1-45D6-A669-ECD2E24E21A9}.Debug|NET60_Windows.ActiveCfg = Debug|NET60_Windows
+ {ED1EA294-1BA1-45D6-A669-ECD2E24E21A9}.Debug|NET60_Windows.Build.0 = Debug|NET60_Windows
+ {ED1EA294-1BA1-45D6-A669-ECD2E24E21A9}.Release|NET60_Windows.ActiveCfg = Release|NET60_Windows
+ {ED1EA294-1BA1-45D6-A669-ECD2E24E21A9}.Release|NET60_Windows.Build.0 = Release|NET60_Windows
+ {C67A7E80-73E6-4BBF-9D3F-DCD86CE306BE}.Debug|NET60_Windows.ActiveCfg = Debug|NET60_Windows
+ {C67A7E80-73E6-4BBF-9D3F-DCD86CE306BE}.Debug|NET60_Windows.Build.0 = Debug|NET60_Windows
+ {C67A7E80-73E6-4BBF-9D3F-DCD86CE306BE}.Release|NET60_Windows.ActiveCfg = Release|NET60_Windows
+ {C67A7E80-73E6-4BBF-9D3F-DCD86CE306BE}.Release|NET60_Windows.Build.0 = Release|NET60_Windows
+ {09EC17AF-24D2-4542-A913-0C27AE345C18}.Debug|NET60_Windows.ActiveCfg = Debug|NET60_Windows
+ {09EC17AF-24D2-4542-A913-0C27AE345C18}.Debug|NET60_Windows.Build.0 = Debug|NET60_Windows
+ {09EC17AF-24D2-4542-A913-0C27AE345C18}.Release|NET60_Windows.ActiveCfg = Release|NET60_Windows
+ {09EC17AF-24D2-4542-A913-0C27AE345C18}.Release|NET60_Windows.Build.0 = Release|NET60_Windows
{01DE9B06-0BCB-4D8A-862E-E8170F5D6B4F}.Debug|NET60_Windows.ActiveCfg = Debug|NET60_Windows
{01DE9B06-0BCB-4D8A-862E-E8170F5D6B4F}.Debug|NET60_Windows.Build.0 = Debug|NET60_Windows
{01DE9B06-0BCB-4D8A-862E-E8170F5D6B4F}.Release|NET60_Windows.ActiveCfg = Release|NET60_Windows
@@ -508,6 +550,13 @@ Global
{B9E338CA-6677-4772-B01D-1FCEABCDAAAB} = {FA7BE306-A3B0-45FA-9D87-0C69E6932C13}
{F0BFEE09-CE03-42F6-9DF1-DED4D86C2A73} = {5B9B5B6B-0BA7-4606-B8E5-70C958346D57}
{1254D922-643B-4F0B-82BD-E9E02399B040} = {F0BFEE09-CE03-42F6-9DF1-DED4D86C2A73}
+ {C068DE76-0651-4F6C-8807-B90EF749D104} = {FA7BE306-A3B0-45FA-9D87-0C69E6932C13}
+ {F0AF3C6E-0E59-4511-A057-79970EA9DC34} = {4CA0BC62-DCB3-456B-80D6-348247640BAB}
+ {CEA31792-BA09-431B-8ECE-E2F0354B2150} = {4CA0BC62-DCB3-456B-80D6-348247640BAB}
+ {3E84B41E-F229-4BF7-8A0F-3D65BA2D00D1} = {4CA0BC62-DCB3-456B-80D6-348247640BAB}
+ {ED1EA294-1BA1-45D6-A669-ECD2E24E21A9} = {5B9B5B6B-0BA7-4606-B8E5-70C958346D57}
+ {C67A7E80-73E6-4BBF-9D3F-DCD86CE306BE} = {FA7BE306-A3B0-45FA-9D87-0C69E6932C13}
+ {09EC17AF-24D2-4542-A913-0C27AE345C18} = {4CA0BC62-DCB3-456B-80D6-348247640BAB}
{01DE9B06-0BCB-4D8A-862E-E8170F5D6B4F} = {FA7BE306-A3B0-45FA-9D87-0C69E6932C13}
{3E4278F7-60EC-491C-8094-B525C36A51A7} = {4CA0BC62-DCB3-456B-80D6-348247640BAB}
EndGlobalSection
diff --git a/src/Libraries/CoreNodes/CoreNodes.csproj b/src/Libraries/CoreNodes/CoreNodes.csproj
index 4ee940a5598..76683b4799e 100644
--- a/src/Libraries/CoreNodes/CoreNodes.csproj
+++ b/src/Libraries/CoreNodes/CoreNodes.csproj
@@ -94,7 +94,7 @@
-
+
diff --git a/src/Libraries/GeometryUIWpf/GeometryUIWpf.csproj b/src/Libraries/GeometryUIWpf/GeometryUIWpf.csproj
index 5d805238a36..0d954f7880a 100644
--- a/src/Libraries/GeometryUIWpf/GeometryUIWpf.csproj
+++ b/src/Libraries/GeometryUIWpf/GeometryUIWpf.csproj
@@ -1,4 +1,7 @@
-
+
+
+ true
+
@@ -9,6 +12,7 @@
GeometryUIWpf
GeometryUIWpf
$(OutputPath)\nodes\
+ false
@@ -18,6 +22,8 @@
+
+
@@ -88,17 +94,13 @@
Resources.en-US.Designer.cs
-
-
-
-
-
+
-
+
\ No newline at end of file
diff --git a/src/Libraries/UnitsUI/UnitsUI.csproj b/src/Libraries/UnitsUI/UnitsUI.csproj
index ed3963f493f..ad722400009 100644
--- a/src/Libraries/UnitsUI/UnitsUI.csproj
+++ b/src/Libraries/UnitsUI/UnitsUI.csproj
@@ -1,4 +1,7 @@
+
+ true
+
@@ -9,6 +12,7 @@
UnitsUI
UnitsUI
$(OutputPath)\nodes\
+ false
@@ -18,6 +22,8 @@
+
+
@@ -93,17 +99,13 @@
Resources.en-US.Designer.cs
-
-
-
-
-
+
-
+
-
\ No newline at end of file
+
diff --git a/test/Libraries/CommandLineTests/CommandLineTests.cs b/test/Libraries/CommandLineTests/CommandLineTests.cs
index dc18215b88e..fe952d9d853 100644
--- a/test/Libraries/CommandLineTests/CommandLineTests.cs
+++ b/test/Libraries/CommandLineTests/CommandLineTests.cs
@@ -3,6 +3,7 @@
using System.IO;
using System.Linq;
using System.Text.RegularExpressions;
+using System.Threading;
using System.Xml;
using Dynamo.Applications;
using Dynamo.ViewModels;
@@ -221,7 +222,13 @@ public void CanOpenAndRunFileWithDictionaryCorrectlyToOutputFileFromDynamoCLIexe
//
// DynamoWPFCLI Tests
//
+
+#if NET6_0_OR_GREATER
+ [Test]
+ [Apartment(ApartmentState.STA)]
+#else
[Test, RequiresSTA]
+#endif
public void CanOpenAndRunDynamoModelWithWPFCommandLineRunner()
{
string openpath = Path.Combine(TestDirectory, @"core\math\Add.dyn");
@@ -244,7 +251,12 @@ public void CanOpenAndRunDynamoModelWithWPFCommandLineRunner()
AssertPreviewValue("4c5889ac-7b91-4fb5-aaad-a2128b533279", 4.0);
}
+#if NET6_0_OR_GREATER
+ [Test]
+ [Apartment(ApartmentState.STA)]
+#else
[Test, RequiresSTA]
+#endif
public void CanOpenAndRunFileWihtListsCorrectlyToOutputFileFromDynamoWPFCLIexe()
{
string openpath = Path.Combine(TestDirectory, @"core\commandline\simplelists.dyn");
@@ -261,7 +273,12 @@ public void CanOpenAndRunFileWihtListsCorrectlyToOutputFileFromDynamoWPFCLIexe()
output);
}
+#if NET6_0_OR_GREATER
+ [Test]
+ [Apartment(ApartmentState.STA)]
+#else
[Test, RequiresSTA]
+#endif
public void CanOpenAndRunFileWithDictionaryCorrectlyToOutputFileFromDynamoWPFCLIexe()
{
string openpath = Path.Combine(TestDirectory, @"core\commandline\simpleDict.dyn");
@@ -284,7 +301,12 @@ public void CanOpenAndRunFileWithDictionaryCorrectlyToOutputFileFromDynamoWPFCLI
}, output);
}
+#if NET6_0_OR_GREATER
+ [Test]
+ [Apartment(ApartmentState.STA)]
+#else
[Test, RequiresSTA]
+#endif
public void CanOpenAndRunFileWithCustomNodeAndOutputGeometryFromDynamoWPFCLIexe()
{
string openpath = Path.Combine(TestDirectory, @"core\commandline\GeometryTest.dyn");
@@ -304,10 +326,12 @@ public void CanOpenAndRunFileWithCustomNodeAndOutputGeometryFromDynamoWPFCLIexe(
Assert.IsNotNull(newFile);
var newGeometry = newFile.ReadToEnd();
- Assert.IsNotNullOrEmpty(geometry);
+ Assert.IsNotNull(geometry);
+ Assert.IsNotEmpty(geometry);
var geometryJson = JsonConvert.DeserializeObject(geometry) as JArray;
- Assert.IsNotNullOrEmpty(newGeometry);
+ Assert.IsNotNull(newGeometry);
+ Assert.IsNotEmpty(newGeometry);
var newGeometryJson = JsonConvert.DeserializeObject(newGeometry) as JArray;
Assert.IsNotNull(geometryJson);
diff --git a/test/Libraries/CommandLineTests/CommandLineTests.csproj b/test/Libraries/CommandLineTests/CommandLineTests.csproj
index 3085d69a5a6..f39bc9da344 100644
--- a/test/Libraries/CommandLineTests/CommandLineTests.csproj
+++ b/test/Libraries/CommandLineTests/CommandLineTests.csproj
@@ -1,4 +1,7 @@
+
+ true
+
@@ -10,10 +13,13 @@
CommandLineTests
+
+
+
+
-
@@ -22,6 +28,11 @@
+
+
+
+
+
{aa782772-fe61-4226-baa4-eb529fa1646b}
diff --git a/test/Libraries/CoreNodesTests/CoreNodesTests.csproj b/test/Libraries/CoreNodesTests/CoreNodesTests.csproj
index 7b8d53b2676..61b1e525a9c 100644
--- a/test/Libraries/CoreNodesTests/CoreNodesTests.csproj
+++ b/test/Libraries/CoreNodesTests/CoreNodesTests.csproj
@@ -1,4 +1,7 @@
+
+ true
+
@@ -12,16 +15,23 @@
DSCoreNodesTests
-
-
+
+
+
+
+
-
+
+
+
+
+
{51BB6014-43F7-4F31-B8D3-E3C37EBEDAF4}
diff --git a/test/Libraries/CoreNodesTests/Setup.cs b/test/Libraries/CoreNodesTests/Setup.cs
index 9f140db8e9f..7593c67a016 100644
--- a/test/Libraries/CoreNodesTests/Setup.cs
+++ b/test/Libraries/CoreNodesTests/Setup.cs
@@ -10,7 +10,11 @@ public class Setup
{
private AssemblyHelper assemblyHelper;
+#if NETFRAMEWORK
[SetUp]
+#elif NET6_0_OR_GREATER
+ [OneTimeSetUp]
+#endif
public void SetUp()
{
var assemblyPath = Assembly.GetExecutingAssembly().Location;
@@ -28,7 +32,11 @@ public void SetUp()
AppDomain.CurrentDomain.AssemblyResolve += assemblyHelper.ResolveAssembly;
}
+#if NETFRAMEWORK
[TearDown]
+#elif NET6_0_OR_GREATER
+ [OneTimeTearDown]
+#endif
public void TearDown()
{
AppDomain.CurrentDomain.AssemblyResolve -= assemblyHelper.ResolveAssembly;
diff --git a/test/Libraries/CoreNodesTests/WebTests.cs b/test/Libraries/CoreNodesTests/WebTests.cs
index f6ca0b19010..aefa95f2b5e 100644
--- a/test/Libraries/CoreNodesTests/WebTests.cs
+++ b/test/Libraries/CoreNodesTests/WebTests.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
using DSCore;
using NUnit.Framework;
@@ -27,7 +27,8 @@ public void WebRequest_GitHubAPI()
{
string url = "https://api.github.com/rate_limit";
string result = Web.WebRequestByUrl(url);
- Assert.IsNotNullOrEmpty(result);
+ Assert.IsNotNull(result);
+ Assert.IsNotEmpty(result);
}
}
}
diff --git a/test/Libraries/DataBridgeTests/DataBridgeTests.csproj b/test/Libraries/DataBridgeTests/DataBridgeTests.csproj
index 39dbd1e8bf6..0d031abb347 100644
--- a/test/Libraries/DataBridgeTests/DataBridgeTests.csproj
+++ b/test/Libraries/DataBridgeTests/DataBridgeTests.csproj
@@ -1,4 +1,7 @@
+
+ true
+
@@ -12,12 +15,19 @@
DataBridgeTests
-
+
+
+
+
-
+
+
+
+
+
{51BB6014-43F7-4F31-B8D3-E3C37EBEDAF4}
diff --git a/test/Libraries/WorkflowTests/Setup.cs b/test/Libraries/WorkflowTests/Setup.cs
index b2759c677c6..b37376ff841 100644
--- a/test/Libraries/WorkflowTests/Setup.cs
+++ b/test/Libraries/WorkflowTests/Setup.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
using System.IO;
using System.Reflection;
using Dynamo.Utilities;
@@ -11,7 +11,11 @@ public class Setup
{
private AssemblyHelper assemblyHelper;
+#if NETFRAMEWORK
[SetUp]
+#elif NET6_0_OR_GREATER
+ [OneTimeSetUp]
+#endif
public void RunBeforeAllTests()
{
var assemblyPath = Assembly.GetExecutingAssembly().Location;
@@ -27,7 +31,11 @@ public void RunBeforeAllTests()
AppDomain.CurrentDomain.AssemblyResolve += assemblyHelper.ResolveAssembly;
}
+#if NETFRAMEWORK
[TearDown]
+#elif NET6_0_OR_GREATER
+ [OneTimeTearDown]
+#endif
public void RunAfterAllTests()
{
AppDomain.CurrentDomain.AssemblyResolve -= assemblyHelper.ResolveAssembly;
diff --git a/test/Libraries/WorkflowTests/WorkflowTests.csproj b/test/Libraries/WorkflowTests/WorkflowTests.csproj
index 2758fea463d..6fcf5bb962a 100644
--- a/test/Libraries/WorkflowTests/WorkflowTests.csproj
+++ b/test/Libraries/WorkflowTests/WorkflowTests.csproj
@@ -1,4 +1,7 @@
+
+ true
+
@@ -10,13 +13,20 @@
WorkflowTests
-
+
+
+
+
-
+
+
+
+
+
{51BB6014-43F7-4F31-B8D3-E3C37EBEDAF4}
diff --git a/test/TestUINodes/TestUINodes.csproj b/test/TestUINodes/TestUINodes.csproj
index c986ed15748..6b3e9d676d6 100644
--- a/test/TestUINodes/TestUINodes.csproj
+++ b/test/TestUINodes/TestUINodes.csproj
@@ -1,4 +1,7 @@
+
+ true
+
@@ -12,18 +15,25 @@
-
- ..\
-
+
+ ..\
+
-
-
+
+
+
+
+
+
+
+
+
{51bb6014-43f7-4f31-b8d3-e3c37ebedaf4}