Merge branch 'pr/221' into multi_targets_pr

LayoutFarm · Feb 26, 2021 · 9f4dc1f · 9f4dc1f
2 parents d4eed5b + 5c19fb0
commit 9f4dc1f
Show file tree

Hide file tree

Showing 52 changed files with 587 additions and 2,836 deletions.
diff --git a/Build/NetStandard/FontAtlas/FontAtlas.csproj → Build/FontAtlas/FontAtlas.csproj b/Build/NetStandard/FontAtlas/FontAtlas.csproj → Build/FontAtlas/FontAtlas.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>net20;netstandard2.0</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -13,12 +13,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\x_autogen_netstandard2.0\PixelFarm.MiniAgg.One\PixelFarm.MiniAgg.One.csproj" />
+    <ProjectReference Include="..\..\x_autogen_netstandard2.0\PixelFarm.MiniAgg.One\PixelFarm.MiniAgg.One.csproj" />
     <ProjectReference Include="..\Typography.GlyphLayout\Typography.GlyphLayout.csproj" />
     <ProjectReference Include="..\Typography.OpenFont\Typography.OpenFont.csproj" />
   </ItemGroup>
 
-  <Import Project="..\..\..\FontAtlas\FontAtlas.projitems" Label="Shared" />
+  <Import Project="..\..\FontAtlas\FontAtlas.projitems" Label="Shared" />
 
 
 

diff --git a/Build/N20/FontAtlas/FontAtlas.csproj b/Build/N20/FontAtlas/FontAtlas.csproj
diff --git a/Build/N20/FontAtlas/Properties/AssemblyInfo.cs b/Build/N20/FontAtlas/Properties/AssemblyInfo.cs
diff --git a/Build/N20/Typography.Contours/Properties/AssemblyInfo.cs b/Build/N20/Typography.Contours/Properties/AssemblyInfo.cs
diff --git a/Build/N20/Typography.Contours/Typography.Contours.csproj b/Build/N20/Typography.Contours/Typography.Contours.csproj
diff --git a/Build/N20/Typography.GlyphLayout/Properties/AssemblyInfo.cs b/Build/N20/Typography.GlyphLayout/Properties/AssemblyInfo.cs
diff --git a/Build/N20/Typography.GlyphLayout/Typography.GlyphLayout.csproj b/Build/N20/Typography.GlyphLayout/Typography.GlyphLayout.csproj
diff --git a/Build/N20/Typography.MsdfGen/Properties/AssemblyInfo.cs b/Build/N20/Typography.MsdfGen/Properties/AssemblyInfo.cs