Skip to content

Feature/netstandard2.0 support #41

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

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

Feature/netstandard2.0 support #41

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
b0413a4
- added support for .net standard 2.0 build
rherlt Jul 13, 2018
d680725
- reset VectorTileReaderPortable.csproj (accidentially modified)
rherlt Jul 13, 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
94 changes: 94 additions & 0 deletions VectorTileCsNetStandard.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExtensionMethodsNetStandard", "src\ExtensionMethods\ExtensionMethodsNetStandard.csproj", "{FD232219-785C-47D5-B10F-E07E07D92795}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GeometryNetStandard", "src\Geometry\GeometryNetStandard.csproj", "{5004E056-79A7-48A1-98AD-11FE7C5FA960}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VectorTileReaderNetStandard", "src\VectorTileReader\VectorTileReaderNetStandard.csproj", "{BF55B9CC-6D81-424D-8E0E-D7B07994AE0B}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PbfReaderNetStandard", "src\PbfReader\PbfReaderNetStandard.csproj", "{52CC6374-1239-44DF-A56A-15BCC5249622}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|ARM = Debug|ARM
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|ARM = Release|ARM
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{FD232219-785C-47D5-B10F-E07E07D92795}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FD232219-785C-47D5-B10F-E07E07D92795}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FD232219-785C-47D5-B10F-E07E07D92795}.Debug|ARM.ActiveCfg = Debug|Any CPU
{FD232219-785C-47D5-B10F-E07E07D92795}.Debug|ARM.Build.0 = Debug|Any CPU
{FD232219-785C-47D5-B10F-E07E07D92795}.Debug|x64.ActiveCfg = Debug|Any CPU
{FD232219-785C-47D5-B10F-E07E07D92795}.Debug|x64.Build.0 = Debug|Any CPU
{FD232219-785C-47D5-B10F-E07E07D92795}.Debug|x86.ActiveCfg = Debug|Any CPU
{FD232219-785C-47D5-B10F-E07E07D92795}.Debug|x86.Build.0 = Debug|Any CPU
{FD232219-785C-47D5-B10F-E07E07D92795}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FD232219-785C-47D5-B10F-E07E07D92795}.Release|Any CPU.Build.0 = Release|Any CPU
{FD232219-785C-47D5-B10F-E07E07D92795}.Release|ARM.ActiveCfg = Release|Any CPU
{FD232219-785C-47D5-B10F-E07E07D92795}.Release|ARM.Build.0 = Release|Any CPU
{FD232219-785C-47D5-B10F-E07E07D92795}.Release|x64.ActiveCfg = Release|Any CPU
{FD232219-785C-47D5-B10F-E07E07D92795}.Release|x64.Build.0 = Release|Any CPU
{FD232219-785C-47D5-B10F-E07E07D92795}.Release|x86.ActiveCfg = Release|Any CPU
{FD232219-785C-47D5-B10F-E07E07D92795}.Release|x86.Build.0 = Release|Any CPU
{5004E056-79A7-48A1-98AD-11FE7C5FA960}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5004E056-79A7-48A1-98AD-11FE7C5FA960}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5004E056-79A7-48A1-98AD-11FE7C5FA960}.Debug|ARM.ActiveCfg = Debug|Any CPU
{5004E056-79A7-48A1-98AD-11FE7C5FA960}.Debug|ARM.Build.0 = Debug|Any CPU
{5004E056-79A7-48A1-98AD-11FE7C5FA960}.Debug|x64.ActiveCfg = Debug|Any CPU
{5004E056-79A7-48A1-98AD-11FE7C5FA960}.Debug|x64.Build.0 = Debug|Any CPU
{5004E056-79A7-48A1-98AD-11FE7C5FA960}.Debug|x86.ActiveCfg = Debug|Any CPU
{5004E056-79A7-48A1-98AD-11FE7C5FA960}.Debug|x86.Build.0 = Debug|Any CPU
{5004E056-79A7-48A1-98AD-11FE7C5FA960}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5004E056-79A7-48A1-98AD-11FE7C5FA960}.Release|Any CPU.Build.0 = Release|Any CPU
{5004E056-79A7-48A1-98AD-11FE7C5FA960}.Release|ARM.ActiveCfg = Release|Any CPU
{5004E056-79A7-48A1-98AD-11FE7C5FA960}.Release|ARM.Build.0 = Release|Any CPU
{5004E056-79A7-48A1-98AD-11FE7C5FA960}.Release|x64.ActiveCfg = Release|Any CPU
{5004E056-79A7-48A1-98AD-11FE7C5FA960}.Release|x64.Build.0 = Release|Any CPU
{5004E056-79A7-48A1-98AD-11FE7C5FA960}.Release|x86.ActiveCfg = Release|Any CPU
{5004E056-79A7-48A1-98AD-11FE7C5FA960}.Release|x86.Build.0 = Release|Any CPU
{BF55B9CC-6D81-424D-8E0E-D7B07994AE0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BF55B9CC-6D81-424D-8E0E-D7B07994AE0B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BF55B9CC-6D81-424D-8E0E-D7B07994AE0B}.Debug|ARM.ActiveCfg = Debug|Any CPU
{BF55B9CC-6D81-424D-8E0E-D7B07994AE0B}.Debug|ARM.Build.0 = Debug|Any CPU
{BF55B9CC-6D81-424D-8E0E-D7B07994AE0B}.Debug|x64.ActiveCfg = Debug|Any CPU
{BF55B9CC-6D81-424D-8E0E-D7B07994AE0B}.Debug|x64.Build.0 = Debug|Any CPU
{BF55B9CC-6D81-424D-8E0E-D7B07994AE0B}.Debug|x86.ActiveCfg = Debug|Any CPU
{BF55B9CC-6D81-424D-8E0E-D7B07994AE0B}.Debug|x86.Build.0 = Debug|Any CPU
{BF55B9CC-6D81-424D-8E0E-D7B07994AE0B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BF55B9CC-6D81-424D-8E0E-D7B07994AE0B}.Release|Any CPU.Build.0 = Release|Any CPU
{BF55B9CC-6D81-424D-8E0E-D7B07994AE0B}.Release|ARM.ActiveCfg = Release|Any CPU
{BF55B9CC-6D81-424D-8E0E-D7B07994AE0B}.Release|ARM.Build.0 = Release|Any CPU
{BF55B9CC-6D81-424D-8E0E-D7B07994AE0B}.Release|x64.ActiveCfg = Release|Any CPU
{BF55B9CC-6D81-424D-8E0E-D7B07994AE0B}.Release|x64.Build.0 = Release|Any CPU
{BF55B9CC-6D81-424D-8E0E-D7B07994AE0B}.Release|x86.ActiveCfg = Release|Any CPU
{BF55B9CC-6D81-424D-8E0E-D7B07994AE0B}.Release|x86.Build.0 = Release|Any CPU
{52CC6374-1239-44DF-A56A-15BCC5249622}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{52CC6374-1239-44DF-A56A-15BCC5249622}.Debug|Any CPU.Build.0 = Debug|Any CPU
{52CC6374-1239-44DF-A56A-15BCC5249622}.Debug|ARM.ActiveCfg = Debug|Any CPU
{52CC6374-1239-44DF-A56A-15BCC5249622}.Debug|ARM.Build.0 = Debug|Any CPU
{52CC6374-1239-44DF-A56A-15BCC5249622}.Debug|x64.ActiveCfg = Debug|Any CPU
{52CC6374-1239-44DF-A56A-15BCC5249622}.Debug|x64.Build.0 = Debug|Any CPU
{52CC6374-1239-44DF-A56A-15BCC5249622}.Debug|x86.ActiveCfg = Debug|Any CPU
{52CC6374-1239-44DF-A56A-15BCC5249622}.Debug|x86.Build.0 = Debug|Any CPU
{52CC6374-1239-44DF-A56A-15BCC5249622}.Release|Any CPU.ActiveCfg = Release|Any CPU
{52CC6374-1239-44DF-A56A-15BCC5249622}.Release|Any CPU.Build.0 = Release|Any CPU
{52CC6374-1239-44DF-A56A-15BCC5249622}.Release|ARM.ActiveCfg = Release|Any CPU
{52CC6374-1239-44DF-A56A-15BCC5249622}.Release|ARM.Build.0 = Release|Any CPU
{52CC6374-1239-44DF-A56A-15BCC5249622}.Release|x64.ActiveCfg = Release|Any CPU
{52CC6374-1239-44DF-A56A-15BCC5249622}.Release|x64.Build.0 = Release|Any CPU
{52CC6374-1239-44DF-A56A-15BCC5249622}.Release|x86.ActiveCfg = Release|Any CPU
{52CC6374-1239-44DF-A56A-15BCC5249622}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
2 changes: 2 additions & 0 deletions appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ environment:
build_script:
#build UWP
- msbuild VectorTileCsPortable.sln /p:Configuration=Debug /p:Platform="Any Cpu" /maxcpucount:%NUMBER_OF_PROCESSORS%
#build NetStandard
- msbuild VectorTileCsNetStandard.sln /p:Configuration=Debug /p:Platform="Any Cpu" /maxcpucount:%NUMBER_OF_PROCESSORS%
#build Net 2.0
- msbuild VectorTileCs.sln /p:Configuration=Net20Debug /p:Platform="Any Cpu" /maxcpucount:%NUMBER_OF_PROCESSORS%
- bin\Net20Debug\v2.0\VerifyNetFrameworkVersion.exe
Expand Down
18 changes: 18 additions & 0 deletions src/ExtensionMethods/ExtensionMethodsNetStandard.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>bin\NetStandardDebug\netstandard2.0</OutputPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<OutputPath>bin\NetStandardRelease\netstandard2.0</OutputPath>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Geometry\GeometryNetStandard.csproj" />
<ProjectReference Include="..\PbfReader\PbfReaderNetStandard.csproj" />
<ProjectReference Include="..\VectorTileReader\VectorTileReaderNetStandard.csproj" />
</ItemGroup>
</Project>
5 changes: 4 additions & 1 deletion src/ExtensionMethods/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,14 @@
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
#if NETSTANDARD2_0
#else
[assembly: AssemblyTitle("Util")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Util")]
#endif
[assembly: AssemblyDescription("")]
[assembly: AssemblyCopyright("Copyright © 2016")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
Expand Down
16 changes: 16 additions & 0 deletions src/Geometry/GeometryNetStandard.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>bin\NetStandardDebug\netstandard2.0</OutputPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<OutputPath>bin\NetStandardRelease\netstandard2.0</OutputPath>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\PbfReader\PbfReaderNetStandard.csproj" />
</ItemGroup>
</Project>
5 changes: 4 additions & 1 deletion src/Geometry/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,14 @@
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
#if NETSTANDARD2_0
#else
[assembly: AssemblyTitle("Geometry")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Geometry")]
#endif
[assembly: AssemblyDescription("")]
[assembly: AssemblyCopyright("Copyright © 2016")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
Expand Down
13 changes: 13 additions & 0 deletions src/PbfReader/PbfReaderNetStandard.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>bin\NetStandardDebug\netstandard2.0</OutputPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<OutputPath>bin\NetStandardRelease\netstandard2.0</OutputPath>
</PropertyGroup>
</Project>
5 changes: 4 additions & 1 deletion src/PbfReader/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,14 @@
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
#if NETSTANDARD2_0
#else
[assembly: AssemblyTitle("PbfReader")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("PbfReader")]
#endif
[assembly: AssemblyDescription("")]
[assembly: AssemblyCopyright("Copyright © 2016")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
Expand Down
5 changes: 4 additions & 1 deletion src/VectorTileReader/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,14 @@
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
#if NETSTANDARD2_0
#else
[assembly: AssemblyTitle("VectorTileReader")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("VectorTileReader")]
#endif
[assembly: AssemblyDescription("")]
[assembly: AssemblyCopyright("Copyright © 2016")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
Expand Down
16 changes: 16 additions & 0 deletions src/VectorTileReader/VectorTileReaderNetStandard.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>bin\NetStandardDebug\netstandard2.0</OutputPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<OutputPath>bin\NetStandardRelease\netstandard2.0</OutputPath>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Geometry\GeometryNetStandard.csproj" />
</ItemGroup>
</Project>