Skip to content

Commit 517366e

Browse files
vnbaaijvnbaaij
authored
Fix #405 (#407)
* Fix #405 Fix #406 Update version * Fix name with space error
1 parent 8e3dbcf commit 517366e

File tree

4 files changed

+26
-17
lines changed

4 files changed

+26
-17
lines changed

‎Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<RepositoryType>git</RepositoryType>
1111
<PublishRepositoryUrl>true</PublishRepositoryUrl>
1212
<SolutionDir>$(MSBuildThisFileDirectory)</SolutionDir>
13-
<VersionPrefix>2.3.2</VersionPrefix>
13+
<VersionPrefix>2.3.3</VersionPrefix>
1414
<VersionSuffix></VersionSuffix>
1515
<AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
1616
</PropertyGroup>

‎src/Microsoft.Fast.Components.FluentUI.Configuration/ConfigurationGenerator.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ private void GenerateSource(SourceProductionContext context, StaticAssetsOptions
158158
sb.AppendLine("\tpublic static IconConfiguration GetIconConfiguration()");
159159
sb.AppendLine("\t{");
160160
sb.AppendLine($"\t\tIconConfiguration config = new({options.PublishIconAssets.ToString().ToLower()});");
161-
if (options.PublishEmojiAssets)
161+
if (options.PublishIconAssets)
162162
{
163163
FormatConfigSection(sb, "Sizes", "IconSize.Size", options.IconSizes);
164164
FormatConfigSection(sb, "Variants", "IconVariant.", options.IconVariants);

‎src/Microsoft.Fast.Components.FluentUI/Microsoft.Fast.Components.FluentUI.csproj

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -328,15 +328,15 @@
328328
</Regular48AssetsCandidates>
329329

330330
<!-- Specify icons that are used inside the library below -->
331-
<RequiredIconAssetsCandidates Include="Assets\icons\ArrowSortUp\20_r.svg" RelativePath="icons\ArrowSortUp\20_r.svg" />
332-
<RequiredIconAssetsCandidates Include="Assets\icons\ArrowSortDown\20_r.svg" RelativePath="icons\ArrowSortDown\20_r.svg" />
333-
<RequiredIconAssetsCandidates Include="Assets\icons\ChevronDoubleLeft\20_r.svg" RelativePath="icons\ChevronDoubleLeft\20_r.svg" />
334-
<RequiredIconAssetsCandidates Include="Assets\icons\ChevronDoubleRight\20_r.svg" RelativePath="icons\ChevronDoubleRight\20_r.svg" />
335-
<RequiredIconAssetsCandidates Include="Assets\icons\ChevronLeft\20_r.svg" RelativePath="icons\ChevronLeft\20_r.svg" />
336-
<RequiredIconAssetsCandidates Include="Assets\icons\ChevronRight\20_r.svg" RelativePath="icons\ChevronRight\20_r.svg" />
337-
<RequiredIconAssetsCandidates Include="Assets\icons\Filter\20_r.svg" RelativePath="icons\Filter\20_r.svg" />
338-
<RequiredIconAssetsCandidates Include="Assets\icons\Info\20_r.svg" RelativePath="icons\Info\20_r.svg" />
339-
<RequiredIconAssetsCandidates Include="Assets\icons\Info\32_r.svg" RelativePath="icons\Info\32_r.svg" />
331+
<RequiredIcon20AssetsCandidates Include="Assets\icons\ArrowSortUp\20_r.svg" RelativePath="icons\ArrowSortUp\20_r.svg" />
332+
<RequiredIcon20AssetsCandidates Include="Assets\icons\ArrowSortDown\20_r.svg" RelativePath="icons\ArrowSortDown\20_r.svg" />
333+
<RequiredIcon20AssetsCandidates Include="Assets\icons\ChevronDoubleLeft\20_r.svg" RelativePath="icons\ChevronDoubleLeft\20_r.svg" />
334+
<RequiredIcon20AssetsCandidates Include="Assets\icons\ChevronDoubleRight\20_r.svg" RelativePath="icons\ChevronDoubleRight\20_r.svg" />
335+
<RequiredIcon20AssetsCandidates Include="Assets\icons\ChevronLeft\20_r.svg" RelativePath="icons\ChevronLeft\20_r.svg" />
336+
<RequiredIcon20AssetsCandidates Include="Assets\icons\ChevronRight\20_r.svg" RelativePath="icons\ChevronRight\20_r.svg" />
337+
<RequiredIcon20AssetsCandidates Include="Assets\icons\Filter\20_r.svg" RelativePath="icons\Filter\20_r.svg" />
338+
<RequiredIcon20AssetsCandidates Include="Assets\icons\Info\20_r.svg" RelativePath="icons\Info\20_r.svg" />
339+
<RequiredIcon32AssetsCandidates Include="Assets\icons\Info\32_r.svg" RelativePath="icons\Info\32_r.svg" />
340340

341341
</ItemGroup>
342342

@@ -471,8 +471,12 @@
471471
<Output TaskParameter="Assets" ItemName="Regular48Assets" />
472472
</DefineStaticWebAssets>
473473

474-
<DefineStaticWebAssets CandidateAssets="@(RequiredIconAssetsCandidates)" SourceId="$(PackageId)" SourceType="Discovered" AssetKind="All" ContentRoot="Assets/icons" BasePath="$(StaticWebAssetBasePath)">
475-
<Output TaskParameter="Assets" ItemName="RequiredIconAssets" />
474+
<DefineStaticWebAssets CandidateAssets="@(RequiredIcon20AssetsCandidates)" SourceId="$(PackageId)" SourceType="Discovered" AssetKind="All" ContentRoot="Assets/icons" BasePath="$(StaticWebAssetBasePath)">
475+
<Output TaskParameter="Assets" ItemName="RequiredIcon20Assets" />
476+
</DefineStaticWebAssets>
477+
478+
<DefineStaticWebAssets CandidateAssets="@(RequiredIcon32AssetsCandidates)" SourceId="$(PackageId)" SourceType="Discovered" AssetKind="All" ContentRoot="Assets/icons" BasePath="$(StaticWebAssetBasePath)">
479+
<Output TaskParameter="Assets" ItemName="RequiredIcon32Assets" />
476480
</DefineStaticWebAssets>
477481

478482
<GenerateStaticWebAsssetsPropsFile StaticWebAssets="@(ActivitiesColorAssets)" PackagePathPrefix="staticwebassets" TargetPropsFilePath="$(IntermediateOutputPath)FluentEmojis.Activities.Color.targets" />
@@ -519,7 +523,8 @@
519523
<GenerateStaticWebAsssetsPropsFile StaticWebAssets="@(Regular32Assets)" PackagePathPrefix="staticwebassets" TargetPropsFilePath="$(IntermediateOutputPath)FluentIcons.Regular32.targets" />
520524
<GenerateStaticWebAsssetsPropsFile StaticWebAssets="@(Filled48Assets)" PackagePathPrefix="staticwebassets" TargetPropsFilePath="$(IntermediateOutputPath)FluentIcons.Filled48.targets" />
521525
<GenerateStaticWebAsssetsPropsFile StaticWebAssets="@(Regular48Assets)" PackagePathPrefix="staticwebassets" TargetPropsFilePath="$(IntermediateOutputPath)FluentIcons.Regular48.targets" />
522-
<GenerateStaticWebAsssetsPropsFile StaticWebAssets="@(RequiredIconAssets)" PackagePathPrefix="staticwebassets" TargetPropsFilePath="$(IntermediateOutputPath)FluentIcons.RequiredIcons.targets" />
526+
<GenerateStaticWebAsssetsPropsFile StaticWebAssets="@(RequiredIcon20Assets)" PackagePathPrefix="staticwebassets" TargetPropsFilePath="$(IntermediateOutputPath)FluentIcons.RequiredIcons20.targets" />
527+
<GenerateStaticWebAsssetsPropsFile StaticWebAssets="@(RequiredIcon32Assets)" PackagePathPrefix="staticwebassets" TargetPropsFilePath="$(IntermediateOutputPath)FluentIcons.RequiredIcons32.targets" />
523528

524529
<ComputeStaticWebAssetsTargetPaths Assets="@(ActivitiesColorAssets)" PathPrefix="staticwebassets" AdjustPathsForPack="true">
525530
<Output TaskParameter="AssetsWithTargetPath" ItemName="_PackStaticWebAssetWithTargetPath" />
@@ -783,8 +788,11 @@
783788
<StaticWebAssetPackageFile Include="$(IntermediateOutputPath)FluentIcons.Regular48.targets">
784789
<PackagePath>build\Microsoft.AspNetCore.StaticWebAssets.Regular48.targets</PackagePath>
785790
</StaticWebAssetPackageFile>
786-
<StaticWebAssetPackageFile Include="$(IntermediateOutputPath)FluentIcons.RequiredIcons.targets">
787-
<PackagePath>build\Microsoft.AspNetCore.StaticWebAssets.RequiredIcons.targets</PackagePath>
791+
<StaticWebAssetPackageFile Include="$(IntermediateOutputPath)FluentIcons.RequiredIcons20.targets">
792+
<PackagePath>build\Microsoft.AspNetCore.StaticWebAssets.RequiredIcons20.targets</PackagePath>
793+
</StaticWebAssetPackageFile>
794+
<StaticWebAssetPackageFile Include="$(IntermediateOutputPath)FluentIcons.RequiredIcons32.targets">
795+
<PackagePath>build\Microsoft.AspNetCore.StaticWebAssets.RequiredIcons32.targets</PackagePath>
788796
</StaticWebAssetPackageFile>
789797
</ItemGroup>
790798
</Target>

‎src/Microsoft.Fast.Components.FluentUI/build/Microsoft.AspNetCore.StaticWebAssets.targets

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,5 +47,6 @@
4747
<Import Condition="$(FluentIconSizes.Contains('32')) AND $(FluentIconVariants.Contains('Regular'))" Project="$(MSBuildThisFileDirectory)Microsoft.AspNetCore.StaticWebAssets.Regular32.targets"/>
4848
<Import Condition="$(FluentIconSizes.Contains('48')) AND $(FluentIconVariants.Contains('Regular'))" Project="$(MSBuildThisFileDirectory)Microsoft.AspNetCore.StaticWebAssets.Regular48.targets"/>
4949

50-
<Import Condition="!($(FluentIconSizes.Contains('20')) AND $(FluentIconVariants.Contains('Regular'))) OR '$(PublishFluentIconAssets)' == 'false'" Project="$(MSBuildThisFileDirectory)Microsoft.AspNetCore.StaticWebAssets.RequiredIcons.targets"/>
50+
<Import Condition="!($(FluentIconSizes.Contains('20')) AND $(FluentIconVariants.Contains('Regular'))) OR '$(PublishFluentIconAssets)' == 'false'" Project="$(MSBuildThisFileDirectory)Microsoft.AspNetCore.StaticWebAssets.RequiredIcons20.targets"/>
51+
<Import Condition="!($(FluentIconSizes.Contains('32')) AND $(FluentIconVariants.Contains('Regular'))) OR '$(PublishFluentIconAssets)' == 'false'" Project="$(MSBuildThisFileDirectory)Microsoft.AspNetCore.StaticWebAssets.RequiredIcons32.targets"/>
5152
</Project>

0 commit comments

Comments
 (0)