Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

vNext #1339

Merged
merged 11 commits into from
Sep 25, 2024
Merged

vNext #1339

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions .github/workflows/GithubActionsRelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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}}
Expand All @@ -87,7 +83,7 @@ jobs:
uses: actions/upload-artifact@v4
with:
name: siteDocFx
path: siteDocFx
path: .artifacts/siteDocFx
############################################################################################################
# Build website
############################################################################################################
Expand Down
15 changes: 7 additions & 8 deletions .github/workflows/GithubActionsWIP.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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}}
Expand All @@ -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
Expand Down
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@
# **/Material.Blazor.Website.MD3/wwwroot/js/*.*

# Generated by DocFx build
/docfx.json
/index.md
/toc.yml
**/api
**/SiteDocFx
**/SiteDocFxMD3
Expand Down
2 changes: 1 addition & 1 deletion LocalBuild.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -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%
Expand Down
16 changes: 16 additions & 0 deletions LocalPublish.cmd
Original file line number Diff line number Diff line change
@@ -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
8 changes: 4 additions & 4 deletions Material.Blazor.Test/Material.Blazor.Test.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion Material.Blazor.Website/Material.Blazor.Website.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
15 changes: 4 additions & 11 deletions Material.Blazor.Website/Pages/DragAndDropList.razor
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
@page "/draganddroplist"

@using Humanizer
@inject IMBToastService ToastService


Expand All @@ -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" />
Expand All @@ -51,7 +50,7 @@

@foreach (var amount in Amounts)
{
<span>@dash @(GetText(amount))</span>
<span>@dash @amount.ToString()</span>
dash = " - ";
}
</div>
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -132,10 +131,4 @@
amounts.Add(i);
}
}


string GetText(decimal amount)
{
return Convert.ToInt32(amount).ToWords().Titleize();
}
}
Loading
Loading