From 63745bf44fb6974c378fed6ad1af9ea1bddb729a Mon Sep 17 00:00:00 2001 From: pinzart Date: Fri, 16 Jun 2023 00:32:53 -0400 Subject: [PATCH 1/6] disable net traffic example --- src/DynamoApplications/StartupUtils.cs | 2 +- src/DynamoCore/Models/DynamoModel.cs | 2 +- src/DynamoPackagesWPF/PackageManagerViewExtension.cs | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/DynamoApplications/StartupUtils.cs b/src/DynamoApplications/StartupUtils.cs index 2e33dd86daa..088f4c4bbab 100644 --- a/src/DynamoApplications/StartupUtils.cs +++ b/src/DynamoApplications/StartupUtils.cs @@ -377,7 +377,7 @@ private static DynamoModel StartDynamoWithDefaultConfig(bool CLImode, HostAnalyticsInfo = info, CLIMode = CLImode }; - config.AuthProvider = CLImode ? null : new Core.IDSDKManager(); + config.AuthProvider = null; config.UpdateManager = CLImode ? null : InitializeUpdateManager(); config.StartInTestMode = CLImode; config.PathResolver = CLImode ? new CLIPathResolver(preloaderLocation, userDataFolder, commonDataFolder) as IPathResolver : new SandboxPathResolver(preloaderLocation) as IPathResolver; diff --git a/src/DynamoCore/Models/DynamoModel.cs b/src/DynamoCore/Models/DynamoModel.cs index 4916fa7082a..234c3215f2d 100644 --- a/src/DynamoCore/Models/DynamoModel.cs +++ b/src/DynamoCore/Models/DynamoModel.cs @@ -909,7 +909,7 @@ protected DynamoModel(IStartConfiguration config) UpdateManager.Log += UpdateManager_Log; if (!IsTestMode && !IsHeadless) { - DefaultUpdateManager.CheckForProductUpdate(UpdateManager); + //DefaultUpdateManager.CheckForProductUpdate(UpdateManager); } Logger.Log(string.Format("Dynamo -- Build {0}", diff --git a/src/DynamoPackagesWPF/PackageManagerViewExtension.cs b/src/DynamoPackagesWPF/PackageManagerViewExtension.cs index 212adb6a1bf..1550be4f8bc 100644 --- a/src/DynamoPackagesWPF/PackageManagerViewExtension.cs +++ b/src/DynamoPackagesWPF/PackageManagerViewExtension.cs @@ -142,10 +142,10 @@ private void RaisePackageHostNotifications(IEnumerable packages) { //check that the package does not target another host, if it does raise a warning. var pkgVersion = new PackageVersion() { host_dependencies = pkg.HostDependencies }; - var containsPackagesThatTargetOtherHosts = packageManager.CheckIfPackagesTargetOtherHosts(new List() { pkgVersion }); + //var containsPackagesThatTargetOtherHosts = packageManager.CheckIfPackagesTargetOtherHosts(new List() { pkgVersion }); // if any do, notify user of the potential conflict with notification. - if (containsPackagesThatTargetOtherHosts) + if (false) { notificationLogged?.Invoke( new NotificationMessage(Name, From eeee08d4b967e0a40552f99cbc9ae6b96cf13f47 Mon Sep 17 00:00:00 2001 From: pinzart Date: Fri, 16 Jun 2023 09:52:42 -0400 Subject: [PATCH 2/6] Update PackageManagerViewExtension.cs --- src/DynamoPackagesWPF/PackageManagerViewExtension.cs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/DynamoPackagesWPF/PackageManagerViewExtension.cs b/src/DynamoPackagesWPF/PackageManagerViewExtension.cs index 1550be4f8bc..c587dd159ed 100644 --- a/src/DynamoPackagesWPF/PackageManagerViewExtension.cs +++ b/src/DynamoPackagesWPF/PackageManagerViewExtension.cs @@ -85,12 +85,15 @@ public void Dispose() public void Loaded(ViewLoadedParams viewLoadedParams) { RequestLoadLayoutSpecs(packageManager.PackageLoader.LocalPackages); + /* + // ALIAS does needs a total network traffic blackout. + // Since there is no way to switch this on/off, we will just skip it for now. var packagesToCheck = packageManager?.PackageLoader.LocalPackages; - if(packagesToCheck != null) + if (packagesToCheck != null) { RaisePackageHostNotifications(packagesToCheck); } - + */ } public void Shutdown() @@ -142,10 +145,10 @@ private void RaisePackageHostNotifications(IEnumerable packages) { //check that the package does not target another host, if it does raise a warning. var pkgVersion = new PackageVersion() { host_dependencies = pkg.HostDependencies }; - //var containsPackagesThatTargetOtherHosts = packageManager.CheckIfPackagesTargetOtherHosts(new List() { pkgVersion }); + var containsPackagesThatTargetOtherHosts = packageManager.CheckIfPackagesTargetOtherHosts(new List() { pkgVersion }); // if any do, notify user of the potential conflict with notification. - if (false) + if (containsPackagesThatTargetOtherHosts) { notificationLogged?.Invoke( new NotificationMessage(Name, From dc65828945b4a939a28ce832954b3178720afe46 Mon Sep 17 00:00:00 2001 From: pinzart Date: Fri, 16 Jun 2023 10:02:18 -0400 Subject: [PATCH 3/6] update --- src/DynamoApplications/StartupUtils.cs | 3 +++ src/DynamoCore/Models/DynamoModel.cs | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/DynamoApplications/StartupUtils.cs b/src/DynamoApplications/StartupUtils.cs index 088f4c4bbab..ff6919078ab 100644 --- a/src/DynamoApplications/StartupUtils.cs +++ b/src/DynamoApplications/StartupUtils.cs @@ -377,7 +377,10 @@ private static DynamoModel StartDynamoWithDefaultConfig(bool CLImode, HostAnalyticsInfo = info, CLIMode = CLImode }; + + // ALIAS does needs a total network traffic blackout. config.AuthProvider = null; + config.UpdateManager = CLImode ? null : InitializeUpdateManager(); config.StartInTestMode = CLImode; config.PathResolver = CLImode ? new CLIPathResolver(preloaderLocation, userDataFolder, commonDataFolder) as IPathResolver : new SandboxPathResolver(preloaderLocation) as IPathResolver; diff --git a/src/DynamoCore/Models/DynamoModel.cs b/src/DynamoCore/Models/DynamoModel.cs index 234c3215f2d..d1f3be13b02 100644 --- a/src/DynamoCore/Models/DynamoModel.cs +++ b/src/DynamoCore/Models/DynamoModel.cs @@ -909,7 +909,8 @@ protected DynamoModel(IStartConfiguration config) UpdateManager.Log += UpdateManager_Log; if (!IsTestMode && !IsHeadless) { - //DefaultUpdateManager.CheckForProductUpdate(UpdateManager); + // ALIAS does needs a total network traffic blackout. + DefaultUpdateManager.CheckForProductUpdate(UpdateManager); } Logger.Log(string.Format("Dynamo -- Build {0}", From 59692ed0a7169806652851f585523258aa625196 Mon Sep 17 00:00:00 2001 From: pinzart Date: Fri, 16 Jun 2023 10:03:33 -0400 Subject: [PATCH 4/6] Update DynamoModel.cs --- src/DynamoCore/Models/DynamoModel.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/DynamoCore/Models/DynamoModel.cs b/src/DynamoCore/Models/DynamoModel.cs index d1f3be13b02..4916fa7082a 100644 --- a/src/DynamoCore/Models/DynamoModel.cs +++ b/src/DynamoCore/Models/DynamoModel.cs @@ -909,7 +909,6 @@ protected DynamoModel(IStartConfiguration config) UpdateManager.Log += UpdateManager_Log; if (!IsTestMode && !IsHeadless) { - // ALIAS does needs a total network traffic blackout. DefaultUpdateManager.CheckForProductUpdate(UpdateManager); } From 6ea69c7ff554d13d09879c0443b77edd611b5cb1 Mon Sep 17 00:00:00 2001 From: pinzart Date: Fri, 16 Jun 2023 10:07:24 -0400 Subject: [PATCH 5/6] Update PackageManagerViewExtension.cs --- src/DynamoPackagesWPF/PackageManagerViewExtension.cs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/DynamoPackagesWPF/PackageManagerViewExtension.cs b/src/DynamoPackagesWPF/PackageManagerViewExtension.cs index c587dd159ed..9428dd7515b 100644 --- a/src/DynamoPackagesWPF/PackageManagerViewExtension.cs +++ b/src/DynamoPackagesWPF/PackageManagerViewExtension.cs @@ -85,15 +85,11 @@ public void Dispose() public void Loaded(ViewLoadedParams viewLoadedParams) { RequestLoadLayoutSpecs(packageManager.PackageLoader.LocalPackages); - /* - // ALIAS does needs a total network traffic blackout. - // Since there is no way to switch this on/off, we will just skip it for now. var packagesToCheck = packageManager?.PackageLoader.LocalPackages; if (packagesToCheck != null) { RaisePackageHostNotifications(packagesToCheck); } - */ } public void Shutdown() @@ -141,6 +137,9 @@ private void RequestLoadViewExtensionsForLoadedPackages(IEnumerable pac private void RaisePackageHostNotifications(IEnumerable packages) { + // ALIAS does needs a total network traffic blackout. + // Since there is no way to switch this on/off, we will just skip it for now. + /* foreach (var pkg in packages) { //check that the package does not target another host, if it does raise a warning. @@ -157,7 +156,7 @@ private void RaisePackageHostNotifications(IEnumerable packages) Resources.TitlePackageTargetOtherHost)); } } - + */ } private void RequestLoadLayoutSpecs(IEnumerable packages) From 3acfbc54af84564c3af1adf649cb2d75b737aec6 Mon Sep 17 00:00:00 2001 From: pinzart Date: Fri, 16 Jun 2023 10:09:20 -0400 Subject: [PATCH 6/6] Update PackageManagerViewExtension.cs --- src/DynamoPackagesWPF/PackageManagerViewExtension.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/DynamoPackagesWPF/PackageManagerViewExtension.cs b/src/DynamoPackagesWPF/PackageManagerViewExtension.cs index 9428dd7515b..2cfcce86b81 100644 --- a/src/DynamoPackagesWPF/PackageManagerViewExtension.cs +++ b/src/DynamoPackagesWPF/PackageManagerViewExtension.cs @@ -86,10 +86,11 @@ public void Loaded(ViewLoadedParams viewLoadedParams) { RequestLoadLayoutSpecs(packageManager.PackageLoader.LocalPackages); var packagesToCheck = packageManager?.PackageLoader.LocalPackages; - if (packagesToCheck != null) + if(packagesToCheck != null) { RaisePackageHostNotifications(packagesToCheck); } + } public void Shutdown()