[Package versions] Refactoring (#2131)

microsoft · Jun 1, 2024 · 5a65947 · 5a65947
1 parent 91522fd
commit 5a65947
Show file tree

Hide file tree

Showing 9 changed files with 43 additions and 47 deletions.
diff --git a/.github/workflows/build-core-lib.yml b/.github/workflows/build-core-lib.yml
@@ -52,7 +52,7 @@ jobs:
        run: dotnet restore
 
      - name: Build
-       run: dotnet build ${{ env.PROJECTS }} --configuration Release
+       run: dotnet build ${{ env.PROJECTS }} --configuration Release -warnaserror
        working-directory: ${{ github.workspace }}
 
      # Unit Tests

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -21,7 +21,10 @@
     <!-- Enable code style analysis -->
     <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
     <!-- <EnableNETAnalyzers>true</EnableNETAnalyzers> -->
-	</PropertyGroup>
+
+    <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
+
+  </PropertyGroup>
 
 	<ItemGroup>
 		<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -10,32 +10,37 @@
     <PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components" Version="4.5.0" />
     <PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components.Emoji" Version="4.6.0" />
     <PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components.Icons" version="4.7.2" />
+
     <!-- Build dependencies -->
-    <PackageVersion Include="Markdig.Signed" Version="0.34.0" />
     <PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="$(AspNetCoreVersion)" />
     <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="$(AspNetCoreVersion)" />
     <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="$(AspNetCoreVersion)" />
-    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="$(RuntimeVersion)" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0-beta1.23525.2" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore" Version="$(EfCoreVersion)" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="$(EfCoreVersion)" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="$(EfCoreVersion)" />
     <PackageVersion Include="Microsoft.Extensions.Configuration.CommandLine" Version="$(RuntimeVersion)" />
     <PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="$(RuntimeVersion)" />
     <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="$(RuntimeVersion)" />
     <PackageVersion Include="Microsoft.Extensions.Http" Version="$(RuntimeVersion)" />
+    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="$(RuntimeVersion)" />
+    <PackageVersion Include="System.Text.Encodings.Web" Version="$(RuntimeVersion)" />
+
+    <PackageVersion Include="Microsoft.EntityFrameworkCore" Version="$(EfCoreVersion)" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="$(EfCoreVersion)" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="$(EfCoreVersion)" />
+
+    <PackageVersion Include="Markdig.Signed" Version="0.34.0" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0-beta1.24219.2" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" />
     <PackageVersion Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.10.48" />
     <PackageVersion Include="Microsoft.VisualStudioEng.MicroBuild.Core" Version="1.0.0" />
-    <PackageVersion Include="System.Text.Encodings.Web" Version="$(RuntimeVersion)" />
     <PackageVersion Include="System.Text.Json" Version="8.0.3" />
+
     <!-- Test dependencies -->
     <PackageVersion Include="bunit" Version="1.28.9" />
-    <PackageVersion Include="FluentAssertions" Version="7.0.0-tags-7-0-0-alpha-3.1" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageVersion Include="FluentAssertions" Version="6.12.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
     <PackageVersion Include="xunit" Version="2.8.0" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.0" />
     <PackageVersion Include="coverlet.msbuild" Version="6.0.0" />
-    <PackageVersion Include="coverlet.collector" Version="6.0.2" />
+    <PackageVersion Include="coverlet.collector" Version="6.0.0" />
+
   </ItemGroup>
 </Project>
diff --git a/eng/pipelines/build-core-lib.yml b/eng/pipelines/build-core-lib.yml
@@ -189,7 +189,7 @@ extends:
           inputs:
             command: 'build'
             projects: ${{ parameters.Projects }}
-            arguments: '--configuration Release /p:ContinuousIntegrationBuild=true'
+            arguments: '--configuration Release /p:ContinuousIntegrationBuild=true -warnaserror'
 
         # Test and generate Code Coverage
         - task: DotNetCoreCLI@2

diff --git a/examples/Demo/Shared/FluentUI.Demo.Shared.csproj b/examples/Demo/Shared/FluentUI.Demo.Shared.csproj
@@ -30,13 +30,7 @@
 
 	<!-- Code Analysis -->
 	<ItemGroup>
-		<!--
-		<PackageReference Include="StyleCop.Analyzers" VersionOverride="1.2.0-beta.556">
-			<PrivateAssets>all</PrivateAssets>
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-		</PackageReference>
-		-->
-		<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" VersionOverride="17.8.14">
+		<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>

diff --git a/examples/Demo/Shared/Microsoft.FluentUI.AspNetCore.Components.xml b/examples/Demo/Shared/Microsoft.FluentUI.AspNetCore.Components.xml
@@ -6296,7 +6296,7 @@
         </member>
         <member name="P:Microsoft.FluentUI.AspNetCore.Components.FluentNavGroup.Expanded">
             <summary>
-            If true, expands the nav group, otherwise collapse it. 
+            If true, expands the nav group, otherwise collapse it.
             Two-way bindable
             </summary>
         </member>
@@ -6312,7 +6312,7 @@
         </member>
         <member name="P:Microsoft.FluentUI.AspNetCore.Components.FluentNavGroup.Gap">
             <summary>
-            Defines the vertical spacing between the NavGroup and adjecent items. 
+            Defines the vertical spacing between the NavGroup and adjecent items.
             Needs to be a valid CSS value.
             </summary>
         </member>
@@ -6323,7 +6323,7 @@
         </member>
         <member name="P:Microsoft.FluentUI.AspNetCore.Components.FluentNavGroup.TitleTemplate">
             <summary>
-            Allows for specific markup and styling to be applied for the group title 
+            Allows for specific markup and styling to be applied for the group title
             When using this, the containded <see cref="T:Microsoft.FluentUI.AspNetCore.Components.FluentNavLink"/>s and <see cref="T:Microsoft.FluentUI.AspNetCore.Components.FluentNavGroup"/>s need to be placed in a ChildContent tag.
             When specifying both Title and TitleTemplate, both will be rendered.
             </summary>

diff --git a/src/Core/Components/DataGrid/Columns/SelectColumn.cs b/src/Core/Components/DataGrid/Columns/SelectColumn.cs
@@ -188,21 +188,21 @@ internal async Task AddOrRemoveSelectedItemAsync(TGridItem? item)
             {
                 _selectedItems.Remove(item);
                 SelectAll = false;
-                await CallOnSelect(item, false);
+                await CallOnSelectAsync(item, false);
             }
             else
             {
                 if (SelectMode == DataGridSelectMode.Single)
                 {
                     foreach (var previous in _selectedItems)
                     {
-                        await CallOnSelect(previous, false);
+                        await CallOnSelectAsync(previous, false);
                     }
                     _selectedItems.Clear();
                 }
 
                 _selectedItems.Add(item);
-                await CallOnSelect(item, true);
+                await CallOnSelectAsync(item, true);
             }
 
             if (SelectedItemsChanged.HasDelegate)
@@ -213,7 +213,7 @@ internal async Task AddOrRemoveSelectedItemAsync(TGridItem? item)
             RefreshHeaderContent();
         }
 
-        Task CallOnSelect(TGridItem item, bool isSelected)
+        Task CallOnSelectAsync(TGridItem item, bool isSelected)
         {
             return OnSelect.HasDelegate
                 ? OnSelect.InvokeAsync((item, isSelected))

diff --git a/src/Core/Components/List/FluentAutocomplete.razor.cs b/src/Core/Components/List/FluentAutocomplete.razor.cs
@@ -333,7 +333,7 @@ protected async Task KeyDownHandlerAsync(FluentKeyCodeEventArgs e)
         switch (e.Key)
         {
             case KeyCode.Escape:
-                await KeyDown_Escape();
+                await KeyDown_EscapeAsync();
                 break;
 
             case KeyCode.Enter:
@@ -345,11 +345,11 @@ protected async Task KeyDownHandlerAsync(FluentKeyCodeEventArgs e)
                                        : false;
                     if (optionDisabled)
                     {
-                        await KeyDown_Escape();
+                        await KeyDown_EscapeAsync();
                     }
                     else
                     {
-                        await KeyDown_Enter();
+                        await KeyDown_EnterAsync();
                     }
                 }
                 else
@@ -359,13 +359,13 @@ protected async Task KeyDownHandlerAsync(FluentKeyCodeEventArgs e)
                 break;
 
             case KeyCode.Backspace:
-                await KeyDown_Backspace();
+                await KeyDown_BackspaceAsync();
                 break;
 
             case KeyCode.Down:
                 if (IsMultiSelectOpened)
                 {
-                    await KeyDown_ArrowDown();
+                    await KeyDown_ArrowDownAsync();
                 }
                 else
                 {
@@ -374,19 +374,19 @@ protected async Task KeyDownHandlerAsync(FluentKeyCodeEventArgs e)
                 break;
 
             case KeyCode.Up:
-                await KeyDown_ArrowUp();
+                await KeyDown_ArrowUpAsync();
                 break;
         }
 
         // Escape
-        Task KeyDown_Escape()
+        Task KeyDown_EscapeAsync()
         {
             IsMultiSelectOpened = false;
             return Task.CompletedTask;
         }
 
         // Backspace
-        async Task KeyDown_Backspace()
+        async Task KeyDown_BackspaceAsync()
         {
             // Remove last selected item
             if (string.IsNullOrEmpty(ValueText) &&
@@ -409,7 +409,7 @@ await InputHandlerAsync(new ChangeEventArgs()
         }
 
         // ArrowUp
-        Task KeyDown_ArrowUp()
+        Task KeyDown_ArrowUpAsync()
         {
             if (Items != null && Items.Any())
             {
@@ -433,7 +433,7 @@ Task KeyDown_ArrowUp()
         }
 
         // ArrowDown
-        Task KeyDown_ArrowDown()
+        Task KeyDown_ArrowDownAsync()
         {
             if (Items != null && Items.Any())
             {
@@ -457,7 +457,7 @@ Task KeyDown_ArrowDown()
         }
 
         // Enter
-        async Task KeyDown_Enter()
+        async Task KeyDown_EnterAsync()
         {
             if (!IsMultiSelectOpened)
             {

diff --git a/src/Core/Microsoft.FluentUI.AspNetCore.Components.csproj b/src/Core/Microsoft.FluentUI.AspNetCore.Components.csproj
@@ -22,7 +22,7 @@
 
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <DebugType>embedded</DebugType>
-
+    
     <PackageOutputPath>$(SolutionDir)artifacts</PackageOutputPath>
   </PropertyGroup>
 
@@ -51,13 +51,7 @@
 
   <!-- Code Analysis -->
   <ItemGroup>
-    <!--
-    <PackageReference Include="StyleCop.Analyzers" VersionOverride="1.2.0-beta.556">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    -->
-    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" VersionOverride="17.8.14">
+    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>