Fix some merge issues

microsoft · Oct 30, 2023 · 5720864 · 5720864
1 parent 372d8da
commit 5720864
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 7 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -26,8 +26,8 @@
     <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="bunit" Version="1.24.10" />
+    <PackageVersion Include="FluentAssertions" Version="7.0.0-alpha.3" />
     <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" />

diff --git a/examples/Demo/Shared/FluentUI.Demo.Shared.csproj b/examples/Demo/Shared/FluentUI.Demo.Shared.csproj
@@ -29,8 +29,8 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.AspNetCore.Components.Web" />
 		<PackageReference Include="Markdig" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.Web" />
 		<PackageReference Include="Microsoft.FluentUI.AspNetCore.Components.Emoji" />
 		<PackageReference Include="Microsoft.FluentUI.AspNetCore.Components.Icons" />
 		<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
@@ -39,7 +39,7 @@
 	<ItemGroup>
 		<ProjectReference Include="..\..\..\src\Core\Microsoft.FluentUI.AspNetCore.Components.csproj" />
 		<ProjectReference Include="..\DocGenerator\FluentUI.Demo.Generators.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
-		<TrimmerRootAssembly Include="Microsoft.Fast.Components.FluentUI" />
+		<TrimmerRootAssembly Include="Microsoft.FluentUI.AspNetCore.Components" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/global.json b/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "7.0.403"
+    "version": "8.0.100-rc.2.23502.2"
   }
 }
diff --git a/nuget.config b/nuget.config
@@ -12,11 +12,15 @@
 	<packageSources>
 		<clear />
 		<add key="NuGet" value="https://api.nuget.org/v3/index.json" />
+		<add key="Packages" value="D:\Source\Packages\" />
 	</packageSources>
 	<packageSourceMapping>
 		<packageSource key="NuGet">
 			<package pattern="*" />
 		</packageSource>
+		<packageSource key="Packages">
+			<package pattern="Microsoft.Fluent.*" />
+		</packageSource>
 	</packageSourceMapping>
 </configuration>
 
diff --git a/src/Core/Microsoft.FluentUI.AspNetCore.Components.csproj b/src/Core/Microsoft.FluentUI.AspNetCore.Components.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
-    <PackageId>Microsoft.Fast.Components.FluentUI</PackageId>
+    <TargetFrameworks>net8.0</TargetFrameworks>
+    <PackageId>Microsoft.FluentUI.AspNetCore.Components</PackageId>
 
     <Summary>A set of Blazor components wrapping Microsoft’s official Fluent UI Web Components. They implement the latest state of the Fluent design language, are built on FAST and work in every major browser.</Summary>
     <PackageTags>Fluent UI, Blazor, Web Components, .NET8</PackageTags>