Skip to content

Commit 84fd039

Browse files
danzuepdanzuep
committed
net9.0 test
1 parent 388b1f5 commit 84fd039

8 files changed

Lines changed: 24 additions & 36 deletions

File tree

‎.github/workflows/_build-web.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ on:
1717
type: string
1818
target_framework:
1919
description: "The target framework to build for"
20-
default: "net10.0"
20+
default: "net9.0"
2121
type: string
2222
dotnet_version:
2323
description: "The version of .NET to use"
24-
default: "10.x"
24+
default: "9.x"
2525
type: string
2626
outputs:
2727
project_path:
@@ -47,7 +47,7 @@ jobs:
4747
uses: actions/setup-dotnet@v5
4848
with:
4949
dotnet-version: ${{ env.NET_VERSION }}
50-
dotnet-quality: 'preview' # 'ga'
50+
dotnet-quality: 'ga' # 'preview'
5151

5252
# https://github.com/actions/cache/blob/main/examples.md#c---nuget
5353
- name: Get any cached NuGet packages from the last run

‎Bible.Sparse/App.razor‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
1-
<Router AppAssembly="@typeof(App).Assembly" NotFoundPage="typeof(Pages.NotFound)">
1+
<Router AppAssembly="@typeof(App).Assembly">
22
<Found Context="routeData">
3-
<RouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)"/>
3+
<RouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)" />
44
<FocusOnNavigate RouteData="@routeData" Selector="h1" />
55
</Found>
6+
<NotFound>
7+
<PageTitle>Not found</PageTitle>
8+
<LayoutView Layout="@typeof(MainLayout)">
9+
<p role="alert">Sorry, there's nothing at this address.</p>
10+
</LayoutView>
11+
</NotFound>
612
</Router>

‎Bible.Sparse/Bible.Sparse.csproj‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,14 @@
11
<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
22

33
<PropertyGroup>
4-
<TargetFramework>net10.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
7-
<OverrideHtmlAssetPlaceholders>true</OverrideHtmlAssetPlaceholders>
87
</PropertyGroup>
98

109
<ItemGroup>
11-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.0-rc.2.25502.107" />
12-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.0-rc.2.25502.107" PrivateAssets="all" />
13-
</ItemGroup>
14-
15-
<ItemGroup>
16-
<StaticWebAssetFingerprintPattern Include="JS" Pattern="*.js" Expression="#[.{fingerprint}]!" />
10+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.10" />
11+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.10" PrivateAssets="all" />
1712
</ItemGroup>
1813

1914
</Project>

‎Bible.Sparse/Pages/NotFound.razor‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎Bible.Sparse/Properties/launchSettings.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"dotnetRunMessages": true,
77
"launchBrowser": true,
88
"inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
9-
"applicationUrl": "http://localhost:5195",
9+
"applicationUrl": "http://localhost:5242",
1010
"environmentVariables": {
1111
"ASPNETCORE_ENVIRONMENT": "Development"
1212
}
@@ -16,7 +16,7 @@
1616
"dotnetRunMessages": true,
1717
"launchBrowser": true,
1818
"inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
19-
"applicationUrl": "https://localhost:7237;http://localhost:5195",
19+
"applicationUrl": "https://localhost:7121;http://localhost:5242",
2020
"environmentVariables": {
2121
"ASPNETCORE_ENVIRONMENT": "Development"
2222
}

‎Bible.Sparse/wwwroot/css/app.css‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,11 @@
4242
}
4343

4444
.loading-progress {
45-
position: absolute;
45+
position: relative;
4646
display: block;
4747
width: 8rem;
4848
height: 8rem;
49-
inset: 20vh 0 auto 0;
50-
margin: 0 auto 0 auto;
49+
margin: 20vh auto 1rem auto;
5150
}
5251

5352
.loading-progress circle {

‎Bible.Sparse/wwwroot/index.html‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,9 @@
66
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
77
<title>Bible.Sparse</title>
88
<base href="/" />
9-
<link rel="preload" id="webassembly" />
10-
<!--<link rel="preload" href="_framework/blazor.webassembly#[.{fingerprint}].js" as="script" crossorigin="anonymous" />-->
11-
<link rel="icon" type="image/png" href="icon-192.png" />
129
<link rel="stylesheet" href="css/app.css" />
1310
<!-- If you add any scoped CSS files, uncomment the following to load them
1411
<link href="Bible.Sparse.styles.css" rel="stylesheet" /> -->
15-
<script type="importmap"></script>
1612
</head>
1713

1814
<body>
@@ -29,10 +25,7 @@
2925
<a href="." class="reload">Reload</a>
3026
<span class="dismiss">🗙</span>
3127
</div>
32-
<!--https://github.com/dotnet/aspnetcore/issues/64060-->
33-
<!--<script src="_framework/blazor.webassembly.js"></script>-->
34-
<script src="_framework/blazor.webassembly#[.{fingerprint}].js"></script>
35-
<!--<script src="_framework/blazor.webassembly#[.{fingerprint}].js" crossorigin="anonymous"></script>-->
28+
<script src="_framework/blazor.webassembly.js"></script>
3629
</body>
3730

3831
</html>

‎Bible.Wasm.sln‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bible.SPA", "Bible.SPA\Bibl
2121
EndProject
2222
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bible.Razor", "Bible.Razor\Bible.Razor.csproj", "{9DA19BED-7E6E-F966-CB2E-F4ED87DF93EC}"
2323
EndProject
24-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bible.Sparse", "Bible.Sparse\Bible.Sparse.csproj", "{C56EA7C3-077B-4B0B-A641-E1F074A6A062}"
24+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bible.Sparse", "Bible.Sparse\Bible.Sparse.csproj", "{FF79E236-556E-474C-976A-E162B230975B}"
2525
EndProject
2626
Global
2727
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -65,10 +65,10 @@ Global
6565
{9DA19BED-7E6E-F966-CB2E-F4ED87DF93EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
6666
{9DA19BED-7E6E-F966-CB2E-F4ED87DF93EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
6767
{9DA19BED-7E6E-F966-CB2E-F4ED87DF93EC}.Release|Any CPU.Build.0 = Release|Any CPU
68-
{C56EA7C3-077B-4B0B-A641-E1F074A6A062}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
69-
{C56EA7C3-077B-4B0B-A641-E1F074A6A062}.Debug|Any CPU.Build.0 = Debug|Any CPU
70-
{C56EA7C3-077B-4B0B-A641-E1F074A6A062}.Release|Any CPU.ActiveCfg = Release|Any CPU
71-
{C56EA7C3-077B-4B0B-A641-E1F074A6A062}.Release|Any CPU.Build.0 = Release|Any CPU
68+
{FF79E236-556E-474C-976A-E162B230975B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
69+
{FF79E236-556E-474C-976A-E162B230975B}.Debug|Any CPU.Build.0 = Debug|Any CPU
70+
{FF79E236-556E-474C-976A-E162B230975B}.Release|Any CPU.ActiveCfg = Release|Any CPU
71+
{FF79E236-556E-474C-976A-E162B230975B}.Release|Any CPU.Build.0 = Release|Any CPU
7272
EndGlobalSection
7373
GlobalSection(SolutionProperties) = preSolution
7474
HideSolutionNode = FALSE

0 commit comments

Comments
 (0)