From 68dd5640dd76f3472e7f2882449ffd410652fae5 Mon Sep 17 00:00:00 2001 From: "mjk.kirschner" Date: Fri, 7 Jun 2024 16:10:59 -0400 Subject: [PATCH 1/8] remove docs and some projects from build and service nuget --- src/Config/CS_SDK.props | 4 ++ src/DynamoCore.sln | 43 ------------------- src/DynamoCore/DynamoCore.csproj | 4 -- .../Graph/Workspaces/LayoutExtensions.cs | 5 +++ .../DynamoUtilitiesTests.csproj | 6 +-- .../ProductLookUpTests.cs | 6 ++- ...isualProgramming.ServiceCoreRuntime.nuspec | 2 +- 7 files changed, 15 insertions(+), 55 deletions(-) diff --git a/src/Config/CS_SDK.props b/src/Config/CS_SDK.props index e4ca45bdbf0..893809de45b 100644 --- a/src/Config/CS_SDK.props +++ b/src/Config/CS_SDK.props @@ -146,4 +146,8 @@ + + + $(DefineConstants);MINIMAL_SERVICE + diff --git a/src/DynamoCore.sln b/src/DynamoCore.sln index 9130994e7e1..0409e371826 100644 --- a/src/DynamoCore.sln +++ b/src/DynamoCore.sln @@ -48,8 +48,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitsCore", "Libraries\Dyna {133FC760-5699-46D9-BEA6-E816B5F01016} = {133FC760-5699-46D9-BEA6-E816B5F01016} EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphLayout", "Engine\GraphLayout\GraphLayout.csproj", "{C2595B04-856D-40AE-8B99-4804C7A70708}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VMDataBridge", "Libraries\VMDataBridge\VMDataBridge.csproj", "{CCB6E56B-2DA1-4EBA-A1F9-E8510E129D12}" ProjectSection(ProjectDependencies) = postProject {133FC760-5699-46D9-BEA6-E816B5F01016} = {133FC760-5699-46D9-BEA6-E816B5F01016} @@ -61,8 +59,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DynamoConversions", "Librar EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DynamoShapeManager", "Tools\DynamoShapeManager\DynamoShapeManager.csproj", "{263FA9C1-F81E-4A8E-95E0-8CDAE20F177B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DynamoInstallDetective", "Tools\DynamoInstallDetective\DynamoInstallDetective.csproj", "{98692887-B389-4F73-A71A-9FC516738DAB}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DynamoCLI", "DynamoCLI\DynamoCLI.csproj", "{5F9AE581-6781-4A4C-A262-1B06CD27208B}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DynamoApplications", "DynamoApplications\DynamoApplications.csproj", "{AA782772-FE61-4226-BAA4-EB529FA1646B}" @@ -75,8 +71,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extensions", "Extensions", EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AssemblyInfoGenerator", "AssemblySharedInfoGenerator\AssemblyInfoGenerator.csproj", "{133FC760-5699-46D9-BEA6-E816B5F01016}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DynamoFeatureFlags", "Tools\DynamoFeatureFlags\DynamoFeatureFlags.csproj", "{94CF053D-BB66-4FC7-883B-48F072701BA9}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Analysis", "Libraries\Analysis\Analysis.csproj", "{76686ED6-E759-4772-81C2-768740BE13FA}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DSCPython", "Libraries\DSCPython\DSCPython.csproj", "{F1541C2D-80A9-4FE7-8D9E-75A8B9FF3479}" @@ -123,8 +117,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DSOffice", "Libraries\DSOff EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DSOfficeUtilities", "Libraries\DSOfficeUtilities\DSOfficeUtilities.csproj", "{9B4FDC96-E2F9-4B8F-894A-4294405D50E7}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DynamoMLDataPipeline", "DynamoMLDataPipeline\DynamoMLDataPipeline.csproj", "{5DF79F45-5F2C-41C1-BACC-890AE514CDA8}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -213,14 +205,6 @@ Global {6E0A079E-85F1-45A1-AD5B-9855E4344809}.Release|Any CPU.Build.0 = Release|Any CPU {6E0A079E-85F1-45A1-AD5B-9855E4344809}.Release|NET_Linux.ActiveCfg = Release|NET_Linux {6E0A079E-85F1-45A1-AD5B-9855E4344809}.Release|NET_Linux.Build.0 = Release|NET_Linux - {C2595B04-856D-40AE-8B99-4804C7A70708}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C2595B04-856D-40AE-8B99-4804C7A70708}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C2595B04-856D-40AE-8B99-4804C7A70708}.Debug|NET_Linux.ActiveCfg = Debug|NET_Linux - {C2595B04-856D-40AE-8B99-4804C7A70708}.Debug|NET_Linux.Build.0 = Debug|NET_Linux - {C2595B04-856D-40AE-8B99-4804C7A70708}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C2595B04-856D-40AE-8B99-4804C7A70708}.Release|Any CPU.Build.0 = Release|Any CPU - {C2595B04-856D-40AE-8B99-4804C7A70708}.Release|NET_Linux.ActiveCfg = Release|NET_Linux - {C2595B04-856D-40AE-8B99-4804C7A70708}.Release|NET_Linux.Build.0 = Release|NET_Linux {CCB6E56B-2DA1-4EBA-A1F9-E8510E129D12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CCB6E56B-2DA1-4EBA-A1F9-E8510E129D12}.Debug|Any CPU.Build.0 = Debug|Any CPU {CCB6E56B-2DA1-4EBA-A1F9-E8510E129D12}.Debug|NET_Linux.ActiveCfg = Debug|NET_Linux @@ -245,14 +229,6 @@ Global {263FA9C1-F81E-4A8E-95E0-8CDAE20F177B}.Release|Any CPU.Build.0 = Release|Any CPU {263FA9C1-F81E-4A8E-95E0-8CDAE20F177B}.Release|NET_Linux.ActiveCfg = Release|NET_Linux {263FA9C1-F81E-4A8E-95E0-8CDAE20F177B}.Release|NET_Linux.Build.0 = Release|NET_Linux - {98692887-B389-4F73-A71A-9FC516738DAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {98692887-B389-4F73-A71A-9FC516738DAB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {98692887-B389-4F73-A71A-9FC516738DAB}.Debug|NET_Linux.ActiveCfg = Debug|NET_Linux - {98692887-B389-4F73-A71A-9FC516738DAB}.Debug|NET_Linux.Build.0 = Debug|NET_Linux - {98692887-B389-4F73-A71A-9FC516738DAB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {98692887-B389-4F73-A71A-9FC516738DAB}.Release|Any CPU.Build.0 = Release|Any CPU - {98692887-B389-4F73-A71A-9FC516738DAB}.Release|NET_Linux.ActiveCfg = Release|NET_Linux - {98692887-B389-4F73-A71A-9FC516738DAB}.Release|NET_Linux.Build.0 = Release|NET_Linux {5F9AE581-6781-4A4C-A262-1B06CD27208B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {5F9AE581-6781-4A4C-A262-1B06CD27208B}.Debug|Any CPU.Build.0 = Debug|Any CPU {5F9AE581-6781-4A4C-A262-1B06CD27208B}.Debug|NET_Linux.ActiveCfg = Debug|NET_Linux @@ -293,14 +269,6 @@ Global {133FC760-5699-46D9-BEA6-E816B5F01016}.Release|Any CPU.Build.0 = Release|Any CPU {133FC760-5699-46D9-BEA6-E816B5F01016}.Release|NET_Linux.ActiveCfg = Release|NET_Linux {133FC760-5699-46D9-BEA6-E816B5F01016}.Release|NET_Linux.Build.0 = Release|NET_Linux - {94CF053D-BB66-4FC7-883B-48F072701BA9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {94CF053D-BB66-4FC7-883B-48F072701BA9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {94CF053D-BB66-4FC7-883B-48F072701BA9}.Debug|NET_Linux.ActiveCfg = Debug|NET_Linux - {94CF053D-BB66-4FC7-883B-48F072701BA9}.Debug|NET_Linux.Build.0 = Debug|NET_Linux - {94CF053D-BB66-4FC7-883B-48F072701BA9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {94CF053D-BB66-4FC7-883B-48F072701BA9}.Release|Any CPU.Build.0 = Release|Any CPU - {94CF053D-BB66-4FC7-883B-48F072701BA9}.Release|NET_Linux.ActiveCfg = Release|NET_Linux - {94CF053D-BB66-4FC7-883B-48F072701BA9}.Release|NET_Linux.Build.0 = Release|NET_Linux {76686ED6-E759-4772-81C2-768740BE13FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {76686ED6-E759-4772-81C2-768740BE13FA}.Debug|Any CPU.Build.0 = Debug|Any CPU {76686ED6-E759-4772-81C2-768740BE13FA}.Debug|NET_Linux.ActiveCfg = Debug|NET_Linux @@ -459,14 +427,6 @@ Global {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|NET_Linux.ActiveCfg = Release|NET_Linux - {5DF79F45-5F2C-41C1-BACC-890AE514CDA8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5DF79F45-5F2C-41C1-BACC-890AE514CDA8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5DF79F45-5F2C-41C1-BACC-890AE514CDA8}.Debug|NET_Linux.ActiveCfg = Debug|NET_Linux - {5DF79F45-5F2C-41C1-BACC-890AE514CDA8}.Debug|NET_Linux.Build.0 = Debug|NET_Linux - {5DF79F45-5F2C-41C1-BACC-890AE514CDA8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5DF79F45-5F2C-41C1-BACC-890AE514CDA8}.Release|Any CPU.Build.0 = Release|Any CPU - {5DF79F45-5F2C-41C1-BACC-890AE514CDA8}.Release|NET_Linux.ActiveCfg = Release|NET_Linux - {5DF79F45-5F2C-41C1-BACC-890AE514CDA8}.Release|NET_Linux.Build.0 = Release|NET_Linux EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -479,14 +439,11 @@ Global {87550B2B-6CB8-461E-8965-DFAFE3AAFB5C} = {FA7BE306-A3B0-45FA-9D87-0C69E6932C13} {D8262D40-4880-41E4-91E4-AF8F480C8637} = {FA7BE306-A3B0-45FA-9D87-0C69E6932C13} {6E0A079E-85F1-45A1-AD5B-9855E4344809} = {FA7BE306-A3B0-45FA-9D87-0C69E6932C13} - {C2595B04-856D-40AE-8B99-4804C7A70708} = {A6533823-A64A-441C-B7A2-7B2772F87002} {CCB6E56B-2DA1-4EBA-A1F9-E8510E129D12} = {FA7BE306-A3B0-45FA-9D87-0C69E6932C13} {C5ADC05B-34E8-47BF-8E78-9C7BF96418C2} = {FA7BE306-A3B0-45FA-9D87-0C69E6932C13} {263FA9C1-F81E-4A8E-95E0-8CDAE20F177B} = {D114C59C-CF66-4CC2-980F-9301FB4EA4E1} - {98692887-B389-4F73-A71A-9FC516738DAB} = {D114C59C-CF66-4CC2-980F-9301FB4EA4E1} {47533B7C-0E1A-44A4-8511-B438645F052A} = {88D45B00-E564-41DB-B57C-9509646CAA49} {C0D6DEE5-5532-4345-9C66-4C00D7FDB8BE} = {FA7BE306-A3B0-45FA-9D87-0C69E6932C13} - {94CF053D-BB66-4FC7-883B-48F072701BA9} = {D114C59C-CF66-4CC2-980F-9301FB4EA4E1} {76686ED6-E759-4772-81C2-768740BE13FA} = {FA7BE306-A3B0-45FA-9D87-0C69E6932C13} {F1541C2D-80A9-4FE7-8D9E-75A8B9FF3479} = {FA7BE306-A3B0-45FA-9D87-0C69E6932C13} {A50C198C-DA6E-4081-BC53-0F44D287F207} = {FA7BE306-A3B0-45FA-9D87-0C69E6932C13} diff --git a/src/DynamoCore/DynamoCore.csproj b/src/DynamoCore/DynamoCore.csproj index 0a267008246..a1ecf94f8cf 100644 --- a/src/DynamoCore/DynamoCore.csproj +++ b/src/DynamoCore/DynamoCore.csproj @@ -41,10 +41,6 @@ - - {c2595b04-856d-40ae-8b99-4804c7a70708} - GraphLayout - {7318d5e5-9d15-4abe-8a51-92f58d4f0b85} ProtoAssociative diff --git a/src/DynamoCore/Graph/Workspaces/LayoutExtensions.cs b/src/DynamoCore/Graph/Workspaces/LayoutExtensions.cs index 92c661b7dd3..7836208d878 100644 --- a/src/DynamoCore/Graph/Workspaces/LayoutExtensions.cs +++ b/src/DynamoCore/Graph/Workspaces/LayoutExtensions.cs @@ -7,8 +7,12 @@ using Dynamo.Graph.Notes; using Dynamo.Selection; +#if !MINIMAL_SERVICE + namespace Dynamo.Graph.Workspaces { + + /// /// Layout class contains methods for organizing graphs. /// @@ -622,3 +626,4 @@ private static void SaveLayoutGraphForNodeAutoComplete(this WorkspaceModel works } } } +#endif diff --git a/test/Libraries/DynamoUtilitiesTests/DynamoUtilitiesTests.csproj b/test/Libraries/DynamoUtilitiesTests/DynamoUtilitiesTests.csproj index ef38eae803b..3776cd2e836 100644 --- a/test/Libraries/DynamoUtilitiesTests/DynamoUtilitiesTests.csproj +++ b/test/Libraries/DynamoUtilitiesTests/DynamoUtilitiesTests.csproj @@ -10,7 +10,7 @@ DynamoUtilitiesTests - + @@ -21,10 +21,6 @@ DynamoUtilities False - - {98692887-b389-4f73-a71a-9fc516738dab} - DynamoInstallDetective - diff --git a/test/Libraries/DynamoUtilitiesTests/ProductLookUpTests.cs b/test/Libraries/DynamoUtilitiesTests/ProductLookUpTests.cs index c49c561c1a9..40a5e067efd 100644 --- a/test/Libraries/DynamoUtilitiesTests/ProductLookUpTests.cs +++ b/test/Libraries/DynamoUtilitiesTests/ProductLookUpTests.cs @@ -1,4 +1,6 @@ -using System; +#if !MINIMAL_SERVICE + +using System; using System.Collections.Generic; using System.Linq; @@ -335,7 +337,6 @@ private static InstalledProductLookUp SetUpProductLookUpFailsToFindProductByName return lookUp.Object; } - private static InstalledProductLookUp SetUpProductLookUp(Dictionary> products, Dictionary> locations) { @@ -375,3 +376,4 @@ private static InstalledProductLookUp SetUpProductLookUp(Dictionary - + From d07d4e8199289acd6475816719c892fa4ca7133d Mon Sep 17 00:00:00 2001 From: "mjk.kirschner" Date: Fri, 7 Jun 2024 18:24:13 -0400 Subject: [PATCH 2/8] headless = climode dont attempt to write with lucene dont copy docs for openxml dont copy samples,licenses,or node docs --- src/DynamoApplications/StartupUtils.cs | 3 +- src/DynamoCore/Models/DynamoModel.cs | 84 +++++++++++-------- .../DSOfficeUtilities.csproj | 2 +- ...isualProgramming.ServiceCoreRuntime.nuspec | 4 +- 4 files changed, 53 insertions(+), 40 deletions(-) diff --git a/src/DynamoApplications/StartupUtils.cs b/src/DynamoApplications/StartupUtils.cs index 3e123943123..9ff854be373 100644 --- a/src/DynamoApplications/StartupUtils.cs +++ b/src/DynamoApplications/StartupUtils.cs @@ -334,7 +334,8 @@ private static DynamoModel StartDynamoWithDefaultConfig(bool CLImode, PathResolver = CreatePathResolver(CLImode, preloaderLocation, userDataFolder, commonDataFolder), IsServiceMode = isServiceMode, Preferences = PreferenceSettings.Instance, - NoNetworkMode = noNetworkMode + NoNetworkMode = noNetworkMode, + IsHeadless = CLImode }; var model = DynamoModel.Start(config); return model; diff --git a/src/DynamoCore/Models/DynamoModel.cs b/src/DynamoCore/Models/DynamoModel.cs index 79bd7ba8eb5..1d8f9686c4e 100644 --- a/src/DynamoCore/Models/DynamoModel.cs +++ b/src/DynamoCore/Models/DynamoModel.cs @@ -712,7 +712,7 @@ protected DynamoModel(IStartConfiguration config) //If network traffic is disabled, analytics should also be disabled - this is already done in //our other entry points(CLI,Sandbox etc) - but //not all integrators will use those entry points, some may just create a DynamoModel directly. - Analytics.DisableAnalytics = NoNetworkMode || Analytics.DisableAnalytics; + Analytics.DisableAnalytics = NoNetworkMode || Analytics.DisableAnalytics || IsServiceMode; // If user skipped analytics from assembly config, do not try to launch the analytics client // or the feature flags client for web traffic reason. @@ -798,51 +798,52 @@ protected DynamoModel(IStartConfiguration config) var userCommonPackageFolder = pathManager.CommonPackageDirectory; AddPackagePath(userCommonPackageFolder); - // Load Python Template - // The loading pattern is conducted in the following order - // 1) Set from DynamoSettings.XML - // 2) Set from API via the configuration file - // 3) Set from PythonTemplate.py located in 'C:\Users\USERNAME\AppData\Roaming\Dynamo\Dynamo Core\2.X' - // 4) Set from OOTB hard-coded default template - - // If a custom python template path doesn't already exists in the DynamoSettings.xml - if (string.IsNullOrEmpty(PreferenceSettings.PythonTemplateFilePath) || !File.Exists(PreferenceSettings.PythonTemplateFilePath) && !IsServiceMode) - { - // To supply a custom python template host integrators should supply a 'DefaultStartConfiguration' config file - // or create a new struct that inherits from 'DefaultStartConfiguration' making sure to set the 'PythonTemplatePath' - // while passing the config to the 'DynamoModel' constructor. - if (config is DefaultStartConfiguration) - { - var configurationSettings = (DefaultStartConfiguration)config; - var templatePath = configurationSettings.PythonTemplatePath; - - // If a custom python template path was set in the config apply that template - if (!string.IsNullOrEmpty(templatePath) && File.Exists(templatePath)) + // Load Python Template + // The loading pattern is conducted in the following order + // 1) Set from DynamoSettings.XML + // 2) Set from API via the configuration file + // 3) Set from PythonTemplate.py located in 'C:\Users\USERNAME\AppData\Roaming\Dynamo\Dynamo Core\2.X' + // 4) Set from OOTB hard-coded default template + + // If a custom python template path doesn't already exists in the DynamoSettings.xml + if (string.IsNullOrEmpty(PreferenceSettings.PythonTemplateFilePath) || + !File.Exists(PreferenceSettings.PythonTemplateFilePath) && !IsServiceMode) + { + // To supply a custom python template host integrators should supply a 'DefaultStartConfiguration' config file + // or create a new struct that inherits from 'DefaultStartConfiguration' making sure to set the 'PythonTemplatePath' + // while passing the config to the 'DynamoModel' constructor. + if (config is DefaultStartConfiguration) { - PreferenceSettings.PythonTemplateFilePath = templatePath; + var configurationSettings = (DefaultStartConfiguration)config; + var templatePath = configurationSettings.PythonTemplatePath; + + // If a custom python template path was set in the config apply that template + if (!string.IsNullOrEmpty(templatePath) && File.Exists(templatePath)) + { + PreferenceSettings.PythonTemplateFilePath = templatePath; Logger.Log(Resources.PythonTemplateDefinedByHost + " : " + PreferenceSettings.PythonTemplateFilePath); + } + + // Otherwise fallback to the default + else + { + SetDefaultPythonTemplate(); + } } - // Otherwise fallback to the default else { + // Fallback to the default SetDefaultPythonTemplate(); } } else { - // Fallback to the default - SetDefaultPythonTemplate(); + // A custom python template path already exists in the DynamoSettings.xml + Logger.Log(Resources.PythonTemplateUserFile + " : " + PreferenceSettings.PythonTemplateFilePath); } - } - - else - { - // A custom python template path already exists in the DynamoSettings.xml - Logger.Log(Resources.PythonTemplateUserFile + " : " + PreferenceSettings.PythonTemplateFilePath); - } - + pathManager.Preferences = PreferenceSettings; PreferenceSettings.RequestUserDataFolder += pathManager.GetUserDataFolder; @@ -861,6 +862,7 @@ protected DynamoModel(IStartConfiguration config) extensionManager.MessageLogged += LogMessage; var extensions = config.Extensions ?? LoadExtensions(); + //don't load linter manager in service mode. if (!IsServiceMode) { LinterManager = new LinterManager(this.ExtensionManager); @@ -975,18 +977,26 @@ protected DynamoModel(IStartConfiguration config) LogWarningMessageEvents.LogInfoMessage += LogInfoMessage; DynamoConsoleLogger.LogMessageToDynamoConsole += LogMessageWrapper; DynamoConsoleLogger.LogErrorToDynamoConsole += LogErrorMessageWrapper; - StartBackupFilesTimer(); + if (!IsServiceMode) + { + StartBackupFilesTimer(); + } TraceReconciliationProcessor = this; State = DynamoModelState.StartedUIless; - // Write index to disk only once - LuceneUtility.CommitWriterChanges(); + + if(!IsServiceMode) + { + // Write index to disk only once + LuceneUtility.CommitWriterChanges(); + } //Disposed writer if it is in file system mode so that the index files can be used by other processes (potentially a second Dynamo session) if (LuceneUtility.startConfig.StorageType == LuceneSearchUtility.LuceneStorage.FILE_SYSTEM) { - LuceneUtility.DisposeWriter(); + LuceneUtility.DisposeWriter(); } + GraphChecksumDictionary = new Dictionary>(); diff --git a/src/Libraries/DSOfficeUtilities/DSOfficeUtilities.csproj b/src/Libraries/DSOfficeUtilities/DSOfficeUtilities.csproj index 8a40de6fe32..a6f8894c25c 100644 --- a/src/Libraries/DSOfficeUtilities/DSOfficeUtilities.csproj +++ b/src/Libraries/DSOfficeUtilities/DSOfficeUtilities.csproj @@ -31,7 +31,7 @@ False True - + diff --git a/tools/NuGet/template-service-core/DynamoVisualProgramming.ServiceCoreRuntime.nuspec b/tools/NuGet/template-service-core/DynamoVisualProgramming.ServiceCoreRuntime.nuspec index 4cfa8ed1d15..87c5cb315fa 100644 --- a/tools/NuGet/template-service-core/DynamoVisualProgramming.ServiceCoreRuntime.nuspec +++ b/tools/NuGet/template-service-core/DynamoVisualProgramming.ServiceCoreRuntime.nuspec @@ -17,6 +17,8 @@ - + From 096a9b3f7fb8cb84c88e3d4fd6468536d780e160 Mon Sep 17 00:00:00 2001 From: "mjk.kirschner" Date: Mon, 10 Jun 2024 18:48:05 -0400 Subject: [PATCH 3/8] revert some changes --- src/Config/CS_SDK.props | 4 -- src/DynamoCore.sln | 43 +++++++++++++++++++ src/DynamoCore/DynamoCore.csproj | 4 ++ .../Graph/Workspaces/LayoutExtensions.cs | 5 --- .../DynamoUtilitiesTests.csproj | 6 ++- .../ProductLookUpTests.cs | 6 +-- 6 files changed, 54 insertions(+), 14 deletions(-) diff --git a/src/Config/CS_SDK.props b/src/Config/CS_SDK.props index 893809de45b..e4ca45bdbf0 100644 --- a/src/Config/CS_SDK.props +++ b/src/Config/CS_SDK.props @@ -146,8 +146,4 @@ - - - $(DefineConstants);MINIMAL_SERVICE - diff --git a/src/DynamoCore.sln b/src/DynamoCore.sln index 0409e371826..9130994e7e1 100644 --- a/src/DynamoCore.sln +++ b/src/DynamoCore.sln @@ -48,6 +48,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitsCore", "Libraries\Dyna {133FC760-5699-46D9-BEA6-E816B5F01016} = {133FC760-5699-46D9-BEA6-E816B5F01016} EndProjectSection EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphLayout", "Engine\GraphLayout\GraphLayout.csproj", "{C2595B04-856D-40AE-8B99-4804C7A70708}" +EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VMDataBridge", "Libraries\VMDataBridge\VMDataBridge.csproj", "{CCB6E56B-2DA1-4EBA-A1F9-E8510E129D12}" ProjectSection(ProjectDependencies) = postProject {133FC760-5699-46D9-BEA6-E816B5F01016} = {133FC760-5699-46D9-BEA6-E816B5F01016} @@ -59,6 +61,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DynamoConversions", "Librar EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DynamoShapeManager", "Tools\DynamoShapeManager\DynamoShapeManager.csproj", "{263FA9C1-F81E-4A8E-95E0-8CDAE20F177B}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DynamoInstallDetective", "Tools\DynamoInstallDetective\DynamoInstallDetective.csproj", "{98692887-B389-4F73-A71A-9FC516738DAB}" +EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DynamoCLI", "DynamoCLI\DynamoCLI.csproj", "{5F9AE581-6781-4A4C-A262-1B06CD27208B}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DynamoApplications", "DynamoApplications\DynamoApplications.csproj", "{AA782772-FE61-4226-BAA4-EB529FA1646B}" @@ -71,6 +75,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extensions", "Extensions", EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AssemblyInfoGenerator", "AssemblySharedInfoGenerator\AssemblyInfoGenerator.csproj", "{133FC760-5699-46D9-BEA6-E816B5F01016}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DynamoFeatureFlags", "Tools\DynamoFeatureFlags\DynamoFeatureFlags.csproj", "{94CF053D-BB66-4FC7-883B-48F072701BA9}" +EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Analysis", "Libraries\Analysis\Analysis.csproj", "{76686ED6-E759-4772-81C2-768740BE13FA}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DSCPython", "Libraries\DSCPython\DSCPython.csproj", "{F1541C2D-80A9-4FE7-8D9E-75A8B9FF3479}" @@ -117,6 +123,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DSOffice", "Libraries\DSOff EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DSOfficeUtilities", "Libraries\DSOfficeUtilities\DSOfficeUtilities.csproj", "{9B4FDC96-E2F9-4B8F-894A-4294405D50E7}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DynamoMLDataPipeline", "DynamoMLDataPipeline\DynamoMLDataPipeline.csproj", "{5DF79F45-5F2C-41C1-BACC-890AE514CDA8}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -205,6 +213,14 @@ Global {6E0A079E-85F1-45A1-AD5B-9855E4344809}.Release|Any CPU.Build.0 = Release|Any CPU {6E0A079E-85F1-45A1-AD5B-9855E4344809}.Release|NET_Linux.ActiveCfg = Release|NET_Linux {6E0A079E-85F1-45A1-AD5B-9855E4344809}.Release|NET_Linux.Build.0 = Release|NET_Linux + {C2595B04-856D-40AE-8B99-4804C7A70708}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C2595B04-856D-40AE-8B99-4804C7A70708}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C2595B04-856D-40AE-8B99-4804C7A70708}.Debug|NET_Linux.ActiveCfg = Debug|NET_Linux + {C2595B04-856D-40AE-8B99-4804C7A70708}.Debug|NET_Linux.Build.0 = Debug|NET_Linux + {C2595B04-856D-40AE-8B99-4804C7A70708}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C2595B04-856D-40AE-8B99-4804C7A70708}.Release|Any CPU.Build.0 = Release|Any CPU + {C2595B04-856D-40AE-8B99-4804C7A70708}.Release|NET_Linux.ActiveCfg = Release|NET_Linux + {C2595B04-856D-40AE-8B99-4804C7A70708}.Release|NET_Linux.Build.0 = Release|NET_Linux {CCB6E56B-2DA1-4EBA-A1F9-E8510E129D12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CCB6E56B-2DA1-4EBA-A1F9-E8510E129D12}.Debug|Any CPU.Build.0 = Debug|Any CPU {CCB6E56B-2DA1-4EBA-A1F9-E8510E129D12}.Debug|NET_Linux.ActiveCfg = Debug|NET_Linux @@ -229,6 +245,14 @@ Global {263FA9C1-F81E-4A8E-95E0-8CDAE20F177B}.Release|Any CPU.Build.0 = Release|Any CPU {263FA9C1-F81E-4A8E-95E0-8CDAE20F177B}.Release|NET_Linux.ActiveCfg = Release|NET_Linux {263FA9C1-F81E-4A8E-95E0-8CDAE20F177B}.Release|NET_Linux.Build.0 = Release|NET_Linux + {98692887-B389-4F73-A71A-9FC516738DAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {98692887-B389-4F73-A71A-9FC516738DAB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {98692887-B389-4F73-A71A-9FC516738DAB}.Debug|NET_Linux.ActiveCfg = Debug|NET_Linux + {98692887-B389-4F73-A71A-9FC516738DAB}.Debug|NET_Linux.Build.0 = Debug|NET_Linux + {98692887-B389-4F73-A71A-9FC516738DAB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {98692887-B389-4F73-A71A-9FC516738DAB}.Release|Any CPU.Build.0 = Release|Any CPU + {98692887-B389-4F73-A71A-9FC516738DAB}.Release|NET_Linux.ActiveCfg = Release|NET_Linux + {98692887-B389-4F73-A71A-9FC516738DAB}.Release|NET_Linux.Build.0 = Release|NET_Linux {5F9AE581-6781-4A4C-A262-1B06CD27208B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {5F9AE581-6781-4A4C-A262-1B06CD27208B}.Debug|Any CPU.Build.0 = Debug|Any CPU {5F9AE581-6781-4A4C-A262-1B06CD27208B}.Debug|NET_Linux.ActiveCfg = Debug|NET_Linux @@ -269,6 +293,14 @@ Global {133FC760-5699-46D9-BEA6-E816B5F01016}.Release|Any CPU.Build.0 = Release|Any CPU {133FC760-5699-46D9-BEA6-E816B5F01016}.Release|NET_Linux.ActiveCfg = Release|NET_Linux {133FC760-5699-46D9-BEA6-E816B5F01016}.Release|NET_Linux.Build.0 = Release|NET_Linux + {94CF053D-BB66-4FC7-883B-48F072701BA9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {94CF053D-BB66-4FC7-883B-48F072701BA9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {94CF053D-BB66-4FC7-883B-48F072701BA9}.Debug|NET_Linux.ActiveCfg = Debug|NET_Linux + {94CF053D-BB66-4FC7-883B-48F072701BA9}.Debug|NET_Linux.Build.0 = Debug|NET_Linux + {94CF053D-BB66-4FC7-883B-48F072701BA9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {94CF053D-BB66-4FC7-883B-48F072701BA9}.Release|Any CPU.Build.0 = Release|Any CPU + {94CF053D-BB66-4FC7-883B-48F072701BA9}.Release|NET_Linux.ActiveCfg = Release|NET_Linux + {94CF053D-BB66-4FC7-883B-48F072701BA9}.Release|NET_Linux.Build.0 = Release|NET_Linux {76686ED6-E759-4772-81C2-768740BE13FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {76686ED6-E759-4772-81C2-768740BE13FA}.Debug|Any CPU.Build.0 = Debug|Any CPU {76686ED6-E759-4772-81C2-768740BE13FA}.Debug|NET_Linux.ActiveCfg = Debug|NET_Linux @@ -427,6 +459,14 @@ Global {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|NET_Linux.ActiveCfg = Release|NET_Linux + {5DF79F45-5F2C-41C1-BACC-890AE514CDA8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5DF79F45-5F2C-41C1-BACC-890AE514CDA8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5DF79F45-5F2C-41C1-BACC-890AE514CDA8}.Debug|NET_Linux.ActiveCfg = Debug|NET_Linux + {5DF79F45-5F2C-41C1-BACC-890AE514CDA8}.Debug|NET_Linux.Build.0 = Debug|NET_Linux + {5DF79F45-5F2C-41C1-BACC-890AE514CDA8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5DF79F45-5F2C-41C1-BACC-890AE514CDA8}.Release|Any CPU.Build.0 = Release|Any CPU + {5DF79F45-5F2C-41C1-BACC-890AE514CDA8}.Release|NET_Linux.ActiveCfg = Release|NET_Linux + {5DF79F45-5F2C-41C1-BACC-890AE514CDA8}.Release|NET_Linux.Build.0 = Release|NET_Linux EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -439,11 +479,14 @@ Global {87550B2B-6CB8-461E-8965-DFAFE3AAFB5C} = {FA7BE306-A3B0-45FA-9D87-0C69E6932C13} {D8262D40-4880-41E4-91E4-AF8F480C8637} = {FA7BE306-A3B0-45FA-9D87-0C69E6932C13} {6E0A079E-85F1-45A1-AD5B-9855E4344809} = {FA7BE306-A3B0-45FA-9D87-0C69E6932C13} + {C2595B04-856D-40AE-8B99-4804C7A70708} = {A6533823-A64A-441C-B7A2-7B2772F87002} {CCB6E56B-2DA1-4EBA-A1F9-E8510E129D12} = {FA7BE306-A3B0-45FA-9D87-0C69E6932C13} {C5ADC05B-34E8-47BF-8E78-9C7BF96418C2} = {FA7BE306-A3B0-45FA-9D87-0C69E6932C13} {263FA9C1-F81E-4A8E-95E0-8CDAE20F177B} = {D114C59C-CF66-4CC2-980F-9301FB4EA4E1} + {98692887-B389-4F73-A71A-9FC516738DAB} = {D114C59C-CF66-4CC2-980F-9301FB4EA4E1} {47533B7C-0E1A-44A4-8511-B438645F052A} = {88D45B00-E564-41DB-B57C-9509646CAA49} {C0D6DEE5-5532-4345-9C66-4C00D7FDB8BE} = {FA7BE306-A3B0-45FA-9D87-0C69E6932C13} + {94CF053D-BB66-4FC7-883B-48F072701BA9} = {D114C59C-CF66-4CC2-980F-9301FB4EA4E1} {76686ED6-E759-4772-81C2-768740BE13FA} = {FA7BE306-A3B0-45FA-9D87-0C69E6932C13} {F1541C2D-80A9-4FE7-8D9E-75A8B9FF3479} = {FA7BE306-A3B0-45FA-9D87-0C69E6932C13} {A50C198C-DA6E-4081-BC53-0F44D287F207} = {FA7BE306-A3B0-45FA-9D87-0C69E6932C13} diff --git a/src/DynamoCore/DynamoCore.csproj b/src/DynamoCore/DynamoCore.csproj index a1ecf94f8cf..0a267008246 100644 --- a/src/DynamoCore/DynamoCore.csproj +++ b/src/DynamoCore/DynamoCore.csproj @@ -41,6 +41,10 @@ + + {c2595b04-856d-40ae-8b99-4804c7a70708} + GraphLayout + {7318d5e5-9d15-4abe-8a51-92f58d4f0b85} ProtoAssociative diff --git a/src/DynamoCore/Graph/Workspaces/LayoutExtensions.cs b/src/DynamoCore/Graph/Workspaces/LayoutExtensions.cs index 7836208d878..92c661b7dd3 100644 --- a/src/DynamoCore/Graph/Workspaces/LayoutExtensions.cs +++ b/src/DynamoCore/Graph/Workspaces/LayoutExtensions.cs @@ -7,12 +7,8 @@ using Dynamo.Graph.Notes; using Dynamo.Selection; -#if !MINIMAL_SERVICE - namespace Dynamo.Graph.Workspaces { - - /// /// Layout class contains methods for organizing graphs. /// @@ -626,4 +622,3 @@ private static void SaveLayoutGraphForNodeAutoComplete(this WorkspaceModel works } } } -#endif diff --git a/test/Libraries/DynamoUtilitiesTests/DynamoUtilitiesTests.csproj b/test/Libraries/DynamoUtilitiesTests/DynamoUtilitiesTests.csproj index 3776cd2e836..ef38eae803b 100644 --- a/test/Libraries/DynamoUtilitiesTests/DynamoUtilitiesTests.csproj +++ b/test/Libraries/DynamoUtilitiesTests/DynamoUtilitiesTests.csproj @@ -10,7 +10,7 @@ DynamoUtilitiesTests - + @@ -21,6 +21,10 @@ DynamoUtilities False + + {98692887-b389-4f73-a71a-9fc516738dab} + DynamoInstallDetective + diff --git a/test/Libraries/DynamoUtilitiesTests/ProductLookUpTests.cs b/test/Libraries/DynamoUtilitiesTests/ProductLookUpTests.cs index 40a5e067efd..c49c561c1a9 100644 --- a/test/Libraries/DynamoUtilitiesTests/ProductLookUpTests.cs +++ b/test/Libraries/DynamoUtilitiesTests/ProductLookUpTests.cs @@ -1,6 +1,4 @@ -#if !MINIMAL_SERVICE - -using System; +using System; using System.Collections.Generic; using System.Linq; @@ -337,6 +335,7 @@ private static InstalledProductLookUp SetUpProductLookUpFailsToFindProductByName return lookUp.Object; } + private static InstalledProductLookUp SetUpProductLookUp(Dictionary> products, Dictionary> locations) { @@ -376,4 +375,3 @@ private static InstalledProductLookUp SetUpProductLookUp(Dictionary Date: Mon, 10 Jun 2024 18:50:37 -0400 Subject: [PATCH 4/8] drop feature flags and ml extension again --- src/DynamoCore.sln | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/src/DynamoCore.sln b/src/DynamoCore.sln index 9130994e7e1..855c121a7ec 100644 --- a/src/DynamoCore.sln +++ b/src/DynamoCore.sln @@ -75,8 +75,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extensions", "Extensions", EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AssemblyInfoGenerator", "AssemblySharedInfoGenerator\AssemblyInfoGenerator.csproj", "{133FC760-5699-46D9-BEA6-E816B5F01016}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DynamoFeatureFlags", "Tools\DynamoFeatureFlags\DynamoFeatureFlags.csproj", "{94CF053D-BB66-4FC7-883B-48F072701BA9}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Analysis", "Libraries\Analysis\Analysis.csproj", "{76686ED6-E759-4772-81C2-768740BE13FA}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DSCPython", "Libraries\DSCPython\DSCPython.csproj", "{F1541C2D-80A9-4FE7-8D9E-75A8B9FF3479}" @@ -123,8 +121,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DSOffice", "Libraries\DSOff EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DSOfficeUtilities", "Libraries\DSOfficeUtilities\DSOfficeUtilities.csproj", "{9B4FDC96-E2F9-4B8F-894A-4294405D50E7}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DynamoMLDataPipeline", "DynamoMLDataPipeline\DynamoMLDataPipeline.csproj", "{5DF79F45-5F2C-41C1-BACC-890AE514CDA8}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -293,14 +289,6 @@ Global {133FC760-5699-46D9-BEA6-E816B5F01016}.Release|Any CPU.Build.0 = Release|Any CPU {133FC760-5699-46D9-BEA6-E816B5F01016}.Release|NET_Linux.ActiveCfg = Release|NET_Linux {133FC760-5699-46D9-BEA6-E816B5F01016}.Release|NET_Linux.Build.0 = Release|NET_Linux - {94CF053D-BB66-4FC7-883B-48F072701BA9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {94CF053D-BB66-4FC7-883B-48F072701BA9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {94CF053D-BB66-4FC7-883B-48F072701BA9}.Debug|NET_Linux.ActiveCfg = Debug|NET_Linux - {94CF053D-BB66-4FC7-883B-48F072701BA9}.Debug|NET_Linux.Build.0 = Debug|NET_Linux - {94CF053D-BB66-4FC7-883B-48F072701BA9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {94CF053D-BB66-4FC7-883B-48F072701BA9}.Release|Any CPU.Build.0 = Release|Any CPU - {94CF053D-BB66-4FC7-883B-48F072701BA9}.Release|NET_Linux.ActiveCfg = Release|NET_Linux - {94CF053D-BB66-4FC7-883B-48F072701BA9}.Release|NET_Linux.Build.0 = Release|NET_Linux {76686ED6-E759-4772-81C2-768740BE13FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {76686ED6-E759-4772-81C2-768740BE13FA}.Debug|Any CPU.Build.0 = Debug|Any CPU {76686ED6-E759-4772-81C2-768740BE13FA}.Debug|NET_Linux.ActiveCfg = Debug|NET_Linux @@ -459,14 +447,6 @@ Global {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|NET_Linux.ActiveCfg = Release|NET_Linux - {5DF79F45-5F2C-41C1-BACC-890AE514CDA8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5DF79F45-5F2C-41C1-BACC-890AE514CDA8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5DF79F45-5F2C-41C1-BACC-890AE514CDA8}.Debug|NET_Linux.ActiveCfg = Debug|NET_Linux - {5DF79F45-5F2C-41C1-BACC-890AE514CDA8}.Debug|NET_Linux.Build.0 = Debug|NET_Linux - {5DF79F45-5F2C-41C1-BACC-890AE514CDA8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5DF79F45-5F2C-41C1-BACC-890AE514CDA8}.Release|Any CPU.Build.0 = Release|Any CPU - {5DF79F45-5F2C-41C1-BACC-890AE514CDA8}.Release|NET_Linux.ActiveCfg = Release|NET_Linux - {5DF79F45-5F2C-41C1-BACC-890AE514CDA8}.Release|NET_Linux.Build.0 = Release|NET_Linux EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -486,7 +466,6 @@ Global {98692887-B389-4F73-A71A-9FC516738DAB} = {D114C59C-CF66-4CC2-980F-9301FB4EA4E1} {47533B7C-0E1A-44A4-8511-B438645F052A} = {88D45B00-E564-41DB-B57C-9509646CAA49} {C0D6DEE5-5532-4345-9C66-4C00D7FDB8BE} = {FA7BE306-A3B0-45FA-9D87-0C69E6932C13} - {94CF053D-BB66-4FC7-883B-48F072701BA9} = {D114C59C-CF66-4CC2-980F-9301FB4EA4E1} {76686ED6-E759-4772-81C2-768740BE13FA} = {FA7BE306-A3B0-45FA-9D87-0C69E6932C13} {F1541C2D-80A9-4FE7-8D9E-75A8B9FF3479} = {FA7BE306-A3B0-45FA-9D87-0C69E6932C13} {A50C198C-DA6E-4081-BC53-0F44D287F207} = {FA7BE306-A3B0-45FA-9D87-0C69E6932C13} From 52320d1332adccefc5b79275fb5658dcf9e4434b Mon Sep 17 00:00:00 2001 From: pinzart90 Date: Thu, 27 Jun 2024 08:51:16 -0400 Subject: [PATCH 5/8] Update DynamoVisualProgramming.ServiceCoreRuntime.nuspec --- .../DynamoVisualProgramming.ServiceCoreRuntime.nuspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/NuGet/template-service-core/DynamoVisualProgramming.ServiceCoreRuntime.nuspec b/tools/NuGet/template-service-core/DynamoVisualProgramming.ServiceCoreRuntime.nuspec index 87c5cb315fa..b42a6ce4bab 100644 --- a/tools/NuGet/template-service-core/DynamoVisualProgramming.ServiceCoreRuntime.nuspec +++ b/tools/NuGet/template-service-core/DynamoVisualProgramming.ServiceCoreRuntime.nuspec @@ -19,6 +19,6 @@ + exclude="**\*.pdb;**\*.txt;**\*.rtf;en-US\fallback_docs\*;NodeHelpSharedDocs\*;Open Source Licenses\*;samples\** "/> From ee9ca6d17ab70d15e67760929d2a41c8cb79f96b Mon Sep 17 00:00:00 2001 From: pinzart90 Date: Sat, 29 Jun 2024 23:39:26 -0400 Subject: [PATCH 6/8] update --- src/Config/CS_SDK.props | 6 +- src/DynamoCore.sln | 142 ++++++++++++++++++ .../Configuration/PreferenceSettings.cs | 5 +- src/DynamoCore/DynamoCore.csproj | 2 +- .../ViewModels/Menu/PreferencesViewModel.cs | 4 +- src/Libraries/Analysis/Analysis.csproj | 2 +- .../CoreNodeModels/CoreNodeModels.csproj | 2 +- src/Libraries/CoreNodes/CoreNodes.csproj | 2 +- src/Libraries/DSOffice/DSOffice.csproj | 2 +- .../DesignScriptBuiltin.csproj | 2 +- src/Libraries/DynamoUnits/UnitsCore.csproj | 2 +- .../GeometryColor/GeometryColor.csproj | 2 +- src/Libraries/GeometryUI/GeometryUI.csproj | 2 +- .../PythonNodeModels/PythonNodeModels.csproj | 2 +- src/Libraries/Tesellation/Tessellation.csproj | 2 +- .../UnitsNodeModels/UnitsNodeModels.csproj | 2 +- .../Watch3DNodeModels.csproj | 2 +- 17 files changed, 165 insertions(+), 18 deletions(-) diff --git a/src/Config/CS_SDK.props b/src/Config/CS_SDK.props index e4ca45bdbf0..75482b9138c 100644 --- a/src/Config/CS_SDK.props +++ b/src/Config/CS_SDK.props @@ -1,6 +1,6 @@ - AnyCPU;NET_Linux; + AnyCPU;NET_Linux;Publish_Linux; Debug AnyCPU x64 @@ -62,6 +62,10 @@ true true + + + false + int\$(TargetFramework)\ obj\$(TargetFramework)\ diff --git a/src/DynamoCore.sln b/src/DynamoCore.sln index 855c121a7ec..8c4595cb0ec 100644 --- a/src/DynamoCore.sln +++ b/src/DynamoCore.sln @@ -125,328 +125,470 @@ Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Debug|NET_Linux = Debug|NET_Linux + Debug|Publish_Linux = Debug|Publish_Linux Release|Any CPU = Release|Any CPU Release|NET_Linux = Release|NET_Linux + Release|Publish_Linux = Release|Publish_Linux EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {7858FA8C-475F-4B8E-B468-1F8200778CF8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7858FA8C-475F-4B8E-B468-1F8200778CF8}.Debug|Any CPU.Build.0 = Debug|Any CPU {7858FA8C-475F-4B8E-B468-1F8200778CF8}.Debug|NET_Linux.ActiveCfg = Debug|NET_Linux {7858FA8C-475F-4B8E-B468-1F8200778CF8}.Debug|NET_Linux.Build.0 = Debug|NET_Linux + {7858FA8C-475F-4B8E-B468-1F8200778CF8}.Debug|Publish_Linux.ActiveCfg = Debug|NET_Linux + {7858FA8C-475F-4B8E-B468-1F8200778CF8}.Debug|Publish_Linux.Build.0 = Debug|NET_Linux {7858FA8C-475F-4B8E-B468-1F8200778CF8}.Release|Any CPU.ActiveCfg = Release|Any CPU {7858FA8C-475F-4B8E-B468-1F8200778CF8}.Release|Any CPU.Build.0 = Release|Any CPU {7858FA8C-475F-4B8E-B468-1F8200778CF8}.Release|NET_Linux.ActiveCfg = Release|NET_Linux {7858FA8C-475F-4B8E-B468-1F8200778CF8}.Release|NET_Linux.Build.0 = Release|NET_Linux + {7858FA8C-475F-4B8E-B468-1F8200778CF8}.Release|Publish_Linux.ActiveCfg = Release|NET_Linux + {7858FA8C-475F-4B8E-B468-1F8200778CF8}.Release|Publish_Linux.Build.0 = Release|NET_Linux {7318D5E5-9D15-4ABE-8A51-92F58D4F0B85}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7318D5E5-9D15-4ABE-8A51-92F58D4F0B85}.Debug|Any CPU.Build.0 = Debug|Any CPU {7318D5E5-9D15-4ABE-8A51-92F58D4F0B85}.Debug|NET_Linux.ActiveCfg = Debug|NET_Linux {7318D5E5-9D15-4ABE-8A51-92F58D4F0B85}.Debug|NET_Linux.Build.0 = Debug|NET_Linux + {7318D5E5-9D15-4ABE-8A51-92F58D4F0B85}.Debug|Publish_Linux.ActiveCfg = Debug|NET_Linux + {7318D5E5-9D15-4ABE-8A51-92F58D4F0B85}.Debug|Publish_Linux.Build.0 = Debug|NET_Linux {7318D5E5-9D15-4ABE-8A51-92F58D4F0B85}.Release|Any CPU.ActiveCfg = Release|Any CPU {7318D5E5-9D15-4ABE-8A51-92F58D4F0B85}.Release|Any CPU.Build.0 = Release|Any CPU {7318D5E5-9D15-4ABE-8A51-92F58D4F0B85}.Release|NET_Linux.ActiveCfg = Release|NET_Linux {7318D5E5-9D15-4ABE-8A51-92F58D4F0B85}.Release|NET_Linux.Build.0 = Release|NET_Linux + {7318D5E5-9D15-4ABE-8A51-92F58D4F0B85}.Release|Publish_Linux.ActiveCfg = Release|NET_Linux + {7318D5E5-9D15-4ABE-8A51-92F58D4F0B85}.Release|Publish_Linux.Build.0 = Release|NET_Linux {7A9E0314-966F-4584-BAA3-7339CBB849D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7A9E0314-966F-4584-BAA3-7339CBB849D1}.Debug|Any CPU.Build.0 = Debug|Any CPU {7A9E0314-966F-4584-BAA3-7339CBB849D1}.Debug|NET_Linux.ActiveCfg = Debug|NET_Linux {7A9E0314-966F-4584-BAA3-7339CBB849D1}.Debug|NET_Linux.Build.0 = Debug|NET_Linux + {7A9E0314-966F-4584-BAA3-7339CBB849D1}.Debug|Publish_Linux.ActiveCfg = Debug|NET_Linux + {7A9E0314-966F-4584-BAA3-7339CBB849D1}.Debug|Publish_Linux.Build.0 = Debug|NET_Linux {7A9E0314-966F-4584-BAA3-7339CBB849D1}.Release|Any CPU.ActiveCfg = Release|Any CPU {7A9E0314-966F-4584-BAA3-7339CBB849D1}.Release|Any CPU.Build.0 = Release|Any CPU {7A9E0314-966F-4584-BAA3-7339CBB849D1}.Release|NET_Linux.ActiveCfg = Release|NET_Linux {7A9E0314-966F-4584-BAA3-7339CBB849D1}.Release|NET_Linux.Build.0 = Release|NET_Linux + {7A9E0314-966F-4584-BAA3-7339CBB849D1}.Release|Publish_Linux.ActiveCfg = Release|NET_Linux + {7A9E0314-966F-4584-BAA3-7339CBB849D1}.Release|Publish_Linux.Build.0 = Release|NET_Linux {0D3D43DC-BD7E-46F0-93F7-1C6A6CC79948}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {0D3D43DC-BD7E-46F0-93F7-1C6A6CC79948}.Debug|Any CPU.Build.0 = Debug|Any CPU {0D3D43DC-BD7E-46F0-93F7-1C6A6CC79948}.Debug|NET_Linux.ActiveCfg = Debug|NET_Linux {0D3D43DC-BD7E-46F0-93F7-1C6A6CC79948}.Debug|NET_Linux.Build.0 = Debug|NET_Linux + {0D3D43DC-BD7E-46F0-93F7-1C6A6CC79948}.Debug|Publish_Linux.ActiveCfg = Debug|NET_Linux + {0D3D43DC-BD7E-46F0-93F7-1C6A6CC79948}.Debug|Publish_Linux.Build.0 = Debug|NET_Linux {0D3D43DC-BD7E-46F0-93F7-1C6A6CC79948}.Release|Any CPU.ActiveCfg = Release|Any CPU {0D3D43DC-BD7E-46F0-93F7-1C6A6CC79948}.Release|Any CPU.Build.0 = Release|Any CPU {0D3D43DC-BD7E-46F0-93F7-1C6A6CC79948}.Release|NET_Linux.ActiveCfg = Release|NET_Linux {0D3D43DC-BD7E-46F0-93F7-1C6A6CC79948}.Release|NET_Linux.Build.0 = Release|NET_Linux + {0D3D43DC-BD7E-46F0-93F7-1C6A6CC79948}.Release|Publish_Linux.ActiveCfg = Release|NET_Linux + {0D3D43DC-BD7E-46F0-93F7-1C6A6CC79948}.Release|Publish_Linux.Build.0 = Release|NET_Linux {A4794476-7D0E-41C0-AD83-4AB929C0A46C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A4794476-7D0E-41C0-AD83-4AB929C0A46C}.Debug|Any CPU.Build.0 = Debug|Any CPU {A4794476-7D0E-41C0-AD83-4AB929C0A46C}.Debug|NET_Linux.ActiveCfg = Debug|NET_Linux {A4794476-7D0E-41C0-AD83-4AB929C0A46C}.Debug|NET_Linux.Build.0 = Debug|NET_Linux + {A4794476-7D0E-41C0-AD83-4AB929C0A46C}.Debug|Publish_Linux.ActiveCfg = Debug|NET_Linux + {A4794476-7D0E-41C0-AD83-4AB929C0A46C}.Debug|Publish_Linux.Build.0 = Debug|NET_Linux {A4794476-7D0E-41C0-AD83-4AB929C0A46C}.Release|Any CPU.ActiveCfg = Release|Any CPU {A4794476-7D0E-41C0-AD83-4AB929C0A46C}.Release|Any CPU.Build.0 = Release|Any CPU {A4794476-7D0E-41C0-AD83-4AB929C0A46C}.Release|NET_Linux.ActiveCfg = Release|NET_Linux {A4794476-7D0E-41C0-AD83-4AB929C0A46C}.Release|NET_Linux.Build.0 = Release|NET_Linux + {A4794476-7D0E-41C0-AD83-4AB929C0A46C}.Release|Publish_Linux.ActiveCfg = Release|NET_Linux + {A4794476-7D0E-41C0-AD83-4AB929C0A46C}.Release|Publish_Linux.Build.0 = Release|NET_Linux {87550B2B-6CB8-461E-8965-DFAFE3AAFB5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {87550B2B-6CB8-461E-8965-DFAFE3AAFB5C}.Debug|Any CPU.Build.0 = Debug|Any CPU {87550B2B-6CB8-461E-8965-DFAFE3AAFB5C}.Debug|NET_Linux.ActiveCfg = Debug|NET_Linux {87550B2B-6CB8-461E-8965-DFAFE3AAFB5C}.Debug|NET_Linux.Build.0 = Debug|NET_Linux + {87550B2B-6CB8-461E-8965-DFAFE3AAFB5C}.Debug|Publish_Linux.ActiveCfg = Debug|NET_Linux + {87550B2B-6CB8-461E-8965-DFAFE3AAFB5C}.Debug|Publish_Linux.Build.0 = Debug|NET_Linux {87550B2B-6CB8-461E-8965-DFAFE3AAFB5C}.Release|Any CPU.ActiveCfg = Release|Any CPU {87550B2B-6CB8-461E-8965-DFAFE3AAFB5C}.Release|Any CPU.Build.0 = Release|Any CPU {87550B2B-6CB8-461E-8965-DFAFE3AAFB5C}.Release|NET_Linux.ActiveCfg = Release|NET_Linux {87550B2B-6CB8-461E-8965-DFAFE3AAFB5C}.Release|NET_Linux.Build.0 = Release|NET_Linux + {87550B2B-6CB8-461E-8965-DFAFE3AAFB5C}.Release|Publish_Linux.ActiveCfg = Release|NET_Linux + {87550B2B-6CB8-461E-8965-DFAFE3AAFB5C}.Release|Publish_Linux.Build.0 = Release|NET_Linux {D8262D40-4880-41E4-91E4-AF8F480C8637}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D8262D40-4880-41E4-91E4-AF8F480C8637}.Debug|Any CPU.Build.0 = Debug|Any CPU {D8262D40-4880-41E4-91E4-AF8F480C8637}.Debug|NET_Linux.ActiveCfg = Debug|NET_Linux {D8262D40-4880-41E4-91E4-AF8F480C8637}.Debug|NET_Linux.Build.0 = Debug|NET_Linux + {D8262D40-4880-41E4-91E4-AF8F480C8637}.Debug|Publish_Linux.ActiveCfg = Debug|NET_Linux + {D8262D40-4880-41E4-91E4-AF8F480C8637}.Debug|Publish_Linux.Build.0 = Debug|NET_Linux {D8262D40-4880-41E4-91E4-AF8F480C8637}.Release|Any CPU.ActiveCfg = Release|Any CPU {D8262D40-4880-41E4-91E4-AF8F480C8637}.Release|Any CPU.Build.0 = Release|Any CPU {D8262D40-4880-41E4-91E4-AF8F480C8637}.Release|NET_Linux.ActiveCfg = Release|NET_Linux {D8262D40-4880-41E4-91E4-AF8F480C8637}.Release|NET_Linux.Build.0 = Release|NET_Linux + {D8262D40-4880-41E4-91E4-AF8F480C8637}.Release|Publish_Linux.ActiveCfg = Release|NET_Linux + {D8262D40-4880-41E4-91E4-AF8F480C8637}.Release|Publish_Linux.Build.0 = Release|NET_Linux {EF879A10-041D-4C68-83E7-3192685F1BAE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {EF879A10-041D-4C68-83E7-3192685F1BAE}.Debug|Any CPU.Build.0 = Debug|Any CPU {EF879A10-041D-4C68-83E7-3192685F1BAE}.Debug|NET_Linux.ActiveCfg = Debug|NET_Linux {EF879A10-041D-4C68-83E7-3192685F1BAE}.Debug|NET_Linux.Build.0 = Debug|NET_Linux + {EF879A10-041D-4C68-83E7-3192685F1BAE}.Debug|Publish_Linux.ActiveCfg = Debug|NET_Linux + {EF879A10-041D-4C68-83E7-3192685F1BAE}.Debug|Publish_Linux.Build.0 = Debug|NET_Linux {EF879A10-041D-4C68-83E7-3192685F1BAE}.Release|Any CPU.ActiveCfg = Release|Any CPU {EF879A10-041D-4C68-83E7-3192685F1BAE}.Release|Any CPU.Build.0 = Release|Any CPU {EF879A10-041D-4C68-83E7-3192685F1BAE}.Release|NET_Linux.ActiveCfg = Release|NET_Linux {EF879A10-041D-4C68-83E7-3192685F1BAE}.Release|NET_Linux.Build.0 = Release|NET_Linux + {EF879A10-041D-4C68-83E7-3192685F1BAE}.Release|Publish_Linux.ActiveCfg = Release|NET_Linux + {EF879A10-041D-4C68-83E7-3192685F1BAE}.Release|Publish_Linux.Build.0 = Release|NET_Linux {B5F435CB-0D8A-40B1-A4F7-5ECB3CE792A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B5F435CB-0D8A-40B1-A4F7-5ECB3CE792A9}.Debug|Any CPU.Build.0 = Debug|Any CPU {B5F435CB-0D8A-40B1-A4F7-5ECB3CE792A9}.Debug|NET_Linux.ActiveCfg = Debug|NET_Linux {B5F435CB-0D8A-40B1-A4F7-5ECB3CE792A9}.Debug|NET_Linux.Build.0 = Debug|NET_Linux + {B5F435CB-0D8A-40B1-A4F7-5ECB3CE792A9}.Debug|Publish_Linux.ActiveCfg = Debug|NET_Linux + {B5F435CB-0D8A-40B1-A4F7-5ECB3CE792A9}.Debug|Publish_Linux.Build.0 = Debug|NET_Linux {B5F435CB-0D8A-40B1-A4F7-5ECB3CE792A9}.Release|Any CPU.ActiveCfg = Release|Any CPU {B5F435CB-0D8A-40B1-A4F7-5ECB3CE792A9}.Release|Any CPU.Build.0 = Release|Any CPU {B5F435CB-0D8A-40B1-A4F7-5ECB3CE792A9}.Release|NET_Linux.ActiveCfg = Release|NET_Linux {B5F435CB-0D8A-40B1-A4F7-5ECB3CE792A9}.Release|NET_Linux.Build.0 = Release|NET_Linux + {B5F435CB-0D8A-40B1-A4F7-5ECB3CE792A9}.Release|Publish_Linux.ActiveCfg = Release|NET_Linux + {B5F435CB-0D8A-40B1-A4F7-5ECB3CE792A9}.Release|Publish_Linux.Build.0 = Release|NET_Linux {6E0A079E-85F1-45A1-AD5B-9855E4344809}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {6E0A079E-85F1-45A1-AD5B-9855E4344809}.Debug|Any CPU.Build.0 = Debug|Any CPU {6E0A079E-85F1-45A1-AD5B-9855E4344809}.Debug|NET_Linux.ActiveCfg = Debug|NET_Linux {6E0A079E-85F1-45A1-AD5B-9855E4344809}.Debug|NET_Linux.Build.0 = Debug|NET_Linux + {6E0A079E-85F1-45A1-AD5B-9855E4344809}.Debug|Publish_Linux.ActiveCfg = Debug|NET_Linux + {6E0A079E-85F1-45A1-AD5B-9855E4344809}.Debug|Publish_Linux.Build.0 = Debug|NET_Linux {6E0A079E-85F1-45A1-AD5B-9855E4344809}.Release|Any CPU.ActiveCfg = Release|Any CPU {6E0A079E-85F1-45A1-AD5B-9855E4344809}.Release|Any CPU.Build.0 = Release|Any CPU {6E0A079E-85F1-45A1-AD5B-9855E4344809}.Release|NET_Linux.ActiveCfg = Release|NET_Linux {6E0A079E-85F1-45A1-AD5B-9855E4344809}.Release|NET_Linux.Build.0 = Release|NET_Linux + {6E0A079E-85F1-45A1-AD5B-9855E4344809}.Release|Publish_Linux.ActiveCfg = Release|NET_Linux + {6E0A079E-85F1-45A1-AD5B-9855E4344809}.Release|Publish_Linux.Build.0 = Release|NET_Linux {C2595B04-856D-40AE-8B99-4804C7A70708}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C2595B04-856D-40AE-8B99-4804C7A70708}.Debug|Any CPU.Build.0 = Debug|Any CPU {C2595B04-856D-40AE-8B99-4804C7A70708}.Debug|NET_Linux.ActiveCfg = Debug|NET_Linux {C2595B04-856D-40AE-8B99-4804C7A70708}.Debug|NET_Linux.Build.0 = Debug|NET_Linux + {C2595B04-856D-40AE-8B99-4804C7A70708}.Debug|Publish_Linux.ActiveCfg = Debug|NET_Linux + {C2595B04-856D-40AE-8B99-4804C7A70708}.Debug|Publish_Linux.Build.0 = Debug|NET_Linux {C2595B04-856D-40AE-8B99-4804C7A70708}.Release|Any CPU.ActiveCfg = Release|Any CPU {C2595B04-856D-40AE-8B99-4804C7A70708}.Release|Any CPU.Build.0 = Release|Any CPU {C2595B04-856D-40AE-8B99-4804C7A70708}.Release|NET_Linux.ActiveCfg = Release|NET_Linux {C2595B04-856D-40AE-8B99-4804C7A70708}.Release|NET_Linux.Build.0 = Release|NET_Linux + {C2595B04-856D-40AE-8B99-4804C7A70708}.Release|Publish_Linux.ActiveCfg = Release|NET_Linux + {C2595B04-856D-40AE-8B99-4804C7A70708}.Release|Publish_Linux.Build.0 = Release|NET_Linux {CCB6E56B-2DA1-4EBA-A1F9-E8510E129D12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CCB6E56B-2DA1-4EBA-A1F9-E8510E129D12}.Debug|Any CPU.Build.0 = Debug|Any CPU {CCB6E56B-2DA1-4EBA-A1F9-E8510E129D12}.Debug|NET_Linux.ActiveCfg = Debug|NET_Linux {CCB6E56B-2DA1-4EBA-A1F9-E8510E129D12}.Debug|NET_Linux.Build.0 = Debug|NET_Linux + {CCB6E56B-2DA1-4EBA-A1F9-E8510E129D12}.Debug|Publish_Linux.ActiveCfg = Debug|NET_Linux + {CCB6E56B-2DA1-4EBA-A1F9-E8510E129D12}.Debug|Publish_Linux.Build.0 = Debug|NET_Linux {CCB6E56B-2DA1-4EBA-A1F9-E8510E129D12}.Release|Any CPU.ActiveCfg = Release|Any CPU {CCB6E56B-2DA1-4EBA-A1F9-E8510E129D12}.Release|Any CPU.Build.0 = Release|Any CPU {CCB6E56B-2DA1-4EBA-A1F9-E8510E129D12}.Release|NET_Linux.ActiveCfg = Release|NET_Linux {CCB6E56B-2DA1-4EBA-A1F9-E8510E129D12}.Release|NET_Linux.Build.0 = Release|NET_Linux + {CCB6E56B-2DA1-4EBA-A1F9-E8510E129D12}.Release|Publish_Linux.ActiveCfg = Release|NET_Linux + {CCB6E56B-2DA1-4EBA-A1F9-E8510E129D12}.Release|Publish_Linux.Build.0 = Release|NET_Linux {C5ADC05B-34E8-47BF-8E78-9C7BF96418C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C5ADC05B-34E8-47BF-8E78-9C7BF96418C2}.Debug|Any CPU.Build.0 = Debug|Any CPU {C5ADC05B-34E8-47BF-8E78-9C7BF96418C2}.Debug|NET_Linux.ActiveCfg = Debug|NET_Linux {C5ADC05B-34E8-47BF-8E78-9C7BF96418C2}.Debug|NET_Linux.Build.0 = Debug|NET_Linux + {C5ADC05B-34E8-47BF-8E78-9C7BF96418C2}.Debug|Publish_Linux.ActiveCfg = Debug|NET_Linux + {C5ADC05B-34E8-47BF-8E78-9C7BF96418C2}.Debug|Publish_Linux.Build.0 = Debug|NET_Linux {C5ADC05B-34E8-47BF-8E78-9C7BF96418C2}.Release|Any CPU.ActiveCfg = Release|Any CPU {C5ADC05B-34E8-47BF-8E78-9C7BF96418C2}.Release|Any CPU.Build.0 = Release|Any CPU {C5ADC05B-34E8-47BF-8E78-9C7BF96418C2}.Release|NET_Linux.ActiveCfg = Release|NET_Linux {C5ADC05B-34E8-47BF-8E78-9C7BF96418C2}.Release|NET_Linux.Build.0 = Release|NET_Linux + {C5ADC05B-34E8-47BF-8E78-9C7BF96418C2}.Release|Publish_Linux.ActiveCfg = Release|NET_Linux + {C5ADC05B-34E8-47BF-8E78-9C7BF96418C2}.Release|Publish_Linux.Build.0 = Release|NET_Linux {263FA9C1-F81E-4A8E-95E0-8CDAE20F177B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {263FA9C1-F81E-4A8E-95E0-8CDAE20F177B}.Debug|Any CPU.Build.0 = Debug|Any CPU {263FA9C1-F81E-4A8E-95E0-8CDAE20F177B}.Debug|NET_Linux.ActiveCfg = Debug|NET_Linux {263FA9C1-F81E-4A8E-95E0-8CDAE20F177B}.Debug|NET_Linux.Build.0 = Debug|NET_Linux + {263FA9C1-F81E-4A8E-95E0-8CDAE20F177B}.Debug|Publish_Linux.ActiveCfg = Debug|NET_Linux + {263FA9C1-F81E-4A8E-95E0-8CDAE20F177B}.Debug|Publish_Linux.Build.0 = Debug|NET_Linux {263FA9C1-F81E-4A8E-95E0-8CDAE20F177B}.Release|Any CPU.ActiveCfg = Release|Any CPU {263FA9C1-F81E-4A8E-95E0-8CDAE20F177B}.Release|Any CPU.Build.0 = Release|Any CPU {263FA9C1-F81E-4A8E-95E0-8CDAE20F177B}.Release|NET_Linux.ActiveCfg = Release|NET_Linux {263FA9C1-F81E-4A8E-95E0-8CDAE20F177B}.Release|NET_Linux.Build.0 = Release|NET_Linux + {263FA9C1-F81E-4A8E-95E0-8CDAE20F177B}.Release|Publish_Linux.ActiveCfg = Release|NET_Linux + {263FA9C1-F81E-4A8E-95E0-8CDAE20F177B}.Release|Publish_Linux.Build.0 = Release|NET_Linux {98692887-B389-4F73-A71A-9FC516738DAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {98692887-B389-4F73-A71A-9FC516738DAB}.Debug|Any CPU.Build.0 = Debug|Any CPU {98692887-B389-4F73-A71A-9FC516738DAB}.Debug|NET_Linux.ActiveCfg = Debug|NET_Linux {98692887-B389-4F73-A71A-9FC516738DAB}.Debug|NET_Linux.Build.0 = Debug|NET_Linux + {98692887-B389-4F73-A71A-9FC516738DAB}.Debug|Publish_Linux.ActiveCfg = Debug|NET_Linux + {98692887-B389-4F73-A71A-9FC516738DAB}.Debug|Publish_Linux.Build.0 = Debug|NET_Linux {98692887-B389-4F73-A71A-9FC516738DAB}.Release|Any CPU.ActiveCfg = Release|Any CPU {98692887-B389-4F73-A71A-9FC516738DAB}.Release|Any CPU.Build.0 = Release|Any CPU {98692887-B389-4F73-A71A-9FC516738DAB}.Release|NET_Linux.ActiveCfg = Release|NET_Linux {98692887-B389-4F73-A71A-9FC516738DAB}.Release|NET_Linux.Build.0 = Release|NET_Linux + {98692887-B389-4F73-A71A-9FC516738DAB}.Release|Publish_Linux.ActiveCfg = Release|NET_Linux + {98692887-B389-4F73-A71A-9FC516738DAB}.Release|Publish_Linux.Build.0 = Release|NET_Linux {5F9AE581-6781-4A4C-A262-1B06CD27208B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {5F9AE581-6781-4A4C-A262-1B06CD27208B}.Debug|Any CPU.Build.0 = Debug|Any CPU {5F9AE581-6781-4A4C-A262-1B06CD27208B}.Debug|NET_Linux.ActiveCfg = Debug|NET_Linux {5F9AE581-6781-4A4C-A262-1B06CD27208B}.Debug|NET_Linux.Build.0 = Debug|NET_Linux + {5F9AE581-6781-4A4C-A262-1B06CD27208B}.Debug|Publish_Linux.ActiveCfg = Debug|NET_Linux + {5F9AE581-6781-4A4C-A262-1B06CD27208B}.Debug|Publish_Linux.Build.0 = Debug|NET_Linux {5F9AE581-6781-4A4C-A262-1B06CD27208B}.Release|Any CPU.ActiveCfg = Release|Any CPU {5F9AE581-6781-4A4C-A262-1B06CD27208B}.Release|Any CPU.Build.0 = Release|Any CPU {5F9AE581-6781-4A4C-A262-1B06CD27208B}.Release|NET_Linux.ActiveCfg = Release|NET_Linux {5F9AE581-6781-4A4C-A262-1B06CD27208B}.Release|NET_Linux.Build.0 = Release|NET_Linux + {5F9AE581-6781-4A4C-A262-1B06CD27208B}.Release|Publish_Linux.ActiveCfg = Release|NET_Linux + {5F9AE581-6781-4A4C-A262-1B06CD27208B}.Release|Publish_Linux.Build.0 = Release|NET_Linux {AA782772-FE61-4226-BAA4-EB529FA1646B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {AA782772-FE61-4226-BAA4-EB529FA1646B}.Debug|Any CPU.Build.0 = Debug|Any CPU {AA782772-FE61-4226-BAA4-EB529FA1646B}.Debug|NET_Linux.ActiveCfg = Debug|NET_Linux {AA782772-FE61-4226-BAA4-EB529FA1646B}.Debug|NET_Linux.Build.0 = Debug|NET_Linux + {AA782772-FE61-4226-BAA4-EB529FA1646B}.Debug|Publish_Linux.ActiveCfg = Debug|NET_Linux + {AA782772-FE61-4226-BAA4-EB529FA1646B}.Debug|Publish_Linux.Build.0 = Debug|NET_Linux {AA782772-FE61-4226-BAA4-EB529FA1646B}.Release|Any CPU.ActiveCfg = Release|Any CPU {AA782772-FE61-4226-BAA4-EB529FA1646B}.Release|Any CPU.Build.0 = Release|Any CPU {AA782772-FE61-4226-BAA4-EB529FA1646B}.Release|NET_Linux.ActiveCfg = Release|NET_Linux {AA782772-FE61-4226-BAA4-EB529FA1646B}.Release|NET_Linux.Build.0 = Release|NET_Linux + {AA782772-FE61-4226-BAA4-EB529FA1646B}.Release|Publish_Linux.ActiveCfg = Release|NET_Linux + {AA782772-FE61-4226-BAA4-EB529FA1646B}.Release|Publish_Linux.Build.0 = Release|NET_Linux {47533B7C-0E1A-44A4-8511-B438645F052A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {47533B7C-0E1A-44A4-8511-B438645F052A}.Debug|Any CPU.Build.0 = Debug|Any CPU {47533B7C-0E1A-44A4-8511-B438645F052A}.Debug|NET_Linux.ActiveCfg = Debug|NET_Linux {47533B7C-0E1A-44A4-8511-B438645F052A}.Debug|NET_Linux.Build.0 = Debug|NET_Linux + {47533B7C-0E1A-44A4-8511-B438645F052A}.Debug|Publish_Linux.ActiveCfg = Debug|NET_Linux + {47533B7C-0E1A-44A4-8511-B438645F052A}.Debug|Publish_Linux.Build.0 = Debug|NET_Linux {47533B7C-0E1A-44A4-8511-B438645F052A}.Release|Any CPU.ActiveCfg = Release|Any CPU {47533B7C-0E1A-44A4-8511-B438645F052A}.Release|Any CPU.Build.0 = Release|Any CPU {47533B7C-0E1A-44A4-8511-B438645F052A}.Release|NET_Linux.ActiveCfg = Release|NET_Linux {47533B7C-0E1A-44A4-8511-B438645F052A}.Release|NET_Linux.Build.0 = Release|NET_Linux + {47533B7C-0E1A-44A4-8511-B438645F052A}.Release|Publish_Linux.ActiveCfg = Release|NET_Linux + {47533B7C-0E1A-44A4-8511-B438645F052A}.Release|Publish_Linux.Build.0 = Release|NET_Linux {C0D6DEE5-5532-4345-9C66-4C00D7FDB8BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C0D6DEE5-5532-4345-9C66-4C00D7FDB8BE}.Debug|Any CPU.Build.0 = Debug|Any CPU {C0D6DEE5-5532-4345-9C66-4C00D7FDB8BE}.Debug|NET_Linux.ActiveCfg = Debug|NET_Linux {C0D6DEE5-5532-4345-9C66-4C00D7FDB8BE}.Debug|NET_Linux.Build.0 = Debug|NET_Linux + {C0D6DEE5-5532-4345-9C66-4C00D7FDB8BE}.Debug|Publish_Linux.ActiveCfg = Debug|NET_Linux + {C0D6DEE5-5532-4345-9C66-4C00D7FDB8BE}.Debug|Publish_Linux.Build.0 = Debug|NET_Linux {C0D6DEE5-5532-4345-9C66-4C00D7FDB8BE}.Release|Any CPU.ActiveCfg = Release|Any CPU {C0D6DEE5-5532-4345-9C66-4C00D7FDB8BE}.Release|Any CPU.Build.0 = Release|Any CPU {C0D6DEE5-5532-4345-9C66-4C00D7FDB8BE}.Release|NET_Linux.ActiveCfg = Release|NET_Linux {C0D6DEE5-5532-4345-9C66-4C00D7FDB8BE}.Release|NET_Linux.Build.0 = Release|NET_Linux + {C0D6DEE5-5532-4345-9C66-4C00D7FDB8BE}.Release|Publish_Linux.ActiveCfg = Release|NET_Linux + {C0D6DEE5-5532-4345-9C66-4C00D7FDB8BE}.Release|Publish_Linux.Build.0 = Release|NET_Linux {133FC760-5699-46D9-BEA6-E816B5F01016}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {133FC760-5699-46D9-BEA6-E816B5F01016}.Debug|Any CPU.Build.0 = Debug|Any CPU {133FC760-5699-46D9-BEA6-E816B5F01016}.Debug|NET_Linux.ActiveCfg = Debug|NET_Linux {133FC760-5699-46D9-BEA6-E816B5F01016}.Debug|NET_Linux.Build.0 = Debug|NET_Linux + {133FC760-5699-46D9-BEA6-E816B5F01016}.Debug|Publish_Linux.ActiveCfg = Debug|NET_Linux + {133FC760-5699-46D9-BEA6-E816B5F01016}.Debug|Publish_Linux.Build.0 = Debug|NET_Linux {133FC760-5699-46D9-BEA6-E816B5F01016}.Release|Any CPU.ActiveCfg = Release|Any CPU {133FC760-5699-46D9-BEA6-E816B5F01016}.Release|Any CPU.Build.0 = Release|Any CPU {133FC760-5699-46D9-BEA6-E816B5F01016}.Release|NET_Linux.ActiveCfg = Release|NET_Linux {133FC760-5699-46D9-BEA6-E816B5F01016}.Release|NET_Linux.Build.0 = Release|NET_Linux + {133FC760-5699-46D9-BEA6-E816B5F01016}.Release|Publish_Linux.ActiveCfg = Release|NET_Linux + {133FC760-5699-46D9-BEA6-E816B5F01016}.Release|Publish_Linux.Build.0 = Release|NET_Linux {76686ED6-E759-4772-81C2-768740BE13FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {76686ED6-E759-4772-81C2-768740BE13FA}.Debug|Any CPU.Build.0 = Debug|Any CPU {76686ED6-E759-4772-81C2-768740BE13FA}.Debug|NET_Linux.ActiveCfg = Debug|NET_Linux {76686ED6-E759-4772-81C2-768740BE13FA}.Debug|NET_Linux.Build.0 = Debug|NET_Linux + {76686ED6-E759-4772-81C2-768740BE13FA}.Debug|Publish_Linux.ActiveCfg = Debug|NET_Linux + {76686ED6-E759-4772-81C2-768740BE13FA}.Debug|Publish_Linux.Build.0 = Debug|NET_Linux {76686ED6-E759-4772-81C2-768740BE13FA}.Release|Any CPU.ActiveCfg = Release|Any CPU {76686ED6-E759-4772-81C2-768740BE13FA}.Release|Any CPU.Build.0 = Release|Any CPU {76686ED6-E759-4772-81C2-768740BE13FA}.Release|NET_Linux.ActiveCfg = Release|NET_Linux {76686ED6-E759-4772-81C2-768740BE13FA}.Release|NET_Linux.Build.0 = Release|NET_Linux + {76686ED6-E759-4772-81C2-768740BE13FA}.Release|Publish_Linux.ActiveCfg = Release|NET_Linux + {76686ED6-E759-4772-81C2-768740BE13FA}.Release|Publish_Linux.Build.0 = Release|NET_Linux {F1541C2D-80A9-4FE7-8D9E-75A8B9FF3479}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F1541C2D-80A9-4FE7-8D9E-75A8B9FF3479}.Debug|Any CPU.Build.0 = Debug|Any CPU {F1541C2D-80A9-4FE7-8D9E-75A8B9FF3479}.Debug|NET_Linux.ActiveCfg = Debug|NET_Linux {F1541C2D-80A9-4FE7-8D9E-75A8B9FF3479}.Debug|NET_Linux.Build.0 = Debug|NET_Linux + {F1541C2D-80A9-4FE7-8D9E-75A8B9FF3479}.Debug|Publish_Linux.ActiveCfg = Debug|NET_Linux + {F1541C2D-80A9-4FE7-8D9E-75A8B9FF3479}.Debug|Publish_Linux.Build.0 = Debug|NET_Linux {F1541C2D-80A9-4FE7-8D9E-75A8B9FF3479}.Release|Any CPU.ActiveCfg = Release|Any CPU {F1541C2D-80A9-4FE7-8D9E-75A8B9FF3479}.Release|Any CPU.Build.0 = Release|Any CPU {F1541C2D-80A9-4FE7-8D9E-75A8B9FF3479}.Release|NET_Linux.ActiveCfg = Release|NET_Linux {F1541C2D-80A9-4FE7-8D9E-75A8B9FF3479}.Release|NET_Linux.Build.0 = Release|NET_Linux + {F1541C2D-80A9-4FE7-8D9E-75A8B9FF3479}.Release|Publish_Linux.ActiveCfg = Release|NET_Linux + {F1541C2D-80A9-4FE7-8D9E-75A8B9FF3479}.Release|Publish_Linux.Build.0 = Release|NET_Linux {A50C198C-DA6E-4081-BC53-0F44D287F207}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A50C198C-DA6E-4081-BC53-0F44D287F207}.Debug|Any CPU.Build.0 = Debug|Any CPU {A50C198C-DA6E-4081-BC53-0F44D287F207}.Debug|NET_Linux.ActiveCfg = Debug|NET_Linux {A50C198C-DA6E-4081-BC53-0F44D287F207}.Debug|NET_Linux.Build.0 = Debug|NET_Linux + {A50C198C-DA6E-4081-BC53-0F44D287F207}.Debug|Publish_Linux.ActiveCfg = Debug|NET_Linux + {A50C198C-DA6E-4081-BC53-0F44D287F207}.Debug|Publish_Linux.Build.0 = Debug|NET_Linux {A50C198C-DA6E-4081-BC53-0F44D287F207}.Release|Any CPU.ActiveCfg = Release|Any CPU {A50C198C-DA6E-4081-BC53-0F44D287F207}.Release|Any CPU.Build.0 = Release|Any CPU {A50C198C-DA6E-4081-BC53-0F44D287F207}.Release|NET_Linux.ActiveCfg = Release|NET_Linux {A50C198C-DA6E-4081-BC53-0F44D287F207}.Release|NET_Linux.Build.0 = Release|NET_Linux + {A50C198C-DA6E-4081-BC53-0F44D287F207}.Release|Publish_Linux.ActiveCfg = Release|NET_Linux + {A50C198C-DA6E-4081-BC53-0F44D287F207}.Release|Publish_Linux.Build.0 = Release|NET_Linux {E674F1A1-BE83-475A-9CC9-F55CADBEC448}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E674F1A1-BE83-475A-9CC9-F55CADBEC448}.Debug|Any CPU.Build.0 = Debug|Any CPU {E674F1A1-BE83-475A-9CC9-F55CADBEC448}.Debug|NET_Linux.ActiveCfg = Debug|NET_Linux {E674F1A1-BE83-475A-9CC9-F55CADBEC448}.Debug|NET_Linux.Build.0 = Debug|NET_Linux + {E674F1A1-BE83-475A-9CC9-F55CADBEC448}.Debug|Publish_Linux.ActiveCfg = Debug|NET_Linux + {E674F1A1-BE83-475A-9CC9-F55CADBEC448}.Debug|Publish_Linux.Build.0 = Debug|NET_Linux {E674F1A1-BE83-475A-9CC9-F55CADBEC448}.Release|Any CPU.ActiveCfg = Release|Any CPU {E674F1A1-BE83-475A-9CC9-F55CADBEC448}.Release|Any CPU.Build.0 = Release|Any CPU {E674F1A1-BE83-475A-9CC9-F55CADBEC448}.Release|NET_Linux.ActiveCfg = Release|NET_Linux {E674F1A1-BE83-475A-9CC9-F55CADBEC448}.Release|NET_Linux.Build.0 = Release|NET_Linux + {E674F1A1-BE83-475A-9CC9-F55CADBEC448}.Release|Publish_Linux.ActiveCfg = Release|NET_Linux + {E674F1A1-BE83-475A-9CC9-F55CADBEC448}.Release|Publish_Linux.Build.0 = Release|NET_Linux {8872CA17-C10D-43B9-8393-5C5A57065EB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8872CA17-C10D-43B9-8393-5C5A57065EB0}.Debug|Any CPU.Build.0 = Debug|Any CPU {8872CA17-C10D-43B9-8393-5C5A57065EB0}.Debug|NET_Linux.ActiveCfg = Debug|NET_Linux {8872CA17-C10D-43B9-8393-5C5A57065EB0}.Debug|NET_Linux.Build.0 = Debug|NET_Linux + {8872CA17-C10D-43B9-8393-5C5A57065EB0}.Debug|Publish_Linux.ActiveCfg = Debug|NET_Linux + {8872CA17-C10D-43B9-8393-5C5A57065EB0}.Debug|Publish_Linux.Build.0 = Debug|NET_Linux {8872CA17-C10D-43B9-8393-5C5A57065EB0}.Release|Any CPU.ActiveCfg = Release|Any CPU {8872CA17-C10D-43B9-8393-5C5A57065EB0}.Release|Any CPU.Build.0 = Release|Any CPU {8872CA17-C10D-43B9-8393-5C5A57065EB0}.Release|NET_Linux.ActiveCfg = Release|NET_Linux {8872CA17-C10D-43B9-8393-5C5A57065EB0}.Release|NET_Linux.Build.0 = Release|NET_Linux + {8872CA17-C10D-43B9-8393-5C5A57065EB0}.Release|Publish_Linux.ActiveCfg = Release|NET_Linux + {8872CA17-C10D-43B9-8393-5C5A57065EB0}.Release|Publish_Linux.Build.0 = Release|NET_Linux {D6279651-D099-4F8D-A319-5BF12ED9F269}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D6279651-D099-4F8D-A319-5BF12ED9F269}.Debug|Any CPU.Build.0 = Debug|Any CPU {D6279651-D099-4F8D-A319-5BF12ED9F269}.Debug|NET_Linux.ActiveCfg = Debug|NET_Linux {D6279651-D099-4F8D-A319-5BF12ED9F269}.Debug|NET_Linux.Build.0 = Debug|NET_Linux + {D6279651-D099-4F8D-A319-5BF12ED9F269}.Debug|Publish_Linux.ActiveCfg = Debug|NET_Linux + {D6279651-D099-4F8D-A319-5BF12ED9F269}.Debug|Publish_Linux.Build.0 = Debug|NET_Linux {D6279651-D099-4F8D-A319-5BF12ED9F269}.Release|Any CPU.ActiveCfg = Release|Any CPU {D6279651-D099-4F8D-A319-5BF12ED9F269}.Release|Any CPU.Build.0 = Release|Any CPU {D6279651-D099-4F8D-A319-5BF12ED9F269}.Release|NET_Linux.ActiveCfg = Release|NET_Linux {D6279651-D099-4F8D-A319-5BF12ED9F269}.Release|NET_Linux.Build.0 = Release|NET_Linux + {D6279651-D099-4F8D-A319-5BF12ED9F269}.Release|Publish_Linux.ActiveCfg = Release|NET_Linux + {D6279651-D099-4F8D-A319-5BF12ED9F269}.Release|Publish_Linux.Build.0 = Release|NET_Linux {31183026-DE70-49CB-BC7C-0DFD0A088F62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {31183026-DE70-49CB-BC7C-0DFD0A088F62}.Debug|Any CPU.Build.0 = Debug|Any CPU {31183026-DE70-49CB-BC7C-0DFD0A088F62}.Debug|NET_Linux.ActiveCfg = Debug|NET_Linux {31183026-DE70-49CB-BC7C-0DFD0A088F62}.Debug|NET_Linux.Build.0 = Debug|NET_Linux + {31183026-DE70-49CB-BC7C-0DFD0A088F62}.Debug|Publish_Linux.ActiveCfg = Debug|NET_Linux + {31183026-DE70-49CB-BC7C-0DFD0A088F62}.Debug|Publish_Linux.Build.0 = Debug|NET_Linux {31183026-DE70-49CB-BC7C-0DFD0A088F62}.Release|Any CPU.ActiveCfg = Release|Any CPU {31183026-DE70-49CB-BC7C-0DFD0A088F62}.Release|Any CPU.Build.0 = Release|Any CPU {31183026-DE70-49CB-BC7C-0DFD0A088F62}.Release|NET_Linux.ActiveCfg = Release|NET_Linux {31183026-DE70-49CB-BC7C-0DFD0A088F62}.Release|NET_Linux.Build.0 = Release|NET_Linux + {31183026-DE70-49CB-BC7C-0DFD0A088F62}.Release|Publish_Linux.ActiveCfg = Release|NET_Linux + {31183026-DE70-49CB-BC7C-0DFD0A088F62}.Release|Publish_Linux.Build.0 = Release|NET_Linux {06B9E5B0-7C50-4351-9D88-E159DC25755F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {06B9E5B0-7C50-4351-9D88-E159DC25755F}.Debug|Any CPU.Build.0 = Debug|Any CPU {06B9E5B0-7C50-4351-9D88-E159DC25755F}.Debug|NET_Linux.ActiveCfg = Debug|NET_Linux {06B9E5B0-7C50-4351-9D88-E159DC25755F}.Debug|NET_Linux.Build.0 = Debug|NET_Linux + {06B9E5B0-7C50-4351-9D88-E159DC25755F}.Debug|Publish_Linux.ActiveCfg = Debug|NET_Linux + {06B9E5B0-7C50-4351-9D88-E159DC25755F}.Debug|Publish_Linux.Build.0 = Debug|NET_Linux {06B9E5B0-7C50-4351-9D88-E159DC25755F}.Release|Any CPU.ActiveCfg = Release|Any CPU {06B9E5B0-7C50-4351-9D88-E159DC25755F}.Release|Any CPU.Build.0 = Release|Any CPU {06B9E5B0-7C50-4351-9D88-E159DC25755F}.Release|NET_Linux.ActiveCfg = Release|NET_Linux {06B9E5B0-7C50-4351-9D88-E159DC25755F}.Release|NET_Linux.Build.0 = Release|NET_Linux + {06B9E5B0-7C50-4351-9D88-E159DC25755F}.Release|Publish_Linux.ActiveCfg = Release|NET_Linux + {06B9E5B0-7C50-4351-9D88-E159DC25755F}.Release|Publish_Linux.Build.0 = Release|NET_Linux {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|NET_Linux.ActiveCfg = Debug|NET_Linux {6CD0F0CF-8199-49F9-B0EA-0B9598B44419}.Debug|NET_Linux.Build.0 = Debug|NET_Linux + {6CD0F0CF-8199-49F9-B0EA-0B9598B44419}.Debug|Publish_Linux.ActiveCfg = Debug|NET_Linux {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|NET_Linux.ActiveCfg = Release|NET_Linux {6CD0F0CF-8199-49F9-B0EA-0B9598B44419}.Release|NET_Linux.Build.0 = Release|NET_Linux + {6CD0F0CF-8199-49F9-B0EA-0B9598B44419}.Release|Publish_Linux.ActiveCfg = Release|NET_Linux {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|NET_Linux.ActiveCfg = Debug|NET_Linux {472084ED-1067-4B2C-8737-3839A6143EB2}.Debug|NET_Linux.Build.0 = Debug|NET_Linux + {472084ED-1067-4B2C-8737-3839A6143EB2}.Debug|Publish_Linux.ActiveCfg = Debug|NET_Linux {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|NET_Linux.ActiveCfg = Release|NET_Linux {472084ED-1067-4B2C-8737-3839A6143EB2}.Release|NET_Linux.Build.0 = Release|NET_Linux + {472084ED-1067-4B2C-8737-3839A6143EB2}.Release|Publish_Linux.ActiveCfg = Release|NET_Linux {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|NET_Linux.ActiveCfg = Debug|NET_Linux {C70FE632-5500-4C57-B3D6-9B5574137551}.Debug|NET_Linux.Build.0 = Debug|NET_Linux + {C70FE632-5500-4C57-B3D6-9B5574137551}.Debug|Publish_Linux.ActiveCfg = Debug|NET_Linux {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|NET_Linux.ActiveCfg = Release|NET_Linux {C70FE632-5500-4C57-B3D6-9B5574137551}.Release|NET_Linux.Build.0 = Release|NET_Linux + {C70FE632-5500-4C57-B3D6-9B5574137551}.Release|Publish_Linux.ActiveCfg = Release|NET_Linux {2235F7CA-AB25-4177-92BC-4B574D2D5DF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2235F7CA-AB25-4177-92BC-4B574D2D5DF6}.Debug|Any CPU.Build.0 = Debug|Any CPU {2235F7CA-AB25-4177-92BC-4B574D2D5DF6}.Debug|NET_Linux.ActiveCfg = Debug|NET_Linux {2235F7CA-AB25-4177-92BC-4B574D2D5DF6}.Debug|NET_Linux.Build.0 = Debug|NET_Linux + {2235F7CA-AB25-4177-92BC-4B574D2D5DF6}.Debug|Publish_Linux.ActiveCfg = Debug|NET_Linux {2235F7CA-AB25-4177-92BC-4B574D2D5DF6}.Release|Any CPU.ActiveCfg = Release|Any CPU {2235F7CA-AB25-4177-92BC-4B574D2D5DF6}.Release|Any CPU.Build.0 = Release|Any CPU {2235F7CA-AB25-4177-92BC-4B574D2D5DF6}.Release|NET_Linux.ActiveCfg = Release|NET_Linux {2235F7CA-AB25-4177-92BC-4B574D2D5DF6}.Release|NET_Linux.Build.0 = Release|NET_Linux + {2235F7CA-AB25-4177-92BC-4B574D2D5DF6}.Release|Publish_Linux.ActiveCfg = Release|NET_Linux {6E1177DB-5E4F-4E2E-82E7-902437E56AED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {6E1177DB-5E4F-4E2E-82E7-902437E56AED}.Debug|Any CPU.Build.0 = Debug|Any CPU {6E1177DB-5E4F-4E2E-82E7-902437E56AED}.Debug|NET_Linux.ActiveCfg = Debug|NET_Linux {6E1177DB-5E4F-4E2E-82E7-902437E56AED}.Debug|NET_Linux.Build.0 = Debug|NET_Linux + {6E1177DB-5E4F-4E2E-82E7-902437E56AED}.Debug|Publish_Linux.ActiveCfg = Debug|NET_Linux {6E1177DB-5E4F-4E2E-82E7-902437E56AED}.Release|Any CPU.ActiveCfg = Release|Any CPU {6E1177DB-5E4F-4E2E-82E7-902437E56AED}.Release|Any CPU.Build.0 = Release|Any CPU {6E1177DB-5E4F-4E2E-82E7-902437E56AED}.Release|NET_Linux.ActiveCfg = Release|NET_Linux {6E1177DB-5E4F-4E2E-82E7-902437E56AED}.Release|NET_Linux.Build.0 = Release|NET_Linux + {6E1177DB-5E4F-4E2E-82E7-902437E56AED}.Release|Publish_Linux.ActiveCfg = Release|NET_Linux {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|NET_Linux.ActiveCfg = Debug|NET_Linux {672BF8EC-1116-49F6-B253-DFCE5CF7D4C9}.Debug|NET_Linux.Build.0 = Debug|NET_Linux + {672BF8EC-1116-49F6-B253-DFCE5CF7D4C9}.Debug|Publish_Linux.ActiveCfg = Debug|NET_Linux {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|NET_Linux.ActiveCfg = Release|NET_Linux {672BF8EC-1116-49F6-B253-DFCE5CF7D4C9}.Release|NET_Linux.Build.0 = Release|NET_Linux + {672BF8EC-1116-49F6-B253-DFCE5CF7D4C9}.Release|Publish_Linux.ActiveCfg = Release|NET_Linux {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|NET_Linux.ActiveCfg = Debug|NET_Linux {4A707244-154B-428F-B589-D65361F24401}.Debug|NET_Linux.Build.0 = Debug|NET_Linux + {4A707244-154B-428F-B589-D65361F24401}.Debug|Publish_Linux.ActiveCfg = Debug|NET_Linux {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|NET_Linux.ActiveCfg = Release|NET_Linux {4A707244-154B-428F-B589-D65361F24401}.Release|NET_Linux.Build.0 = Release|NET_Linux + {4A707244-154B-428F-B589-D65361F24401}.Release|Publish_Linux.ActiveCfg = Release|NET_Linux {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|NET_Linux.ActiveCfg = Debug|NET_Linux {AB735028-22B0-4083-9CC5-805C582818EA}.Debug|NET_Linux.Build.0 = Debug|NET_Linux + {AB735028-22B0-4083-9CC5-805C582818EA}.Debug|Publish_Linux.ActiveCfg = Debug|NET_Linux {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|NET_Linux.ActiveCfg = Release|NET_Linux {AB735028-22B0-4083-9CC5-805C582818EA}.Release|NET_Linux.Build.0 = Release|NET_Linux + {AB735028-22B0-4083-9CC5-805C582818EA}.Release|Publish_Linux.ActiveCfg = Release|NET_Linux {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|NET_Linux.ActiveCfg = Debug|NET_Linux {F8D2E3E5-4505-4463-9367-2EB2629D7DCD}.Debug|NET_Linux.Build.0 = Debug|NET_Linux + {F8D2E3E5-4505-4463-9367-2EB2629D7DCD}.Debug|Publish_Linux.ActiveCfg = Debug|NET_Linux {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|NET_Linux.ActiveCfg = Release|NET_Linux {F8D2E3E5-4505-4463-9367-2EB2629D7DCD}.Release|NET_Linux.Build.0 = Release|NET_Linux + {F8D2E3E5-4505-4463-9367-2EB2629D7DCD}.Release|Publish_Linux.ActiveCfg = Release|NET_Linux {61169E56-DED9-464F-B800-AE31AEC1F750}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {61169E56-DED9-464F-B800-AE31AEC1F750}.Debug|Any CPU.Build.0 = Debug|Any CPU {61169E56-DED9-464F-B800-AE31AEC1F750}.Debug|NET_Linux.ActiveCfg = Debug|NET_Linux {61169E56-DED9-464F-B800-AE31AEC1F750}.Debug|NET_Linux.Build.0 = Debug|NET_Linux + {61169E56-DED9-464F-B800-AE31AEC1F750}.Debug|Publish_Linux.ActiveCfg = Debug|NET_Linux + {61169E56-DED9-464F-B800-AE31AEC1F750}.Debug|Publish_Linux.Build.0 = Debug|NET_Linux {61169E56-DED9-464F-B800-AE31AEC1F750}.Release|Any CPU.ActiveCfg = Release|Any CPU {61169E56-DED9-464F-B800-AE31AEC1F750}.Release|Any CPU.Build.0 = Release|Any CPU {61169E56-DED9-464F-B800-AE31AEC1F750}.Release|NET_Linux.ActiveCfg = Release|NET_Linux {61169E56-DED9-464F-B800-AE31AEC1F750}.Release|NET_Linux.Build.0 = Release|NET_Linux + {61169E56-DED9-464F-B800-AE31AEC1F750}.Release|Publish_Linux.ActiveCfg = Release|NET_Linux + {61169E56-DED9-464F-B800-AE31AEC1F750}.Release|Publish_Linux.Build.0 = Release|NET_Linux {6CC1E399-B5A5-4FA2-A98C-5D8B2BA280A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {6CC1E399-B5A5-4FA2-A98C-5D8B2BA280A1}.Debug|Any CPU.Build.0 = Debug|Any CPU {6CC1E399-B5A5-4FA2-A98C-5D8B2BA280A1}.Debug|NET_Linux.ActiveCfg = Debug|NET_Linux {6CC1E399-B5A5-4FA2-A98C-5D8B2BA280A1}.Debug|NET_Linux.Build.0 = Debug|NET_Linux + {6CC1E399-B5A5-4FA2-A98C-5D8B2BA280A1}.Debug|Publish_Linux.ActiveCfg = Debug|NET_Linux + {6CC1E399-B5A5-4FA2-A98C-5D8B2BA280A1}.Debug|Publish_Linux.Build.0 = Debug|NET_Linux {6CC1E399-B5A5-4FA2-A98C-5D8B2BA280A1}.Release|Any CPU.ActiveCfg = Release|Any CPU {6CC1E399-B5A5-4FA2-A98C-5D8B2BA280A1}.Release|Any CPU.Build.0 = Release|Any CPU {6CC1E399-B5A5-4FA2-A98C-5D8B2BA280A1}.Release|NET_Linux.ActiveCfg = Release|NET_Linux {6CC1E399-B5A5-4FA2-A98C-5D8B2BA280A1}.Release|NET_Linux.Build.0 = Release|NET_Linux + {6CC1E399-B5A5-4FA2-A98C-5D8B2BA280A1}.Release|Publish_Linux.ActiveCfg = Release|NET_Linux + {6CC1E399-B5A5-4FA2-A98C-5D8B2BA280A1}.Release|Publish_Linux.Build.0 = Release|NET_Linux {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|NET_Linux.ActiveCfg = Debug|NET_Linux + {9B4FDC96-E2F9-4B8F-894A-4294405D50E7}.Debug|Publish_Linux.ActiveCfg = Debug|NET_Linux {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|NET_Linux.ActiveCfg = Release|NET_Linux + {9B4FDC96-E2F9-4B8F-894A-4294405D50E7}.Release|Publish_Linux.ActiveCfg = Release|NET_Linux EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/DynamoCore/Configuration/PreferenceSettings.cs b/src/DynamoCore/Configuration/PreferenceSettings.cs index 833f7bc9669..6b42daeecaf 100644 --- a/src/DynamoCore/Configuration/PreferenceSettings.cs +++ b/src/DynamoCore/Configuration/PreferenceSettings.cs @@ -1061,9 +1061,10 @@ public static PreferenceSettings Load(string filePath) { if (namespaces[index] == "ProtoGeometry.dll:Autodesk.DesignScript.Geometry.Panel") { - namespaces[index] = $"ProtoGeometry.dll:{typeof(Autodesk.DesignScript.Geometry.PanelSurface).FullName}"; + namespaces[index] = "ProtoGeometry.dll:Autodesk.DesignScript.Geometry.PanelSurface"; } } + fs.Close(); // Release file lock } } @@ -1188,7 +1189,7 @@ internal void InitializeNamespacesToExcludeFromLibrary() NamespacesToExcludeFromLibrary = new List() { "ProtoGeometry.dll:Autodesk.DesignScript.Geometry.TSpline", - $"ProtoGeometry.dll:{typeof(Autodesk.DesignScript.Geometry.PanelSurface).FullName}" + "ProtoGeometry.dll:Autodesk.DesignScript.Geometry.PanelSurface" }; NamespacesToExcludeFromLibrarySpecified = true; } diff --git a/src/DynamoCore/DynamoCore.csproj b/src/DynamoCore/DynamoCore.csproj index 7b231d8eb5a..192bd70230a 100644 --- a/src/DynamoCore/DynamoCore.csproj +++ b/src/DynamoCore/DynamoCore.csproj @@ -170,7 +170,7 @@ - + diff --git a/src/DynamoCoreWpf/ViewModels/Menu/PreferencesViewModel.cs b/src/DynamoCoreWpf/ViewModels/Menu/PreferencesViewModel.cs index e0be7d8a335..406cfcf7fbe 100644 --- a/src/DynamoCoreWpf/ViewModels/Menu/PreferencesViewModel.cs +++ b/src/DynamoCoreWpf/ViewModels/Menu/PreferencesViewModel.cs @@ -1271,11 +1271,11 @@ public bool EnablePanelingIsChecked get { return !preferenceSettings.NamespacesToExcludeFromLibrary.Contains( - $"ProtoGeometry.dll:{typeof(Autodesk.DesignScript.Geometry.PanelSurface).FullName}"); + "ProtoGeometry.dll:Autodesk.DesignScript.Geometry.PanelSurface"); } set { - HideUnhideNamespace(!value, "ProtoGeometry.dll", typeof(Autodesk.DesignScript.Geometry.PanelSurface).FullName); + HideUnhideNamespace(!value, "ProtoGeometry.dll", "Autodesk.DesignScript.Geometry.PanelSurface"); RaisePropertyChanged(nameof(EnablePanelingIsChecked)); } } diff --git a/src/Libraries/Analysis/Analysis.csproj b/src/Libraries/Analysis/Analysis.csproj index 24d8d170507..61444b3b3b6 100644 --- a/src/Libraries/Analysis/Analysis.csproj +++ b/src/Libraries/Analysis/Analysis.csproj @@ -60,7 +60,7 @@ - + diff --git a/src/Libraries/CoreNodeModels/CoreNodeModels.csproj b/src/Libraries/CoreNodeModels/CoreNodeModels.csproj index a77619d159c..094128b7845 100644 --- a/src/Libraries/CoreNodeModels/CoreNodeModels.csproj +++ b/src/Libraries/CoreNodeModels/CoreNodeModels.csproj @@ -83,7 +83,7 @@ Resources.en-US.Designer.cs - + diff --git a/src/Libraries/CoreNodes/CoreNodes.csproj b/src/Libraries/CoreNodes/CoreNodes.csproj index 0bcc8a4f753..e8c162ada3d 100644 --- a/src/Libraries/CoreNodes/CoreNodes.csproj +++ b/src/Libraries/CoreNodes/CoreNodes.csproj @@ -77,7 +77,7 @@ - + diff --git a/src/Libraries/DSOffice/DSOffice.csproj b/src/Libraries/DSOffice/DSOffice.csproj index 3041e7addb3..c8f73ced6e8 100644 --- a/src/Libraries/DSOffice/DSOffice.csproj +++ b/src/Libraries/DSOffice/DSOffice.csproj @@ -67,7 +67,7 @@ Resources.Designer.cs - + diff --git a/src/Libraries/DesignScriptBuiltin/DesignScriptBuiltin.csproj b/src/Libraries/DesignScriptBuiltin/DesignScriptBuiltin.csproj index 4b0391f81a3..2a62225fda2 100644 --- a/src/Libraries/DesignScriptBuiltin/DesignScriptBuiltin.csproj +++ b/src/Libraries/DesignScriptBuiltin/DesignScriptBuiltin.csproj @@ -47,7 +47,7 @@ Resources.en-US.Designer.cs - + diff --git a/src/Libraries/DynamoUnits/UnitsCore.csproj b/src/Libraries/DynamoUnits/UnitsCore.csproj index e4f3201ac0a..8381db852de 100644 --- a/src/Libraries/DynamoUnits/UnitsCore.csproj +++ b/src/Libraries/DynamoUnits/UnitsCore.csproj @@ -42,7 +42,7 @@ - + diff --git a/src/Libraries/GeometryColor/GeometryColor.csproj b/src/Libraries/GeometryColor/GeometryColor.csproj index 2f167d91e90..8b7bc1485e1 100644 --- a/src/Libraries/GeometryColor/GeometryColor.csproj +++ b/src/Libraries/GeometryColor/GeometryColor.csproj @@ -67,7 +67,7 @@ Resources.en-US.Designer.cs - + diff --git a/src/Libraries/GeometryUI/GeometryUI.csproj b/src/Libraries/GeometryUI/GeometryUI.csproj index 4a5f692ed78..17596e514aa 100644 --- a/src/Libraries/GeometryUI/GeometryUI.csproj +++ b/src/Libraries/GeometryUI/GeometryUI.csproj @@ -70,7 +70,7 @@ Resources.en-US.Designer.cs - + diff --git a/src/Libraries/PythonNodeModels/PythonNodeModels.csproj b/src/Libraries/PythonNodeModels/PythonNodeModels.csproj index 1f72f16b716..46afc45922c 100644 --- a/src/Libraries/PythonNodeModels/PythonNodeModels.csproj +++ b/src/Libraries/PythonNodeModels/PythonNodeModels.csproj @@ -61,7 +61,7 @@ Resources.en-US.Designer.cs - + diff --git a/src/Libraries/Tesellation/Tessellation.csproj b/src/Libraries/Tesellation/Tessellation.csproj index 87d32105842..e7790b7e1a9 100644 --- a/src/Libraries/Tesellation/Tessellation.csproj +++ b/src/Libraries/Tesellation/Tessellation.csproj @@ -56,7 +56,7 @@ - + diff --git a/src/Libraries/UnitsNodeModels/UnitsNodeModels.csproj b/src/Libraries/UnitsNodeModels/UnitsNodeModels.csproj index 91b9a6112f2..c01fbf3e1a0 100644 --- a/src/Libraries/UnitsNodeModels/UnitsNodeModels.csproj +++ b/src/Libraries/UnitsNodeModels/UnitsNodeModels.csproj @@ -42,7 +42,7 @@ Resources.Designer.cs - + diff --git a/src/Libraries/Watch3DNodeModels/Watch3DNodeModels.csproj b/src/Libraries/Watch3DNodeModels/Watch3DNodeModels.csproj index b41c9df41c8..3f6dcd2b835 100644 --- a/src/Libraries/Watch3DNodeModels/Watch3DNodeModels.csproj +++ b/src/Libraries/Watch3DNodeModels/Watch3DNodeModels.csproj @@ -64,7 +64,7 @@ Resources.en-US.Designer.cs - + From 185add4048bb5a1a68a6b6660d922b5b4e234664 Mon Sep 17 00:00:00 2001 From: pinzart90 Date: Sat, 29 Jun 2024 23:47:29 -0400 Subject: [PATCH 7/8] update --- src/DynamoCore/DynamoCore.csproj | 2 +- src/Libraries/Analysis/Analysis.csproj | 2 +- src/Libraries/CoreNodeModels/CoreNodeModels.csproj | 2 +- src/Libraries/CoreNodes/CoreNodes.csproj | 2 +- src/Libraries/DSOffice/DSOffice.csproj | 2 +- src/Libraries/DesignScriptBuiltin/DesignScriptBuiltin.csproj | 4 ++-- src/Libraries/DynamoUnits/UnitsCore.csproj | 4 ++-- src/Libraries/GeometryColor/GeometryColor.csproj | 2 +- src/Libraries/GeometryUI/GeometryUI.csproj | 2 +- src/Libraries/PythonNodeModels/PythonNodeModels.csproj | 4 ++-- src/Libraries/Tesellation/Tessellation.csproj | 2 +- src/Libraries/UnitsNodeModels/UnitsNodeModels.csproj | 2 +- src/Libraries/Watch3DNodeModels/Watch3DNodeModels.csproj | 4 ++-- 13 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/DynamoCore/DynamoCore.csproj b/src/DynamoCore/DynamoCore.csproj index 192bd70230a..305c7db289e 100644 --- a/src/DynamoCore/DynamoCore.csproj +++ b/src/DynamoCore/DynamoCore.csproj @@ -170,7 +170,7 @@ - + diff --git a/src/Libraries/Analysis/Analysis.csproj b/src/Libraries/Analysis/Analysis.csproj index 61444b3b3b6..1554e176999 100644 --- a/src/Libraries/Analysis/Analysis.csproj +++ b/src/Libraries/Analysis/Analysis.csproj @@ -60,7 +60,7 @@ - + diff --git a/src/Libraries/CoreNodeModels/CoreNodeModels.csproj b/src/Libraries/CoreNodeModels/CoreNodeModels.csproj index 094128b7845..3d23dbe3b1a 100644 --- a/src/Libraries/CoreNodeModels/CoreNodeModels.csproj +++ b/src/Libraries/CoreNodeModels/CoreNodeModels.csproj @@ -83,7 +83,7 @@ Resources.en-US.Designer.cs - + diff --git a/src/Libraries/CoreNodes/CoreNodes.csproj b/src/Libraries/CoreNodes/CoreNodes.csproj index e8c162ada3d..4d18049ef85 100644 --- a/src/Libraries/CoreNodes/CoreNodes.csproj +++ b/src/Libraries/CoreNodes/CoreNodes.csproj @@ -77,7 +77,7 @@ - + diff --git a/src/Libraries/DSOffice/DSOffice.csproj b/src/Libraries/DSOffice/DSOffice.csproj index c8f73ced6e8..e0f6b02cceb 100644 --- a/src/Libraries/DSOffice/DSOffice.csproj +++ b/src/Libraries/DSOffice/DSOffice.csproj @@ -67,7 +67,7 @@ Resources.Designer.cs - + diff --git a/src/Libraries/DesignScriptBuiltin/DesignScriptBuiltin.csproj b/src/Libraries/DesignScriptBuiltin/DesignScriptBuiltin.csproj index 2a62225fda2..919255b53d0 100644 --- a/src/Libraries/DesignScriptBuiltin/DesignScriptBuiltin.csproj +++ b/src/Libraries/DesignScriptBuiltin/DesignScriptBuiltin.csproj @@ -47,9 +47,9 @@ Resources.en-US.Designer.cs - + - \ No newline at end of file + diff --git a/src/Libraries/DynamoUnits/UnitsCore.csproj b/src/Libraries/DynamoUnits/UnitsCore.csproj index 8381db852de..d6bb215a00d 100644 --- a/src/Libraries/DynamoUnits/UnitsCore.csproj +++ b/src/Libraries/DynamoUnits/UnitsCore.csproj @@ -42,7 +42,7 @@ - + @@ -51,4 +51,4 @@ - \ No newline at end of file + diff --git a/src/Libraries/GeometryColor/GeometryColor.csproj b/src/Libraries/GeometryColor/GeometryColor.csproj index 8b7bc1485e1..1e64a145a0c 100644 --- a/src/Libraries/GeometryColor/GeometryColor.csproj +++ b/src/Libraries/GeometryColor/GeometryColor.csproj @@ -67,7 +67,7 @@ Resources.en-US.Designer.cs - + diff --git a/src/Libraries/GeometryUI/GeometryUI.csproj b/src/Libraries/GeometryUI/GeometryUI.csproj index 17596e514aa..213dbed5531 100644 --- a/src/Libraries/GeometryUI/GeometryUI.csproj +++ b/src/Libraries/GeometryUI/GeometryUI.csproj @@ -70,7 +70,7 @@ Resources.en-US.Designer.cs - + diff --git a/src/Libraries/PythonNodeModels/PythonNodeModels.csproj b/src/Libraries/PythonNodeModels/PythonNodeModels.csproj index 46afc45922c..6b991b571be 100644 --- a/src/Libraries/PythonNodeModels/PythonNodeModels.csproj +++ b/src/Libraries/PythonNodeModels/PythonNodeModels.csproj @@ -61,9 +61,9 @@ Resources.en-US.Designer.cs - + - \ No newline at end of file + diff --git a/src/Libraries/Tesellation/Tessellation.csproj b/src/Libraries/Tesellation/Tessellation.csproj index e7790b7e1a9..8426d457578 100644 --- a/src/Libraries/Tesellation/Tessellation.csproj +++ b/src/Libraries/Tesellation/Tessellation.csproj @@ -56,7 +56,7 @@ - + diff --git a/src/Libraries/UnitsNodeModels/UnitsNodeModels.csproj b/src/Libraries/UnitsNodeModels/UnitsNodeModels.csproj index c01fbf3e1a0..66b2b553f5e 100644 --- a/src/Libraries/UnitsNodeModels/UnitsNodeModels.csproj +++ b/src/Libraries/UnitsNodeModels/UnitsNodeModels.csproj @@ -42,7 +42,7 @@ Resources.Designer.cs - + diff --git a/src/Libraries/Watch3DNodeModels/Watch3DNodeModels.csproj b/src/Libraries/Watch3DNodeModels/Watch3DNodeModels.csproj index 3f6dcd2b835..1f1860873a8 100644 --- a/src/Libraries/Watch3DNodeModels/Watch3DNodeModels.csproj +++ b/src/Libraries/Watch3DNodeModels/Watch3DNodeModels.csproj @@ -64,9 +64,9 @@ Resources.en-US.Designer.cs - + - \ No newline at end of file + From 1906c5f8986485fc76d96d6cf671a2103a809aad Mon Sep 17 00:00:00 2001 From: pinzart90 Date: Sun, 30 Jun 2024 02:22:11 -0400 Subject: [PATCH 8/8] revert this --- src/DynamoApplications/StartupUtils.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/DynamoApplications/StartupUtils.cs b/src/DynamoApplications/StartupUtils.cs index 9ff854be373..78e663ffbfc 100644 --- a/src/DynamoApplications/StartupUtils.cs +++ b/src/DynamoApplications/StartupUtils.cs @@ -335,7 +335,8 @@ private static DynamoModel StartDynamoWithDefaultConfig(bool CLImode, IsServiceMode = isServiceMode, Preferences = PreferenceSettings.Instance, NoNetworkMode = noNetworkMode, - IsHeadless = CLImode + //Breaks all Lucene calls. TI enable this would require a lot of refactoring around Lucene usage in Dynamo. + //IsHeadless = CLImode }; var model = DynamoModel.Start(config); return model;