Skip to content

Commit

Permalink
net9.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Jimmys20 committed Nov 16, 2024
1 parent 43209d5 commit 92cca2f
Show file tree
Hide file tree
Showing 10 changed files with 36 additions and 41 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ jobs:
# uses GitHub's checkout action to checkout code form the master branch
- uses: actions/checkout@v2

# sets up .NET Core SDK 8.0
# sets up .NET Core SDK 9.0
- name: Setup .NET Core SDK
uses: actions/setup-dotnet@v1
with:
dotnet-version: '8.0.x'
dotnet-version: '9.0.x'

# publishes Blazor project to the release-folder
- name: Publish .NET Core Project
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<ServiceWorkerAssetsManifest>service-worker-assets.js</ServiceWorkerAssetsManifest>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="BlazorPro.BlazorSize" Version="6.2.2" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.3" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.3" PrivateAssets="all" />
<PackageReference Include="BlazorPro.BlazorSize" Version="9.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.0" PrivateAssets="all" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
}

.top-row {
height: 3.5rem;
min-height: 3.5rem;
background-color: rgba(0,0,0,0.4);
}

Expand Down
4 changes: 2 additions & 2 deletions demo/Jimmys20.BlazorComponents.Demo/Pages/Weather.razor
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ else
<thead>
<tr>
<th>Date</th>
<th>Temp. (C)</th>
<th>Temp. (F)</th>
<th aria-label="Temperature in Celsius">Temp. (C)</th>
<th aria-label="Temperature in Farenheit">Temp. (F)</th>
<th>Summary</th>
</tr>
</thead>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,5 @@
{
"$schema": "http://json.schemastore.org/launchsettings.json",
"iisSettings": {
"windowsAuthentication": false,
"anonymousAuthentication": true,
"iisExpress": {
"applicationUrl": "http://localhost:57830",
"sslPort": 44387
}
},
"$schema": "https://json.schemastore.org/launchsettings.json",
"profiles": {
"http": {
"commandName": "Project",
Expand All @@ -28,14 +20,6 @@
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
},
"IIS Express": {
"commandName": "IISExpress",
"launchBrowser": true,
"inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
}
}
}
11 changes: 11 additions & 0 deletions demo/Jimmys20.BlazorComponents.Demo/wwwroot/css/app.css
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,11 @@ a, .btn-link {
}

#blazor-error-ui {
color-scheme: light only;
background: lightyellow;
bottom: 0;
box-shadow: 0 -1px 2px rgba(0, 0, 0, 0.2);
box-sizing: border-box;
display: none;
left: 0;
padding: 0.6rem 1.25rem 0.7rem 1.25rem;
Expand Down Expand Up @@ -102,6 +104,15 @@ code {
color: #c02d76;
}

.form-floating > .form-control-plaintext::placeholder, .form-floating > .form-control::placeholder {
color: var(--bs-secondary-color);
text-align: end;
}

.form-floating > .form-control-plaintext:focus::placeholder, .form-floating > .form-control:focus::placeholder {
text-align: start;
}

.jm-dropzone {
border: 1px dashed var(--bs-secondary);
border-radius: 0.2rem;
Expand Down
6 changes: 3 additions & 3 deletions demo/Jimmys20.BlazorComponents.Demo/wwwroot/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Jimmys20.BlazorComponents.Demo</title>
<base href="/" />
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/css/bootstrap.min.css" integrity="sha384-rbsA2VBKQhggwzxH7pPCaAqO46MgnOM80zW1RWuH61DGLwZJEdK2Kadq2F9CUG65" crossorigin="anonymous">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
<link rel="stylesheet" href="css/app.css" />
<link rel="icon" type="image/png" href="favicon.png" />
<link href="Jimmys20.BlazorComponents.Demo.styles.css" rel="stylesheet" />
Expand All @@ -26,8 +26,8 @@

<div id="blazor-error-ui">
An unhandled error has occurred.
<a href="" class="reload">Reload</a>
<a class="dismiss">🗙</a>
<a href="." class="reload">Reload</a>
<span class="dismiss">🗙</span>
</div>

<script src="js/DragDropTouch.js"></script>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,6 @@ public partial class JmButton : BootstrapComponentBase
/// </summary>
[Parameter] public ButtonType Type { get; set; }

/// <summary>
/// Specifies the size of the button.
/// </summary>
[Parameter] public ButtonSize Size { get; set; }

/// <summary>
/// Fires when the button is clicked.
/// </summary>
Expand All @@ -36,6 +31,11 @@ public partial class JmButton : BootstrapComponentBase
/// </summary>
[Parameter] public bool Outline { get; set; }

/// <summary>
/// Specifies the size of the button.
/// </summary>
[Parameter] public ButtonSize Size { get; set; }

/// <summary>
/// Specifies if the button is active.
/// </summary>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">

<PropertyGroup>
<Version>1.1.0</Version>
<TargetFramework>net8.0</TargetFramework>
<Version>1.1.1</Version>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Description>Collection of various Bootstrap components for Blazor.</Description>
<PackageReadmeFile>README.md</PackageReadmeFile>
Expand All @@ -14,7 +14,7 @@

<ItemGroup>
<PackageReference Include="BlazorComponentUtilities" Version="1.8.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.3" />
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="9.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">

<PropertyGroup>
<Version>1.2.0</Version>
<TargetFramework>net8.0</TargetFramework>
<Version>1.2.1</Version>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Description>Collection of various Blazor components.</Description>
<PackageReadmeFile>README.md</PackageReadmeFile>
Expand All @@ -13,8 +13,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Excubo.Blazor.Canvas" Version="3.2.44" />
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.3" />
<PackageReference Include="Excubo.Blazor.Canvas" Version="3.2.66" />
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="9.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down

0 comments on commit 92cca2f

Please sign in to comment.