Make the project ready for .NET Standard TFM

maxmind · May 9, 2016 · a13753b · a13753b
1 parent e1d14a2
commit a13753b
Show file tree

Hide file tree

Showing 30 changed files with 311 additions and 575 deletions.
diff --git a/.gitignore b/.gitignore
@@ -82,6 +82,7 @@ publish
 
 # NuGet Packages Directory
 packages
+*.lock.json
 
 # Windows Azure Build Output
 csx
@@ -93,6 +94,7 @@ AppPackages/
 # Others
 [Bb]in
 [Oo]bj
+artifacts
 sql
 TestResults
 [Tt]est[Rr]esult*

diff --git a/.nuget/NuGet.Config b/.nuget/NuGet.Config
diff --git a/.nuget/NuGet.targets b/.nuget/NuGet.targets
diff --git a/MaxMind.Db.Benchmark/MaxMind.Db.Benchmark.csproj b/MaxMind.Db.Benchmark/MaxMind.Db.Benchmark.csproj
diff --git a/MaxMind.Db.Benchmark/MaxMind.Db.Benchmark.xproj b/MaxMind.Db.Benchmark/MaxMind.Db.Benchmark.xproj
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+  </PropertyGroup>
+
+  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>f1051d87-38be-4e9c-b7b3-9fa2dfb4fb56</ProjectGuid>
+    <RootNamespace>MaxMind.Db.Benchmark</RootNamespace>
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <SchemaVersion>2.0</SchemaVersion>
+  </PropertyGroup>
+  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
+</Project>
diff --git a/MaxMind.Db.Benchmark/app.config b/MaxMind.Db.Benchmark/app.config
diff --git a/MaxMind.Db.Benchmark/project.json b/MaxMind.Db.Benchmark/project.json
@@ -0,0 +1,32 @@
+{
+  "version": "2.0.0-*",
+  "description": "Benchmark project to validate .NET reader for the MaxMind DB file format",
+  "packOptions": {
+    "authors": [ "MaxMind, Inc." ],
+    "tags": [ "" ],
+    "projectUrl": "https://github.com/maxmind/MaxMind-DB-Reader-dotnet",
+    "licenseUrl": "https://github.com/maxmind/MaxMind-DB-Reader-dotnet/blob/v2.0.0/LICENSE",
+    "copyright": "Copyright © 2013-2016"
+  },
+
+  "buildOptions": {
+    "emitEntryPoint": true
+  },
+  "dependencies": {
+    "MaxMind.Db": "2.0.0-*"
+  },
+  "frameworks": {
+    "net45": { },
+    "netcoreapp1.0": {
+      "imports": "dnxcore50",
+      "dependencies": {
+        "Microsoft.NETCore.App": {
+          "type": "platform",
+          "version": "1.0.0-rc2-3002543"
+        },
+        "Microsoft.CSharp": "4.0.1-rc3-24026-00",
+        "System.Console": "4.0.0-rc3-24026-00",
+      }
+    }
+  }
+}
diff --git a/MaxMind.Db.Test/DecoderTest.cs b/MaxMind.Db.Test/DecoderTest.cs
@@ -1,10 +1,10 @@
 #region
 
-using NUnit.Framework;
 using System;
 using System.Collections.Generic;
 using System.Numerics;
 using System.Text;
+using NUnit.Framework;
 
 #endregion