microsoft · EisenbergEffect · Oct 27, 2021 · Sep 28, 2021 · Sep 28, 2021 · Sep 28, 2021
@@ -16,7 +16,8 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 5.0.x
+        dotnet-version: 6.0.x
+        include-prerelease: true
     - name: Restore dependencies
       run: dotnet restore
     - name: Build

@@ -13,7 +13,7 @@
 
 The `Microsoft.Fast.Components.FluentUI` package provides a lightweight set of [Blazor](https://blazor.net) component wrappers around Microsoft's official FluentUI Web Components. The FluentUI Web Components are built on [FAST](https://www.fast.design/) and work in every major browser. To get up and running with `Microsoft.Fast.Components.FluentUI` see the Getting Started section below.
 
-The source for `@fluentui/web-components` is hosted in [the Fluent UI monorepo](https://github.com/microsoft/fluentui/tree/master/packages/web-components).
+The source for `@fluentui/web-components` is hosted in [the Fluent UI monorepo](https://github.com/microsoft/fluentui/tree/master/packages/web-components). An implementation of all the current Fluent Web Components can be found at https://aka.ms/fluentwebcomponents.
 
 ## Getting Started
 

@@ -36,13 +36,13 @@
 
 <h2>Sorting/Filtering grid</h2>
 <FluentTextField @oninput="FilterChanged">Filter Fruit</FluentTextField>
-<FluentDataGrid id="sortingGrid" GridTemplateColumns="1fr 1fr 1fr 1fr" RowsData=SortedRowsGrid ColumnDefinitions=SortingColumnsGrid>
+<FluentDataGrid id="sortingGrid" GridTemplateColumns="1fr 1fr 1fr" RowsData=SortedRowsGrid ColumnDefinitions=SortingColumnsGrid>
     <HeaderCellTemplate >
         <FluentButton @onclick=@(()=>SortColumn(context))>
-            @context.Title 
+            @context.Title
             @if (context.Title == lastSortColumn?.Title)
             {
-                @(isAscending ? " ↑" : " ↓")                
+                @(isAscending ? " ↑" : " ↓")
             }
         </FluentButton>
     </HeaderCellTemplate>
@@ -73,21 +73,21 @@
     private bool isAscending = false;
     public string filterValue = "";
 
-    List<SampleGrid1Data> RowsGrid1 = new List<SampleGrid1Data>()
+    List<SampleGrid1Data> RowsGrid1 = new()
     {
         new SampleGrid1Data("Rob", 19 ),
         new SampleGrid1Data("Bob", 20 )
     };
 
-    List<SampleGrid2Data> RowsGrid2 = new List<SampleGrid2Data>()
+    List<SampleGrid2Data> RowsGrid2 = new()
     {
         new SampleGrid2Data("value 1-1", "value 2-1", "value 3-1", "value 4-1" ),
         new SampleGrid2Data("value 1-2", "value 2-2", "value 3-2", "value 4-2" ),
         new SampleGrid2Data("value 1-3", "value 2-3", "value 3-3", "value 4-3" ),
         new SampleGrid2Data("value 1-4", "value 2-4", "value 3-4", "value 4-4" )
 
     };
-        
+
     List<SampleGrid3Data> RawSortedRowsGrid = new List<SampleGrid3Data>()
     {
         new SampleGrid3Data("apples", "$1.50", "red" ),
@@ -96,7 +96,7 @@
         new SampleGrid3Data("oranges", "$1.25", "orange" )
 
     };
-    List<SampleGrid3Data> SortedRowsGrid;
+    List<SampleGrid3Data> SortedRowsGrid = new();
 
 
     protected override void OnInitialized()
@@ -112,7 +112,7 @@
         SortingColumnsGrid.Add(new ColumnDefinition<SampleGrid3Data>("Fruit", x => x.fruit));
         SortingColumnsGrid.Add(new ColumnDefinition<SampleGrid3Data>("Cost", x => x.cost));
         SortingColumnsGrid.Add(new ColumnDefinition<SampleGrid3Data>("Color", x => x.color));
-        
+
         SortedRowsGrid = RawSortedRowsGrid;
 
         base.OnInitialized();
@@ -121,7 +121,7 @@
     private void FilterChanged(ChangeEventArgs args)
     {
         var filter = args.Value as string;
-        
+
         if (string.IsNullOrWhiteSpace(filter))
         {
             SortedRowsGrid = RawSortedRowsGrid;
@@ -132,9 +132,9 @@
         }
         if (lastSortColumn != null)
         {
-            SortedRowsGrid.Sort(new CustomComparer(lastSortColumn.FieldSelector, isAscending));
+            SortedRowsGrid.Sort(new CustomComparer(lastSortColumn.FieldSelector!, isAscending));
         }
-        
+
     }
 
     private void SortColumn(ColumnDefinition<SampleGrid3Data> columnDefinition)
@@ -148,7 +148,7 @@
             lastSortColumn = columnDefinition;
             isAscending = true;
         }
-        SortedRowsGrid.Sort(new CustomComparer(columnDefinition.FieldSelector, isAscending));
+        SortedRowsGrid.Sort(new CustomComparer(columnDefinition.FieldSelector!, isAscending));
     }
 
     class CustomComparer : IComparer<SampleGrid3Data>
@@ -162,10 +162,10 @@
             _isAscending = isAscending;
         }
 
-        int IComparer<SampleGrid3Data>.Compare(SampleGrid3Data x, SampleGrid3Data y)
+        int IComparer<SampleGrid3Data>.Compare(SampleGrid3Data? x, SampleGrid3Data? y)
         {
-            var xs = _selector(x) as string;
-            var ys = _selector(y) as string;
+            var xs = _selector(x!) as string;
+            var ys = _selector(y!) as string;
             if (xs == null || ys == null)
                 return 0;
             return string.Compare(xs, ys) * (_isAscending ? 1 : -1);

@@ -15,12 +15,12 @@
 <button @onclick="OnOpenModalParameterButtonClick">Open dialog with variable</button>
 
 @code{
-    private FluentDialog MyFluentDialog;
+    private FluentDialog? MyFluentDialog;
     public bool ModalHidden { get; set; } = true;
 
 
-    private void OnOpenModalRefButtonClick() => MyFluentDialog.Show();
-    private void OnCloseModalRefButtonClick() => MyFluentDialog.Hide();
+    private void OnOpenModalRefButtonClick() => MyFluentDialog!.Show();
+    private void OnCloseModalRefButtonClick() => MyFluentDialog!.Hide();
 
     private void OnOpenModalParameterButtonClick() => ModalHidden = false;
     private void OnCloseModalParameterButtonClick() => ModalHidden = true;

@@ -1,25 +1,3 @@
-<div style="
-          direction: ltr;
-          display: grid;
-          grid-auto-flow: column;
-          grid-template-columns: min-content;
-          grid-gap: 12px;
-      ">
-    <script suppress-error='BL9992'>
-      darkTheme = false;
-    </script>
-    <FluentSwitch onclick="document.dir = document.dir === 'rtl' ? 'ltr' : 'rtl'; document.getElementsByTagName('fluent-design-system-provider')[0].setAttribute('direction', document.dir);">
-        <span style="padding-inline-end: 8px;">Direction</span>
-        <span slot="unchecked-message">ltr</span>
-        <span slot="checked-message">rtl</span>
-    </FluentSwitch>
-
-    <FluentSwitch onclick="document.darkTheme = !document.darkTheme; document.getElementsByTagName('fluent-design-system-provider')[0].setAttribute('background-color', darkTheme ? '#333333' : '#F7F7F7');">
-        <span style="padding-inline-end: 8px;"> Theme</span>
-        <span slot="checked-message">Dark</span>
-        <span slot="unchecked-message">Light</span>
-    </FluentSwitch>
-</div>
 <h1>Switch</h1>
 <h4>Default</h4>
 <div style="display: flex; flex-direction: column;">

@@ -1,12 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\Microsoft.Fast.Components.FluentUI\Microsoft.Fast.Components.FluentUI.csproj" />
   </ItemGroup>
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
-    <RuntimeFrameworkVersion>5.0.10</RuntimeFrameworkVersion>
+    <TargetFramework>net6.0</TargetFramework>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

@@ -158,22 +158,22 @@
     private class FormModel
     {
         [Required]
-        public string SelectValue { get; set; }
+        public string? SelectValue { get; set; }
 
         [Required]
-        public string TextFieldValue { get; set; }
+        public string? TextFieldValue { get; set; }
 
         [Required]
         public int? NumberFieldValue { get; set; }
 
         [Required]
-        public string TextAreaValue { get; set; }
+        public string? TextAreaValue { get; set; }
 
         [Required]
-        public string ComboboxValue { get; set; }
+        public string? ComboboxValue { get; set; }
 
         [Required]
-        public string RadioGroupValue { get; set; }
+        public string? RadioGroupValue { get; set; }
 
         [Required]
         public bool CheckboxValue { get; set; }

@@ -1,19 +1,15 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.Extensions.Logging;
+using System.Diagnostics;
 
 namespace FluentUIServerSample.Pages
 {
     [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
     [IgnoreAntiforgeryToken]
     public class ErrorModel : PageModel
     {
-        public string RequestId { get; set; }
+        public string? RequestId { get; set; }
 
         public bool ShowRequestId => !string.IsNullOrEmpty(RequestId);
 

@@ -121,12 +121,12 @@
 </div>
 
 @code {
-    string TextFieldValueImplicit;
-    string TextFieldValueExplicit;
+    string? TextFieldValueImplicit;
+    string? TextFieldValueExplicit;
     int NumberFieldValueImplicit;
     int NumberFieldValueExplicit;
-    string TextAreaValueImplicit;
-    string TextAreaValueExplicit;
+    string? TextAreaValueImplicit;
+    string? TextAreaValueExplicit;
     bool CheckboxValueImplicit;
     bool CheckboxValueExplicit;
     bool SwitchValueImplicit;
@@ -135,13 +135,12 @@
     bool FluentMenuItemValueExplicit;
     int SliderValueImplicit;
     int SliderValueExplicit;
-    string SelectValueImplicit;
-    string SelectValueExplicit;
-    string RadioGroupValueImplicit;
-    string RadioGroupValueExplicit;
+    string? SelectValueImplicit;
+    string? SelectValueExplicit;
+    string? RadioGroupValueImplicit;
+    string? RadioGroupValueExplicit;
     int ListboxIndexValueImplicit;
     int ListboxIndexValueExplicit;
-    string ComboboxValueImplicit;
-    string ComboboxValueExplicit;
-
+    string? ComboboxValueImplicit;
+    string? ComboboxValueExplicit;
 }