diff --git a/CppNet_CoreCLR.csproj b/CppNet_CoreCLR.csproj
new file mode 100644
index 0000000..9869bd1
--- /dev/null
+++ b/CppNet_CoreCLR.csproj
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <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>
+	<TargetFrameworkRootPath>$(SolutionDir)\CoreFX\</TargetFrameworkRootPath>
+	<FrameworkPathOverride>$(TargetFrameworkRootPath)\CoreCLR\v5.0</FrameworkPathOverride>
+    <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>
+  <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" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Argument.cs" />
+    <Compile Include="Feature.cs" />
+    <Compile Include="FileLexerSource.cs" />
+    <Compile Include="FixedTokenSource.cs" />
+    <Compile Include="JavaCompat\JavaCompat.cs" />
+    <Compile Include="JavaFile.cs" />
+    <Compile Include="JavaFileSystem.cs" />
+    <Compile Include="JoinReader.cs" />
+    <Compile Include="LexerException.cs" />
+    <Compile Include="LexerSource.cs" />
+    <Compile Include="Macro.cs" />
+    <Compile Include="MacroTokenSource.cs" />
+    <Compile Include="Preprocessor.cs" />
+    <Compile Include="PreprocessorListener.cs" />
+    <Compile Include="PreprocessorListenerBase.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Source.cs" />
+    <Compile Include="SourceIterator.cs" />
+    <Compile Include="State.cs" />
+    <Compile Include="StringLexerSource.cs" />
+    <Compile Include="Token.cs" />
+    <Compile Include="VirtualFile.cs" />
+    <Compile Include="VirtualFileSystem.cs" />
+    <Compile Include="Warning.cs" />
+  </ItemGroup>
+  <Import Project="$(TargetFrameworkRootPath)\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>
diff --git a/CppNet_CoreCLR.sln b/CppNet_CoreCLR.sln
new file mode 100644
index 0000000..ed17819
--- /dev/null
+++ b/CppNet_CoreCLR.sln
@@ -0,0 +1,22 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.23107.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CppNet_CoreCLR", "CppNet_CoreCLR.csproj", "{C2FD9262-69F8-4B75-9AB1-FF359C9143E9}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|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}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C2FD9262-69F8-4B75-9AB1-FF359C9143E9}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal