Skip to content
Open

6.0.0 #1370

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
26 changes: 13 additions & 13 deletions .github/workflows/GithubActionsRelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ name: GithubActionsRelease
on:
push:
tags:
- 5.** # Push events to matching pattern, i.e. 5.0.0, 5.1.0
- 6.** # Push events to matching pattern, i.e. 6.0.0, 6.1.0

env:
buildPlatform: 'Any CPU'
Expand Down Expand Up @@ -48,15 +48,15 @@ jobs:
- name: Use dotnet
uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.x'
dotnet-version: '10.x'

- name: Install pnpm
uses: pnpm/action-setup@v4
with:
version: 11.12.0
version: 12.6.0

- name: Run the acceptance tests as the first build action and cancel out the rest if it fails
run: dotnet test ${{env.projectTest}} --configuration ${{env.buildConfiguration}}
run: dotnet test --project ${{env.projectTest}} --configuration ${{env.buildConfiguration}}
############################################################################################################
# Build documentation
############################################################################################################
Expand All @@ -71,15 +71,15 @@ jobs:
- name: Setup dotnet
uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.x'
dotnet-version: '10.x'

- name: Setup docfx
run: dotnet tool update -g docfx

- name: Install pnpm
uses: pnpm/action-setup@v4
with:
version: 11.12.0
version: 12.6.0

- name: Build Material.Blazor
run: dotnet build ${{env.projectMB}} --configuration ${{env.buildConfiguration}}
Expand Down Expand Up @@ -114,12 +114,12 @@ jobs:
- name: Setup dotnet
uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.x'
dotnet-version: '10.x'

- name: Install pnpm
uses: pnpm/action-setup@v4
with:
version: 11.12.0
version: 12.6.0

- name: Build and Publish Website 🔧
run: >
Expand All @@ -128,7 +128,7 @@ jobs:
--output ${{env.outputWeb}}
-p:Version=${{env.version}}
-p:BlazorEnableCompression=false
--framework net8.0
--framework net10.0

- name: Upload Website Artifacts 🔺 # The website is then uploaded as an artifact named 'siteWeb'.
uses: actions/upload-artifact@v4
Expand All @@ -152,12 +152,12 @@ jobs:
- name: Setup dotnet
uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.x'
dotnet-version: '10.x'

- name: Install pnpm
uses: pnpm/action-setup@v4
with:
version: 11.12.0
version: 12.6.0

- name: Download Artifacts 🔻 # The documentation is downloaded into the 'siteDocFx' folder.
uses: actions/download-artifact@v4
Expand Down Expand Up @@ -207,12 +207,12 @@ jobs:
- name: Setup dotnet
uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.x'
dotnet-version: '10.x'

- name: Install pnpm
uses: pnpm/action-setup@v4
with:
version: 11.12.0
version: 12.6.0

- name: Build Material.Blazor & Generate the NuGet package 🔧
run: >
Expand Down
26 changes: 13 additions & 13 deletions .github/workflows/GithubActionsWIP.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:

steps:
- id: setVersion
run: echo "version=5.0.0-wip.$(date +'%Y-%m-%d--%H-%M-%S')" >> $GITHUB_OUTPUT
run: echo "version=6.0.0-wip.$(date +'%Y-%m-%d--%H-%M-%S')" >> $GITHUB_OUTPUT
shell: bash

############################################################################################################
Expand All @@ -79,15 +79,15 @@ jobs:
- name: Setup dotnet
uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.x'
dotnet-version: '10.x'

- name: Install pnpm
uses: pnpm/action-setup@v4
with:
version: 11.12.0
version: 12.6.0

- name: Run the acceptance tests as the first build action and cancel out the rest if it fails
run: dotnet test ${{env.projectTest}} --configuration ${{env.buildConfiguration}}
run: dotnet test --project ${{env.projectTest}} --configuration ${{env.buildConfiguration}}

############################################################################################################
# Build documentation
Expand All @@ -104,15 +104,15 @@ jobs:
- name: Setup dotnet
uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.x'
dotnet-version: '10.x'

- name: Setup docfx
run: dotnet tool update -g docfx

- name: Install pnpm
uses: pnpm/action-setup@v4
with:
version: 11.12.0
version: 12.6.0

- name: Build Material.Blazor
run: dotnet build ${{env.projectMB}} --configuration ${{env.buildConfiguration}}
Expand Down Expand Up @@ -154,12 +154,12 @@ jobs:
- name: Setup dotnet
uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.x'
dotnet-version: '10.x'

- name: Install pnpm
uses: pnpm/action-setup@v4
with:
version: 11.12.0
version: 12.6.0

- name: Build & Publish Website 🔧
run: >
Expand All @@ -168,7 +168,7 @@ jobs:
--output ${{env.outputWeb}}
-p:Version=${{env.ciVersion}}
-p:BlazorEnableCompression=false
--framework net8.0
--framework net10.0

# All of the trace was added to show that .js & .min.js files were getting created but not
# being included in the published content. This was a result of VS 'helpfully' adding some
Expand Down Expand Up @@ -218,12 +218,12 @@ jobs:
- name: Setup dotnet
uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.x'
dotnet-version: '10.x'

- name: Install pnpm
uses: pnpm/action-setup@v4
with:
version: 11.12.0
version: 12.6.0

- name: Build Material.Blazor & Generate the NuGet package 🔧
run: >
Expand Down Expand Up @@ -402,12 +402,12 @@ jobs:
- name: Setup dotnet
uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.x'
dotnet-version: '10.x'

- name: Install pnpm
uses: pnpm/action-setup@v4
with:
version: 11.12.0
version: 12.6.0

- name: Build Material.Blazor & Generate the NuGet package 🔧
run: >
Expand Down
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
</PropertyGroup>

<PropertyGroup>
<TargetFrameworks>net8.0</TargetFrameworks>
<TargetFrameworks>net10.0</TargetFrameworks>
<Configurations>Server;WebAssembly</Configurations>
</PropertyGroup>

Expand Down
4 changes: 2 additions & 2 deletions Material.Blazor.Test/Material.Blazor.Test.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@

<ItemGroup>
<PackageReference Include="bunit" Version="2.11.3" />
<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="8.0.31" />
<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="10.0.12" />
<PackageReference Include="NSubstitute" Version="6.2.0" />
<PackageReference Include="xunit.v3" Version="4.0.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="4.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.8.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.10.1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Material.Blazor\Material.Blazor.csproj" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

<PropertyGroup>
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
<!-- This project has no .razor files, so opt in to the .NET 10 Blazor script (blazor.server.js) static web asset -->
<RequiresAspNetWebAssets>true</RequiresAspNetWebAssets>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)'=='Debug'">
Expand All @@ -13,26 +15,23 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components" Version="8.0.31" />
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.31" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.31" />
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.3" />
<PackageReference Include="Serilog.AspNetCore" Version="8.0.3" />
<PackageReference Include="Serilog.AspNetCore" Version="10.0.0" />
<PackageReference Include="Serilog.Sinks.Async" Version="2.1.0" />
</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>

<!--Compression directives (Note that the patterns are relative to wwwroot)-->
<PropertyGroup>
<CompressionIncludePatterns>$(CompressionIncludePatterns);**/*.css;**/*.js</CompressionIncludePatterns>
<BuildCompressionFormats>gzip;brotli</BuildCompressionFormats>
<!--
Build (development) stays gzip-only, the SDK default. With MapStaticAssets the .NET 10 development
runtime handler re-compresses assets on the fly as gzip but keeps the endpoint's Content-Encoding,
so build-time brotli endpoints send gzip bytes labelled 'br' and the browser fails to load them.
-->
<BuildCompressionFormats>gzip</BuildCompressionFormats>
<PublishCompressionFormats>gzip;brotli</PublishCompressionFormats>
</PropertyGroup>

Expand Down
49 changes: 12 additions & 37 deletions Material.Blazor.Website.Server/Pages/Host.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,8 @@
@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers

@using Material.Blazor.Website
@using Material.Blazor.Website.Server
@using Microsoft.AspNetCore.Components.Web

@{
Microsoft.AspNetCore.Mvc.Rendering.RenderMode renderMode = PlatformDetermination.IsBlazorServer ? Microsoft.AspNetCore.Mvc.Rendering.RenderMode.Server : Microsoft.AspNetCore.Mvc.Rendering.RenderMode.WebAssembly;
}

<!DOCTYPE html>
<html lang="en" dir="ltr">

Expand All @@ -21,12 +16,15 @@
<title>Material.Blazor</title>
<base href="/" />

<link href="_content/Material.Blazor/material.blazor.min.css" rel="stylesheet">
@* Maps JS module paths to their fingerprinted URLs from MapStaticAssets *@
<script type="importmap"></script>

<link href="~/_content/Material.Blazor/material.blazor.min.css" asp-append-version="true" rel="stylesheet">

<link href="_content/Material.Blazor.Website/icons/icon-512.png" rel="apple-touch-icon" sizes="512x512">
<link href="_content/Material.Blazor.Website/icons/favicon-32x32.png" rel="icon" type="image/png" sizes="32x32">
<link href="_content/Material.Blazor.Website/icons/favicon-16x16.png" rel="icon" type="image/png" sizes="16x16">
<link href="_content/Material.Blazor.Website/css/material-default-theme.min.css" rel="stylesheet" id="app-style">
<link href="~/_content/Material.Blazor.Website/css/material-default-theme.min.css" asp-append-version="true" rel="stylesheet" id="app-style">

<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
Expand All @@ -41,28 +39,12 @@
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.1.1/css/all.min.css" crossorigin="anonymous" />
<link href="https://cdnjs.cloudflare.com/ajax/libs/open-iconic/1.1.1/font/css/open-iconic.min.css" crossorigin="anonymous" rel="stylesheet" /> <!-- Global site tag (gtag.js) - Google Analytics -->

@if (PlatformDetermination.IsBlazorServer)
{
<component type="typeof(HeadOutlet)" render-mode="@renderMode" />
}
<component type="typeof(HeadOutlet)" render-mode="Server" />

</head>

<body class="mdc-typography mb-custom-scrollbars">
@if (PlatformDetermination.IsBlazorServer)
{
<component type="typeof(AppMD2)" render-mode="@renderMode" />
}
else
{
<div id="app">
<svg class="loading-progress">
<circle r="40%" cx="50%" cy="50%" />
<circle r="40%" cx="50%" cy="50%" />
</svg>
<div class="loading-progress-text"></div>
</div>
}
<component type="typeof(AppMD2)" render-mode="Server" />

<div id="blazor-error-ui">
<environment include="Staging,Production">
Expand All @@ -75,18 +57,11 @@
<a class="dismiss">🗙</a>
</div>

<script src="_content/Material.Blazor/material.blazor.js"></script>
<script src="_content/Material.Blazor.Website/js/material.blazor.website.js"></script>
<script src="_content/GoogleAnalytics.Blazor/googleanalytics.blazor.js"></script>

@if (PlatformDetermination.IsBlazorServer)
{
<script src="_framework/blazor.server.js"></script>
}
else
{
<script src="_framework/blazor.webassembly.js"></script>
}
<script src="~/_content/Material.Blazor/material.blazor.js" asp-append-version="true"></script>
<script src="~/_content/Material.Blazor.Website/js/material.blazor.website.js" asp-append-version="true"></script>
<script src="~/_content/GoogleAnalytics.Blazor/googleanalytics.blazor.js" asp-append-version="true"></script>

<script src="~/_framework/blazor.server.js" asp-append-version="true"></script>

</body>
</html>
23 changes: 0 additions & 23 deletions Material.Blazor.Website.Server/PlatformDetermination.cs

This file was deleted.

Loading
Loading