merge dev for 4.6.0 release

microsoft · Mar 28, 2024 · 2d5fe9c · 2d5fe9c
2 parents 9366da1 + a1df60d
commit 2d5fe9c
Show file tree

Hide file tree

Showing 213 changed files with 6,289 additions and 984 deletions.
diff --git a/.azure-devops/build-all-lib.yml b/.azure-devops/build-all-lib.yml
diff --git a/.azure-devops/build-core-lib.yml b/.azure-devops/build-core-lib.yml
diff --git a/.azure-devops/build-demo.yml b/.azure-devops/build-demo.yml
diff --git a/.azure-devops/common/template-to-build-projects.yml b/.azure-devops/common/template-to-build-projects.yml
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,3 +1,4 @@
 {
-  "dotnet.defaultSolution": "Microsoft.FluentUI.sln"
-}
+  "dotnet.defaultSolution": "Microsoft.FluentUI.sln",
+  "azure-pipelines.1ESPipelineTemplatesSchemaFile": true
+}
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -12,16 +12,15 @@
 		<SolutionDir>$(MSBuildThisFileDirectory)</SolutionDir>
 		<AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
 
-		<VersionFile>4.5.0</VersionFile>
-		<VersionPrefix>4.5.0</VersionPrefix>
+		<VersionFile>4.6.0</VersionFile>
+		<VersionPrefix>4.6.0</VersionPrefix>
 		<VersionSuffix></VersionSuffix>
 		<AssemblyVersion>$(VersionFile)</AssemblyVersion>
 		<FileVersion>$(VersionFile)</FileVersion>
 
-        <!-- Enable code style analysis -->
-        <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
-        <!-- <EnableNETAnalyzers>true</EnableNETAnalyzers> -->
-
+    <!-- Enable code style analysis -->
+    <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
+    <!-- <EnableNETAnalyzers>true</EnableNETAnalyzers> -->
 	</PropertyGroup>
 
 	<ItemGroup>