Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[General] Some miscellaneous changes #3353

Merged
merged 2 commits into from
Feb 14, 2025
Merged

[General] Some miscellaneous changes #3353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2a68b58
- Do not warn on directory mismatches
vnbaaij Feb 13, 2025
64175d6
Merge branch 'dev' into users/vnbaaij/misc
dvoituron Feb 14, 2025
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
56 changes: 29 additions & 27 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,38 +1,40 @@
<Project>
<PropertyGroup>
<Authors>Microsoft</Authors>
<Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
<NeutralLanguage>en</NeutralLanguage>
<Owners>Microsoft Corporation</Owners>
<PackageProjectUrl>https://github.com/microsoft/fluentui-blazor</PackageProjectUrl>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<RepositoryUrl>https://github.com/microsoft/fluentui-blazor</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<SolutionDir>$(MSBuildThisFileDirectory)</SolutionDir>
<AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
<PropertyGroup>
<Authors>Microsoft</Authors>
<Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
<NeutralLanguage>en</NeutralLanguage>
<Owners>Microsoft Corporation</Owners>
<PackageProjectUrl>https://github.com/microsoft/fluentui-blazor</PackageProjectUrl>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<RepositoryUrl>https://github.com/microsoft/fluentui-blazor</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<SolutionDir>$(MSBuildThisFileDirectory)</SolutionDir>
<AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>

<VersionFile>4.11.5</VersionFile>
<VersionPrefix>4.11.5</VersionPrefix>
<VersionSuffix></VersionSuffix>
<AssemblyVersion>$(VersionFile)</AssemblyVersion>
<FileVersion>$(VersionFile)</FileVersion>

<VersionFile>4.11.5</VersionFile>
<VersionPrefix>4.11.5</VersionPrefix>
<VersionSuffix></VersionSuffix>
<AssemblyVersion>$(VersionFile)</AssemblyVersion>
<FileVersion>$(VersionFile)</FileVersion>

<LangVersion>latest</LangVersion>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>

<!-- Enable code style analysis -->
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
<EnableNETAnalyzers>true</EnableNETAnalyzers>
<!-- Enable code style analysis -->
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
<EnableNETAnalyzers>true</EnableNETAnalyzers>

<SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
<SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
<NoWarn>IDE0130</NoWarn>

</PropertyGroup>
</PropertyGroup>

<ItemGroup>
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
<_Parameter1>Microsoft.FluentUI.AspNetCore.Components.Tests</_Parameter1>
</AssemblyAttribute>
</ItemGroup>
<ItemGroup>
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
<_Parameter1>Microsoft.FluentUI.AspNetCore.Components.Tests</_Parameter1>
</AssemblyAttribute>
</ItemGroup>
</Project>
1 change: 1 addition & 0 deletions examples/Demo/Shared/Microsoft.FluentUI.AspNetCore.Components.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -833,6 +833,7 @@
<member name="P:Microsoft.FluentUI.AspNetCore.Components.FluentButton.FormId">
<summary>
Gets or sets the id of a form to associate the element to.
Both the <see cref="P:Microsoft.FluentUI.AspNetCore.Components.FluentComponentBase.Id"/> and the FormId must be set if the button is placed outside of a form.
</summary>
</member>
<member name="P:Microsoft.FluentUI.AspNetCore.Components.FluentButton.Action">
Expand Down
2 changes: 1 addition & 1 deletion examples/Demo/Shared/Shared/DemoMainLayout.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
</div>
<FluentSpacer />
<div class="copy">
Microsoft © 2024. All rights reserved.
Microsoft © 2025. All rights reserved.
</div>
</FluentFooter>
</FluentLayout>
Expand Down
5 changes: 5 additions & 0 deletions src/Core/Components/Button/FluentButton.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// ------------------------------------------------------------------------
// MIT License - Copyright (c) Microsoft Corporation. All rights reserved.
// ------------------------------------------------------------------------

using Microsoft.AspNetCore.Components;
using Microsoft.AspNetCore.Components.Web;
using Microsoft.FluentUI.AspNetCore.Components.Extensions;
Expand Down Expand Up @@ -33,6 +37,7 @@ public partial class FluentButton : FluentComponentBase, IAsyncDisposable

/// <summary>
/// Gets or sets the id of a form to associate the element to.
/// Both the <see cref="FluentComponentBase.Id"/> and the FormId must be set if the button is placed outside of a form.
/// </summary>
[Parameter]
public string? FormId { get; set; }
Expand Down
4 changes: 2 additions & 2 deletions src/Core/Microsoft.FluentUI.AspNetCore.Components.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@
<WarningLevel>6</WarningLevel>
<NullableReferenceTypes>true</NullableReferenceTypes>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<NoWarn>1701;1702;8669;1591;1816</NoWarn>
<NoWarn>$(NoWarn);1701;1702;8669;1591;1816</NoWarn>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)'=='Release'">
<Optimize>True</Optimize>
<NoWarn>1701;1702;8669;1591</NoWarn>
<NoWarn>$(NoWarn);1701;1702;8669;1591</NoWarn>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
</PropertyGroup>

Expand Down