Fix: Packed nuget has incorrect paths for imported libraries

mingyaulee · Feb 13, 2024 · 7803a0b · 7803a0b
1 parent e16aec0
commit 7803a0b
Show file tree

Hide file tree

Showing 8 changed files with 3 additions and 188 deletions.
diff --git a/src/Blazor.BrowserExtension.Template/HelloBlazorExtension/wwwroot/css/app.css b/src/Blazor.BrowserExtension.Template/HelloBlazorExtension/wwwroot/css/app.css
@@ -1,6 +1,4 @@
-@import url('open-iconic/font/css/open-iconic-bootstrap.min.css');
-
-html, body {
+html, body {
     font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
 }
 

diff --git a/src/Blazor.BrowserExtension/Blazor.BrowserExtension.csproj b/src/Blazor.BrowserExtension/Blazor.BrowserExtension.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Razor">
+<Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <!-- Build properties. -->
   <PropertyGroup>
@@ -28,13 +28,9 @@
       <Pack>true</Pack>
       <PackagePath>build</PackagePath>
     </Content>
-    <Content Include="JsFetchHttpClient\JsHttpClient.js">
-      <Pack>true</Pack>
-      <PackagePath>content\BrowserExtensionScripts</PackagePath>
-    </Content>
     <Content Include="content\src\lib\**">
       <Pack>true</Pack>
-      <PackagePath>content\BrowserExtensionScripts\lib</PackagePath>
+      <PackagePath>content\staticwebassets\lib</PackagePath>
     </Content>
     <Content Include="..\Icon\Icon.png">
       <Pack>true</Pack>

diff --git a/src/Blazor.BrowserExtension/JsFetchHttpClient/JsHttpClient.cs b/src/Blazor.BrowserExtension/JsFetchHttpClient/JsHttpClient.cs
diff --git a/src/Blazor.BrowserExtension/JsFetchHttpClient/JsHttpClient.js b/src/Blazor.BrowserExtension/JsFetchHttpClient/JsHttpClient.js
diff --git a/src/Blazor.BrowserExtension/JsFetchHttpClient/JsHttpMessageHandler.cs b/src/Blazor.BrowserExtension/JsFetchHttpClient/JsHttpMessageHandler.cs
diff --git a/src/Blazor.BrowserExtension/JsFetchHttpClient/JsHttpResponseMessage.cs b/src/Blazor.BrowserExtension/JsFetchHttpClient/JsHttpResponseMessage.cs
diff --git a/src/Blazor.BrowserExtension/build/Blazor.BrowserExtension.targets b/src/Blazor.BrowserExtension/build/Blazor.BrowserExtension.targets
@@ -1,24 +1,6 @@
 <!-- build/Blazor.BrowserExtension.targets -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
-  <!-- Region
-    Adds the content JavaScript files from the NuGet package to the project.
-  -->
-  <PropertyGroup>
-    <_BrowserExtension_Package_Contents_Scripts_Directory Condition="'$(_BrowserExtension_Package_Contents_Scripts_Directory)' == ''">$(MSBuildThisFileDirectory)..\content\BrowserExtensionScripts</_BrowserExtension_Package_Contents_Scripts_Directory>
-  </PropertyGroup>
-
-  <ItemGroup Condition="'$(IncludeBrowserExtensionAssets)' == 'true'">
-    <StaticWebAsset Include="$(_BrowserExtension_Package_Contents_Scripts_Directory)\**\*.*">
-      <SourceType>Package</SourceType>
-      <SourceId>Blazor.BrowserExtension</SourceId>
-      <ContentRoot>$(_BrowserExtension_Package_Contents_Scripts_Directory)</ContentRoot>
-      <BasePath>_content/Blazor.BrowserExtension</BasePath>
-      <RelativePath>%(RecursiveDir)%(Filename)%(Extension)</RelativePath>
-    </StaticWebAsset>
-  </ItemGroup>
-  <!-- EndRegion -->
-
   <!-- Target
     Runs only when another target depends on this target.
     Defines the config for browser extension.

diff --git a/test/Blazor.BrowserExtension.IntegrationTest/Blazor.BrowserExtension.IntegrationTest.csproj b/test/Blazor.BrowserExtension.IntegrationTest/Blazor.BrowserExtension.IntegrationTest.csproj
@@ -6,10 +6,6 @@
   </PropertyGroup>
 
   <!-- Link scripts according to the directory structure in the NuGet package -->
-  <PropertyGroup>
-    <_BrowserExtension_Package_Contents_Scripts_Directory>$(MSBuildThisFileDirectory)..\..\src\Blazor.BrowserExtension\content\dist</_BrowserExtension_Package_Contents_Scripts_Directory>
-  </PropertyGroup>
-
   <ItemGroup>
     <StaticWebAsset Include="$(MSBuildThisFileDirectory)..\..\src\Blazor.BrowserExtension\content\src\lib\*.*">
       <SourceType>Package</SourceType>