Skip to content

Commit 9f4dc1f

Browse files
committed
Merge branch 'pr/221' into multi_targets_pr
2 parents d4eed5b + 5c19fb0 commit 9f4dc1f

File tree

52 files changed

+587
-2836
lines changed

Some content is hidden

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

52 files changed

+587
-2836
lines changed

Build/NetStandard/FontAtlas/FontAtlas.csproj renamed to Build/FontAtlas/FontAtlas.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netstandard2.0</TargetFramework>
4+
<TargetFrameworks>net20;netstandard2.0</TargetFrameworks>
55
</PropertyGroup>
66

77
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -13,12 +13,12 @@
1313
</PropertyGroup>
1414

1515
<ItemGroup>
16-
<ProjectReference Include="..\..\..\x_autogen_netstandard2.0\PixelFarm.MiniAgg.One\PixelFarm.MiniAgg.One.csproj" />
16+
<ProjectReference Include="..\..\x_autogen_netstandard2.0\PixelFarm.MiniAgg.One\PixelFarm.MiniAgg.One.csproj" />
1717
<ProjectReference Include="..\Typography.GlyphLayout\Typography.GlyphLayout.csproj" />
1818
<ProjectReference Include="..\Typography.OpenFont\Typography.OpenFont.csproj" />
1919
</ItemGroup>
2020

21-
<Import Project="..\..\..\FontAtlas\FontAtlas.projitems" Label="Shared" />
21+
<Import Project="..\..\FontAtlas\FontAtlas.projitems" Label="Shared" />
2222

2323

2424

Build/N20/FontAtlas/FontAtlas.csproj

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

Build/N20/FontAtlas/Properties/AssemblyInfo.cs

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

Build/N20/Typography.Contours/Properties/AssemblyInfo.cs

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

Build/N20/Typography.Contours/Typography.Contours.csproj

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

Build/N20/Typography.GlyphLayout/Properties/AssemblyInfo.cs

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

Build/N20/Typography.GlyphLayout/Typography.GlyphLayout.csproj

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

Build/N20/Typography.MsdfGen/Properties/AssemblyInfo.cs

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

0 commit comments

Comments
 (0)