Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed issue #50 , Compatible with VS 2017 #52

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixed issue #50 , Compatible with VS 2017 #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
456434b
Fixed issue #50
Dilip-Nandakumar Feb 14, 2018
5551eb6
Remove unnecessary files in previous commit
Dilip-Nandakumar Feb 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 33 additions & 0 deletions NOpenType/NOpenType.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Description>Simple and clean TrueType font loader and renderer written purely in c#.</Description>
<Copyright>Copyright 2016 Samuel Carlsson</Copyright>
<AssemblyTitle>NOpenType</AssemblyTitle>
<VersionPrefix>0.0.1</VersionPrefix>
<Authors>Samuel Carlsson, WinterDev</Authors>
<TargetFramework>netstandard2.0</TargetFramework>
<AssemblyName>NOpenType</AssemblyName>
<PackageId>NOpenType</PackageId>
<PackageTags>font;truetype;true-type</PackageTags>
<PackageIconUrl>https://github.com/vidstige/NRasterizer/raw/master/icon.png</PackageIconUrl>
<PackageProjectUrl>https://github.com/vidstige/NRasterizer</PackageProjectUrl>
<PackageLicenseUrl>https://github.com/vidstige/NRasterizer/blob/master/LICENSE.md</PackageLicenseUrl>
<RepositoryType>git</RepositoryType>
<RepositoryUrl>https://github.com/vidstige/NRasterizer</RepositoryUrl>
<NetStandardImplicitPackageVersion>1.6.0</NetStandardImplicitPackageVersion>
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
</PropertyGroup>

<ItemGroup>
<DotNetCliToolReference Include="dotnet-version" Version="1.1.0" />
</ItemGroup>

</Project>
22 changes: 0 additions & 22 deletions NOpenType/NOpenType.xproj
View file
Open in desktop

This file was deleted.

42 changes: 0 additions & 42 deletions NOpenType/project.json
View file
Open in desktop

This file was deleted.

32 changes: 32 additions & 0 deletions NRasterizer.CLI/NRasterizer.CLI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net471</TargetFramework>
<DebugType>portable</DebugType>
<AssemblyName>NRasterizer.CLI</AssemblyName>
<OutputType>Exe</OutputType>
<PackageId>NRasterizer.CLI</PackageId>
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
</PropertyGroup>

<ItemGroup>
<None Include="App.config" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\NOpenType\NOpenType.csproj" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
<Reference Include="System.Drawing" />
<Reference Include="System" />
<Reference Include="Microsoft.CSharp" />
</ItemGroup>

</Project>
22 changes: 0 additions & 22 deletions NRasterizer.CLI/NRasterizer.CLI.xproj
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion NRasterizer.CLI/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
// The form "{Major}.{Minor}.*" will automatically update the build and revision,
// and "{Major}.{Minor}.{Build}.*" will update just the revision.

[assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]

// The following attributes are used to specify the signing key for the assembly,
// if desired. See the Mono documentation for more information about signing.
Expand Down
19 changes: 0 additions & 19 deletions NRasterizer.CLI/project.json
View file
Open in desktop

This file was deleted.

33 changes: 33 additions & 0 deletions NRasterizer.Tests/NRasterizer.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp2.0</TargetFramework>
<DebugType>portable</DebugType>
<AssemblyName>NRasterizer.Tests</AssemblyName>
<PackageId>NRasterizer.Tests</PackageId>
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
<PackageTargetFallback>$(PackageTargetFallback);dotnet5.4;portable-net451+win8</PackageTargetFallback>
<RuntimeFrameworkVersion>1.0.4</RuntimeFrameworkVersion>
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\NOpenType\NOpenType.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20170106-08" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-beta5-build1225" />
<PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.1.1" />
<PackageReference Include="xunit" Version="2.2.0-beta5-build3474" />
<PackageReference Include="moq" Version="4.6.38-alpha" />
</ItemGroup>

</Project>
25 changes: 0 additions & 25 deletions NRasterizer.Tests/NRasterizer.Tests.xproj
View file
Open in desktop

This file was deleted.

30 changes: 0 additions & 30 deletions NRasterizer.Tests/project.json
View file
Open in desktop

This file was deleted.

19 changes: 11 additions & 8 deletions NRasterizer.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,8 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
# Visual Studio 15
VisualStudioVersion = 15.0.27004.2005
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "NRasterizer.Tests", "NRasterizer.Tests\NRasterizer.Tests.xproj", "{FC36D8CB-3B6C-4078-AAE0-68A4223BB2C4}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "NRasterizer.CLI", "NRasterizer.CLI\NRasterizer.CLI.xproj", "{8FD65B63-92A2-4868-AC93-19E385DF76C6}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "NOpenType", "NOpenType\NOpenType.xproj", "{4F74A90E-C244-4B7C-98E4-72C1622517FC}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionItems", "SolutionItems", "{4DDB15E9-E21C-4043-AE71-F0DEB9F14BED}"
ProjectSection(SolutionItems) = preProject
appveyor.yml = appveyor.yml
Expand All @@ -18,6 +12,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionItems", "SolutionIt
README.md = README.md
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NRasterizer.Tests", "NRasterizer.Tests\NRasterizer.Tests.csproj", "{FC36D8CB-3B6C-4078-AAE0-68A4223BB2C4}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NRasterizer.CLI", "NRasterizer.CLI\NRasterizer.CLI.csproj", "{8FD65B63-92A2-4868-AC93-19E385DF76C6}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NOpenType", "NOpenType\NOpenType.csproj", "{4F74A90E-C244-4B7C-98E4-72C1622517FC}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -40,4 +40,7 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {16653EFD-6AF4-48BC-BDB5-23EA1D819E6F}
EndGlobalSection
EndGlobal
Binary file added UpgradeLog.htm
View file
Open in desktop
Binary file not shown.