Switched to .NET Standard 1.3

CppNet.csproj

@@ -1,84 +1,19 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition="'$(Configuration)' == 'DebugCoreCLR' or '$(Configuration)' == 'ReleaseCoreCLR'">
-    <TargetFrameworkRootPath>$(MSBuildThisFileDirectory)\CoreFX</TargetFrameworkRootPath>
-    <FrameworkPathOverride>$(TargetFrameworkRootPath)\CoreCLR\v5.0</FrameworkPathOverride>
-    <UseCoreCLR>true</UseCoreCLR>
-  </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{C2FD9262-69F8-4B75-9AB1-FF359C9143E9}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>CppNet</RootNamespace>
-    <AssemblyName>CppNet</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>Bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>Bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugCoreCLR|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>Bin\CoreCLR\Debug\</OutputPath>
-    <IntermediateOutputPath>obj\CoreCLR\Debug</IntermediateOutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseCoreCLR|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>Bin\CoreCLR\Release\</OutputPath>
-    <IntermediateOutputPath>obj\CoreCLR\Release</IntermediateOutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SignAssembly>true</SignAssembly>
-  </PropertyGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <AssemblyOriginatorKeyFile>cppnet.snk</AssemblyOriginatorKeyFile>
+    <TargetFramework>netstandard1.3</TargetFramework>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
   </PropertyGroup>
+
   <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
+    <Compile Remove="CppReader.cs" />
+    <Compile Remove="CppTask.cs" />
+    <Compile Remove="InputLexerSource.cs" />
+    <Compile Remove="TokenSnifferSource.cs" />
   </ItemGroup>
+
   <ItemGroup>
     <Folder Include="Properties\" />
   </ItemGroup>
-  <Import Project="CppNetShared.projitems" Label="Shared" />
-  <Import Condition="'$(UseCoreCLR)' == ''" Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Condition="'$(UseCoreCLR)' == 'true'" Project="$(MSBuildThisFileDirectory)\CoreFX\configs\CoreCLR.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
+
 </Project>

CppNet.sln

@@ -1,34 +1,25 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30011.22
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CppNet", "CppNet.csproj", "{C2FD9262-69F8-4B75-9AB1-FF359C9143E9}"
-EndProject
-Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "CppNetShared", "CppNetShared.shproj", "{8D8A8527-A2A6-494E-8D19-7BB23CBB7BC8}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CppNet", "CppNet.csproj", "{D0D95F78-106B-40A0-B6AC-0710468B82F5}"
 EndProject
 Global
-	GlobalSection(SharedMSBuildProjectFiles) = preSolution
-		CppNetShared.projitems*{8d8a8527-a2a6-494e-8d19-7bb23cbb7bc8}*SharedItemsImports = 13
-		CppNetShared.projitems*{c2fd9262-69f8-4b75-9ab1-ff359c9143e9}*SharedItemsImports = 4
-	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
-		DebugCoreCLR|Any CPU = DebugCoreCLR|Any CPU
 		Release|Any CPU = Release|Any CPU
-		ReleaseCoreCLR|Any CPU = ReleaseCoreCLR|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{C2FD9262-69F8-4B75-9AB1-FF359C9143E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C2FD9262-69F8-4B75-9AB1-FF359C9143E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C2FD9262-69F8-4B75-9AB1-FF359C9143E9}.DebugCoreCLR|Any CPU.ActiveCfg = DebugCoreCLR|Any CPU
-		{C2FD9262-69F8-4B75-9AB1-FF359C9143E9}.DebugCoreCLR|Any CPU.Build.0 = DebugCoreCLR|Any CPU
-		{C2FD9262-69F8-4B75-9AB1-FF359C9143E9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C2FD9262-69F8-4B75-9AB1-FF359C9143E9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C2FD9262-69F8-4B75-9AB1-FF359C9143E9}.ReleaseCoreCLR|Any CPU.ActiveCfg = ReleaseCoreCLR|Any CPU
-		{C2FD9262-69F8-4B75-9AB1-FF359C9143E9}.ReleaseCoreCLR|Any CPU.Build.0 = ReleaseCoreCLR|Any CPU
+		{D0D95F78-106B-40A0-B6AC-0710468B82F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D0D95F78-106B-40A0-B6AC-0710468B82F5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D0D95F78-106B-40A0-B6AC-0710468B82F5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D0D95F78-106B-40A0-B6AC-0710468B82F5}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {A3F4E454-5AC6-42DA-9B2A-EB76C56EA71F}
+	EndGlobalSection
 EndGlobal