Skip to content

Commit

Permalink
Merge branch 'archives-v3' of https://github.com/microsoft/fluentui-b…
Browse files Browse the repository at this point in the history
…lazor into archives-v3
  • Loading branch information
vnbaaij committed Nov 13, 2024
2 parents a336d3f + 0317f6f commit 2559924
Show file tree
Hide file tree
Showing 25 changed files with 433 additions and 69 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/cicd_publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@ jobs:
uses: actions/checkout@v3

- name: .NET Setup SDKs
uses: actions/setup-dotnet@v2
uses: actions/setup-dotnet@v4
with:
dotnet-version: |
7.0.x
include-prerelease: true
dotnet-quality: ga

- name: .NET Builld
run: dotnet build ${{ env.PROJECT }} -c ${{ env.BUILD_CONFIG }} -o publish -f net7.0 -r linux-x64 --self-contained=true -p:BuildNumber=$BUILD_NUMBER -p:SourceRevisionId=$GITHUB_SHA -p:ContinuousIntegrationBuild=true
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deploy_preview.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@ jobs:
uses: actions/checkout@v3

- name: .NET Setup SDKs
uses: actions/setup-dotnet@v2
uses: actions/setup-dotnet@v4
with:
dotnet-version: |
7.0.x
include-prerelease: true
dotnet-quality: ga

- name: .NET Builld
run: dotnet build ${{ env.PROJECT }} -c ${{ env.BUILD_CONFIG }} -o publish -f net7.0 -r linux-x64 --self-contained=true -p:BuildNumber=$BUILD_NUMBER -p:SourceRevisionId=$GITHUB_SHA -p:ContinuousIntegrationBuild=true
Expand Down
4 changes: 2 additions & 2 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
<SolutionDir>$(MSBuildThisFileDirectory)</SolutionDir>
<AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>

<VersionFile>3.7.9</VersionFile>
<VersionPrefix>3.7.9</VersionPrefix>
<VersionFile>3.8.0</VersionFile>
<VersionPrefix>3.8.0</VersionPrefix>
<VersionSuffix></VersionSuffix>
<AssemblyVersion>$(VersionFile)</AssemblyVersion>
<FileVersion>$(VersionFile)</FileVersion>
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ variables:
# File and Package version
# dev branch: 1.2.4-Preview-23282-1' (PackageSuffix is always ignored in Dev branch)
# main branch: 1.2.4-RC.1' (PackageSuffix is ignored, if empty, in Main branch)
FileVersion: '3.7.9' # Set the next final version here.
FileVersion: '3.8.0' # Set the next final version here.
PackageSuffix: ''
8 changes: 4 additions & 4 deletions examples/Demo/Client/FluentUI.Demo.Client.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
</PropertyGroup>

<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.31" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.31" PrivateAssets="all" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.36" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.36" PrivateAssets="all" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.19" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.19" PrivateAssets="all" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.20" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.20" PrivateAssets="all" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions examples/Demo/Shared/FluentUI.Demo.Shared.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@
</PropertyGroup>

<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.31" />
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.36" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="7.0.19" />
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="7.0.20" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions examples/Demo/Shared/Pages/Index/Index.razor
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
<h1>Welcome to the Fluent UI Blazor components library</h1>
<div class="demopanel" style="margin: 1rem 0; padding: 2.5rem; text-align: center">
<p>This is the demo and documentation site for version <strong>@_version</strong> of the library.</p>
<p>This version <strong>only</strong> supports .NET 6 (supported till November 12 2024) and .NET 7 (out of support since May 14 2024).</p>
<p>This version <strong>is no longer supported</strong> as both .NET 6 and .NET 7 are out of support now.</p>
<p>The site reflects the latest state of the v3 development. The version shown above might be newer than what is available on NuGet.</p>
<br />
<p>See <a href="https://www.fluentui-blazor.net/">https://www.fluentui-blazor.net/</a> for the v4 demo and documentation site (supporting .NET 8).</p>
<p>See <a href="https://www.fluentui-blazor.net/">https://www.fluentui-blazor.net/</a> for the, supported, v4 demo and documentation site (supporting .NET 8 and .NET 9).</p>
</div>

<h2 id="introduction">Introduction</h2>
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"sdk": {
"version": "7.0.409"
"version": "7.0.410"
}
}
13 changes: 10 additions & 3 deletions src/Assets/FluentUI.Icons/Icons/Filled12.cs

Large diffs are not rendered by default.

52 changes: 42 additions & 10 deletions src/Assets/FluentUI.Icons/Icons/Filled16.cs

Large diffs are not rendered by default.

Loading

0 comments on commit 2559924

Please sign in to comment.