DynamoDS · mjkkirschner · Mar 6, 2023 · Feb 8, 2023 · Feb 8, 2023 · Feb 8, 2023
diff --git a/.github/workflows/dynamoNet6.0_linux_build.yml b/.github/workflows/dynamoNet6.0_linux_build.yml
@@ -9,12 +9,8 @@ jobs:
       uses: actions/checkout@v2
       with:
         path: Dynamo
-        repository: DynamoDS/Dynamo
-        ref: master
     - name: Setup dotnet
       uses: actions/setup-dotnet@v3
-      with:
-        dotnet-version: '6.0.x'
 
     - name: Install dependencies for linux runtime
       run: dotnet restore ${{ github.workspace }}/Dynamo/src/DynamoCore.net6.sln -p:Platform=NET60_Linux --runtime=linux-x64
@@ -27,11 +23,12 @@ jobs:
         cd "${{ github.workspace }}/Dynamo/bin/NET60_Linux/Release"
         echo "***Locating DynamoCLI for Linux!***"
         test "./DynamoCLI.exe" && echo "DynamoCLI exists!"
-#TODO_NET6 - return to this when we can build subset of tests in net6/7/8
-#    - name: Run smoke tests
-#      run: |
-#        cd "${{ github.workspace }}/Dynamo/bin/NET60_Linux/Release"
-#        echo "***Running Smoke tests on linux***"
-#        dotnet test DynamoCoreTests.dll --test-adapter-path  ~/.nuget/packages/nunittestadapter/2.3.0/build/ --filter TestCategory=SmokeTest
+    - name: Run smoke tests
+      run: |
+        cd "${{ github.workspace }}/Dynamo/bin/NET60_Linux/Release"
+        echo "***Running Smoke tests on linux***"
+        #TODO unfortunately dotnet does not find any tests in this assembly.
+        #dotnet test DynamoCoreTests.dll --filter "TestCategory~UnitTest"
+
 
 
diff --git a/extern/Python/CPython_netstd20/Python.Included.dll b/extern/Python/CPython_netstd20/Python.Included.dll
diff --git a/extern/Python/CPython_netstd20/Python.Runtime.dll b/extern/Python/CPython_netstd20/Python.Runtime.dll
diff --git a/src/DynamoApplications/StartupUtils.cs b/src/DynamoApplications/StartupUtils.cs
@@ -38,7 +38,7 @@ internal class CMDLineOptions
         [Option('x', "ConvertFile", Required = false, HelpText = "When used in combination with the 'O' flag, opens a .dyn file from the specified path and converts it to .json." +
             "File will have the .json extension and be located in the same directory as the original file.")]
         public bool ConvertFile { get; set; }
-        [Option('g', "Geometry", Required = false, HelpText = "Instruct Dynamo to output geometry from all evaluations to a json file at this path.")]
+        [Option( "Geometry", Required = false, HelpText = "Instruct Dynamo to output geometry from all evaluations to a json file at this path.")]
         public string GeometryFilePath { get; set; } = String.Empty;
         [Option('i', "Import", Required = false, HelpText = "Instruct Dynamo to import an assembly as a node library.This argument should be a filepath to a single.dll" +
             " - if you wish to import multiple dlls - list the dlls separated by a space: -i 'assembly1.dll' 'assembly2.dll'")]
@@ -223,10 +223,9 @@ public static CommandLineArguments Parse(string[] args)
                 .Add("hn=|HN=|hostname", "Identify Dynamo variation associated with host", hn => hostname = hn)
                 .Add("si=|SI=|sessionId", "Identify Dynamo host analytics session id", si => sessionId = si)
                 .Add("pi=|PI=|parentId", "Identify Dynamo host analytics parent id", pi => parentId = pi)
-                .Add("da|DA|disableAnalytics", "Disables analytics in Dynamo for the process liftime", da => disableAnalytics = da != null)
+                .Add("da|DA|disableAnalytics|DisableAnalytics", "Disables analytics in Dynamo for the process liftime", da => disableAnalytics = da != null)
                 .Add("cr=|CR=|cerLocation", "Specify the crash error report tool location on disk ", cr => cerLocation = cr)
                 .Add("s|S|service mode", "Service mode, bypasses certain Dynamo launch steps for maximum startup performance", s => serviceMode = s != null);
-
                 optionsSet.Parse(args);
 
                 if (showHelp)

diff --git a/src/DynamoCLI/Program.cs b/src/DynamoCLI/Program.cs
@@ -113,7 +113,7 @@ private static DynamoModel StartupDynamo(StartupUtils.CommandLineArguments cmdLi
 
             model.ShutdownCompleted += (m) => { ShutDown(); };
 
-            cmdLineArgs.ImportedPaths.ToList().ForEach(path =>
+            cmdLineArgs.ImportedPaths?.ToList().ForEach(path =>
             {
                 CommandLineRunner.ImportAssembly(model, path);
             });

diff --git a/src/DynamoCore.net6.sln b/src/DynamoCore.net6.sln
@@ -93,6 +93,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Watch3DNodeModels", "Librar
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Migrations", "Migrations\Migrations.csproj", "{06B9E5B0-7C50-4351-9D88-E159DC25755F}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{5B9B5B6B-0BA7-4606-B8E5-70C958346D57}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestServices", "..\test\Libraries\TestServices\TestServices.csproj", "{6CD0F0CF-8199-49F9-B0EA-0B9598B44419}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DSOffice", "Libraries\DSOffice\DSOffice.csproj", "{9B4FDC96-E2F9-4B8F-894A-4294405D50E7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DynamoCoreTests", "..\test\DynamoCoreTests\DynamoCoreTests.csproj", "{472084ED-1067-4B2C-8737-3839A6143EB2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FFITarget", "..\test\Engine\FFITarget\FFITarget.csproj", "{C70FE632-5500-4C57-B3D6-9B5574137551}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -569,6 +579,70 @@ Global
 		{06B9E5B0-7C50-4351-9D88-E159DC25755F}.Release|NET60_Windows.Build.0 = Release|NET60_Windows
 		{06B9E5B0-7C50-4351-9D88-E159DC25755F}.Release|x64.ActiveCfg = Release|x64
 		{06B9E5B0-7C50-4351-9D88-E159DC25755F}.Release|x64.Build.0 = Release|x64
+		{6CD0F0CF-8199-49F9-B0EA-0B9598B44419}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6CD0F0CF-8199-49F9-B0EA-0B9598B44419}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6CD0F0CF-8199-49F9-B0EA-0B9598B44419}.Debug|NET60_Linux.ActiveCfg = Debug|NET60_Linux
+		{6CD0F0CF-8199-49F9-B0EA-0B9598B44419}.Debug|NET60_Linux.Build.0 = Debug|NET60_Linux
+		{6CD0F0CF-8199-49F9-B0EA-0B9598B44419}.Debug|NET60_Windows.ActiveCfg = Debug|NET60_Windows
+		{6CD0F0CF-8199-49F9-B0EA-0B9598B44419}.Debug|NET60_Windows.Build.0 = Debug|NET60_Windows
+		{6CD0F0CF-8199-49F9-B0EA-0B9598B44419}.Debug|x64.ActiveCfg = Debug|x64
+		{6CD0F0CF-8199-49F9-B0EA-0B9598B44419}.Debug|x64.Build.0 = Debug|x64
+		{6CD0F0CF-8199-49F9-B0EA-0B9598B44419}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6CD0F0CF-8199-49F9-B0EA-0B9598B44419}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6CD0F0CF-8199-49F9-B0EA-0B9598B44419}.Release|NET60_Linux.ActiveCfg = Release|NET60_Linux
+		{6CD0F0CF-8199-49F9-B0EA-0B9598B44419}.Release|NET60_Linux.Build.0 = Release|NET60_Linux
+		{6CD0F0CF-8199-49F9-B0EA-0B9598B44419}.Release|NET60_Windows.ActiveCfg = Release|NET60_Windows
+		{6CD0F0CF-8199-49F9-B0EA-0B9598B44419}.Release|NET60_Windows.Build.0 = Release|NET60_Windows
+		{6CD0F0CF-8199-49F9-B0EA-0B9598B44419}.Release|x64.ActiveCfg = Release|x64
+		{6CD0F0CF-8199-49F9-B0EA-0B9598B44419}.Release|x64.Build.0 = Release|x64
+		{9B4FDC96-E2F9-4B8F-894A-4294405D50E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9B4FDC96-E2F9-4B8F-894A-4294405D50E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9B4FDC96-E2F9-4B8F-894A-4294405D50E7}.Debug|NET60_Linux.ActiveCfg = Debug|NET60_Linux
+		{9B4FDC96-E2F9-4B8F-894A-4294405D50E7}.Debug|NET60_Linux.Build.0 = Debug|NET60_Linux
+		{9B4FDC96-E2F9-4B8F-894A-4294405D50E7}.Debug|NET60_Windows.ActiveCfg = Debug|NET60_Windows
+		{9B4FDC96-E2F9-4B8F-894A-4294405D50E7}.Debug|NET60_Windows.Build.0 = Debug|NET60_Windows
+		{9B4FDC96-E2F9-4B8F-894A-4294405D50E7}.Debug|x64.ActiveCfg = Debug|x64
+		{9B4FDC96-E2F9-4B8F-894A-4294405D50E7}.Debug|x64.Build.0 = Debug|x64
+		{9B4FDC96-E2F9-4B8F-894A-4294405D50E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9B4FDC96-E2F9-4B8F-894A-4294405D50E7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9B4FDC96-E2F9-4B8F-894A-4294405D50E7}.Release|NET60_Linux.ActiveCfg = Release|NET60_Linux
+		{9B4FDC96-E2F9-4B8F-894A-4294405D50E7}.Release|NET60_Linux.Build.0 = Release|NET60_Linux
+		{9B4FDC96-E2F9-4B8F-894A-4294405D50E7}.Release|NET60_Windows.ActiveCfg = Release|NET60_Windows
+		{9B4FDC96-E2F9-4B8F-894A-4294405D50E7}.Release|NET60_Windows.Build.0 = Release|NET60_Windows
+		{9B4FDC96-E2F9-4B8F-894A-4294405D50E7}.Release|x64.ActiveCfg = Release|x64
+		{9B4FDC96-E2F9-4B8F-894A-4294405D50E7}.Release|x64.Build.0 = Release|x64
+		{472084ED-1067-4B2C-8737-3839A6143EB2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{472084ED-1067-4B2C-8737-3839A6143EB2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{472084ED-1067-4B2C-8737-3839A6143EB2}.Debug|NET60_Linux.ActiveCfg = Debug|NET60_Linux
+		{472084ED-1067-4B2C-8737-3839A6143EB2}.Debug|NET60_Linux.Build.0 = Debug|NET60_Linux
+		{472084ED-1067-4B2C-8737-3839A6143EB2}.Debug|NET60_Windows.ActiveCfg = Debug|NET60_Windows
+		{472084ED-1067-4B2C-8737-3839A6143EB2}.Debug|NET60_Windows.Build.0 = Debug|NET60_Windows
+		{472084ED-1067-4B2C-8737-3839A6143EB2}.Debug|x64.ActiveCfg = Debug|x64
+		{472084ED-1067-4B2C-8737-3839A6143EB2}.Debug|x64.Build.0 = Debug|x64
+		{472084ED-1067-4B2C-8737-3839A6143EB2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{472084ED-1067-4B2C-8737-3839A6143EB2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{472084ED-1067-4B2C-8737-3839A6143EB2}.Release|NET60_Linux.ActiveCfg = Release|NET60_Linux
+		{472084ED-1067-4B2C-8737-3839A6143EB2}.Release|NET60_Linux.Build.0 = Release|NET60_Linux
+		{472084ED-1067-4B2C-8737-3839A6143EB2}.Release|NET60_Windows.ActiveCfg = Release|NET60_Windows
+		{472084ED-1067-4B2C-8737-3839A6143EB2}.Release|NET60_Windows.Build.0 = Release|NET60_Windows
+		{472084ED-1067-4B2C-8737-3839A6143EB2}.Release|x64.ActiveCfg = Release|x64
+		{472084ED-1067-4B2C-8737-3839A6143EB2}.Release|x64.Build.0 = Release|x64
+		{C70FE632-5500-4C57-B3D6-9B5574137551}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C70FE632-5500-4C57-B3D6-9B5574137551}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C70FE632-5500-4C57-B3D6-9B5574137551}.Debug|NET60_Linux.ActiveCfg = Debug|NET60_Linux
+		{C70FE632-5500-4C57-B3D6-9B5574137551}.Debug|NET60_Linux.Build.0 = Debug|NET60_Linux
+		{C70FE632-5500-4C57-B3D6-9B5574137551}.Debug|NET60_Windows.ActiveCfg = Debug|NET60_Windows
+		{C70FE632-5500-4C57-B3D6-9B5574137551}.Debug|NET60_Windows.Build.0 = Debug|NET60_Windows
+		{C70FE632-5500-4C57-B3D6-9B5574137551}.Debug|x64.ActiveCfg = Debug|x64
+		{C70FE632-5500-4C57-B3D6-9B5574137551}.Debug|x64.Build.0 = Debug|x64
+		{C70FE632-5500-4C57-B3D6-9B5574137551}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C70FE632-5500-4C57-B3D6-9B5574137551}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C70FE632-5500-4C57-B3D6-9B5574137551}.Release|NET60_Linux.ActiveCfg = Release|NET60_Linux
+		{C70FE632-5500-4C57-B3D6-9B5574137551}.Release|NET60_Linux.Build.0 = Release|NET60_Linux
+		{C70FE632-5500-4C57-B3D6-9B5574137551}.Release|NET60_Windows.ActiveCfg = Release|NET60_Windows
+		{C70FE632-5500-4C57-B3D6-9B5574137551}.Release|NET60_Windows.Build.0 = Release|NET60_Windows
+		{C70FE632-5500-4C57-B3D6-9B5574137551}.Release|x64.ActiveCfg = Release|x64
+		{C70FE632-5500-4C57-B3D6-9B5574137551}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -597,6 +671,10 @@ Global
 		{D6279651-D099-4F8D-A319-5BF12ED9F269} = {FA7BE306-A3B0-45FA-9D87-0C69E6932C13}
 		{31183026-DE70-49CB-BC7C-0DFD0A088F62} = {FA7BE306-A3B0-45FA-9D87-0C69E6932C13}
 		{06B9E5B0-7C50-4351-9D88-E159DC25755F} = {FA7BE306-A3B0-45FA-9D87-0C69E6932C13}
+		{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}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {89CB19C6-BF0A-4E6A-BFDA-79D143EAB59D}

diff --git a/src/DynamoCore/Properties/AssemblyInfo.cs b/src/DynamoCore/Properties/AssemblyInfo.cs
@@ -50,5 +50,7 @@
 [assembly: InternalsVisibleTo("GraphNodeManagerViewExtension")]
 [assembly: InternalsVisibleTo("ExportSampleImagesViewExtension")]
 [assembly: InternalsVisibleTo("DocumentationBrowserViewExtension")]
+[assembly: InternalsVisibleTo("Net60SmokeTests")]
+
 
 [assembly: TypeForwardedTo(typeof(Dynamo.Scheduler.Disposable))]
diff --git a/src/DynamoInstall/Release.xsl b/src/DynamoInstall/Release.xsl
@@ -47,6 +47,10 @@
     <xsl:key name="moq-search" match="wix:Component[contains(wix:File/@Source, 'Moq')]" use="@Id"/>
     <xsl:template match="wix:Component[key('moq-search', @Id)]" />
 
+    <!--Exclude Caste.Core.dll-->
+    <xsl:key name="castle-search" match="wix:Component[contains(wix:File/@Source, 'Castle.Core')]" use="@Id"/>
+    <xsl:template match="wix:Component[key(castle-search', @Id)]" />
+
     <!--Exclude nunit*.dll-->
     <xsl:key name="nunit-search" match="wix:Component[contains(wix:File/@Source, 'nunit')]" use="@Id"/>
     <xsl:template match="wix:Component[key('nunit-search', @Id)]" />

diff --git a/src/Libraries/DSCPython/DSCPython.csproj b/src/Libraries/DSCPython/DSCPython.csproj
@@ -10,34 +10,27 @@
     <AssemblyName>DSCPython</AssemblyName>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Python.Included, Version=2.5.2.7195, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\extern\Python\Python.Included.dll</HintPath>
-    </Reference>
-    <Reference Include="Python.Runtime, Version=2.5.2.7195, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\extern\Python\Python.Runtime.dll</HintPath>
-    </Reference>
+
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
-    <Reference Include="Python.Included, Version=2.5.2.6664, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Python.Included, Version=2.5.2.7417, Culture=neutral, processorArchitecture=MSIL">
         <SpecificVersion>False</SpecificVersion>
         <HintPath>..\..\..\extern\Python\CPython_netstd20\Python.Included.dll</HintPath>
     </Reference>
-    <Reference Include="Python.Runtime, Version=2.5.2.6664, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Python.Runtime, Version=2.5.2.7417, Culture=neutral, processorArchitecture=MSIL">
         <SpecificVersion>False</SpecificVersion>
         <HintPath>..\..\..\extern\Python\CPython_netstd20\Python.Runtime.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'net48' ">
-    <Reference Include="Python.Included, Version=2.5.2.4265, Culture=neutral, processorArchitecture=MSIL">
-        <SpecificVersion>False</SpecificVersion>
-        <HintPath>..\..\..\extern\Python\Python.Included.dll</HintPath>
-    </Reference>
-    <Reference Include="Python.Runtime, Version=2.5.2.4265, Culture=neutral, processorArchitecture=MSIL">
-        <SpecificVersion>False</SpecificVersion>
-        <HintPath>..\..\..\extern\Python\Python.Runtime.dll</HintPath>
-    </Reference>
+      <Reference Include="Python.Included, Version=2.5.2.7195, Culture=neutral, processorArchitecture=MSIL">
+          <SpecificVersion>False</SpecificVersion>
+          <HintPath>..\..\..\extern\Python\Python.Included.dll</HintPath>
+      </Reference>
+      <Reference Include="Python.Runtime, Version=2.5.2.7195, Culture=neutral, processorArchitecture=MSIL">
+          <SpecificVersion>False</SpecificVersion>
+          <HintPath>..\..\..\extern\Python\Python.Runtime.dll</HintPath>
+      </Reference>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\DynamoCore\DynamoCore.csproj">

diff --git a/src/Libraries/DSOffice/DSOffice.csproj b/src/Libraries/DSOffice/DSOffice.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <ImportGroup Label="PropertySheets">
     <Import Project="$(SolutionDir)Config\CS_SDK.props" />
   </ImportGroup>
@@ -10,11 +10,13 @@
     <AssemblyName>DSOffice</AssemblyName>
     <DocumentationFile>$(OutputPath)\$(UICulture)\DSOffice.xml</DocumentationFile>
   </PropertyGroup>
+    <ItemGroup Condition=" '$(TargetFramework)' == 'net48' ">
+        <PackageReference Include="Microsoft.Office.Interop.Excel" Version="15.0.4795.1000">
+            <ExcludeAssets>runtime</ExcludeAssets>
+        </PackageReference>
+    </ItemGroup>
   <ItemGroup>
 	<PackageReference Include="DocumentFormat.OpenXml" Version="2.12.3" CopyXML="true" />
-	<PackageReference Include="Microsoft.Office.Interop.Excel" Version="15.0.4795.1000">
-	  <ExcludeAssets>runtime</ExcludeAssets>
-	</PackageReference>
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
@@ -72,7 +74,7 @@
   <Target Name="CopyFiles" BeforeTargets="Build">
     <Copy SourceFiles="$(ProjectDir)DSOffice_DynamoCustomization.xml" DestinationFiles="$(OutDir)DSOffice_DynamoCustomization.xml" />
   </Target>
-  <Target Name="GenerateFiles" AfterTargets="Build" Condition=" '$(OS)' != 'Unix' ">
+  <Target Name="GenerateFiles" AfterTargets="Build" Condition=" '$(OS)' != 'Unix' AND '$(TargetFramework)' == 'net48'">
     <!-- Get System.Drawing.dll -->
     <GetReferenceAssemblyPaths TargetFrameworkMoniker=".NETFramework, Version=$(ResourceGeneration_FrameworkVersion)">
       <Output TaskParameter="FullFrameworkReferenceAssemblyPaths" PropertyName="FrameworkAssembliesPath" />

diff --git a/src/Libraries/DSOffice/Excel.cs b/src/Libraries/DSOffice/Excel.cs
@@ -5,7 +5,9 @@
 using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices;
+#if NETFRAMEWORK
 using Microsoft.Office.Interop.Excel;
+#endif
 using DynamoServices;
 using Autodesk.DesignScript.Runtime;
 using Dynamo.Graph.Nodes;
@@ -15,6 +17,7 @@
 
 namespace DSOffice
 {
+#if NETFRAMEWORK
     internal class ExcelCloseEventArgs : EventArgs
     {
         public ExcelCloseEventArgs(bool saveWorkbooks = true)
@@ -341,7 +344,7 @@ internal static object[][] WriteData(string filePath, string sheetName, int star
     [IsVisibleInDynamoLibrary(false)]
     public class WorkSheet
     {
-        #region Helper methods
+#region Helper methods
 
         private static object[][] ConvertToJaggedArray(object[,] input, bool convertToString = false)
         {
@@ -447,7 +450,7 @@ private static object[][] ConvertToJaggedArray(object[,] input, bool convertToSt
             return output;
         }
 
-        #endregion
+#endregion
         /// <summary>
         /// Returns data from given worksheet (GetDataFromExcelWorksheet node)
         /// </summary>
@@ -703,7 +706,7 @@ internal WorkSheet GetWorksheetByName(string sheetName)
         }
 
     }
-
+#endif
     /// <summary>
     ///     Methods for Import/Export category.
     /// </summary>
@@ -806,6 +809,7 @@ public static IList ImportCSV(string filePath, bool transpose = false)
             if (transpose) return CSVdatalist;
             else return DSCore.List.Transpose(CSVdatalist);
         }
+#if NETFRAMEWORK
 
         /// <summary>
         ///     Read data from a Microsoft Excel spreadsheet. Data is read by row and
@@ -869,7 +873,7 @@ public static object[][] ExportToExcel(string filePath, string sheetName, int st
         {
             return Excel.WriteData(filePath, sheetName, startRow, startColumn, data, overWrite, writeAsString);
         }
-
+#endif
         /// <summary>
         /// Read data from a Microsoft Excel spreadsheet by using the Open XML standard.
         /// Data is read by row and returned in a series of lists by row.

diff --git a/src/Libraries/DesignScriptBuiltin/Dictionary.cs b/src/Libraries/DesignScriptBuiltin/Dictionary.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;
@@ -129,6 +129,13 @@ public override string ToString()
                 result.Append("}");
                 return result.ToString();
             }
+
+            //TODO this could cause unanticipated consequences -
+            //figure out how to add customer comparer for nunit3 instead...
+            public override bool Equals(object obj)
+            {
+                return (bool)(this?.ToString().Equals(obj?.ToString()));
+            }
         }
     }
 }
diff --git a/src/PythonMigrationViewExtension/Properties/AssemblyInfo.cs b/src/PythonMigrationViewExtension/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
@@ -13,4 +13,4 @@
 
 // Visible to DynamoCoreWpfTests dll for unit testing
 [assembly: InternalsVisibleTo("IronPythonTests")]
-[assembly: InternalsVisibleTo("DynamoCoreTests")]
+[assembly: InternalsVisibleTo("DynamoPythonTests")]