Skip to content

Commit 9790f20

Browse files
MarkStegaMarkStega
authored
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
1 parent 721f1bf commit 9790f20

20 files changed

Lines changed: 427 additions & 459 deletions

‎.github/workflows/GithubActionsRelease.yml‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,7 @@ jobs:
6969
dotnet-version: '8.x'
7070

7171
- name: Setup docfx
72-
run: |
73-
copy Material.Blazor\docfx.json.MD2 docfx.json
74-
copy Material.Blazor\index.md.MD2 index.md
75-
copy Material.Blazor\toc.yml.MD2 toc.yml
76-
dotnet tool update -g docfx
72+
run: dotnet tool update -g docfx
7773

7874
- name: Build Material.Blazor
7975
run: dotnet build ${{env.projectMB}} --configuration ${{env.buildConfiguration}}
@@ -87,7 +83,7 @@ jobs:
8783
uses: actions/upload-artifact@v4
8884
with:
8985
name: siteDocFx
90-
path: siteDocFx
86+
path: .artifacts/siteDocFx
9187
############################################################################################################
9288
# Build website
9389
############################################################################################################

‎.github/workflows/GithubActionsWIP.yml‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -102,11 +102,7 @@ jobs:
102102
dotnet-version: '8.x'
103103

104104
- name: Setup docfx
105-
run: |
106-
copy Material.Blazor\docfx.json.MD2 docfx.json
107-
copy Material.Blazor\index.md.MD2 index.md
108-
copy Material.Blazor\toc.yml.MD2 toc.yml
109-
dotnet tool update -g docfx
105+
run: dotnet tool update -g docfx
110106

111107
- name: Build Material.Blazor
112108
run: dotnet build ${{env.projectMB}} --configuration ${{env.buildConfiguration}}
@@ -116,14 +112,17 @@ jobs:
116112
env:
117113
DOCFX_SOURCE_BRANCH_NAME: main
118114

119-
- name: Show the documentation artifacts
120-
run: dir siteDocFx
115+
- name: Show the documentation site artifacts
116+
run: dir .artifacts/siteDocFx
117+
118+
- name: Show the documentation site api artifacts
119+
run: dir .artifacts/siteDocFx/.artifacts/api
121120

122121
- name: Upload Documentation Artifacts 🔺 # The documentation site is then uploaded as an artifact named 'siteDocFx'.
123122
uses: actions/upload-artifact@v4
124123
with:
125124
name: siteDocFx
126-
path: siteDocFx
125+
path: .artifacts/siteDocFx
127126

128127
############################################################################################################
129128
# Build website

‎.gitignore‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@
1616
# **/Material.Blazor.Website.MD3/wwwroot/js/*.*
1717

1818
# Generated by DocFx build
19-
/docfx.json
20-
/index.md
21-
/toc.yml
2219
**/api
2320
**/SiteDocFx
2421
**/SiteDocFxMD3

‎LocalBuild.cmd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
set argVersion=%1
33
if "%1" == "" set argVersion=5.0.104
44
set argDestination=%2
5-
if "%2" == "" set argDestination="c:\solutions\local nuget packages"
5+
if "%2" == "" set argDestination="d:\local nuget packages"
66

77
echo Version is %argVersion%
88
echo Destination is %argDestination%

‎LocalPublish.cmd‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
@echo off
2+
set argVersion=%1
3+
if "%1" == "" set argVersion=5.0.104
4+
set argDestination=%2
5+
if "%2" == "" set argDestination="d:\local nuget packages\publish"
6+
7+
echo Version is %argVersion%
8+
echo Destination is %argDestination%
9+
echo ...
10+
echo Beginning publish
11+
echo ...
12+
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
13+
echo Build results
14+
echo ...
15+
dir %argDestination%
16+
pause

‎Material.Blazor.Test/Material.Blazor.Test.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@
44
</PropertyGroup>
55

66
<ItemGroup>
7-
<PackageReference Include="bunit" Version="1.30.3" />
8-
<PackageReference Include="bunit.core" Version="1.30.3" />
9-
<PackageReference Include="bunit.web" Version="1.30.3" />
7+
<PackageReference Include="bunit" Version="1.31.3" />
8+
<PackageReference Include="bunit.core" Version="1.31.3" />
9+
<PackageReference Include="bunit.web" Version="1.31.3" />
1010
<PackageReference Include="NSubstitute" Version="5.1.0" />
1111
<PackageReference Include="xunit" Version="2.9.0" />
1212
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
1313
<PrivateAssets>all</PrivateAssets>
1414
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1515
</PackageReference>
16-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
16+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
1717
</ItemGroup>
1818
<ItemGroup>
1919
<ProjectReference Include="..\Material.Blazor\Material.Blazor.csproj" />

‎Material.Blazor.Website.Server/Material.Blazor.Website.Server.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
</ItemGroup>
2525

2626
<ItemGroup>
27+
<!--<ProjectReference Include="..\Material.Blazor.Website.WebAssembly\Material.Blazor.Website.WebAssembly.csproj" />-->
2728
<ProjectReference Include="..\Material.Blazor.Website.WebAssembly\Material.Blazor.Website.WebAssembly.csproj" />
2829
<ProjectReference Include="..\Material.Blazor.Website\Material.Blazor.Website.csproj" />
2930
</ItemGroup>

‎Material.Blazor.Website/Material.Blazor.Website.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
<PackageReference Include="GoogleAnalytics.Blazor" Version="1.0.3" />
3434
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.8" />
3535
<PackageReference Include="Microsoft.AspNetCore.Components" Version="8.0.8" />
36-
<PackageReference Include="Humanizer " Version="2.14.1" />
3736
<PackageReference Include="System.Net.Http.Json" Version="8.0.0" />
3837
</ItemGroup>
3938

‎Material.Blazor.Website/Pages/DragAndDropList.razor‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
@page "/draganddroplist"
22

3-
@using Humanizer
43
@inject IMBToastService ToastService
54

65

@@ -27,7 +26,7 @@
2726
<Content>
2827
<div class="mdc-layout-grid__inner" style="width: 100%;">
2928
<div class="mdc-layout-grid__cell--span-12 mdc-typography--headline6">
30-
@(GetText(amount))
29+
@amount.ToString()
3130
</div>
3231
<div class="mdc-layout-grid__cell--span-3">
3332
<MBButton Label="Button" ButtonStyle="@MBButtonStyle.ContainedUnelevated" />
@@ -51,7 +50,7 @@
5150

5251
@foreach (var amount in Amounts)
5352
{
54-
<span>@dash @(GetText(amount))</span>
53+
<span>@dash @amount.ToString()</span>
5554
dash = " - ";
5655
}
5756
</div>
@@ -99,8 +98,8 @@
9998

10099

101100
@code {
102-
private List<decimal> amounts = new();
103-
private List<decimal> Amounts
101+
private List<int> amounts = new();
102+
private List<int> Amounts
104103
{
105104
get => amounts;
106105
set
@@ -132,10 +131,4 @@
132131
amounts.Add(i);
133132
}
134133
}
135-
136-
137-
string GetText(decimal amount)
138-
{
139-
return Convert.ToInt32(amount).ToWords().Titleize();
140-
}
141134
}

0 commit comments

Comments
 (0)