diff --git a/.gitignore b/.gitignore
index d60ed8ce68c..30f286b7466 100644
--- a/.gitignore
+++ b/.gitignore
@@ -104,11 +104,7 @@ test/core/customast/test.txt
test/core/files/test.png
test/core/migration/writetext.txt
logo.png
-/src/Notifications/node_modules
-/src/Notifications/package.json
-/src/Notifications/package-lock.json
-/src/Notifications/.npm-cache
-/src/DynamoCoreWpf/node_modules
-/src/DynamoCoreWpf/package-lock.json
-/src/DynamoCoreWpf/package.json
-/src/DynamoCoreWpf/.npm-cache
+/src/DynamoCoreWpf/Packages
+dynamods-splash-screen-*.tgz
+/src/Notifications/Packages
+/src/Notifications/dynamods-notifications-center-*.tgz
diff --git a/extern/.gitignore b/extern/.gitignore
index ee20ca77c6d..82403cdaaa7 100644
--- a/extern/.gitignore
+++ b/extern/.gitignore
@@ -1,3 +1,3 @@
# override specific package dlls#
###################
-!*.dll
\ No newline at end of file
+!*.dll
diff --git a/src/DynamoCoreWpf/DynamoCoreWpf.csproj b/src/DynamoCoreWpf/DynamoCoreWpf.csproj
index 53017118c10..cb702bceb57 100644
--- a/src/DynamoCoreWpf/DynamoCoreWpf.csproj
+++ b/src/DynamoCoreWpf/DynamoCoreWpf.csproj
@@ -11,22 +11,50 @@
$(OutputPath)\DynamoCoreWpf.XML
False
False
+ x64
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ %(TGZFiles.Filename)
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
diff --git a/src/DynamoCoreWpf/Views/SplashScreen/SplashScreen.xaml.cs b/src/DynamoCoreWpf/Views/SplashScreen/SplashScreen.xaml.cs
index 9120f055dbc..a5d6274485d 100644
--- a/src/DynamoCoreWpf/Views/SplashScreen/SplashScreen.xaml.cs
+++ b/src/DynamoCoreWpf/Views/SplashScreen/SplashScreen.xaml.cs
@@ -21,8 +21,8 @@ namespace Dynamo.UI.Views
public partial class SplashScreen : Window
{
// These are hardcoded string and should only change when npm package structure changed or image path changed
- private static readonly string htmlEmbeddedFile = "Dynamo.Wpf.node_modules._dynamods.splash_screen.build.index.html";
- private static readonly string jsEmbeddedFile = "Dynamo.Wpf.node_modules._dynamods.splash_screen.build.index.bundle.js";
+ private static readonly string htmlEmbeddedFile = "Dynamo.Wpf.Packages.SplashScreen.build.index.html";
+ private static readonly string jsEmbeddedFile = "Dynamo.Wpf.Packages.SplashScreen.build.index.bundle.js";
private static readonly string backgroundImage = "Dynamo.Wpf.Views.SplashScreen.WebApp.splashScreenBackground.png";
private static readonly string imageFileExtension = "png";
@@ -274,7 +274,7 @@ protected override async void OnContentRendered(EventArgs e)
webView.CoreWebView2.Settings.IsZoomControlEnabled = false;
var assembly = Assembly.GetExecutingAssembly();
-
+
using (Stream stream = assembly.GetManifestResourceStream(htmlEmbeddedFile))
using (StreamReader reader = new StreamReader(stream))
{
diff --git a/src/Notifications/NotificationCenterController.cs b/src/Notifications/NotificationCenterController.cs
index 6987c212813..2364395c4f8 100644
--- a/src/Notifications/NotificationCenterController.cs
+++ b/src/Notifications/NotificationCenterController.cs
@@ -47,8 +47,8 @@ public class NotificationCenterController
private static readonly int notificationPopupVerticalOffset = 5;
private static readonly int limitOfMonthsFilterNotifications = 6;
- private static readonly string htmlEmbeddedFile = "Dynamo.Notifications.node_modules._dynamods.notifications_center.build.index.html";
- private static readonly string jsEmbeddedFile = "Dynamo.Notifications.node_modules._dynamods.notifications_center.build.index.bundle.js";
+ private static readonly string htmlEmbeddedFile = "Dynamo.Notifications.Packages.NotificationCenter.build.index.html";
+ private static readonly string jsEmbeddedFile = "Dynamo.Notifications.Packages.NotificationCenter.build.index.bundle.js";
private static readonly string NotificationCenterButtonName = "notificationsButton";
internal DirectoryInfo webBrowserUserDataFolder;
diff --git a/src/Notifications/Notifications.csproj b/src/Notifications/Notifications.csproj
index dcf928614ac..5e8c73a0845 100644
--- a/src/Notifications/Notifications.csproj
+++ b/src/Notifications/Notifications.csproj
@@ -1,4 +1,4 @@
-
+
@@ -10,18 +10,46 @@
Notifications
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ %(TGZFiles.Filename)
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
diff --git a/test/DynamoCoreWpfTests/ViewExtensions/NotificationsExtensionTests.cs b/test/DynamoCoreWpfTests/ViewExtensions/NotificationsExtensionTests.cs
index b210dd72446..db893d69222 100644
--- a/test/DynamoCoreWpfTests/ViewExtensions/NotificationsExtensionTests.cs
+++ b/test/DynamoCoreWpfTests/ViewExtensions/NotificationsExtensionTests.cs
@@ -1,4 +1,4 @@
-using Dynamo.Utilities;
+using Dynamo.Utilities;
using Dynamo.Notifications.View;
using NUnit.Framework;
using System;
@@ -36,7 +36,7 @@ public void PressNotificationButtonAndShowPopup()
public void ValidateNotificationsUIEmbededFiles()
{
var assembly = AppDomain.CurrentDomain.GetAssemblies().FirstOrDefault(x=>x.ManifestModule.Name.Contains("Notifications.dll"));
- var htmlFile = "Dynamo.Notifications.node_modules._dynamods.notifications_center.build.index.html";
+ var htmlFile = "Dynamo.Notifications.Packages.NotificationCenter.build.index.html";
var mainJstag = "mainJs";