vNext (#1339)

* Check if WASM build is broken on GHA * Update ServeDocs.cmd * npm updates * Update documentation build * Remove gitignore of root docfx files * Account for artifacts directory * Add to M.B.csproj per dotnet/docfx#10231 (comment) * npmupdate, DocFx addition to M.B.csproj * Release notes * Additional WiP debug * wip #2
Material-Blazor · Sep 25, 2024 · 9790f20 · 9790f20
1 parent 721f1bf
commit 9790f20
Show file tree

Hide file tree

Showing 20 changed files with 427 additions and 459 deletions.
diff --git a/.github/workflows/GithubActionsRelease.yml b/.github/workflows/GithubActionsRelease.yml
@@ -69,11 +69,7 @@ jobs:
         dotnet-version: '8.x'
 
     - name: Setup docfx
-      run: |
-          copy Material.Blazor\docfx.json.MD2 docfx.json
-          copy Material.Blazor\index.md.MD2 index.md
-          copy Material.Blazor\toc.yml.MD2 toc.yml
-          dotnet tool update -g docfx
+      run: dotnet tool update -g docfx
 
     - name: Build Material.Blazor
       run: dotnet build ${{env.projectMB}} --configuration ${{env.buildConfiguration}}
@@ -87,7 +83,7 @@ jobs:
       uses: actions/upload-artifact@v4
       with:
         name: siteDocFx
-        path: siteDocFx       
+        path: .artifacts/siteDocFx       
 ############################################################################################################
 # Build website
 ############################################################################################################

diff --git a/.github/workflows/GithubActionsWIP.yml b/.github/workflows/GithubActionsWIP.yml
@@ -102,11 +102,7 @@ jobs:
         dotnet-version: '8.x'
 
     - name: Setup docfx
-      run: |
-          copy Material.Blazor\docfx.json.MD2 docfx.json
-          copy Material.Blazor\index.md.MD2 index.md
-          copy Material.Blazor\toc.yml.MD2 toc.yml
-          dotnet tool update -g docfx
+      run: dotnet tool update -g docfx
 
     - name: Build Material.Blazor
       run: dotnet build ${{env.projectMB}} --configuration ${{env.buildConfiguration}}
@@ -116,14 +112,17 @@ jobs:
       env:
         DOCFX_SOURCE_BRANCH_NAME: main
 
-    - name: Show the documentation artifacts
-      run: dir siteDocFx
+    - name: Show the documentation site artifacts
+      run: dir .artifacts/siteDocFx
+
+    - name: Show the documentation site api artifacts
+      run: dir .artifacts/siteDocFx/.artifacts/api
 
     - name: Upload Documentation Artifacts 🔺 # The documentation site is then uploaded as an artifact named 'siteDocFx'.
       uses: actions/upload-artifact@v4
       with:
         name: siteDocFx
-        path: siteDocFx
+        path: .artifacts/siteDocFx
 
 ############################################################################################################
 # Build website

diff --git a/.gitignore b/.gitignore
@@ -16,9 +16,6 @@
 # **/Material.Blazor.Website.MD3/wwwroot/js/*.*
 
 # Generated by DocFx build
-/docfx.json
-/index.md
-/toc.yml
 **/api
 **/SiteDocFx
 **/SiteDocFxMD3

diff --git a/LocalBuild.cmd b/LocalBuild.cmd
@@ -2,7 +2,7 @@
 set argVersion=%1
 if "%1" == "" set argVersion=5.0.104
 set argDestination=%2
-if "%2" == "" set argDestination="c:\solutions\local nuget packages"
+if "%2" == "" set argDestination="d:\local nuget packages"
 
 echo Version is %argVersion%
 echo Destination is %argDestination%

diff --git a/LocalPublish.cmd b/LocalPublish.cmd
@@ -0,0 +1,16 @@
+@echo off
+set argVersion=%1
+if "%1" == "" set argVersion=5.0.104
+set argDestination=%2
+if "%2" == "" set argDestination="d:\local nuget packages\publish"
+
+echo Version is %argVersion%
+echo Destination is %argDestination%
+echo ...
+echo Beginning publish
+echo ...
+dotnet publish material.blazor.website.webassembly/material.blazor.website.webassembly.csproj -p:Version=%argVersion% --configuration WebAssembly  --artifacts-path .artifacts --sc --framework net8.0 --output %argDestination% --runtime browser-wasm
+echo Build results
+echo ...
+dir %argDestination%
+pause
diff --git a/Material.Blazor.Test/Material.Blazor.Test.csproj b/Material.Blazor.Test/Material.Blazor.Test.csproj
@@ -4,16 +4,16 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="bunit" Version="1.30.3" />
-		<PackageReference Include="bunit.core" Version="1.30.3" />
-		<PackageReference Include="bunit.web" Version="1.30.3" />
+		<PackageReference Include="bunit" Version="1.31.3" />
+		<PackageReference Include="bunit.core" Version="1.31.3" />
+		<PackageReference Include="bunit.web" Version="1.31.3" />
 		<PackageReference Include="NSubstitute" Version="5.1.0" />
 		<PackageReference Include="xunit" Version="2.9.0" />
 		<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
 	</ItemGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\Material.Blazor\Material.Blazor.csproj" />

diff --git a/Material.Blazor.Website.Server/Material.Blazor.Website.Server.csproj b/Material.Blazor.Website.Server/Material.Blazor.Website.Server.csproj
@@ -24,6 +24,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
+		<!--<ProjectReference Include="..\Material.Blazor.Website.WebAssembly\Material.Blazor.Website.WebAssembly.csproj" />-->
 		<ProjectReference Include="..\Material.Blazor.Website.WebAssembly\Material.Blazor.Website.WebAssembly.csproj" />
 		<ProjectReference Include="..\Material.Blazor.Website\Material.Blazor.Website.csproj" />
 	</ItemGroup>

diff --git a/Material.Blazor.Website/Material.Blazor.Website.csproj b/Material.Blazor.Website/Material.Blazor.Website.csproj
@@ -33,7 +33,6 @@
 		<PackageReference Include="GoogleAnalytics.Blazor" Version="1.0.3" />
 		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.8" />
 		<PackageReference Include="Microsoft.AspNetCore.Components" Version="8.0.8" />
-		<PackageReference Include="Humanizer " Version="2.14.1" />
 		<PackageReference Include="System.Net.Http.Json" Version="8.0.0" />
 	</ItemGroup>
 

diff --git a/Material.Blazor.Website/Pages/DragAndDropList.razor b/Material.Blazor.Website/Pages/DragAndDropList.razor
@@ -1,6 +1,5 @@
 @page "/draganddroplist"
 
-@using Humanizer
 @inject IMBToastService ToastService
 
 
@@ -27,7 +26,7 @@
                         <Content>
                             <div class="mdc-layout-grid__inner" style="width: 100%;">
                                 <div class="mdc-layout-grid__cell--span-12 mdc-typography--headline6">
-                                    @(GetText(amount))
+                                    @amount.ToString()
                                 </div>
                                 <div class="mdc-layout-grid__cell--span-3">
                                     <MBButton Label="Button" ButtonStyle="@MBButtonStyle.ContainedUnelevated" />
@@ -51,7 +50,7 @@
 
                         @foreach (var amount in Amounts)
                         {
-                            <span>@dash @(GetText(amount))</span>
+                            <span>@dash @amount.ToString()</span>
                             dash = " - ";
                         }
                     </div>
@@ -99,8 +98,8 @@
 
 
 @code {
-    private List<decimal> amounts = new();
-    private List<decimal> Amounts
+    private List<int> amounts = new();
+    private List<int> Amounts
     {
         get => amounts;
         set
@@ -132,10 +131,4 @@
             amounts.Add(i);
         }
     }
-
-
-    string GetText(decimal amount)
-    {
-        return Convert.ToInt32(amount).ToWords().Titleize();
-    }
 }