Remove Dynamo RaaS (DynamoDS#2291)

* Remove DynamoRaaS * Remove dlls from extern
reddyashish · Dec 10, 2018 · 23866a2 · 23866a2
1 parent 7550073
commit 23866a2
Show file tree

Hide file tree

Showing 20 changed files with 2 additions and 2,596 deletions.
diff --git a/extern/DynamoRaaS/App.config b/extern/DynamoRaaS/App.config
diff --git a/extern/DynamoRaaS/DynamoRaaS.dll b/extern/DynamoRaaS/DynamoRaaS.dll
diff --git a/extern/DynamoRaaS/DynamoRaaSHelper.dll b/extern/DynamoRaaS/DynamoRaaSHelper.dll
diff --git a/extern/DynamoRaaS/JobMonitor.dll b/extern/DynamoRaaS/JobMonitor.dll
diff --git a/extern/DynamoRaaS/RevitRaaS.dll b/extern/DynamoRaaS/RevitRaaS.dll
diff --git a/extern/DynamoRaaS/RevitRaaS.dll.config b/extern/DynamoRaaS/RevitRaaS.dll.config
diff --git a/extern/DynamoRaaS/SDF.dll b/extern/DynamoRaaS/SDF.dll
diff --git a/extern/DynamoRaaS/SDFTests.dll b/extern/DynamoRaaS/SDFTests.dll
diff --git a/extern/DynamoRaaS/SimpleRaaS.dll b/extern/DynamoRaaS/SimpleRaaS.dll
diff --git a/extern/DynamoRaaS/SimpleRaaS.xml b/extern/DynamoRaaS/SimpleRaaS.xml
diff --git a/extern/DynamoRaaS/SimpleRaaS_DynamoCustomization.xml b/extern/DynamoRaaS/SimpleRaaS_DynamoCustomization.xml
diff --git a/extern/DynamoRaaS/en-US/DynamoRaaS.resources.dll b/extern/DynamoRaaS/en-US/DynamoRaaS.resources.dll
diff --git a/extern/DynamoRaaS/en-US/RevitRaaS.resources.dll b/extern/DynamoRaaS/en-US/RevitRaaS.resources.dll
diff --git a/src/DynamoRevit/DynamoRevit.cs b/src/DynamoRevit/DynamoRevit.cs
@@ -593,8 +593,6 @@ private static void InitializeCore(DynamoRevitCommandData commandData)
         private static void InitializeAssemblies()
         {
             RevitAssemblyLoader.LoadAll();
-            AppDomain.CurrentDomain.AssemblyResolve +=
-                Analyze.Render.AssemblyHelper.ResolveAssemblies;
         }
 
         private static void InitializeDocumentManager(DynamoRevitCommandData commandData)
@@ -798,9 +796,6 @@ private static void OnDynamoViewClosed(object sender, EventArgs e)
             view.Dispatcher.UnhandledException -= Dispatcher_UnhandledException;
             view.Closed -= OnDynamoViewClosed;
 
-            AppDomain.CurrentDomain.AssemblyResolve -=
-                Analyze.Render.AssemblyHelper.ResolveAssemblies;
-
             DynamoRevitApp.DynamoButtonEnabled = true;
 
             //the model is shutdown when DynamoView is closed

diff --git a/src/DynamoRevit/DynamoRevit.csproj b/src/DynamoRevit/DynamoRevit.csproj
@@ -50,9 +50,6 @@
       <HintPath>$(PACKAGESPATH)\DynamoVisualProgramming.Core\lib\net47\DynamoApplications.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="DynamoRaaSHelper">
-      <HintPath>$(DynamoExternPath)\DynamoRaaS\DynamoRaaSHelper.dll</HintPath>
-    </Reference>
     <Reference Include="DynamoServices">
       <HintPath>$(PACKAGESPATH)\DynamoVisualProgramming.DynamoServices\lib\net47\DynamoServices.dll</HintPath>
       <Private>False</Private>
@@ -205,16 +202,6 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>xcopy /Y "$(DynamoExternPath)\DynamoRaaS\RevitRaaS.dll.config" "$(OutputPath)"
-xcopy /Y "$(DynamoExternPath)\DynamoRaaS\DynamoRaaS.dll" "$(OutputPath)nodes\"
-xcopy /Y "$(DynamoExternPath)\DynamoRaaS\SimpleRaaS.dll" "$(OutputPath)"
-xcopy /Y "$(DynamoExternPath)\DynamoRaaS\JobMonitor.dll" "$(OutputPath)"
-xcopy /Y "$(DynamoExternPath)\DynamoRaaS\RevitRaaS.dll" "$(OutputPath)"
-xcopy /Y "$(DynamoExternPath)\DynamoRaaS\SDF.dll" "$(OutputPath)"
-xcopy /Y "$(DynamoExternPath)\DynamoRaaS\*_DynamoCustomization.xml" "$(OutputPath)"
-xcopy /Y "$(DynamoExternPath)\DynamoRaaS\SimpleRaas.xml" "$(OutputPath)en-US\"
-xcopy /Y "$(DynamoExternPath)\DynamoRaaS\en-US\RevitRaaS.resources.dll" "$(OutputPath)en-US\"
-xcopy /Y "$(DynamoExternPath)\DynamoRaaS\en-US\DynamoRaaS.resources.dll" "$(OutputPath)nodes\en-US\"</PostBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

diff --git a/src/DynamoRevit/Resources/LayoutSpecs.json b/src/DynamoRevit/Resources/LayoutSpecs.json
@@ -22,10 +22,6 @@
                   "path": "Analysis.Analysis",
                   "inclusive": false
                 },
-                {
-                  "path": "SimpleRaaS.Analyze",
-                  "inclusive": false
-                },
                 {
                   "path": "Analyze.Render"
                 },

diff --git a/src/DynamoRevit/RevitPathResolver.cs b/src/DynamoRevit/RevitPathResolver.cs
@@ -22,15 +22,12 @@ internal RevitPathResolver(string userDataFolder, string commonDataFolder)
 
             var nodesDirectory = Path.Combine(currentAssemblyDir, "nodes");
             var revitNodesDll = Path.Combine(currentAssemblyDir, "RevitNodes.dll");
-            var simpleRaaSDll = Path.Combine(currentAssemblyDir, "SimpleRaaS.dll");
 
             // Just making sure we are looking at the right level of nesting.
             if (!Directory.Exists(nodesDirectory))
                 throw new DirectoryNotFoundException(nodesDirectory);
             if (!File.Exists(revitNodesDll))
                 throw new FileNotFoundException(revitNodesDll);
-            if (!File.Exists(simpleRaaSDll))
-                throw new FileNotFoundException(simpleRaaSDll);
 
             // Add Revit-specific library paths for preloading.
             preloadLibraryPaths = new List<string>
@@ -49,8 +46,7 @@ internal RevitPathResolver(string userDataFolder, string commonDataFolder)
                 "Analysis.dll",
                 "GeometryColor.dll",
 
-                revitNodesDll,
-                simpleRaaSDll
+                revitNodesDll
             };
 
             // Add an additional node processing folder