Skip to content

Commit 316ad68

Browse files
committed
fix: Remove dll from package and refactor packing the package
1 parent 44c5b96 commit 316ad68

File tree

6 files changed

+32
-36
lines changed

6 files changed

+32
-36
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,20 +43,11 @@ jobs:
4343
with:
4444
useConfigFile: true
4545
configFilePath: build/gitversion.yml
46-
47-
- name: Build
48-
run: |
49-
cd nuget
50-
dotnet new classlib -f netstandard2.0 -o uno.fonts.fluent
51-
cd uno.fonts.fluent
52-
rm *.cs
53-
dotnet build -c Release
54-
cp bin\Release\netstandard2.0\uno.fonts.fluent.dll ..
5546

5647
- name: Pack
5748
run: |
5849
$adjustedPackageVersion="${{ steps.gitversion.outputs.semVer }}".ToLower();
59-
build/nuget.exe pack nuget/Uno.Fonts.Fluent.nuspec -Version $adjustedPackageVersion -OutputDirectory ./artifacts
50+
dotnet pack nuget/Uno.Fonts.Fluent.csproj -p:PackageVersion=$adjustedPackageVersion --output ./artifacts
6051
6152
- name: Upload Artifacts
6253
uses: actions/upload-artifact@v2

build/nuget.exe

-6.15 MB
Binary file not shown.

nuget/Uno.Fonts.Fluent.csproj

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<PropertyGroup>
3+
<TargetFramework>netstandard1.0</TargetFramework>
4+
<MinClientVersion>5.0.0</MinClientVersion>
5+
<PackageId>Uno.Fonts.Fluent</PackageId>
6+
<Title>Uno Platform Fluent Font</Title>
7+
<Authors>Uno Platform</Authors>
8+
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
9+
<RequireLicenseAcceptance>false</RequireLicenseAcceptance>
10+
<PackageProjectUrl>https://github.com/unoplatform/uno.fonts</PackageProjectUrl>
11+
<PackageIcon>icon.png</PackageIcon>
12+
<Description>Uno Platform Fluent Font (Windows 11 iconography)</Description>
13+
<Copyright>Copyright (C) 2015-2023 Uno Platform inc. - all rights reserved</Copyright>
14+
<RepositoryType>git</RepositoryType>
15+
<RepositoryUrl>https://github.com/unoplatform/uno.fonts.git</RepositoryUrl>
16+
<IncludeBuildOutput>false</IncludeBuildOutput>
17+
18+
<!-- https://github.com/NuGet/Home/issues/8583 -->
19+
<NoWarn>$(NoWarn);NU5128</NoWarn>
20+
</PropertyGroup>
21+
<ItemGroup>
22+
<None Include="icon.png" Pack="true" PackagePath="\"/>
23+
<None Include="buildTransitive/**/*.*" Pack="true">
24+
<PackagePath>buildTransitive</PackagePath>
25+
</None>
26+
</ItemGroup>
27+
</Project>

nuget/Uno.Fonts.Fluent.nuspec

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

nuget/uno.fonts.fluent.props renamed to nuget/buildTransitive/uno.fonts.fluent.props

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,8 @@
33
<PropertyGroup Condition="'$(UnoFontsFluentDisableImport)'==''">
44
<UnoPlatformDefaultSymbolsFontFamily>ms-appx://uno.fonts.fluent/Fonts/uno-fluentui-assets.ttf</UnoPlatformDefaultSymbolsFontFamily>
55
</PropertyGroup>
6+
7+
<Target Name="_UnoAddPriMarker" AfterTargets="ResolvePackageAssets">
8+
<_UnoPriFiles Include="$(MSBuildThisFileDirectory)uno.fonts.fluent.uprimarker" />
9+
</Target>
610
</Project>

0 commit comments

Comments
 (0)