Skip to content

Commit 2d5fe9c

Browse files
committed
merge dev for 4.6.0 release
2 parents 9366da1 + a1df60d commit 2d5fe9c

File tree

213 files changed

+6289
-984
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

213 files changed

+6289
-984
lines changed

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

Lines changed: 0 additions & 23 deletions
This file was deleted.

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

Lines changed: 0 additions & 22 deletions
This file was deleted.

.azure-devops/build-demo.yml

Lines changed: 0 additions & 19 deletions
This file was deleted.

.azure-devops/common/template-to-build-projects.yml

Lines changed: 0 additions & 300 deletions
This file was deleted.

.vscode/settings.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
{
2-
"dotnet.defaultSolution": "Microsoft.FluentUI.sln"
3-
}
2+
"dotnet.defaultSolution": "Microsoft.FluentUI.sln",
3+
"azure-pipelines.1ESPipelineTemplatesSchemaFile": true
4+
}

Directory.Build.props

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,15 @@
1212
<SolutionDir>$(MSBuildThisFileDirectory)</SolutionDir>
1313
<AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
1414

15-
<VersionFile>4.5.0</VersionFile>
16-
<VersionPrefix>4.5.0</VersionPrefix>
15+
<VersionFile>4.6.0</VersionFile>
16+
<VersionPrefix>4.6.0</VersionPrefix>
1717
<VersionSuffix></VersionSuffix>
1818
<AssemblyVersion>$(VersionFile)</AssemblyVersion>
1919
<FileVersion>$(VersionFile)</FileVersion>
2020

21-
<!-- Enable code style analysis -->
22-
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
23-
<!-- <EnableNETAnalyzers>true</EnableNETAnalyzers> -->
24-
21+
<!-- Enable code style analysis -->
22+
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
23+
<!-- <EnableNETAnalyzers>true</EnableNETAnalyzers> -->
2524
</PropertyGroup>
2625

2726
<ItemGroup>

0 commit comments

Comments
 (0)