Add support for .NET Standard 2.0

Loupi · Feb 25, 2019 · 123f347 · 123f347
1 parent d0a476c
commit 123f347
Show file tree

Hide file tree

Showing 323 changed files with 3,532 additions and 2,684 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,10 @@
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
 
+
+.vs/
+packages/
+
 # User-specific files
 *.suo
 *.user

diff --git a/Frontenac/Blueprints-.NET4.0/Blueprints.csproj b/Frontenac/Blueprints-.NET4.0/Blueprints.csproj
@@ -14,6 +14,8 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
     <CodeContractsAssemblyMode>0</CodeContractsAssemblyMode>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -202,9 +204,8 @@
     <StartupObject />
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net40\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net40\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -236,15 +237,9 @@
     <Compile Include="..\Blueprints\Contracts\QueryContract.cs">
       <Link>Contracts\QueryContract.cs</Link>
     </Compile>
-    <Compile Include="..\Blueprints\Contracts\ThreadedTransactionalGraphContract.cs">
-      <Link>Contracts\ThreadedTransactionalGraphContract.cs</Link>
-    </Compile>
     <Compile Include="..\Blueprints\Contracts\VertexContract.cs">
       <Link>Contracts\VertexContract.cs</Link>
     </Compile>
-    <Compile Include="..\Blueprints\Contracts\VertexQueryContract.cs">
-      <Link>Contracts\VertexQueryContract.cs</Link>
-    </Compile>
     <Compile Include="..\Blueprints\DictionaryElement.cs">
       <Link>DictionaryElement.cs</Link>
     </Compile>
@@ -689,9 +684,6 @@
     <Compile Include="..\Blueprints\Util\Wrappers\Wrapped\WrappedVertexIterable.cs">
       <Link>Util\Wrappers\Wrapped\WrappedVertexIterable.cs</Link>
     </Compile>
-    <Compile Include="..\Blueprints\Util\Wrappers\WrapperGraphContract.cs">
-      <Link>Util\Wrappers\WrapperGraphContract.cs</Link>
-    </Compile>
     <Compile Include="..\Blueprints\Util\Wrappers\WrapperVertexQuery.cs">
       <Link>Util\Wrappers\WrapperVertexQuery.cs</Link>
     </Compile>
@@ -708,19 +700,9 @@
     <EmbeddedResource Include="..\Blueprints\Util\IO\GraphML\graph-example-1.xml">
       <Link>Util\IO\GraphML\graph-example-1.xml</Link>
     </EmbeddedResource>
-    <Content Include="FodyWeavers.xml" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
-  <Import Project="..\packages\Fody.1.29.0\build\Fody.targets" Condition="Exists('..\packages\Fody.1.29.0\build\Fody.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Fody.1.29.0\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.29.0\build\Fody.targets'))" />
-    <Error Condition="!Exists('..\packages\GitVersionTask.3.0.2\Build\GitVersionTask.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GitVersionTask.3.0.2\Build\GitVersionTask.targets'))" />
-  </Target>
-  <Import Project="..\packages\GitVersionTask.3.0.2\Build\GitVersionTask.targets" Condition="Exists('..\packages\GitVersionTask.3.0.2\Build\GitVersionTask.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">

diff --git a/Frontenac/Blueprints-.NET4.0/FodyWeavers.xml b/Frontenac/Blueprints-.NET4.0/FodyWeavers.xml
diff --git a/Frontenac/Blueprints-.NET4.0/Properties/AssemblyInfo.cs b/Frontenac/Blueprints-.NET4.0/Properties/AssemblyInfo.cs
@@ -22,6 +22,9 @@
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("0aca691b-9897-4bee-a521-1407e3396749")]
 
+[assembly: AssemblyVersion("2.5.0.0")]
+[assembly: AssemblyFileVersion("2.5.0.0")]
+
 // For tests
 
 [assembly:

diff --git a/Frontenac/Blueprints-.NET4.0/packages.config b/Frontenac/Blueprints-.NET4.0/packages.config
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Fody" version="1.29.0" targetFramework="net40" developmentDependency="true" />
-  <package id="GitVersionTask" version="3.0.2" targetFramework="net40" developmentDependency="true" />
-  <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net40" />
-  <package id="Stamp.Fody" version="1.2.0" targetFramework="net40" />
+  <package id="Newtonsoft.Json" version="12.0.1" targetFramework="net40" />
 </packages>