Skip to content
Merged
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
28 changes: 14 additions & 14 deletions .github/workflows/build-core-lib.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,17 +47,17 @@ jobs:
dotnet-version: 8.0.x
dotnet-quality: ga

- name: Setup .NET 9.0
uses: actions/setup-dotnet@v4
with:
dotnet-version: 9.0.204
dotnet-quality: ga

# - name: Setup .NET 10.0
# - name: Setup .NET 9.0
# uses: actions/setup-dotnet@v4
# with:
# dotnet-version: 10.0.x
# dotnet-quality: preview
# dotnet-version: 9.0.204
# dotnet-quality: ga

- name: Setup .NET 10.0
uses: actions/setup-dotnet@v4
with:
dotnet-version: 10.0.x
dotnet-quality: preview

# Build

Expand Down Expand Up @@ -155,7 +155,7 @@ jobs:
runs-on: ubuntu-latest
name: Build and Deploy Demo site
env:
DOTNET_VERSION: "net9.0"
DOTNET_VERSION: "net10.0"
DOTNET_CLI_TELEMETRY_OPTOUT: 1
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
DOTNET_NOLOGO: true
Expand All @@ -173,11 +173,11 @@ jobs:
- name: .NET Setup SDKs
uses: actions/setup-dotnet@v4
with:
dotnet-version: 9.0.204
dotnet-quality: ga
dotnet-version: 10.0.x
dotnet-quality: preview

- name: .NET Builld
run: dotnet build ${{ env.PROJECT }} -c ${{ env.BUILD_CONFIG }} -o publish -f ${{ env.DOTNET_VERSION }} -r linux-x64 --self-contained=true -p:BuildNumber=$BUILD_NUMBER -p:SourceRevisionId=$GITHUB_SHA -p:ContinuousIntegrationBuild=true
#- name: .NET Builld
# run: dotnet build ${{ env.PROJECT }} -c ${{ env.BUILD_CONFIG }} -o publish -f ${{ env.DOTNET_VERSION }} -r linux-x64 --self-contained=true -p:BuildNumber=$BUILD_NUMBER -p:SourceRevisionId=$GITHUB_SHA -p:ContinuousIntegrationBuild=true

- name: .NET Publish
run: dotnet publish ${{ env.PROJECT }} -c ${{ env.BUILD_CONFIG }} -o publish -f ${{ env.DOTNET_VERSION }} -r linux-x64 --self-contained=true -p:BuildNumber=$BUILD_NUMBER -p:SourceRevisionId=$GITHUB_SHA -p:ContinuousIntegrationBuild=true
Expand Down
24 changes: 12 additions & 12 deletions .github/workflows/deploy_demo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
runs-on: ubuntu-latest
name: Build and deploy Demo site
env:
DOTNET_VERSION: "net9.0"
DOTNET_VERSION: "net10.0"
DOTNET_CLI_TELEMETRY_OPTOUT: 1
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
DOTNET_NOLOGO: true
Expand All @@ -34,17 +34,17 @@ jobs:
- name: Checkout source
uses: actions/checkout@v4

- name: Setup .NET 9.0
uses: actions/setup-dotnet@v4
with:
dotnet-version: 9.0.204
dotnet-quality: ga

# - name: Setup .NET 10.0
# - name: Setup .NET 9.0
# uses: actions/setup-dotnet@v4
# with:
# dotnet-version: 10.0.x
# dotnet-quality: preview
# dotnet-version: 9.0.204
# dotnet-quality: ga

- name: Setup .NET 10.0
uses: actions/setup-dotnet@v4
with:
dotnet-version: 10.0.x
dotnet-quality: preview

- name: NPM Install
uses: actions/setup-node@v4
Expand All @@ -54,8 +54,8 @@ jobs:

- run: npm install "src/Core.Assets/"

- name: .NET Builld
run: dotnet build ${{ env.PROJECT }} -c ${{ env.BUILD_CONFIG }} -o publish -f ${{ env.DOTNET_VERSION }} -r linux-x64 --self-contained=true -p:BuildNumber=$BUILD_NUMBER -p:SourceRevisionId=$GITHUB_SHA -p:ContinuousIntegrationBuild=true
# - name: .NET Builld
# run: dotnet build ${{ env.PROJECT }} -c ${{ env.BUILD_CONFIG }} -o publish -f ${{ env.DOTNET_VERSION }} -r linux-x64 --self-contained=true -p:BuildNumber=$BUILD_NUMBER -p:SourceRevisionId=$GITHUB_SHA -p:ContinuousIntegrationBuild=true

- name: .NET Publish
run: dotnet publish ${{ env.PROJECT }} -c ${{ env.BUILD_CONFIG }} -o publish -f ${{ env.DOTNET_VERSION }} -r linux-x64 --self-contained=true -p:BuildNumber=$BUILD_NUMBER -p:SourceRevisionId=$GITHUB_SHA -p:ContinuousIntegrationBuild=true
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/deploy_preview.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@ jobs:
- name: .NET Setup SDKs
uses: actions/setup-dotnet@v4
with:
dotnet-version: 9.0.204
dotnet-quality: ga
dotnet-version: 10.0.x
dotnet-quality: preview

- name: .NET Builld
run: dotnet build ${{ env.PROJECT }} -c ${{ env.BUILD_CONFIG }} -o publish -f ${{ env.DOTNET_VERSION }} -r linux-x64 --self-contained=true -p:BuildNumber=$BUILD_NUMBER -p:SourceRevisionId=$GITHUB_SHA -p:ContinuousIntegrationBuild=true
# - name: .NET Builld
# run: dotnet build ${{ env.PROJECT }} -c ${{ env.BUILD_CONFIG }} -o publish -f ${{ env.DOTNET_VERSION }} -r linux-x64 --self-contained=true -p:BuildNumber=$BUILD_NUMBER -p:SourceRevisionId=$GITHUB_SHA -p:ContinuousIntegrationBuild=true

- name: .NET Publish
run: dotnet publish ${{ env.PROJECT }} -c ${{ env.BUILD_CONFIG }} -o publish -f ${{ env.DOTNET_VERSION }} -r linux-x64 --self-contained=true -p:BuildNumber=$BUILD_NUMBER -p:SourceRevisionId=$GITHUB_SHA -p:ContinuousIntegrationBuild=true
Expand Down
30 changes: 15 additions & 15 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,33 +2,33 @@
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<RuntimeVersion8>8.0.0</RuntimeVersion8>
<AspNetCoreVersion8>8.0.16</AspNetCoreVersion8>
<EfCoreVersion8>8.0.16</EfCoreVersion8>
<RuntimeVersion9>9.0.5</RuntimeVersion9>
<AspNetCoreVersion9>9.0.5</AspNetCoreVersion9>
<EfCoreVersion9>9.0.5</EfCoreVersion9>
<RuntimeVersion10>10.0.0-preview.4.25258.110</RuntimeVersion10>
<AspNetCoreVersion10>10.0.0-preview.4.25258.110</AspNetCoreVersion10>
<EfCoreVersion10>10.0.0-preview.4.25258.110</EfCoreVersion10>
<AspNetCoreVersion8>8.0.17</AspNetCoreVersion8>
<EfCoreVersion8>8.0.17</EfCoreVersion8>
<RuntimeVersion9>9.0.6</RuntimeVersion9>
<AspNetCoreVersion9>9.0.6</AspNetCoreVersion9>
<EfCoreVersion9>9.0.6</EfCoreVersion9>
<RuntimeVersion10>10.0.0-preview.5.25277.114</RuntimeVersion10>
<AspNetCoreVersion10>10.0.0-preview.5.25277.114</AspNetCoreVersion10>
<EfCoreVersion10>10.0.0-preview.5.25277.114</EfCoreVersion10>
</PropertyGroup>
<ItemGroup>
<!-- For Sample Apps -->
<PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components" Version="4.11.9" />
<PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components.Icons" version="4.11.9" />
<PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components.Icons" version="4.12.0" />
<PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components.Emoji" Version="4.11.9" />
<!-- Test dependencies -->
<PackageVersion Include="bunit" Version="1.38.5" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
<PackageVersion Include="xunit" Version="2.9.3" />
<PackageVersion Include="xunit.runner.visualstudio" Version="3.0.2" />
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.0" />
<PackageVersion Include="coverlet.msbuild" Version="6.0.0" />
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
<!-- Shared dependencies -->
<PackageVersion Include="Markdig.Signed" Version="0.41.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.13.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="4.14.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.14.0" />
<PackageVersion Include="Microsoft.OData.Client" Version="8.2.3" />
<PackageVersion Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.13.61" />
<PackageVersion Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.14.15" />
<PackageVersion Include="Microsoft.VisualStudioEng.MicroBuild.Core" Version="1.0.0" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
Expand Down Expand Up @@ -87,4 +87,4 @@
<PackageVersion Include="System.Text.Encodings.Web" Version="$(RuntimeVersion10)" />
<PackageVersion Include="System.Text.Json" Version="$(RuntimeVersion9)" />
</ItemGroup>
</Project>
</Project>
2 changes: 1 addition & 1 deletion examples/Demo/Client/FluentUI.Demo.Client.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">

<PropertyGroup>
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<LangVersion>latest</LangVersion>
Expand Down
2 changes: 1 addition & 1 deletion examples/Demo/Server/FluentUI.Demo.Server.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<LangVersion>latest</LangVersion>
Expand Down
2 changes: 1 addition & 1 deletion examples/Demo/Shared/FluentUI.Demo.Shared.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">
<PropertyGroup>
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<LangVersion>latest</LangVersion>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9039,7 +9039,67 @@
</member>
<member name="P:Microsoft.FluentUI.AspNetCore.Components.FluentSortableList`1.Fallback">
<summary>
Gets or sets wether ro ignore the HTML5 DnD behaviour and force the fallback to kick in
Gets or sets wether to ignore the HTML5 DnD behaviour and force the fallback to kick in
</summary>
</member>
<member name="P:Microsoft.FluentUI.AspNetCore.Components.FluentSortableList`1.ListItemFilteredColor">
<summary>
Gets or sets the color of filtered list items.
</summary>
</member>
<member name="P:Microsoft.FluentUI.AspNetCore.Components.FluentSortableList`1.ListBorderWidth">
<summary>
Gets or sets the border width on the list. Must be a valid CSS measurement.
</summary>
</member>
<member name="P:Microsoft.FluentUI.AspNetCore.Components.FluentSortableList`1.ListBorderColor">
<summary>
Gets or sets the color of the border on the list.
</summary>
</member>
<member name="P:Microsoft.FluentUI.AspNetCore.Components.FluentSortableList`1.ListPadding">
<summary>
Gets or sets the padding on the list. Must be a valid CSS measurement.
</summary>
</member>
<member name="P:Microsoft.FluentUI.AspNetCore.Components.FluentSortableList`1.ListItemBackgroundColor">
<summary>
Gets or sets the background color of the list items.
</summary>
</member>
<member name="P:Microsoft.FluentUI.AspNetCore.Components.FluentSortableList`1.ListItemHeight">
<summary>
Gets or sets the height of the list items. Must be a valid CSS measurement.
</summary>
</member>
<member name="P:Microsoft.FluentUI.AspNetCore.Components.FluentSortableList`1.ListItemBorderWidth">
<summary>
Gets or sets the border width on the list items. Must be a valid CSS measurement.
</summary>
</member>
<member name="P:Microsoft.FluentUI.AspNetCore.Components.FluentSortableList`1.ListItemBorderColor">
<summary>
Gets or sets the border color of the list items.
</summary>
</member>
<member name="P:Microsoft.FluentUI.AspNetCore.Components.FluentSortableList`1.ListItemDropBorderColor">
<summary>
Gets or sets the border color of the list items during repositioning.
</summary>
</member>
<member name="P:Microsoft.FluentUI.AspNetCore.Components.FluentSortableList`1.ListItemDropColor">
<summary>
Gets or sets the background color of the list items during repositioning.
</summary>
</member>
<member name="P:Microsoft.FluentUI.AspNetCore.Components.FluentSortableList`1.ListItemPadding">
<summary>
Gets or sets the padding on the list items. Must be a valid CSS measurement.
</summary>
</member>
<member name="P:Microsoft.FluentUI.AspNetCore.Components.FluentSortableList`1.ListItemSpacing">
<summary>
Gets or sets the spacing between list items. Must be a valid CSS measurement.
</summary>
</member>
<member name="P:Microsoft.FluentUI.AspNetCore.Components.FluentSortableListEventArgs.OldIndex">
Expand Down
2 changes: 1 addition & 1 deletion global.json → global.bak
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "9.0.204",
"version": "9.0.301",
"allowPrerelease": true,
"rollForward": "latestPatch"
}
Expand Down
2 changes: 1 addition & 1 deletion src/Core/Microsoft.FluentUI.AspNetCore.Components.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">
<PropertyGroup>
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
<PackageId>Microsoft.FluentUI.AspNetCore.Components</PackageId>

<Summary>A Blazor component library leveraging Microsoft’s Fluent Design System UI. Use the look of modern Microsoft products in your Blazor applications</Summary>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
<PackageId>Microsoft.FluentUI.AspNetCore.Components.DataGrid.EntityFrameworkAdapter</PackageId>
<Authors>Microsoft</Authors>
<Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
<PackageId>Microsoft.FluentUI.AspNetCore.Components.DataGrid.ODataAdapter</PackageId>
<Authors>Microsoft</Authors>
<Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@

<PropertyGroup>
<!-- for templates -->
<AspirePackageVersion>9.0.0</AspirePackageVersion>
<MicrosoftExtensionsHttpResiliencePackageVersion>9.0.3</MicrosoftExtensionsHttpResiliencePackageVersion>
<AspirePackageVersion>9.3.0</AspirePackageVersion>
<MicrosoftExtensionsHttpResiliencePackageVersion>9.0.5</MicrosoftExtensionsHttpResiliencePackageVersion>
<MicrosoftAspNetCorePackageVersionForNet8>8.0.14</MicrosoftAspNetCorePackageVersionForNet8>
<MicrosoftAspNetCorePackageVersionForNet9>9.0.3</MicrosoftAspNetCorePackageVersionForNet9>
<MicrosoftAspNetCorePackageVersionForNet9>9.0.5</MicrosoftAspNetCorePackageVersionForNet9>

</PropertyGroup>

Expand Down
Loading