Add FDC3 IIFE Bundle Directly from dist

morganstanley · Jul 3, 2023 · b50b8c4 · BalassaMarton · Jul 3, 2023 · b50b8c4
1 parent e28fade
commit b50b8c4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 20 deletions.
diff --git a/src/shell/dotnet/Shell/App.xaml.cs b/src/shell/dotnet/Shell/App.xaml.cs
@@ -190,7 +190,7 @@ private void InjectFdc3()
     public string ReadPreloadResource(string name)
     {
         var assembly = Assembly.GetExecutingAssembly();
-        string resourcePath = $$"""Shell.Preload.{{name}}""";
+        string resourcePath = $$"""Shell.{{name}}""";
 
         using (var stream = assembly.GetManifestResourceStream(resourcePath))
         using (var reader = new StreamReader(stream))

diff --git a/src/shell/dotnet/Shell/Shell.csproj b/src/shell/dotnet/Shell/Shell.csproj
@@ -14,11 +14,11 @@
 		<None Remove="MainWindow.xaml" />
 		<None Remove="WebWindow.xaml" />
 	</ItemGroup>
-	
+
 	<ItemGroup>
-	  <EmbeddedResource Include="Preload\fdc3-iife-bundle.js">
-	    <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-	  </EmbeddedResource>
+		<EmbeddedResource Include="..\..\js\composeui-fdc3\dist\fdc3-iife-bundle.js">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</EmbeddedResource>
 	</ItemGroup>
 
 	<ItemGroup>
@@ -44,7 +44,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<Folder Include="Preload\" />
+		<Folder Include="..\..\js\composeui-fdc3\dist\"/>
 		<Folder Include="Utilities\" />
 	</ItemGroup>
 
@@ -53,8 +53,4 @@
 		<ProjectReference Include="..\..\..\messaging\dotnet\src\Host\MorganStanley.ComposeUI.Messaging.Host.csproj" />
 	</ItemGroup>
 
-	<Target Name="PreBuild" BeforeTargets="PreBuildEvent">
-	  <Exec Command="PowerShell cd ..\..\..\..\ ; .\src\shell\dotnet\copy-fdc3-iife-bundle.ps1" />
-	</Target>
-
 </Project>
diff --git a/src/shell/dotnet/copy-fdc3-iife-bundle.ps1 b/src/shell/dotnet/copy-fdc3-iife-bundle.ps1