feat(templates): remove conditions from Bit.BlazorUI.Extras reference…

…s in Boilerplate #8441 (#8442)
bitfoundation · Aug 29, 2024 · 7b8ff19 · 7b8ff19
1 parent 9ec3b85
commit 7b8ff19
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 16 deletions.
diff --git a/...erplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Boilerplate.Client.Core.csproj b/...erplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Boilerplate.Client.Core.csproj
@@ -24,7 +24,7 @@
         <PackageReference Condition=" '$(offlineDb)' == 'true' OR '$(offlineDb)' == ''" Include="Bit.Besql" Version="8.11.0-pre-04" />
         <PackageReference Condition=" '$(signalr)' == 'true' OR '$(signalr)' == ''" Include="Microsoft.AspNetCore.SignalR.Client" Version="8.0.8" />
         <PackageReference Condition=" '$(offlineDb)' == 'true' OR '$(offlineDb)' == ''" Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.8" />
-        <PackageReference Condition=" '$(sample)' == 'Admin' OR '$(sample)' == ''" Include="Bit.BlazorUI.Extras" Version="8.11.0-pre-04" />
+        <PackageReference Include="Bit.BlazorUI.Extras" Version="8.11.0-pre-04" />
         <!--/-:msbuild-conditional:noEmit -->
         <PackageReference Include="Bit.CodeAnalyzers" Version="8.11.0-pre-04" PrivateAssets="all" />
         <PackageReference Include="Bit.SourceGenerators" Version="8.11.0-pre-04" PrivateAssets="all" />

diff --git a/...mplates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/wwwroot/index.html b/...mplates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/wwwroot/index.html
@@ -23,9 +23,7 @@
     <link rel="stylesheet" href="_content/Bit.BlazorUI/styles/bit.blazorui.css" />
     <link rel="stylesheet" href="_content/Bit.BlazorUI.Icons/styles/bit.blazorui.icons.css" />
     <link rel="stylesheet" href="_content/Bit.BlazorUI.Assets/styles/bit.blazorui.assets.css" />
-    <!--#if (sample == "Admin")-->
     <link rel="stylesheet" href="_content/Bit.BlazorUI.Extras/styles/bit.blazorui.extras.css" />
-    <!--#endif-->
     <link rel="stylesheet" href="_content/Boilerplate.Client.Core/styles/app.css" />
     <link rel="stylesheet" href="_content/Boilerplate.Client.Core/Boilerplate.Client.Core.bundle.scp.css" />
     <link rel="stylesheet" href="Boilerplate.Client.Maui.styles.css" />
@@ -140,10 +138,8 @@
     <script src="_framework/blazor.webview.js" autostart="false"></script>
     <script src="_content/Bit.Butil/bit-butil.js"></script>
     <script src="_content/Bit.BlazorUI/scripts/bit.blazorui.js"></script>
-    <!--#if (sample == "Admin")-->
-    <script src="_content/Bit.BlazorUI.Extras/scripts/bit.blazorui.extras.js"></script>
-    <!--#endif-->
     <script src="_content/Boilerplate.Client.Core/scripts/app.js"></script>
+    <script src="_content/Bit.BlazorUI.Extras/scripts/bit.blazorui.extras.js"></script>
 
 </body>
 

diff --git a/...ilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/Boilerplate.Client.Web.csproj b/...ilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/Boilerplate.Client.Web.csproj
@@ -52,11 +52,11 @@
     </ItemGroup>
 
     <!--/+:msbuild-conditional:noEmit -->
-    <ItemGroup Condition=" ('$(sample)' == 'Admin' OR '$(sample)' == '') AND ('$(offlineDb)' == 'false' OR '$(offlineDb)' == '')">
+    <ItemGroup Condition="'$(offlineDb)' == 'false' OR '$(offlineDb)' == ''">
         <BlazorWebAssemblyLazyLoad Include="System.Private.Xml.wasm" />
         <BlazorWebAssemblyLazyLoad Include="System.Data.Common.wasm" />
     </ItemGroup>
-    <ItemGroup Condition="'$(sample)' == 'Admin' OR '$(sample)' == ''">
+    <ItemGroup>
         <BlazorWebAssemblyLazyLoad Include="Newtonsoft.Json.wasm" />
     </ItemGroup>
     <!--/-:msbuild-conditional:noEmit -->

diff --git a/...emplates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/wwwroot/index.html b/...emplates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/wwwroot/index.html
@@ -28,9 +28,7 @@
     <link href="_content/Bit.BlazorUI/styles/bit.blazorui.css" rel="stylesheet" />
     <link href="_content/Bit.BlazorUI.Icons/styles/bit.blazorui.icons.css" rel="stylesheet" />
     <link href="_content/Bit.BlazorUI.Assets/styles/bit.blazorui.assets.css" rel="stylesheet" />
-    <!--#if (sample == "Admin") -->
     <link href="_content/Bit.BlazorUI.Extras/styles/bit.blazorui.extras.css" rel="stylesheet" />
-    <!--#endif -->
     <link href="_content/Boilerplate.Client.Core/styles/app.css" rel="stylesheet" />
     <link href="_content/Boilerplate.Client.Core/Boilerplate.Client.Core.bundle.scp.css" rel="stylesheet" />
     <script src="_framework/blazor.webassembly.js" autostart="false"></script>
@@ -216,8 +214,6 @@
     <!--#endif -->
     <script src="_content/Bit.BlazorUI/scripts/bit.blazorui.js"></script>
     <script src="_content/Boilerplate.Client.Core/scripts/app.js"></script>
-    <!--#if (sample == "Admin") -->
     <script src="_content/Bit.BlazorUI.Extras/scripts/bit.blazorui.extras.js"></script>
-    <!--#endif -->
 </body>
 </html>
diff --git a/...plates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Components/App.razor b/...plates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Components/App.razor
@@ -44,9 +44,7 @@
     <Link rel="stylesheet" href="_content/Bit.BlazorUI/styles/bit.blazorui.css" />
     <Link rel="stylesheet" href="_content/Bit.BlazorUI.Icons/styles/bit.blazorui.icons.css" />
     <Link rel="stylesheet" href="_content/Bit.BlazorUI.Assets/styles/bit.blazorui.assets.css" />
-    @*#if (sample == "Admin")*@
     <Link rel="stylesheet" href="_content/Bit.BlazorUI.Extras/styles/bit.blazorui.extras.css" />
-    @*#endif*@
     <Link rel="stylesheet" href="_content/Boilerplate.Client.Core/styles/app.css" />
     <Link rel="stylesheet" href="_content/Boilerplate.Client.Core/Boilerplate.Client.Core.bundle.scp.css" />
 
@@ -86,9 +84,7 @@
         @*#endif*@
         <Script src="_content/Bit.BlazorUI/scripts/bit.blazorui.js"></Script>
         <Script src="_content/Boilerplate.Client.Core/scripts/app.js"></Script>
-        @*#if (sample == "Admin")*@
         <Script src="_content/Bit.BlazorUI.Extras/scripts/bit.blazorui.extras.js"></Script>
-        @*#endif*@
     }
 </body>