Skip to content

Commit

Permalink
fix: Remove dll from package and refactor packing the package
Browse files Browse the repository at this point in the history
  • Loading branch information
Youssef1313 committed Jan 19, 2023
1 parent 44c5b96 commit 316ad68
Show file tree
Hide file tree
Showing 6 changed files with 32 additions and 36 deletions.
11 changes: 1 addition & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,20 +43,11 @@ jobs:
with:
useConfigFile: true
configFilePath: build/gitversion.yml

- name: Build
run: |
cd nuget
dotnet new classlib -f netstandard2.0 -o uno.fonts.fluent
cd uno.fonts.fluent
rm *.cs
dotnet build -c Release
cp bin\Release\netstandard2.0\uno.fonts.fluent.dll ..

- name: Pack
run: |
$adjustedPackageVersion="${{ steps.gitversion.outputs.semVer }}".ToLower();
build/nuget.exe pack nuget/Uno.Fonts.Fluent.nuspec -Version $adjustedPackageVersion -OutputDirectory ./artifacts
dotnet pack nuget/Uno.Fonts.Fluent.csproj -p:PackageVersion=$adjustedPackageVersion --output ./artifacts
- name: Upload Artifacts
uses: actions/upload-artifact@v2
Expand Down
Binary file removed build/nuget.exe
Binary file not shown.
27 changes: 27 additions & 0 deletions nuget/Uno.Fonts.Fluent.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard1.0</TargetFramework>
<MinClientVersion>5.0.0</MinClientVersion>
<PackageId>Uno.Fonts.Fluent</PackageId>
<Title>Uno Platform Fluent Font</Title>
<Authors>Uno Platform</Authors>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
<RequireLicenseAcceptance>false</RequireLicenseAcceptance>
<PackageProjectUrl>https://github.com/unoplatform/uno.fonts</PackageProjectUrl>
<PackageIcon>icon.png</PackageIcon>
<Description>Uno Platform Fluent Font (Windows 11 iconography)</Description>
<Copyright>Copyright (C) 2015-2023 Uno Platform inc. - all rights reserved</Copyright>
<RepositoryType>git</RepositoryType>
<RepositoryUrl>https://github.com/unoplatform/uno.fonts.git</RepositoryUrl>
<IncludeBuildOutput>false</IncludeBuildOutput>

<!-- https://github.com/NuGet/Home/issues/8583 -->
<NoWarn>$(NoWarn);NU5128</NoWarn>
</PropertyGroup>
<ItemGroup>
<None Include="icon.png" Pack="true" PackagePath="\"/>
<None Include="buildTransitive/**/*.*" Pack="true">
<PackagePath>buildTransitive</PackagePath>
</None>
</ItemGroup>
</Project>
26 changes: 0 additions & 26 deletions nuget/Uno.Fonts.Fluent.nuspec

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,8 @@
<PropertyGroup Condition="'$(UnoFontsFluentDisableImport)'==''">
<UnoPlatformDefaultSymbolsFontFamily>ms-appx://uno.fonts.fluent/Fonts/uno-fluentui-assets.ttf</UnoPlatformDefaultSymbolsFontFamily>
</PropertyGroup>

<Target Name="_UnoAddPriMarker" AfterTargets="ResolvePackageAssets">
<_UnoPriFiles Include="$(MSBuildThisFileDirectory)uno.fonts.fluent.uprimarker" />
</Target>
</Project>
File renamed without changes.

0 comments on commit 316ad68

Please sign in to comment.