merge rebranding

.azure-devops/build-core-lib.yml

@@ -19,6 +19,6 @@ extends:
   template: common/template-to-build-projects.yml
   parameters:
       Projects: |
-       **/Microsoft.Fast.Components.FluentUI.csproj
+       **/Microsoft.FluentUI.AspNetCore.Components.csproj
       Tests: |
-       **/Microsoft.Fast.Components.FluentUI.Tests.csproj
+       **/Microsoft.FluentUI.AspNetCore.Components.Tests.csproj

.azure-devops/common/versioning.yml

@@ -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.3.0'
-  PackageSuffix: ''
+  FileVersion: '4.0.0'
+  PackageSuffix: 'preview.3'

Directory.Build.props

@@ -11,11 +11,17 @@
 		<PublishRepositoryUrl>true</PublishRepositoryUrl>
 		<SolutionDir>$(MSBuildThisFileDirectory)</SolutionDir>
 		<AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
+
+		<VersionFile>4.0.0</VersionFile>
+		<VersionPrefix>4.0.0</VersionPrefix>
+		<VersionSuffix>preview.3</VersionSuffix>
+		<AssemblyVersion>$(VersionFile)</AssemblyVersion>
+		<FileVersion>$(VersionFile)</FileVersion>
 	</PropertyGroup>
 
 	<ItemGroup>
 		<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
-			<_Parameter1>Microsoft.Fast.Components.FluentUI.Tests</_Parameter1>
+			<_Parameter1>Microsoft.FluentUI.AspNetCore.Components.Tests</_Parameter1>
 		</AssemblyAttribute>
 	</ItemGroup>
 </Project>

Directory.Packages.props

@@ -0,0 +1,37 @@
+<Project>
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+    <RuntimeVersion>8.0.0-rc.2.23479.6</RuntimeVersion>
+    <AspNetCoreVersion>8.0.0-rc.2.23480.2</AspNetCoreVersion>
+    <EfCoreVersion>8.0.0-rc.2.23480.1</EfCoreVersion>
+  </PropertyGroup>
+  <ItemGroup>
+    <!-- build dependencies -->
+    <PackageVersion Include="Markdig" Version="0.33.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.23472.1" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0-2.final" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore" 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.FluentUI.AspNetCore.Components" Version="4.0.0-preview.2" />
+    <PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components.Emoji" Version="4.0.0-preview.1" />
+    <PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components.Icons" version="4.0.0-preview.2" />
+    <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
+    <PackageVersion Include="System.Text.Encodings.Web" Version="$(RuntimeVersion)" />
+    <PackageVersion Include="System.Text.Json" Version="$(RuntimeVersion)" />
+    <!-- test dependencies -->
+    <PackageVersion Include="bunit" Version="1.25.1-preview" />
+    <PackageVersion Include="FluentAssertions" Version="7.0.0-alpha.2" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0-preview-23503-02" />
+    <PackageVersion Include="xunit" Version="2.5.3" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.3" />
+    <PackageVersion Include="coverlet.msbuild" Version="6.0.0" />
+    <PackageVersion Include="coverlet.collector" Version="6.0.0" />
+  </ItemGroup>
+</Project>

Microsoft.FluentUI.sln

@@ -27,15 +27,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentUI.Demo.Server", "exa
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentUI.Demo.Client", "examples\Demo\Client\FluentUI.Demo.Client.csproj", "{9D6713B7-7ECB-4D79-946B-92BE6D60DFC1}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Fast.Components.FluentUI", "src\Core\Microsoft.Fast.Components.FluentUI.csproj", "{962C8010-8EE5-4504-AD28-536D98565DCE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.FluentUI.AspNetCore.Components", "src\Core\Microsoft.FluentUI.AspNetCore.Components.csproj", "{962C8010-8EE5-4504-AD28-536D98565DCE}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Fast.Components.FluentUI.DataGrid.EntityFrameworkAdapter", "src\Extensions\DataGrid.EntityFrameworkAdapter\Microsoft.Fast.Components.FluentUI.DataGrid.EntityFrameworkAdapter.csproj", "{8CD1F82B-4922-42DD-A83D-BCA7BF1A1C40}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.FluentUI.AspNetCore.Components.DataGrid.EntityFrameworkAdapter", "src\Extensions\DataGrid.EntityFrameworkAdapter\Microsoft.FluentUI.AspNetCore.Components.DataGrid.EntityFrameworkAdapter.csproj", "{8CD1F82B-4922-42DD-A83D-BCA7BF1A1C40}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Fast.Components.FluentUI.Generators", "src\Extensions\DesignToken.Generator\Microsoft.Fast.Components.FluentUI.Generators.csproj", "{222EC695-2AB9-44AC-BF85-78080A74DFFE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.FluentUI.AspNetCore.Components.Generators", "src\Extensions\DesignToken.Generator\Microsoft.FluentUI.AspNetCore.Components.Generators.csproj", "{222EC695-2AB9-44AC-BF85-78080A74DFFE}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Fast.Templates.FluentUI", "src\Templates\Microsoft.Fast.Templates.FluentUI.csproj", "{F0820C2A-B8CC-42FB-A4E3-B7D5B356E38E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.FluentUI.AspNetCore.Templates", "src\Templates\Microsoft.FluentUI.AspNetCore.Templates.csproj", "{F0820C2A-B8CC-42FB-A4E3-B7D5B356E38E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Fast.Components.FluentUI.Tests", "tests\Core\Microsoft.Fast.Components.FluentUI.Tests.csproj", "{3EF0E994-318F-4CB9-A109-81E6CE9B762C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.FluentUI.AspNetCore.Components.Tests", "tests\Core\Microsoft.FluentUI.AspNetCore.Components.Tests.csproj", "{3EF0E994-318F-4CB9-A109-81E6CE9B762C}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DocGenerator", "DocGenerator", "{DAE11C9D-6756-4B05-B3D8-FE7C28411F95}"
 EndProject
@@ -46,7 +46,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		CODE_OF_CONDUCT.md = CODE_OF_CONDUCT.md
 		CONTRIBUTING.md = CONTRIBUTING.md
 		Directory.Build.props = Directory.Build.props
+		Directory.Packages.props = Directory.Packages.props
+		global.json = global.json
 		LICENSE = LICENSE
+		NuGet.config = NuGet.config
 		README.md = README.md
 		SECURITY.md = SECURITY.md
 		WHATSNEW.md = WHATSNEW.md

README.md

@@ -2,18 +2,20 @@
 
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 [![.NET C#](https://img.shields.io/badge/.NET-C%23-blue)](https://docs.microsoft.com/en-us/dotnet/csharp/)
-![Nuget](https://img.shields.io/nuget/v/Microsoft.Fast.Components.FluentUI?label=NuGet%20Component%20Library)
+![Nuget](https://img.shields.io/nuget/v/Microsoft.FluentUI.AspNetCore.Components?label=NuGet%20Component%20Library)
 ![Nuget](https://img.shields.io/nuget/v/Microsoft.Fast.Templates.FluentUI?label=NuGet%20Templates)
 
 [![Validate Security](https://github.com/microsoft/fluentui-blazor/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/microsoft/fluentui-blazor/actions/workflows/codeql-analysis.yml)
 [![Gitter](https://img.shields.io/badge/chat%20on-gitter-7289da.svg)](https://app.gitter.im/#/room/#fluentui-blazor:gitter.im)
 [![Discord](https://img.shields.io/badge/chat%20on-discord-7289da.svg)](https://discord.gg/FcSNfg4)
 
 :star:  We appreciate your star, it helps!
+## V4.0 progress
+- v4.0.0-preview.2 is functionally equal to v3.2.2
 
 ## Introduction
 
-The `Microsoft.Fast.Components.FluentUI` package provides a set of [Blazor](https://blazor.net) components which you can use to build applications that have 
+The `Microsoft.FluentUI.AspNetCore.Components` package provides a set of [Blazor](https://blazor.net) components which you can use to build applications that have 
 the look and feel or modern Microsoft applications. Some of the components are wrappers around Microsoft's official FluentUI Web Components. Others are components 
 that leverage the Fluent UI design system or make it easier to work with Fluent UI. To get up and running with the library, see the 'Getting Started' section below.
 
@@ -28,10 +30,10 @@ If you are upgrading from an earlier version of the library, please see the [wha
 
 ## Getting Started
 
-To get started using the Fluent UI Blazor components for Blazor, you will first need to install the official [Nuget package for Fluent UI Blazor](https://www.nuget.org/packages/Microsoft.Fast.Components.FluentUI/) in the project you would like to use the library and components. You can use the following command:
+To get started using the Fluent UI Blazor components for Blazor, you will first need to install the official [Nuget package for Fluent UI Blazor](https://www.nuget.org/packages/Microsoft.FluentUI.AspNetCore.Components/) in the project you would like to use the library and components. You can use the following command:
 
 ```shell
-dotnet add package Microsoft.Fast.Components.FluentUI
+dotnet add package Microsoft.FluentUI.AspNetCore.Components
 ```
 
 ### Script
@@ -61,14 +63,14 @@ Reboot is a collection of element-specific CSS changes in a single file to help
 If you want to use Reboot, you'll need to add to your `index.html` or `_Layout.cshtml` file a line that includes the stylesheet (`.css` file). This can be done by adding the following line to the `<head>` section:
 
 ```html    
-<link href="_content/Microsoft.Fast.Components.FluentUI/css/reboot.css" rel="stylesheet" />
+<link href="_content/Microsoft.FluentUI.AspNetCore.Components/css/reboot.css" rel="stylesheet" />
 ```    
 
 It is entirely possible to build a site without using Reboot. If you choose not to use it, please do add the `variables.css` file (which is otherwise imported through the `reboot.css` file) 
 to your `index.html` or `_Layout.cshtml` file in the `<head>` section like this:
 
 ```html
-<link href="_content/Microsoft.Fast.Components.FluentUI/css/variables.css" rel="stylesheet" />
+<link href="_content/Microsoft.FluentUI.AspNetCore.Components/css/variables.css" rel="stylesheet" />
 ```
 
 The file contains a number of CSS variables that are required to be defined for the components to work correctly. 
@@ -99,13 +101,13 @@ With the package installed and the script configured, you can begin using the Fl
 as any other Blazor component. Just be sure to add the following using statement to your views:
 
 ```razor
-@using Microsoft.Fast.Components.FluentUI
+@using Microsoft.FluentUI.AspNetCore.Components
 ```
 
 Here's a small example of a `FluentCard` with a `FluentButton` that uses the Fluent "Accent" appearance:
 
 ```razor
-@using Microsoft.Fast.Components.FluentUI
+@using Microsoft.FluentUI.AspNetCore.Components
 
 <FluentCard>
   <h2>Hello World!</h2>
@@ -114,7 +116,7 @@ Here's a small example of a `FluentCard` with a `FluentButton` that uses the Flu
 ```
 > **Tip**
 > 
-> You can add `@using Microsoft.Fast.Components.FluentUI` to the namespace collection in `_Imports.razor`, so you don't have to add it to every razor page 
+> You can add `@using Microsoft.FluentUI.AspNetCore.Components` to the namespace collection in `_Imports.razor`, so you don't have to add it to every razor page 
 that uses one of the components.
 
 
@@ -139,7 +141,7 @@ Currently when using the WebView to run Blazor (so all Hybrid variants) the web-
 There is also an issue with loading the custom event handlers that are being configured by the web-components script. Until these are fixed on the WebView side, there is a workaround available, namely to intercept `'_framework/blazor.modules.json'` and provide proper JS initializers file (created by build). The needed	`initializersLoader.webview.js` has been added to the library and needs to be included with a script tag **before** the `_framework/blazor.webview.js` script tag:
 
 ```xml
-<script app-name="{NAME OF YOUR APP}" src="./_content/Microsoft.Fast.Components.FluentUI/js/initializersLoader.webview.js"></script>
+<script app-name="{NAME OF YOUR APP}" src="./_content/Microsoft.FluentUI.AspNetCore.Components/js/initializersLoader.webview.js"></script>
 <script src="_framework/blazor.webview.js"></script>
 ```
 
@@ -154,7 +156,7 @@ If you want to use the `<FluentDataGrid>` with data provided through EF Core, yo
 ### Installation
 Install the package by running the command:
 ```
-dotnet add package Microsoft.Fast.Components.FluentUI.DataGrid.EntityFrameworkAdapter
+dotnet add package Microsoft.FluentUI.AspNetCore.Components.DataGrid.EntityFrameworkAdapter
 ```
 
 ### Usage