lucenenet-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nightowl...@apache.org
Subject [27/52] [abbrv] lucenenet git commit: SWEEP: Consolidated shared project configuration in project.json
Date Tue, 25 Apr 2017 11:51:08 GMT
SWEEP: Consolidated shared project configuration in project.json


Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/8f98c521
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/8f98c521
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/8f98c521

Branch: refs/heads/master
Commit: 8f98c521ead1f0d11ce47e18679e1cd2e1c7e165
Parents: 88bd0d4
Author: Shad Storhaug <shad@shadstorhaug.com>
Authored: Sat Apr 22 02:46:11 2017 +0700
Committer: Shad Storhaug <shad@shadstorhaug.com>
Committed: Sat Apr 22 03:16:07 2017 +0700

----------------------------------------------------------------------
 src/Lucene.Net.Analysis.Common/project.json     |  52 ++--
 src/Lucene.Net.Analysis.Stempel/project.json    |  37 +--
 src/Lucene.Net.Classification/project.json      |  19 +-
 src/Lucene.Net.Codecs/project.json              |  19 +-
 src/Lucene.Net.Expressions/project.json         |  15 +-
 src/Lucene.Net.Facet/project.json               |  19 +-
 src/Lucene.Net.Grouping/project.json            |  19 +-
 src/Lucene.Net.Highlighter/project.json         |  19 +-
 src/Lucene.Net.Icu/project.json                 |  13 +-
 src/Lucene.Net.Join/project.json                |  19 +-
 src/Lucene.Net.Memory/project.json              |  19 +-
 src/Lucene.Net.Misc/project.json                |  22 +-
 src/Lucene.Net.Queries/project.json             |  19 +-
 src/Lucene.Net.QueryParser/project.json         |  15 +-
 src/Lucene.Net.Sandbox/project.json             |  19 +-
 src/Lucene.Net.Spatial/project.json             |  19 +-
 src/Lucene.Net.Suggest/project.json             |  19 +-
 .../Support/ApiScanTestBase.cs                  |   4 +-
 src/Lucene.Net.TestFramework/project.json       |  77 ++----
 .../project.json                                | 267 +++++++------------
 .../project.json                                |  30 +--
 .../project.json                                |  15 +-
 src/Lucene.Net.Tests.Codecs/project.json        |  15 +-
 src/Lucene.Net.Tests.Expressions/project.json   |  15 +-
 src/Lucene.Net.Tests.Facet/project.json         |  15 +-
 src/Lucene.Net.Tests.Grouping/project.json      |  15 +-
 src/Lucene.Net.Tests.Highlighter/project.json   |  30 +--
 src/Lucene.Net.Tests.Icu/project.json           |  20 +-
 src/Lucene.Net.Tests.Join/project.json          |  15 +-
 src/Lucene.Net.Tests.Memory/project.json        |  33 +--
 src/Lucene.Net.Tests.Misc/project.json          |  15 +-
 src/Lucene.Net.Tests.Queries/project.json       |  15 +-
 src/Lucene.Net.Tests.QueryParser/project.json   | 102 +++----
 src/Lucene.Net.Tests.Sandbox/project.json       |  30 +--
 src/Lucene.Net.Tests.Spatial/project.json       |  63 ++---
 src/Lucene.Net.Tests.Suggest/project.json       |  30 +--
 src/Lucene.Net.Tests/project.json               | 157 ++++-------
 src/Lucene.Net/Support/Deflater.cs              |   4 +-
 src/Lucene.Net/Support/Inflater.cs              |   4 +-
 src/Lucene.Net/Support/SharpZipLib.cs           |   4 +-
 src/Lucene.Net/Support/StreamUtils.cs           |   4 +-
 src/Lucene.Net/project.json                     |  26 +-
 42 files changed, 496 insertions(+), 872 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8f98c521/src/Lucene.Net.Analysis.Common/project.json
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Analysis.Common/project.json b/src/Lucene.Net.Analysis.Common/project.json
index 5c23e92..67e2682 100644
--- a/src/Lucene.Net.Analysis.Common/project.json
+++ b/src/Lucene.Net.Analysis.Common/project.json
@@ -11,6 +11,22 @@
     "repository": { "url": "https://github.com/apache/lucenenet" },
     "tags": [ "lucene.net", "core", "text", "search", "information", "retrieval", "lucene", "apache", "analysis", "index", "query" ]
   },
+  "buildOptions": {
+    "compile": {
+      "includeFiles": [ "../CommonAssemblyInfo.cs" ]
+    },
+    "embed": {
+      "include": [
+        "Analysis/**/stopwords.txt",
+        "Analysis/Snowball/*_stop.txt"
+      ],
+      "includeFiles": [
+        "Analysis/Gl/galician.rslp",
+        "Analysis/Pt/portuguese.rslp",
+        "Analysis/Compound/Hyphenation/hyphenation.dtd"
+      ]
+    }
+  },
   "dependencies": {
     "Lucene.Net": "4.8.0"
   },
@@ -22,23 +38,7 @@
       },
       "buildOptions": {
         "debugType": "portable",
-        "define": [ "NETSTANDARD" ],
-        "compile": {
-          "includeFiles": [
-            "../CommonAssemblyInfo.cs"
-          ]
-        },
-        "embed": {
-          "include": [
-            "Analysis/**/stopwords.txt",
-            "Analysis/Snowball/*_stop.txt"
-          ],
-          "includeFiles": [
-            "Analysis/Gl/galician.rslp",
-            "Analysis/Pt/portuguese.rslp",
-            "Analysis/Compound/Hyphenation/hyphenation.dtd"
-          ]
-        }
+        "define": [ "NETSTANDARD" ]
       }
     },
     "net451": {
@@ -47,23 +47,7 @@
       },
       "buildOptions": {
         "debugType": "full",
-        "define": [ "FEATURE_CLONEABLE", "FEATURE_DTD_PROCESSING", "FEATURE_SERIALIZABLE" ],
-        "compile": {
-          "includeFiles": [
-            "../CommonAssemblyInfo.cs"
-          ]
-        },
-        "embed": {
-          "include": [
-            "Analysis/**/stopwords.txt",
-            "Analysis/Snowball/*_stop.txt"
-          ],
-          "includeFiles": [
-            "Analysis/Gl/galician.rslp",
-            "Analysis/Pt/portuguese.rslp",
-            "Analysis/Compound/Hyphenation/hyphenation.dtd"
-          ]
-        }
+        "define": [ "FEATURE_CLONEABLE", "FEATURE_DTD_PROCESSING", "FEATURE_SERIALIZABLE" ]
       }
     }
   }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8f98c521/src/Lucene.Net.Analysis.Stempel/project.json
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Analysis.Stempel/project.json b/src/Lucene.Net.Analysis.Stempel/project.json
index 487e6e5..4696854 100644
--- a/src/Lucene.Net.Analysis.Stempel/project.json
+++ b/src/Lucene.Net.Analysis.Stempel/project.json
@@ -11,6 +11,17 @@
     "repository": { "url": "https://github.com/apache/lucenenet" },
     "tags": [ "lucene.net", "core", "text", "search", "information", "retrieval", "lucene", "apache", "analysis", "index", "query" ]
   },
+  "buildOptions": {
+    "compile": {
+      "includeFiles": [ "../CommonAssemblyInfo.cs" ]
+    },
+    "embed": {
+      "includeFiles": [
+        "Pl/stemmer_20000.tbl",
+        "Pl/stopwords.txt"
+      ]
+    }
+  },
   "dependencies": {
     "Lucene.Net.Analysis.Common": "4.8.0"
   },
@@ -19,18 +30,7 @@
       "imports": "dnxcore50",
       "buildOptions": {
         "debugType": "portable",
-        "define": [ "NETSTANDARD" ],
-        "compile": {
-          "includeFiles": [
-            "../CommonAssemblyInfo.cs"
-          ]
-        },
-        "embed": {
-          "includeFiles": [
-            "Pl/stemmer_20000.tbl",
-            "Pl/stopwords.txt"
-          ]
-        }
+        "define": [ "NETSTANDARD" ]
       },
       "dependencies": {
         "NETStandard.Library": "1.6.0"
@@ -39,18 +39,7 @@
     "net451": {
       "buildOptions": {
         "debugType": "full",
-        "define": [ "FEATURE_SERIALIZABLE" ],
-        "compile": {
-          "includeFiles": [
-            "../CommonAssemblyInfo.cs"
-          ]
-        },
-        "embed": {
-          "includeFiles": [
-            "Pl/stemmer_20000.tbl",
-            "Pl/stopwords.txt"
-          ]
-        }
+        "define": [ "FEATURE_SERIALIZABLE" ]
       }
     }
   }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8f98c521/src/Lucene.Net.Classification/project.json
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Classification/project.json b/src/Lucene.Net.Classification/project.json
index e1ea3c1..e24d80b 100644
--- a/src/Lucene.Net.Classification/project.json
+++ b/src/Lucene.Net.Classification/project.json
@@ -11,6 +11,11 @@
     "repository": { "url": "https://github.com/apache/lucenenet" },
     "tags": [ "lucene.net", "core", "text", "search", "information", "retrieval", "lucene", "apache", "analysis", "index", "query" ]
   },
+  "buildOptions": {
+    "compile": {
+      "includeFiles": [ "../CommonAssemblyInfo.cs" ]
+    }
+  },
   "dependencies": {
     "Lucene.Net": "4.8.0",
     "Lucene.Net.Queries": "4.8.0"
@@ -19,12 +24,7 @@
     "netstandard1.5": {
       "imports": "dnxcore50",
       "buildOptions": {
-        "debugType": "portable",
-        "compile": {
-          "includeFiles": [
-            "../CommonAssemblyInfo.cs"
-          ]
-        }
+        "debugType": "portable"
       },
       "dependencies": {
         "NETStandard.Library": "1.6.0"
@@ -33,12 +33,7 @@
     "net451": {
       "buildOptions": {
         "debugType": "full",
-        "define": [ "FEATURE_SERIALIZABLE" ],
-        "compile": {
-          "includeFiles": [
-            "../CommonAssemblyInfo.cs"
-          ]
-        }
+        "define": [ "FEATURE_SERIALIZABLE" ]
       }
     }
   }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8f98c521/src/Lucene.Net.Codecs/project.json
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/project.json b/src/Lucene.Net.Codecs/project.json
index a96f359..80a943f 100644
--- a/src/Lucene.Net.Codecs/project.json
+++ b/src/Lucene.Net.Codecs/project.json
@@ -11,6 +11,11 @@
     "repository": { "url": "https://github.com/apache/lucenenet" },
     "tags": [ "lucene.net", "core", "text", "search", "information", "retrieval", "lucene", "apache", "analysis", "index", "query" ]
   },
+  "buildOptions": {
+    "compile": {
+      "includeFiles": [ "../CommonAssemblyInfo.cs" ]
+    }
+  },
   "dependencies": {
     "Lucene.Net": "4.8.0"
   },
@@ -18,12 +23,7 @@
     "netstandard1.5": {
       "imports": "dnxcore50",
       "buildOptions": {
-        "debugType": "portable",
-        "compile": {
-          "includeFiles": [
-            "../CommonAssemblyInfo.cs"
-          ]
-        }
+        "debugType": "portable"
       },
       "dependencies": {
         "NETStandard.Library": "1.6.0"
@@ -35,12 +35,7 @@
       },
       "buildOptions": {
         "debugType": "full",
-        "define": [ "FEATURE_SERIALIZABLE" ],
-        "compile": {
-          "includeFiles": [
-            "../CommonAssemblyInfo.cs"
-          ]
-        }
+        "define": [ "FEATURE_SERIALIZABLE" ]
       }
     }
   }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8f98c521/src/Lucene.Net.Expressions/project.json
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Expressions/project.json b/src/Lucene.Net.Expressions/project.json
index b38016f..70c5fad 100644
--- a/src/Lucene.Net.Expressions/project.json
+++ b/src/Lucene.Net.Expressions/project.json
@@ -11,6 +11,11 @@
     "repository": { "url": "https://github.com/apache/lucenenet" },
     "tags": [ "lucene.net", "core", "text", "search", "information", "retrieval", "lucene", "apache", "analysis", "index", "query" ]
   },
+  "buildOptions": {
+    "compile": {
+      "includeFiles": [ "../CommonAssemblyInfo.cs" ]
+    }
+  },
   "dependencies": {
     "antlr3.runtime.netcore": "3.6.0-rc2",
     "Lucene.Net.Queries": "4.8.0"
@@ -22,9 +27,6 @@
         "debugType": "portable",
         "define": [ "NETSTANDARD" ],
         "compile": {
-          "includeFiles": [
-            "../CommonAssemblyInfo.cs"
-          ],
           "excludeFiles": [
             "Properties/Settings.Designer.cs"
           ]
@@ -43,12 +45,7 @@
     "net451": {
       "buildOptions": {
         "debugType": "full",
-        "define": [ "FEATURE_SERIALIZABLE" ],
-        "compile": {
-          "includeFiles": [
-            "../CommonAssemblyInfo.cs"
-          ]
-        }
+        "define": [ "FEATURE_SERIALIZABLE" ]
       }
     }
   }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8f98c521/src/Lucene.Net.Facet/project.json
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Facet/project.json b/src/Lucene.Net.Facet/project.json
index 038780a..b269cd5 100644
--- a/src/Lucene.Net.Facet/project.json
+++ b/src/Lucene.Net.Facet/project.json
@@ -11,6 +11,11 @@
     "repository": { "url": "https://github.com/apache/lucenenet" },
     "tags": [ "lucene.net", "core", "text", "search", "information", "retrieval", "lucene", "apache", "analysis", "index", "query" ]
   },
+  "buildOptions": {
+    "compile": {
+      "includeFiles": [ "../CommonAssemblyInfo.cs" ]
+    }
+  },
   "dependencies": {
     "Lucene.Net.Join": "4.8.0",
     "Lucene.Net.Queries": "4.8.0"
@@ -20,12 +25,7 @@
       "imports": "dnxcore50",
       "buildOptions": {
         "debugType": "portable",
-        "define": [ "NETSTANDARD" ],
-        "compile": {
-          "includeFiles": [
-            "../CommonAssemblyInfo.cs"
-          ]
-        }
+        "define": [ "NETSTANDARD" ]
       },
       "dependencies": {
         "NETStandard.Library": "1.6.0",
@@ -36,12 +36,7 @@
     "net451": {
       "buildOptions": {
         "debugType": "full",
-        "define": [ "FEATURE_SERIALIZABLE" ],
-        "compile": {
-          "includeFiles": [
-            "../CommonAssemblyInfo.cs"
-          ]
-        }
+        "define": [ "FEATURE_SERIALIZABLE" ]
       }
     }
   }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8f98c521/src/Lucene.Net.Grouping/project.json
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Grouping/project.json b/src/Lucene.Net.Grouping/project.json
index 8fc95b6..f44b7b1 100644
--- a/src/Lucene.Net.Grouping/project.json
+++ b/src/Lucene.Net.Grouping/project.json
@@ -11,6 +11,11 @@
     "repository": { "url": "https://github.com/apache/lucenenet" },
     "tags": [ "lucene.net", "core", "text", "search", "information", "retrieval", "lucene", "apache", "analysis", "index", "query" ]
   },
+  "buildOptions": {
+    "compile": {
+      "includeFiles": [ "../CommonAssemblyInfo.cs" ]
+    }
+  },
   "dependencies": {
     "Lucene.Net": "4.8.0",
     "Lucene.Net.Queries": "4.8.0"
@@ -19,12 +24,7 @@
     "netstandard1.5": {
       "imports": "dnxcore50",
       "buildOptions": {
-        "debugType": "portable",
-        "compile": {
-          "includeFiles": [
-            "../CommonAssemblyInfo.cs"
-          ]
-        }
+        "debugType": "portable"
       },
       "dependencies": {
         "NETStandard.Library": "1.6.0"
@@ -33,12 +33,7 @@
     "net451": {
       "buildOptions": {
         "debugType": "full",
-        "define": [ "FEATURE_SERIALIZABLE" ],
-        "compile": {
-          "includeFiles": [
-            "../CommonAssemblyInfo.cs"
-          ]
-        }
+        "define": [ "FEATURE_SERIALIZABLE" ]
       }
     }
   }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8f98c521/src/Lucene.Net.Highlighter/project.json
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Highlighter/project.json b/src/Lucene.Net.Highlighter/project.json
index a20fbb4..b94b440 100644
--- a/src/Lucene.Net.Highlighter/project.json
+++ b/src/Lucene.Net.Highlighter/project.json
@@ -11,6 +11,11 @@
     "repository": { "url": "https://github.com/apache/lucenenet" },
     "tags": [ "lucene.net", "core", "text", "search", "information", "retrieval", "lucene", "apache", "analysis", "index", "query" ]
   },
+  "buildOptions": {
+    "compile": {
+      "includeFiles": [ "../CommonAssemblyInfo.cs" ]
+    }
+  },
   "dependencies": {
     "Lucene.Net.Memory": "4.8.0",
     "Lucene.Net.Analysis.Common": "4.8.0",
@@ -21,12 +26,7 @@
       "imports": "dnxcore50",
       "buildOptions": {
         "debugType": "portable",
-        "define": [ "NETSTANDARD" ],
-        "compile": {
-          "includeFiles": [
-            "../CommonAssemblyInfo.cs"
-          ]
-        }
+        "define": [ "NETSTANDARD" ]
       },
       "dependencies": {
         "NETStandard.Library": "1.6.0"
@@ -35,12 +35,7 @@
     "net451": {
       "buildOptions": {
         "debugType": "full",
-        "define": [ "FEATURE_SERIALIZABLE" ],
-        "compile": {
-          "includeFiles": [
-            "../CommonAssemblyInfo.cs"
-          ]
-        }
+        "define": [ "FEATURE_SERIALIZABLE" ]
       }
     }
   }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8f98c521/src/Lucene.Net.Icu/project.json
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Icu/project.json b/src/Lucene.Net.Icu/project.json
index 5194e93..0915cf1 100644
--- a/src/Lucene.Net.Icu/project.json
+++ b/src/Lucene.Net.Icu/project.json
@@ -11,12 +11,6 @@
     "repository": { "url": "https://github.com/apache/lucenenet" },
     "tags": [ "lucene.net", "core", "text", "search", "information", "retrieval", "lucene", "apache", "analysis", "index", "query" ]
   },
-  "dependencies": {
-    "icu.net": "54.1.1-alpha",
-    "Lucene.Net": "4.8.0",
-    "Lucene.Net.Analysis.Common": "4.8.0",
-    "Lucene.Net.Highlighter": "4.8.0"
-  },
   "buildOptions": {
     "compile": {
       "includeFiles": [
@@ -42,7 +36,12 @@
       "includeFiles": [ "Analysis/Th/stopwords.txt" ]
     }
   },
-
+  "dependencies": {
+    "icu.net": "54.1.1-alpha",
+    "Lucene.Net": "4.8.0",
+    "Lucene.Net.Analysis.Common": "4.8.0",
+    "Lucene.Net.Highlighter": "4.8.0"
+  },
   "frameworks": {
     "netstandard1.5": {
       "imports": "dnxcore50",

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8f98c521/src/Lucene.Net.Join/project.json
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Join/project.json b/src/Lucene.Net.Join/project.json
index fe6aaf3..63db858 100644
--- a/src/Lucene.Net.Join/project.json
+++ b/src/Lucene.Net.Join/project.json
@@ -11,6 +11,11 @@
     "repository": { "url": "https://github.com/apache/lucenenet" },
     "tags": [ "lucene.net", "core", "text", "search", "information", "retrieval", "lucene", "apache", "analysis", "index", "query" ]
   },
+  "buildOptions": {
+    "compile": {
+      "includeFiles": [ "../CommonAssemblyInfo.cs" ]
+    }
+  },
   "dependencies": {
     "Lucene.Net.Grouping": "4.8.0"
   },
@@ -18,12 +23,7 @@
     "netstandard1.5": {
       "imports": "dnxcore50",
       "buildOptions": {
-        "debugType": "portable",
-        "compile": {
-          "includeFiles": [
-            "../CommonAssemblyInfo.cs"
-          ]
-        }
+        "debugType": "portable"
       },
       "dependencies": {
         "NETStandard.Library": "1.6.0"
@@ -32,12 +32,7 @@
     "net451": {
       "buildOptions": {
         "debugType": "full",
-        "define": [ "FEATURE_SERIALIZABLE" ],
-        "compile": {
-          "includeFiles": [
-            "../CommonAssemblyInfo.cs"
-          ]
-        }
+        "define": [ "FEATURE_SERIALIZABLE" ]
       }
     }
   }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8f98c521/src/Lucene.Net.Memory/project.json
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Memory/project.json b/src/Lucene.Net.Memory/project.json
index 7eae284..ce84d87 100644
--- a/src/Lucene.Net.Memory/project.json
+++ b/src/Lucene.Net.Memory/project.json
@@ -11,6 +11,11 @@
     "repository": { "url": "https://github.com/apache/lucenenet" },
     "tags": [ "lucene.net", "core", "text", "search", "information", "retrieval", "lucene", "apache", "analysis", "index", "query" ]
   },
+  "buildOptions": {
+    "compile": {
+      "includeFiles": [ "../CommonAssemblyInfo.cs" ]
+    }
+  },
   "dependencies": {
     "Lucene.Net": "4.8.0"
   },
@@ -18,12 +23,7 @@
     "netstandard1.5": {
       "imports": "dnxcore50",
       "buildOptions": {
-        "debugType": "portable",
-        "compile": {
-          "includeFiles": [
-            "../CommonAssemblyInfo.cs"
-          ]
-        }
+        "debugType": "portable"
       },
       "dependencies": {
         "NETStandard.Library": "1.6.0"
@@ -32,12 +32,7 @@
     "net451": {
       "buildOptions": {
         "debugType": "full",
-        "define": [ "FEATURE_SERIALIZABLE" ],
-        "compile": {
-          "includeFiles": [
-            "../CommonAssemblyInfo.cs"
-          ]
-        }
+        "define": [ "FEATURE_SERIALIZABLE" ]
       }
     }
   }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8f98c521/src/Lucene.Net.Misc/project.json
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Misc/project.json b/src/Lucene.Net.Misc/project.json
index c7b2ab6..d2c13ab 100644
--- a/src/Lucene.Net.Misc/project.json
+++ b/src/Lucene.Net.Misc/project.json
@@ -11,6 +11,12 @@
     "repository": { "url": "https://github.com/apache/lucenenet" },
     "tags": [ "lucene.net", "core", "text", "search", "information", "retrieval", "lucene", "apache", "analysis", "index", "query" ]
   },
+  "buildOptions": {
+    "compile": {
+      "includeFiles": [ "../CommonAssemblyInfo.cs" ],
+      "exclude": [ "Store/*" ]
+    }
+  },
   "dependencies": {
     "Lucene.Net.Analysis.Common": "4.8.0"
   },
@@ -18,13 +24,7 @@
     "netstandard1.5": {
       "imports": "dnxcore50",
       "buildOptions": {
-        "debugType": "portable",
-        "compile": {
-          "exclude": [ "Store/*" ],
-          "includeFiles": [
-            "../CommonAssemblyInfo.cs"
-          ]
-        }
+        "debugType": "portable"
       },
       "dependencies": {
         "NETStandard.Library": "1.6.0"
@@ -33,13 +33,7 @@
     "net451": {
       "buildOptions": {
         "debugType": "full",
-        "define": [ "FEATURE_SERIALIZABLE" ],
-        "compile": {
-          "exclude": [ "Store/*" ],
-          "includeFiles": [
-            "../CommonAssemblyInfo.cs"
-          ]
-        }
+        "define": [ "FEATURE_SERIALIZABLE" ]
       }
     }
   }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8f98c521/src/Lucene.Net.Queries/project.json
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/project.json b/src/Lucene.Net.Queries/project.json
index 480d6b7..405e443 100644
--- a/src/Lucene.Net.Queries/project.json
+++ b/src/Lucene.Net.Queries/project.json
@@ -11,6 +11,11 @@
     "repository": { "url": "https://github.com/apache/lucenenet" },
     "tags": [ "lucene.net", "core", "text", "search", "information", "retrieval", "lucene", "apache", "analysis", "index", "query" ]
   },
+  "buildOptions": {
+    "compile": {
+      "includeFiles": [ "../CommonAssemblyInfo.cs" ]
+    }
+  },
   "dependencies": {
     "Lucene.Net": "4.8.0"
   },
@@ -18,12 +23,7 @@
     "netstandard1.5": {
       "imports": "dnxcore50",
       "buildOptions": {
-        "debugType": "portable",
-        "compile": {
-          "includeFiles": [
-            "../CommonAssemblyInfo.cs"
-          ]
-        }
+        "debugType": "portable"
       },
       "dependencies": {
         "NETStandard.Library": "1.6.0"
@@ -32,12 +32,7 @@
     "net451": {
       "buildOptions": {
         "debugType": "full",
-        "define": [ "FEATURE_SERIALIZABLE" ],
-        "compile": {
-          "includeFiles": [
-            "../CommonAssemblyInfo.cs"
-          ]
-        }
+        "define": [ "FEATURE_SERIALIZABLE" ]
       }
     }
   }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8f98c521/src/Lucene.Net.QueryParser/project.json
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/project.json b/src/Lucene.Net.QueryParser/project.json
index e45e167..f184217 100644
--- a/src/Lucene.Net.QueryParser/project.json
+++ b/src/Lucene.Net.QueryParser/project.json
@@ -11,6 +11,11 @@
     "repository": { "url": "https://github.com/apache/lucenenet" },
     "tags": [ "lucene.net", "core", "text", "search", "information", "retrieval", "lucene", "apache", "analysis", "index", "query" ]
   },
+  "buildOptions": {
+    "compile": {
+      "includeFiles": [ "../CommonAssemblyInfo.cs" ]
+    }
+  },
   "dependencies": {
     "Lucene.Net.Analysis.Common": "4.8.0",
     "Lucene.Net.Queries": "4.8.0",
@@ -22,9 +27,6 @@
       "buildOptions": {
         "debugType": "portable",
         "compile": {
-          "includeFiles": [
-            "../CommonAssemblyInfo.cs"
-          ],
           "excludeFiles": [
             "Xml/QueryTemplateManager.cs"
           ]
@@ -38,12 +40,7 @@
     "net451": {
       "buildOptions": {
         "debugType": "full",
-        "define": [ "FEATURE_SERIALIZABLE", "FEATURE_CLONEABLE" ],
-        "compile": {
-          "includeFiles": [
-            "../CommonAssemblyInfo.cs"
-          ]
-        }
+        "define": [ "FEATURE_SERIALIZABLE", "FEATURE_CLONEABLE" ]
       },
       "frameworkAssemblies": {
         "System.Xml": "4.0.0.0"

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8f98c521/src/Lucene.Net.Sandbox/project.json
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Sandbox/project.json b/src/Lucene.Net.Sandbox/project.json
index 85a9193..ec481f8 100644
--- a/src/Lucene.Net.Sandbox/project.json
+++ b/src/Lucene.Net.Sandbox/project.json
@@ -11,6 +11,11 @@
     "repository": { "url": "https://github.com/apache/lucenenet" },
     "tags": [ "lucene.net", "core", "text", "search", "information", "retrieval", "lucene", "apache", "analysis", "index", "query" ]
   },
+  "buildOptions": {
+    "compile": {
+      "includeFiles": [ "../CommonAssemblyInfo.cs" ]
+    }
+  },
   "dependencies": {
     "Lucene.Net": "4.8.0"
   },
@@ -18,12 +23,7 @@
     "netstandard1.5": {
       "imports": "dnxcore50",
       "buildOptions": {
-        "debugType": "portable",
-        "compile": {
-          "includeFiles": [
-            "../CommonAssemblyInfo.cs"
-          ]
-        }
+        "debugType": "portable"
       },
       "dependencies": {
         "NETStandard.Library": "1.6.0"
@@ -32,12 +32,7 @@
     "net451": {
       "buildOptions": {
         "debugType": "full",
-        "define": [ "FEATURE_SERIALIZABLE" ],
-        "compile": {
-          "includeFiles": [
-            "../CommonAssemblyInfo.cs"
-          ]
-        }
+        "define": [ "FEATURE_SERIALIZABLE" ]
       }
     }
   }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8f98c521/src/Lucene.Net.Spatial/project.json
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Spatial/project.json b/src/Lucene.Net.Spatial/project.json
index e4678f3..c5c33fc 100644
--- a/src/Lucene.Net.Spatial/project.json
+++ b/src/Lucene.Net.Spatial/project.json
@@ -11,6 +11,11 @@
     "repository": { "url": "https://github.com/apache/lucenenet" },
     "tags": [ "lucene.net", "core", "text", "search", "information", "retrieval", "lucene", "apache", "analysis", "index", "query" ]
   },
+  "buildOptions": {
+    "compile": {
+      "includeFiles": [ "../CommonAssemblyInfo.cs" ]
+    }
+  },
   "dependencies": {
     "Lucene.Net.Queries": "4.8.0",
     "GeoAPI": "1.7.4",
@@ -22,12 +27,7 @@
       "imports": [ "dnxcore50", "portable-net403+sl5+win8+wp8+wpa81" ],
       "buildOptions": {
         "debugType": "portable",
-        "define": [ "NETSTANDARD" ],
-        "compile": {
-          "includeFiles": [
-            "../CommonAssemblyInfo.cs"
-          ]
-        }
+        "define": [ "NETSTANDARD" ]
       },
       "dependencies": {
         "NETStandard.Library": "1.6.0"
@@ -39,12 +39,7 @@
       },
       "buildOptions": {
         "debugType": "full",
-        "define": [ "FEATURE_SERIALIZABLE" ],
-        "compile": {
-          "includeFiles": [
-            "../CommonAssemblyInfo.cs"
-          ]
-        }
+        "define": [ "FEATURE_SERIALIZABLE" ]
       }
     }
   }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8f98c521/src/Lucene.Net.Suggest/project.json
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Suggest/project.json b/src/Lucene.Net.Suggest/project.json
index 0f44dee..157ade9 100644
--- a/src/Lucene.Net.Suggest/project.json
+++ b/src/Lucene.Net.Suggest/project.json
@@ -11,6 +11,11 @@
     "repository": { "url": "https://github.com/apache/lucenenet" },
     "tags": [ "lucene.net", "core", "text", "search", "information", "retrieval", "lucene", "apache", "analysis", "index", "query" ]
   },
+  "buildOptions": {
+    "compile": {
+      "includeFiles": [ "../CommonAssemblyInfo.cs" ]
+    }
+  },
   "dependencies": {
     "Lucene.Net.Analysis.Common": "4.8.0",
     "Lucene.Net.Misc": "4.8.0",
@@ -20,12 +25,7 @@
     "netstandard1.5": {
       "imports": "dnxcore50",
       "buildOptions": {
-        "debugType": "portable",
-        "compile": {
-          "includeFiles": [
-            "../CommonAssemblyInfo.cs"
-          ]
-        }
+        "debugType": "portable"
       },
       "dependencies": {
         "NETStandard.Library": "1.6.0"
@@ -34,12 +34,7 @@
     "net451": {
       "buildOptions": {
         "debugType": "full",
-        "define": [ "FEATURE_SERIALIZABLE" ],
-        "compile": {
-          "includeFiles": [
-            "../CommonAssemblyInfo.cs"
-          ]
-        }
+        "define": [ "FEATURE_SERIALIZABLE" ]
       }
     }
   }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8f98c521/src/Lucene.Net.TestFramework/Support/ApiScanTestBase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Support/ApiScanTestBase.cs b/src/Lucene.Net.TestFramework/Support/ApiScanTestBase.cs
index e0bee0c..57bb99e 100644
--- a/src/Lucene.Net.TestFramework/Support/ApiScanTestBase.cs
+++ b/src/Lucene.Net.TestFramework/Support/ApiScanTestBase.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Util;
+#if !NETSTANDARD
+using Lucene.Net.Util;
 using NUnit.Framework;
 using System;
 using System.Collections;
@@ -1072,3 +1073,4 @@ namespace Lucene.Net.Support
         }
     }
 }
+#endif
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8f98c521/src/Lucene.Net.TestFramework/project.json
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/project.json b/src/Lucene.Net.TestFramework/project.json
index f53fbe5..45e8d8a 100644
--- a/src/Lucene.Net.TestFramework/project.json
+++ b/src/Lucene.Net.TestFramework/project.json
@@ -2,6 +2,30 @@
   "version": "4.8.0",
   "title": "Lucene.Net.TestFramework",
   "description": "Framework for testing Lucene.Net-based applications from The Apache Software Foundation.",
+  "buildOptions": {
+    "compile": {
+      "includeFiles": [ "../CommonAssemblyInfo.cs" ],
+      "excludeFiles": [
+        "Util/AbstractBeforeAfterRule.cs",
+        "Util/CloseableDirectory.cs",
+        "Util/FailureMarker.cs",
+        "Util/QuickPatchThreadsFilter.cs",
+        "Util/RemoveUponClose.cs",
+        "Util/RunListenerPrintReproduceInfo.cs",
+        "Util/TestRuleAssertionsRequired.cs",
+        "Util/TestRuleDelegate.cs",
+        "Util/TestRuleFieldCacheSanity.cs",
+        "Util/TestRuleIgnoreAfterMaxFailures.cs",
+        "Util/TestRuleIgnoreTestSuites.cs",
+        "Util/TestRuleMarkFailure.cs",
+        "Util/TestRuleSetupAndRestoreInstanceEnv.cs",
+        "Util/TestRuleSetupTeardownChained.cs",
+        "Util/TestRuleStoreClassName.cs",
+        "Util/TestRuleThreadAndTestName.cs",
+        "Util/TestSecurityManager.cs"
+      ]
+    }
+  },
   "dependencies": {
     "Lucene.Net.Analysis.Common": "4.8.0",
     "Lucene.Net.Codecs": "4.8.0",
@@ -18,32 +42,7 @@
       },
       "buildOptions": {
         "debugType": "portable",
-        "define": [ "FEATURE_STACKTRACE", "NETSTANDARD" ],
-        "compile": {
-          "includeFiles": [
-            "../CommonAssemblyInfo.cs"
-          ],
-          "excludeFiles": [
-            "Support/ApiScanTestBase.cs",
-            "Util/AbstractBeforeAfterRule.cs",
-            "Util/CloseableDirectory.cs",
-            "Util/FailureMarker.cs",
-            "Util/QuickPatchThreadsFilter.cs",
-            "Util/RemoveUponClose.cs",
-            "Util/RunListenerPrintReproduceInfo.cs",
-            "Util/TestRuleAssertionsRequired.cs",
-            "Util/TestRuleDelegate.cs",
-            "Util/TestRuleFieldCacheSanity.cs",
-            "Util/TestRuleIgnoreAfterMaxFailures.cs",
-            "Util/TestRuleIgnoreTestSuites.cs",
-            "Util/TestRuleMarkFailure.cs",
-            "Util/TestRuleSetupAndRestoreInstanceEnv.cs",
-            "Util/TestRuleSetupTeardownChained.cs",
-            "Util/TestRuleStoreClassName.cs",
-            "Util/TestRuleThreadAndTestName.cs",
-            "Util/TestSecurityManager.cs"
-          ]
-        }
+        "define": [ "FEATURE_STACKTRACE", "NETSTANDARD" ]
       }
     },
     "net451": {
@@ -54,31 +53,7 @@
       },
       "buildOptions": {
         "debugType": "full",
-        "define": [ "FEATURE_SERIALIZABLE" ],
-        "compile": {
-          "includeFiles": [
-            "../CommonAssemblyInfo.cs"
-          ],
-          "excludeFiles": [
-            "Util/AbstractBeforeAfterRule.cs",
-            "Util/CloseableDirectory.cs",
-            "Util/FailureMarker.cs",
-            "Util/QuickPatchThreadsFilter.cs",
-            "Util/RemoveUponClose.cs",
-            "Util/RunListenerPrintReproduceInfo.cs",
-            "Util/TestRuleAssertionsRequired.cs",
-            "Util/TestRuleDelegate.cs",
-            "Util/TestRuleFieldCacheSanity.cs",
-            "Util/TestRuleIgnoreAfterMaxFailures.cs",
-            "Util/TestRuleIgnoreTestSuites.cs",
-            "Util/TestRuleMarkFailure.cs",
-            "Util/TestRuleSetupAndRestoreInstanceEnv.cs",
-            "Util/TestRuleSetupTeardownChained.cs",
-            "Util/TestRuleStoreClassName.cs",
-            "Util/TestRuleThreadAndTestName.cs",
-            "Util/TestSecurityManager.cs"
-          ]
-        }
+        "define": [ "FEATURE_SERIALIZABLE" ]
       }
     }
   }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8f98c521/src/Lucene.Net.Tests.Analysis.Common/project.json
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Analysis.Common/project.json b/src/Lucene.Net.Tests.Analysis.Common/project.json
index c6dd743..cd4f619 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/project.json
+++ b/src/Lucene.Net.Tests.Analysis.Common/project.json
@@ -1,6 +1,95 @@
 {
   "version": "4.8.0",
   "title": "Lucene.Net.Tests.Analysis.Common",
+  "buildOptions": {
+    "compile": {
+      "includeFiles": [ "../CommonAssemblyInfo.cs" ]
+    },
+    "embed": {
+      "includeFiles": [
+        "Analysis/En/porterTestData.zip",
+        "Analysis/En/kstemTestData.zip",
+        "Analysis/Snowball/TestSnowballVocabData.zip",
+        "Analysis/Fr/frlighttestdata.zip",
+        "Analysis/Fr/frminimaltestdata.zip",
+        "Analysis/De/delighttestdata.zip",
+        "Analysis/De/deminimaltestdata.zip",
+        "Analysis/Es/eslighttestdata.zip",
+        "Analysis/Ru/rulighttestdata.zip",
+        "Analysis/Ckb/ckbtestdata.zip",
+        "Analysis/Fi/filighttestdata.zip",
+        "Analysis/Gl/gltestdata.zip",
+        "Analysis/Pt/ptlighttestdata.zip",
+        "Analysis/Pt/ptminimaltestdata.zip",
+        "Analysis/Pt/ptrslptestdata.zip",
+        "Analysis/Hu/hulighttestdata.zip",
+        "Analysis/It/itlighttestdata.zip",
+        "Analysis/Sv/svlighttestdata.zip",
+        "Analysis/Hunspell/broken-flags.aff",
+        "Analysis/Hunspell/broken.aff",
+        "Analysis/Hunspell/circumfix.aff",
+        "Analysis/Hunspell/circumfix.dic",
+        "Analysis/Hunspell/complexprefix.aff",
+        "Analysis/Hunspell/complexprefix.dic",
+        "Analysis/Hunspell/compressed-before-set.aff",
+        "Analysis/Hunspell/compressed-empty-alias.aff",
+        "Analysis/Hunspell/compressed.aff",
+        "Analysis/Hunspell/compressed.dic",
+        "Analysis/Hunspell/condition.aff",
+        "Analysis/Hunspell/condition.dic",
+        "Analysis/Hunspell/conv.aff",
+        "Analysis/Hunspell/conv.dic",
+        "Analysis/Hunspell/dependencies.aff",
+        "Analysis/Hunspell/dependencies.dic",
+        "Analysis/Hunspell/escaped.aff",
+        "Analysis/Hunspell/escaped.dic",
+        "Analysis/Hunspell/flaglong.aff",
+        "Analysis/Hunspell/flaglong.dic",
+        "Analysis/Hunspell/flagnum.aff",
+        "Analysis/Hunspell/flagnum.dic",
+        "Analysis/Hunspell/homonyms.aff",
+        "Analysis/Hunspell/homonyms.dic",
+        "Analysis/Hunspell/ignore.aff",
+        "Analysis/Hunspell/ignore.dic",
+        "Analysis/Hunspell/mixedcase.dic",
+        "Analysis/Hunspell/morph.aff",
+        "Analysis/Hunspell/morph.dic",
+        "Analysis/Hunspell/optional-condition.aff",
+        "Analysis/Hunspell/simple.aff",
+        "Analysis/Hunspell/simple.dic",
+        "Analysis/Hunspell/twofold.aff",
+        "Analysis/Hunspell/twosuffixes.aff",
+        "Analysis/Hunspell/twosuffixes.dic",
+        "Analysis/Core/stop-1.txt",
+        "Analysis/Core/stop-2.txt",
+        "Analysis/Core/stop-snowball.txt",
+        "Analysis/Core/urls.from.random.text.with.urls.txt",
+        "Analysis/Core/email.addresses.from.random.text.with.email.addresses.txt",
+        "Analysis/Core/LuceneResourcesWikiPage.html",
+        "Analysis/Core/LuceneResourcesWikiPageURLs.txt",
+        "Analysis/Core/random.text.with.email.addresses.txt",
+        "Analysis/Core/random.text.with.urls.txt",
+        "Analysis/Core/stoptypes-1.txt",
+        "Analysis/Core/stoptypes-2.txt",
+        "Analysis/CharFilters/htmlStripReaderTest.html",
+        "Analysis/CharFilters/MS-Word14generated.htm",
+        "Analysis/Cz/customStopWordFile.txt",
+        "Analysis/Synonym/synonyms-wordnet.txt",
+        "Analysis/Synonym/synonyms.txt",
+        "Analysis/Miscellaneous/keep-1.txt",
+        "Analysis/Miscellaneous/keep-2.txt",
+        "Analysis/Util/frenchArticles.txt",
+        "Analysis/De/data.txt",
+        "Analysis/No/nb_light.txt",
+        "Analysis/No/nb_minimal.txt",
+        "Analysis/No/nn_light.txt",
+        "Analysis/No/nn_minimal.txt",
+        "Analysis/Compound/compoundDictionary.txt",
+        "Analysis/Compound/da_UTF8.xml",
+        "Analysis/Compound/da_compoundDictionary.txt"
+      ]
+    }
+  },
   "dependencies": {
     "dotnet-test-nunit-teamcity": "3.4.0-beta-3",
     "Lucene.Net.Analysis.Common": "4.8.0",
@@ -15,96 +104,9 @@
         "debugType": "portable",
         "define": [ "NETSTANDARD" ],
         "compile": {
-          "includeFiles": [
-            "../CommonAssemblyInfo.cs"
-          ],
           "excludeFiles": [
             "Support/TestApiConsistency.cs"
           ]
-        },
-        "embed": {
-          "includeFiles": [
-            "Analysis/En/porterTestData.zip",
-            "Analysis/En/kstemTestData.zip",
-            "Analysis/Snowball/TestSnowballVocabData.zip",
-            "Analysis/Fr/frlighttestdata.zip",
-            "Analysis/Fr/frminimaltestdata.zip",
-            "Analysis/De/delighttestdata.zip",
-            "Analysis/De/deminimaltestdata.zip",
-            "Analysis/Es/eslighttestdata.zip",
-            "Analysis/Ru/rulighttestdata.zip",
-            "Analysis/Ckb/ckbtestdata.zip",
-            "Analysis/Fi/filighttestdata.zip",
-            "Analysis/Gl/gltestdata.zip",
-            "Analysis/Pt/ptlighttestdata.zip",
-            "Analysis/Pt/ptminimaltestdata.zip",
-            "Analysis/Pt/ptrslptestdata.zip",
-            "Analysis/Hu/hulighttestdata.zip",
-            "Analysis/It/itlighttestdata.zip",
-            "Analysis/Sv/svlighttestdata.zip",
-            "Analysis/Hunspell/broken-flags.aff",
-            "Analysis/Hunspell/broken.aff",
-            "Analysis/Hunspell/circumfix.aff",
-            "Analysis/Hunspell/circumfix.dic",
-            "Analysis/Hunspell/complexprefix.aff",
-            "Analysis/Hunspell/complexprefix.dic",
-            "Analysis/Hunspell/compressed-before-set.aff",
-            "Analysis/Hunspell/compressed-empty-alias.aff",
-            "Analysis/Hunspell/compressed.aff",
-            "Analysis/Hunspell/compressed.dic",
-            "Analysis/Hunspell/condition.aff",
-            "Analysis/Hunspell/condition.dic",
-            "Analysis/Hunspell/conv.aff",
-            "Analysis/Hunspell/conv.dic",
-            "Analysis/Hunspell/dependencies.aff",
-            "Analysis/Hunspell/dependencies.dic",
-            "Analysis/Hunspell/escaped.aff",
-            "Analysis/Hunspell/escaped.dic",
-            "Analysis/Hunspell/flaglong.aff",
-            "Analysis/Hunspell/flaglong.dic",
-            "Analysis/Hunspell/flagnum.aff",
-            "Analysis/Hunspell/flagnum.dic",
-            "Analysis/Hunspell/homonyms.aff",
-            "Analysis/Hunspell/homonyms.dic",
-            "Analysis/Hunspell/ignore.aff",
-            "Analysis/Hunspell/ignore.dic",
-            "Analysis/Hunspell/mixedcase.dic",
-            "Analysis/Hunspell/morph.aff",
-            "Analysis/Hunspell/morph.dic",
-            "Analysis/Hunspell/optional-condition.aff",
-            "Analysis/Hunspell/simple.aff",
-            "Analysis/Hunspell/simple.dic",
-            "Analysis/Hunspell/twofold.aff",
-            "Analysis/Hunspell/twosuffixes.aff",
-            "Analysis/Hunspell/twosuffixes.dic",
-            "Analysis/Core/stop-1.txt",
-            "Analysis/Core/stop-2.txt",
-            "Analysis/Core/stop-snowball.txt",
-            "Analysis/Core/urls.from.random.text.with.urls.txt",
-            "Analysis/Core/email.addresses.from.random.text.with.email.addresses.txt",
-            "Analysis/Core/LuceneResourcesWikiPage.html",
-            "Analysis/Core/LuceneResourcesWikiPageURLs.txt",
-            "Analysis/Core/random.text.with.email.addresses.txt",
-            "Analysis/Core/random.text.with.urls.txt",
-            "Analysis/Core/stoptypes-1.txt",
-            "Analysis/Core/stoptypes-2.txt",
-            "Analysis/CharFilters/htmlStripReaderTest.html",
-            "Analysis/CharFilters/MS-Word14generated.htm",
-            "Analysis/Cz/customStopWordFile.txt",
-            "Analysis/Synonym/synonyms-wordnet.txt",
-            "Analysis/Synonym/synonyms.txt",
-            "Analysis/Miscellaneous/keep-1.txt",
-            "Analysis/Miscellaneous/keep-2.txt",
-            "Analysis/Util/frenchArticles.txt",
-            "Analysis/De/data.txt",
-            "Analysis/No/nb_light.txt",
-            "Analysis/No/nb_minimal.txt",
-            "Analysis/No/nn_light.txt",
-            "Analysis/No/nn_minimal.txt",
-            "Analysis/Compound/compoundDictionary.txt",
-            "Analysis/Compound/da_UTF8.xml",
-            "Analysis/Compound/da_compoundDictionary.txt"
-          ]
         }
       },
       "dependencies": {
@@ -118,96 +120,7 @@
     "net451": {
       "buildOptions": {
         "debugType": "full",
-        "define": [ "FEATURE_SERIALIZABLE" ],
-        "compile": {
-          "includeFiles": [
-            "../CommonAssemblyInfo.cs"
-          ]
-        },
-        "embed": {
-          "includeFiles": [
-            "Analysis/En/porterTestData.zip",
-            "Analysis/En/kstemTestData.zip",
-            "Analysis/Snowball/TestSnowballVocabData.zip",
-            "Analysis/Fr/frlighttestdata.zip",
-            "Analysis/Fr/frminimaltestdata.zip",
-            "Analysis/De/delighttestdata.zip",
-            "Analysis/De/deminimaltestdata.zip",
-            "Analysis/Es/eslighttestdata.zip",
-            "Analysis/Ru/rulighttestdata.zip",
-            "Analysis/Ckb/ckbtestdata.zip",
-            "Analysis/Fi/filighttestdata.zip",
-            "Analysis/Gl/gltestdata.zip",
-            "Analysis/Pt/ptlighttestdata.zip",
-            "Analysis/Pt/ptminimaltestdata.zip",
-            "Analysis/Pt/ptrslptestdata.zip",
-            "Analysis/Hu/hulighttestdata.zip",
-            "Analysis/It/itlighttestdata.zip",
-            "Analysis/Sv/svlighttestdata.zip",
-            "Analysis/Hunspell/broken-flags.aff",
-            "Analysis/Hunspell/broken.aff",
-            "Analysis/Hunspell/circumfix.aff",
-            "Analysis/Hunspell/circumfix.dic",
-            "Analysis/Hunspell/complexprefix.aff",
-            "Analysis/Hunspell/complexprefix.dic",
-            "Analysis/Hunspell/compressed-before-set.aff",
-            "Analysis/Hunspell/compressed-empty-alias.aff",
-            "Analysis/Hunspell/compressed.aff",
-            "Analysis/Hunspell/compressed.dic",
-            "Analysis/Hunspell/condition.aff",
-            "Analysis/Hunspell/condition.dic",
-            "Analysis/Hunspell/conv.aff",
-            "Analysis/Hunspell/conv.dic",
-            "Analysis/Hunspell/dependencies.aff",
-            "Analysis/Hunspell/dependencies.dic",
-            "Analysis/Hunspell/escaped.aff",
-            "Analysis/Hunspell/escaped.dic",
-            "Analysis/Hunspell/flaglong.aff",
-            "Analysis/Hunspell/flaglong.dic",
-            "Analysis/Hunspell/flagnum.aff",
-            "Analysis/Hunspell/flagnum.dic",
-            "Analysis/Hunspell/homonyms.aff",
-            "Analysis/Hunspell/homonyms.dic",
-            "Analysis/Hunspell/ignore.aff",
-            "Analysis/Hunspell/ignore.dic",
-            "Analysis/Hunspell/mixedcase.dic",
-            "Analysis/Hunspell/morph.aff",
-            "Analysis/Hunspell/morph.dic",
-            "Analysis/Hunspell/optional-condition.aff",
-            "Analysis/Hunspell/simple.aff",
-            "Analysis/Hunspell/simple.dic",
-            "Analysis/Hunspell/twofold.aff",
-            "Analysis/Hunspell/twosuffixes.aff",
-            "Analysis/Hunspell/twosuffixes.dic",
-            "Analysis/Core/stop-1.txt",
-            "Analysis/Core/stop-2.txt",
-            "Analysis/Core/stop-snowball.txt",
-            "Analysis/Core/urls.from.random.text.with.urls.txt",
-            "Analysis/Core/email.addresses.from.random.text.with.email.addresses.txt",
-            "Analysis/Core/LuceneResourcesWikiPage.html",
-            "Analysis/Core/LuceneResourcesWikiPageURLs.txt",
-            "Analysis/Core/random.text.with.email.addresses.txt",
-            "Analysis/Core/random.text.with.urls.txt",
-            "Analysis/Core/stoptypes-1.txt",
-            "Analysis/Core/stoptypes-2.txt",
-            "Analysis/CharFilters/htmlStripReaderTest.html",
-            "Analysis/CharFilters/MS-Word14generated.htm",
-            "Analysis/Cz/customStopWordFile.txt",
-            "Analysis/Synonym/synonyms-wordnet.txt",
-            "Analysis/Synonym/synonyms.txt",
-            "Analysis/Miscellaneous/keep-1.txt",
-            "Analysis/Miscellaneous/keep-2.txt",
-            "Analysis/Util/frenchArticles.txt",
-            "Analysis/De/data.txt",
-            "Analysis/No/nb_light.txt",
-            "Analysis/No/nb_minimal.txt",
-            "Analysis/No/nn_light.txt",
-            "Analysis/No/nn_minimal.txt",
-            "Analysis/Compound/compoundDictionary.txt",
-            "Analysis/Compound/da_UTF8.xml",
-            "Analysis/Compound/da_compoundDictionary.txt"
-          ]
-        }
+        "define": [ "FEATURE_SERIALIZABLE" ]
       }
     }
   },

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8f98c521/src/Lucene.Net.Tests.Analysis.Stempel/project.json
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Analysis.Stempel/project.json b/src/Lucene.Net.Tests.Analysis.Stempel/project.json
index 48f323b..3c59e56 100644
--- a/src/Lucene.Net.Tests.Analysis.Stempel/project.json
+++ b/src/Lucene.Net.Tests.Analysis.Stempel/project.json
@@ -1,6 +1,16 @@
 {
   "version": "4.8.0",
   "title": "Lucene.Net.Tests.Analysis.Stempel",
+  "buildOptions": {
+    "compile": {
+      "includeFiles": [ "../CommonAssemblyInfo.cs" ]
+    },
+    "embed": {
+      "includeFiles": [
+        "Egothor.Stemmer/testRules.txt"
+      ]
+    }
+  },
   "dependencies": {
     "dotnet-test-nunit-teamcity": "3.4.0-beta-3",
     "Lucene.Net.Analysis.Stempel": "4.8.0",
@@ -15,17 +25,9 @@
         "debugType": "portable",
         "define": [ "NETSTANDARD" ],
         "compile": {
-          "includeFiles": [
-            "../CommonAssemblyInfo.cs"
-          ],
           "excludeFiles": [
             "Support/TestApiConsistency.cs"
           ]
-        },
-        "embed": {
-          "includeFiles": [
-            "Egothor.Stemmer/testRules.txt"
-          ]
         }
       },
       "dependencies": {
@@ -38,17 +40,7 @@
     "net451": {
       "buildOptions": {
         "debugType": "full",
-        "define": [ "FEATURE_SERIALIZABLE" ],
-        "compile": {
-          "includeFiles": [
-            "../CommonAssemblyInfo.cs"
-          ]
-        },
-        "embed": {
-          "includeFiles": [
-            "Egothor.Stemmer/testRules.txt"
-          ]
-        }
+        "define": [ "FEATURE_SERIALIZABLE" ]
       }
     }
   },

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8f98c521/src/Lucene.Net.Tests.Classification/project.json
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Classification/project.json b/src/Lucene.Net.Tests.Classification/project.json
index 4ebbff3..f70eb57 100644
--- a/src/Lucene.Net.Tests.Classification/project.json
+++ b/src/Lucene.Net.Tests.Classification/project.json
@@ -1,6 +1,11 @@
 {
   "version": "4.8.0",
   "title": "Lucene.Net.Tests.Classification",
+  "buildOptions": {
+    "compile": {
+      "includeFiles": [ "../CommonAssemblyInfo.cs" ]
+    }
+  },
   "dependencies": {
     "dotnet-test-nunit-teamcity": "3.4.0-beta-3",
     "Lucene.Net.Analysis.Common": "4.8.0",
@@ -15,9 +20,6 @@
       "buildOptions": {
         "debugType": "portable",
         "compile": {
-          "includeFiles": [
-            "../CommonAssemblyInfo.cs"
-          ],
           "excludeFiles": [
             "Support/TestApiConsistency.cs"
           ]
@@ -33,12 +35,7 @@
     "net451": {
       "buildOptions": {
         "debugType": "full",
-        "define": [ "FEATURE_SERIALIZABLE" ],
-        "compile": {
-          "includeFiles": [
-            "../CommonAssemblyInfo.cs"
-          ]
-        }
+        "define": [ "FEATURE_SERIALIZABLE" ]
       }
     }
   },

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8f98c521/src/Lucene.Net.Tests.Codecs/project.json
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Codecs/project.json b/src/Lucene.Net.Tests.Codecs/project.json
index dcc9dba..6be65e9 100644
--- a/src/Lucene.Net.Tests.Codecs/project.json
+++ b/src/Lucene.Net.Tests.Codecs/project.json
@@ -1,6 +1,11 @@
 {
   "version": "4.8.0",
   "title": "Lucene.Net.Tests.Codecs",
+  "buildOptions": {
+    "compile": {
+      "includeFiles": [ "../CommonAssemblyInfo.cs" ]
+    }
+  },
   "dependencies": {
     "dotnet-test-nunit-teamcity": "3.4.0-beta-3",
     "Lucene.Net.Analysis.Common": "4.8.0",
@@ -16,9 +21,6 @@
         "debugType": "portable",
         "define": [ "NETSTANDARD" ],
         "compile": {
-          "includeFiles": [
-            "../CommonAssemblyInfo.cs"
-          ],
           "excludeFiles": [
             "Support/TestApiConsistency.cs"
           ]
@@ -34,12 +36,7 @@
     "net451": {
       "buildOptions": {
         "debugType": "full",
-        "define": [ "FEATURE_SERIALIZABLE" ],
-        "compile": {
-          "includeFiles": [
-            "../CommonAssemblyInfo.cs"
-          ]
-        }
+        "define": [ "FEATURE_SERIALIZABLE" ]
       }
     }
   },

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8f98c521/src/Lucene.Net.Tests.Expressions/project.json
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Expressions/project.json b/src/Lucene.Net.Tests.Expressions/project.json
index 3ec0be2..021f138 100644
--- a/src/Lucene.Net.Tests.Expressions/project.json
+++ b/src/Lucene.Net.Tests.Expressions/project.json
@@ -1,6 +1,11 @@
 {
   "version": "4.8.0",
   "title": "Lucene.Net.Tests.Expressions",
+  "buildOptions": {
+    "compile": {
+      "includeFiles": [ "../CommonAssemblyInfo.cs" ]
+    }
+  },
   "dependencies": {
     "dotnet-test-nunit-teamcity": "3.4.0-beta-3",
     "Lucene.Net.Expressions": "4.8.0",
@@ -15,9 +20,6 @@
       "buildOptions": {
         "debugType": "portable",
         "compile": {
-          "includeFiles": [
-            "../CommonAssemblyInfo.cs"
-          ],
           "excludeFiles": [
             "Support/TestApiConsistency.cs"
           ]
@@ -33,12 +35,7 @@
     "net451": {
       "buildOptions": {
         "debugType": "full",
-        "define": [ "FEATURE_SERIALIZABLE" ],
-        "compile": {
-          "includeFiles": [
-            "../CommonAssemblyInfo.cs"
-          ]
-        }
+        "define": [ "FEATURE_SERIALIZABLE" ]
       }
     }
   },

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8f98c521/src/Lucene.Net.Tests.Facet/project.json
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Facet/project.json b/src/Lucene.Net.Tests.Facet/project.json
index 0a4374c..6423d53 100644
--- a/src/Lucene.Net.Tests.Facet/project.json
+++ b/src/Lucene.Net.Tests.Facet/project.json
@@ -1,6 +1,11 @@
 {
   "version": "4.8.0",
   "title": "Lucene.Net.Tests.Classification",
+  "buildOptions": {
+    "compile": {
+      "includeFiles": [ "../CommonAssemblyInfo.cs" ]
+    }
+  },
   "dependencies": {
     "dotnet-test-nunit-teamcity": "3.4.0-beta-3",
     "Lucene.Net.Facet": "4.8.0",
@@ -16,9 +21,6 @@
         "debugType": "portable",
         "define": [ "NETSTANDARD" ],
         "compile": {
-          "includeFiles": [
-            "../CommonAssemblyInfo.cs"
-          ],
           "excludeFiles": [
             "Support/TestApiConsistency.cs"
           ]
@@ -38,12 +40,7 @@
           "FEATURE_SERIALIZABLE",
           "FEATURE_THREAD_PRIORITY",
           "FEATURE_THREADINTERRUPTEDEXCEPTION"
-        ],
-        "compile": {
-          "includeFiles": [
-            "../CommonAssemblyInfo.cs"
-          ]
-        }
+        ]
       }
     }
   },

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8f98c521/src/Lucene.Net.Tests.Grouping/project.json
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Grouping/project.json b/src/Lucene.Net.Tests.Grouping/project.json
index 2e03e46..62dfaef 100644
--- a/src/Lucene.Net.Tests.Grouping/project.json
+++ b/src/Lucene.Net.Tests.Grouping/project.json
@@ -1,6 +1,11 @@
 {
   "version": "4.8.0",
   "title": "Lucene.Net.Tests.Grouping",
+  "buildOptions": {
+    "compile": {
+      "includeFiles": [ "../CommonAssemblyInfo.cs" ]
+    }
+  },
   "dependencies": {
     "dotnet-test-nunit-teamcity": "3.4.0-beta-3",
     "Lucene.Net.Grouping": "4.8.0",
@@ -16,9 +21,6 @@
         "debugType": "portable",
         "define": [ "NETSTANDARD" ],
         "compile": {
-          "includeFiles": [
-            "../CommonAssemblyInfo.cs"
-          ],
           "excludeFiles": [
             "Support/TestApiConsistency.cs"
           ]
@@ -34,12 +36,7 @@
     "net451": {
       "buildOptions": {
         "debugType": "full",
-        "define": [ "FEATURE_SERIALIZABLE" ],
-        "compile": {
-          "includeFiles": [
-            "../CommonAssemblyInfo.cs"
-          ]
-        }
+        "define": [ "FEATURE_SERIALIZABLE" ]
       }
     }
   },

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8f98c521/src/Lucene.Net.Tests.Highlighter/project.json
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Highlighter/project.json b/src/Lucene.Net.Tests.Highlighter/project.json
index cdda24b..4f338ab 100644
--- a/src/Lucene.Net.Tests.Highlighter/project.json
+++ b/src/Lucene.Net.Tests.Highlighter/project.json
@@ -1,6 +1,16 @@
 {
   "version": "4.8.0",
   "title": "Lucene.Net.Tests.Highlighter",
+  "buildOptions": {
+    "compile": {
+      "includeFiles": [ "../CommonAssemblyInfo.cs" ]
+    },
+    "embed": {
+      "includeFiles": [
+        "PostingsHighlight/CambridgeMA.utf8"
+      ]
+    }
+  },
   "dependencies": {
     "dotnet-test-nunit-teamcity": "3.4.0-beta-3",
     "Lucene.Net.Highlighter": "4.8.0",
@@ -16,17 +26,9 @@
         "debugType": "portable",
         "define": [ "NETSTANDARD" ],
         "compile": {
-          "includeFiles": [
-            "../CommonAssemblyInfo.cs"
-          ],
           "excludeFiles": [
             "Support/TestApiConsistency.cs"
           ]
-        },
-        "embed": {
-          "includeFiles": [
-            "PostingsHighlight/CambridgeMA.utf8"
-          ]
         }
       },
       "dependencies": {
@@ -40,17 +42,7 @@
     "net451": {
       "buildOptions": {
         "debugType": "full",
-        "define": [ "FEATURE_SERIALIZABLE" ],
-        "compile": {
-          "includeFiles": [
-            "../CommonAssemblyInfo.cs"
-          ]
-        },
-        "embed": {
-          "includeFiles": [
-            "PostingsHighlight/CambridgeMA.utf8"
-          ]
-        }
+        "define": [ "FEATURE_SERIALIZABLE" ]
       }
     }
   },

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8f98c521/src/Lucene.Net.Tests.Icu/project.json
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Icu/project.json b/src/Lucene.Net.Tests.Icu/project.json
index da075bc..136ec92 100644
--- a/src/Lucene.Net.Tests.Icu/project.json
+++ b/src/Lucene.Net.Tests.Icu/project.json
@@ -1,16 +1,6 @@
 {
   "version": "4.8.0",
   "title": "Lucene.Net.Tests.Icu",
-  "dependencies": {
-    "dotnet-test-nunit-teamcity": "3.4.0-beta-3",
-    "Lucene.Net": "4.8.0",
-    "Lucene.Net.Analysis.Common": "4.8.0",
-    "Lucene.Net.Highlighter": "4.8.0",
-    "Lucene.Net.Icu": "4.8.0",
-    "Lucene.Net.TestFramework": "4.8.0",
-    "Lucene.Net.Tests.Analysis.Common": "4.8.0",
-    "NUnit": "3.5.0"
-  },
   "buildOptions": {
     "compile": {
       "includeFiles": [
@@ -33,6 +23,16 @@
       ]
     }
   },
+  "dependencies": {
+    "dotnet-test-nunit-teamcity": "3.4.0-beta-3",
+    "Lucene.Net": "4.8.0",
+    "Lucene.Net.Analysis.Common": "4.8.0",
+    "Lucene.Net.Highlighter": "4.8.0",
+    "Lucene.Net.Icu": "4.8.0",
+    "Lucene.Net.TestFramework": "4.8.0",
+    "Lucene.Net.Tests.Analysis.Common": "4.8.0",
+    "NUnit": "3.5.0"
+  },
   "testRunner": "nunit-teamcity",
   "frameworks": {
     "netcoreapp1.0": {

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8f98c521/src/Lucene.Net.Tests.Join/project.json
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Join/project.json b/src/Lucene.Net.Tests.Join/project.json
index 56e5640..d642013 100644
--- a/src/Lucene.Net.Tests.Join/project.json
+++ b/src/Lucene.Net.Tests.Join/project.json
@@ -1,6 +1,11 @@
 {
   "version": "4.8.0",
   "title": "Lucene.Net.Tests.Join",
+  "buildOptions": {
+    "compile": {
+      "includeFiles": [ "../CommonAssemblyInfo.cs" ]
+    }
+  },
   "dependencies": {
     "dotnet-test-nunit-teamcity": "3.4.0-beta-3",
     "Lucene.Net.Grouping": "4.8.0",
@@ -15,9 +20,6 @@
       "buildOptions": {
         "debugType": "portable",
         "compile": {
-          "includeFiles": [
-            "../CommonAssemblyInfo.cs"
-          ],
           "excludeFiles": [
             "Support/TestApiConsistency.cs"
           ]
@@ -33,12 +35,7 @@
     "net451": {
       "buildOptions": {
         "debugType": "full",
-        "define": [ "FEATURE_SERIALIZABLE" ],
-        "compile": {
-          "includeFiles": [
-            "../CommonAssemblyInfo.cs"
-          ]
-        }
+        "define": [ "FEATURE_SERIALIZABLE" ]
       }
     }
   },

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8f98c521/src/Lucene.Net.Tests.Memory/project.json
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Memory/project.json b/src/Lucene.Net.Tests.Memory/project.json
index cfa1a67..c2cf17f 100644
--- a/src/Lucene.Net.Tests.Memory/project.json
+++ b/src/Lucene.Net.Tests.Memory/project.json
@@ -1,6 +1,17 @@
 {
   "version": "4.8.0",
   "title": "Lucene.Net.Tests.Memory",
+  "buildOptions": {
+    "compile": {
+      "includeFiles": [ "../CommonAssemblyInfo.cs" ]
+    },
+    "embed": {
+      "includeFiles": [
+        "Index/Memory/testqueries.txt",
+        "Index/Memory/testqueries2.txt"
+      ]
+    }
+  },
   "dependencies": {
     "dotnet-test-nunit-teamcity": "3.4.0-beta-3",
     "Lucene.Net.Memory": "4.8.0",
@@ -15,18 +26,9 @@
       "buildOptions": {
         "debugType": "portable",
         "compile": {
-          "includeFiles": [
-            "../CommonAssemblyInfo.cs"
-          ],
           "excludeFiles": [
             "Support/TestApiConsistency.cs"
           ]
-        },
-        "embed": {
-          "includeFiles": [
-            "Index/Memory/testqueries.txt",
-            "Index/Memory/testqueries2.txt"
-          ]
         }
       },
       "dependencies": {
@@ -39,18 +41,7 @@
     "net451": {
       "buildOptions": {
         "debugType": "full",
-        "define": [ "FEATURE_SERIALIZABLE" ],
-        "compile": {
-          "includeFiles": [
-            "../CommonAssemblyInfo.cs"
-          ]
-        },
-        "embed": {
-          "includeFiles": [
-            "Index/Memory/testqueries.txt",
-            "Index/Memory/testqueries2.txt"
-          ]
-        }
+        "define": [ "FEATURE_SERIALIZABLE" ]
       }
     }
   },

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8f98c521/src/Lucene.Net.Tests.Misc/project.json
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Misc/project.json b/src/Lucene.Net.Tests.Misc/project.json
index 4af5463..1586276 100644
--- a/src/Lucene.Net.Tests.Misc/project.json
+++ b/src/Lucene.Net.Tests.Misc/project.json
@@ -1,6 +1,11 @@
 {
   "version": "4.8.0",
   "title": "Lucene.Net.Tests.Misc",
+  "buildOptions": {
+    "compile": {
+      "includeFiles": [ "../CommonAssemblyInfo.cs" ]
+    }
+  },
   "dependencies": {
     "dotnet-test-nunit-teamcity": "3.4.0-beta-3",
     "Lucene.Net.Misc": "4.8.0",
@@ -14,9 +19,6 @@
       "buildOptions": {
         "debugType": "portable",
         "compile": {
-          "includeFiles": [
-            "../CommonAssemblyInfo.cs"
-          ],
           "excludeFiles": [
             "Support/TestApiConsistency.cs"
           ]
@@ -32,12 +34,7 @@
     "net451": {
       "buildOptions": {
         "debugType": "full",
-        "define": [ "FEATURE_SERIALIZABLE" ],
-        "compile": {
-          "includeFiles": [
-            "../CommonAssemblyInfo.cs"
-          ]
-        }
+        "define": [ "FEATURE_SERIALIZABLE" ]
       }
     }
   },

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8f98c521/src/Lucene.Net.Tests.Queries/project.json
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Queries/project.json b/src/Lucene.Net.Tests.Queries/project.json
index 4c9c641..128b9a2 100644
--- a/src/Lucene.Net.Tests.Queries/project.json
+++ b/src/Lucene.Net.Tests.Queries/project.json
@@ -1,6 +1,11 @@
 {
   "version": "4.8.0",
   "title": "Lucene.Net.Tests.Queries",
+  "buildOptions": {
+    "compile": {
+      "includeFiles": [ "../CommonAssemblyInfo.cs" ]
+    }
+  },
   "dependencies": {
     "dotnet-test-nunit-teamcity": "3.4.0-beta-3",
     "Lucene.Net.Queries": "4.8.0",
@@ -14,9 +19,6 @@
       "buildOptions": {
         "debugType": "portable",
         "compile": {
-          "includeFiles": [
-            "../CommonAssemblyInfo.cs"
-          ],
           "excludeFiles": [
             "Support/TestApiConsistency.cs"
           ]
@@ -32,12 +34,7 @@
     "net451": {
       "buildOptions": {
         "debugType": "full",
-        "define": [ "FEATURE_SERIALIZABLE" ],
-        "compile": {
-          "includeFiles": [
-            "../CommonAssemblyInfo.cs"
-          ]
-        }
+        "define": [ "FEATURE_SERIALIZABLE" ]
       }
     }
   },

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8f98c521/src/Lucene.Net.Tests.QueryParser/project.json
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.QueryParser/project.json b/src/Lucene.Net.Tests.QueryParser/project.json
index 67be0b1..331539b 100644
--- a/src/Lucene.Net.Tests.QueryParser/project.json
+++ b/src/Lucene.Net.Tests.QueryParser/project.json
@@ -1,6 +1,40 @@
 {
   "version": "4.8.0",
   "title": "Lucene.Net.Tests.QueryParser",
+  "buildOptions": {
+    "compile": {
+      "includeFiles": [ "../CommonAssemblyInfo.cs" ]
+    },
+    "embed": {
+      "includeFiles": [
+        "Xml/albumBooleanQuery.xsl",
+        "Xml/albumFilteredQuery.xsl",
+        "Xml/albumLuceneClassicQuery.xsl",
+        "Xml/BooleanFilter.xml",
+        "Xml/BooleanQuery.xml",
+        "Xml/BoostingQuery.xml",
+        "Xml/BoostingTermQuery.xml",
+        "Xml/CachedFilter.xml",
+        "Xml/ConstantScoreQuery.xml",
+        "Xml/DisjunctionMaxQuery.xml",
+        "Xml/DuplicateFilterQuery.xml",
+        "Xml/FuzzyLikeThisQuery.xml",
+        "Xml/LikeThisQuery.xml",
+        "Xml/MatchAllDocsQuery.xml",
+        "Xml/NestedBooleanQuery.xml",
+        "Xml/NumericRangeFilterQuery.xml",
+        "Xml/NumericRangeQueryQuery.xml",
+        "Xml/RangeFilterQuery.xml",
+        "Xml/reuters21578.txt",
+        "Xml/SpanQuery.xml",
+        "Xml/TermQuery.xml",
+        "Xml/TermsFilterQuery.xml",
+        "Xml/TermsQuery.xml",
+        "Xml/UserInputQuery.xml",
+        "Xml/UserInputQueryCustomField.xml"
+      ]
+    }
+  },
   "dependencies": {
     "dotnet-test-nunit-teamcity": "3.4.0-beta-3",
     "Lucene.Net.Analysis.Common": "4.8.0",
@@ -16,42 +50,10 @@
         "debugType": "portable",
         "define": [ "NETSTANDARD" ],
         "compile": {
-          "includeFiles": [
-            "../CommonAssemblyInfo.cs"
-          ],
           "excludeFiles": [
             "Xml/TestQueryTemplateManager.cs",
             "Support/TestApiConsistency.cs"
           ]
-        },
-        "embed": {
-          "includeFiles": [
-            "Xml/albumBooleanQuery.xsl",
-            "Xml/albumFilteredQuery.xsl",
-            "Xml/albumLuceneClassicQuery.xsl",
-            "Xml/BooleanFilter.xml",
-            "Xml/BooleanQuery.xml",
-            "Xml/BoostingQuery.xml",
-            "Xml/BoostingTermQuery.xml",
-            "Xml/CachedFilter.xml",
-            "Xml/ConstantScoreQuery.xml",
-            "Xml/DisjunctionMaxQuery.xml",
-            "Xml/DuplicateFilterQuery.xml",
-            "Xml/FuzzyLikeThisQuery.xml",
-            "Xml/LikeThisQuery.xml",
-            "Xml/MatchAllDocsQuery.xml",
-            "Xml/NestedBooleanQuery.xml",
-            "Xml/NumericRangeFilterQuery.xml",
-            "Xml/NumericRangeQueryQuery.xml",
-            "Xml/RangeFilterQuery.xml",
-            "Xml/reuters21578.txt",
-            "Xml/SpanQuery.xml",
-            "Xml/TermQuery.xml",
-            "Xml/TermsFilterQuery.xml",
-            "Xml/TermsQuery.xml",
-            "Xml/UserInputQuery.xml",
-            "Xml/UserInputQueryCustomField.xml"
-          ]
         }
       },
       "dependencies": {
@@ -64,41 +66,7 @@
     "net451": {
       "buildOptions": {
         "debugType": "full",
-        "define": [ "FEATURE_SERIALIZABLE" ],
-        "compile": {
-          "includeFiles": [
-            "../CommonAssemblyInfo.cs"
-          ]
-        },
-        "embed": {
-          "includeFiles": [
-            "Xml/albumBooleanQuery.xsl",
-            "Xml/albumFilteredQuery.xsl",
-            "Xml/albumLuceneClassicQuery.xsl",
-            "Xml/BooleanFilter.xml",
-            "Xml/BooleanQuery.xml",
-            "Xml/BoostingQuery.xml",
-            "Xml/BoostingTermQuery.xml",
-            "Xml/CachedFilter.xml",
-            "Xml/ConstantScoreQuery.xml",
-            "Xml/DisjunctionMaxQuery.xml",
-            "Xml/DuplicateFilterQuery.xml",
-            "Xml/FuzzyLikeThisQuery.xml",
-            "Xml/LikeThisQuery.xml",
-            "Xml/MatchAllDocsQuery.xml",
-            "Xml/NestedBooleanQuery.xml",
-            "Xml/NumericRangeFilterQuery.xml",
-            "Xml/NumericRangeQueryQuery.xml",
-            "Xml/RangeFilterQuery.xml",
-            "Xml/reuters21578.txt",
-            "Xml/SpanQuery.xml",
-            "Xml/TermQuery.xml",
-            "Xml/TermsFilterQuery.xml",
-            "Xml/TermsQuery.xml",
-            "Xml/UserInputQuery.xml",
-            "Xml/UserInputQueryCustomField.xml"
-          ]
-        }
+        "define": [ "FEATURE_SERIALIZABLE" ]
       }
     }
   },

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8f98c521/src/Lucene.Net.Tests.Sandbox/project.json
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Sandbox/project.json b/src/Lucene.Net.Tests.Sandbox/project.json
index c2b4963..9d65892 100644
--- a/src/Lucene.Net.Tests.Sandbox/project.json
+++ b/src/Lucene.Net.Tests.Sandbox/project.json
@@ -1,6 +1,16 @@
 {
   "version": "4.8.0",
   "title": "Lucene.Net.Tests.Sandbox",
+  "buildOptions": {
+    "compile": {
+      "includeFiles": [ "../CommonAssemblyInfo.cs" ]
+    },
+    "embed": {
+      "includeFiles": [
+        "Queries/fuzzyTestData.txt"
+      ]
+    }
+  },
   "dependencies": {
     "dotnet-test-nunit-teamcity": "3.4.0-beta-3",
     "Lucene.Net.Codecs": "4.8.0",
@@ -15,17 +25,9 @@
       "buildOptions": {
         "debugType": "portable",
         "compile": {
-          "includeFiles": [
-            "../CommonAssemblyInfo.cs"
-          ],
           "excludeFiles": [
             "Support/TestApiConsistency.cs"
           ]
-        },
-        "embed": {
-          "includeFiles": [
-            "Queries/fuzzyTestData.txt"
-          ]
         }
       },
       "dependencies": {
@@ -38,17 +40,7 @@
     "net451": {
       "buildOptions": {
         "debugType": "full",
-        "define": [ "FEATURE_SERIALIZABLE" ],
-        "compile": {
-          "includeFiles": [
-            "../CommonAssemblyInfo.cs"
-          ]
-        },
-        "embed": {
-          "includeFiles": [
-            "Queries/fuzzyTestData.txt"
-          ]
-        }
+        "define": [ "FEATURE_SERIALIZABLE" ]
       }
     }
   },

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8f98c521/src/Lucene.Net.Tests.Spatial/project.json
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Spatial/project.json b/src/Lucene.Net.Tests.Spatial/project.json
index a20d4f9..78ad1bd 100644
--- a/src/Lucene.Net.Tests.Spatial/project.json
+++ b/src/Lucene.Net.Tests.Spatial/project.json
@@ -1,6 +1,27 @@
 {
   "version": "4.8.0",
   "title": "Lucene.Net.Tests.Spatial",
+  "buildOptions": {
+    "compile": {
+      "includeFiles": [ "../CommonAssemblyInfo.cs" ]
+    },
+    "embed": {
+      "includeFiles": [
+        "Test-Files/cities-Intersects-BBox.txt",
+        "Test-Files/Data/countries-bbox.txt",
+        "Test-Files/Data/countries-poly.txt",
+        "Test-Files/Data/geonames-IE.txt",
+        "Test-Files/Data/LUCENE-4464.txt",
+        "Test-Files/Data/simple-bbox.txt",
+        "Test-Files/Data/states-bbox.txt",
+        "Test-Files/Data/states-poly.txt",
+        "Test-Files/Data/world-cities-points.txt",
+        "Test-Files/simple-Queries-BBox.txt",
+        "Test-Files/states-Intersects-BBox.txt",
+        "Test-Files/states-IsWithin-BBox.txt"
+      ]
+    }
+  },
   "dependencies": {
     "dotnet-test-nunit-teamcity": "3.4.0-beta-3",
     "Lucene.Net.Spatial": "4.8.0",
@@ -16,28 +37,9 @@
         "debugType": "portable",
         "define": [ "NETSTANDARD" ],
         "compile": {
-          "includeFiles": [
-            "../CommonAssemblyInfo.cs"
-          ],
           "excludeFiles": [
             "Support/TestApiConsistency.cs"
           ]
-        },
-        "embed": {
-          "includeFiles": [
-            "Test-Files/cities-Intersects-BBox.txt",
-            "Test-Files/Data/countries-bbox.txt",
-            "Test-Files/Data/countries-poly.txt",
-            "Test-Files/Data/geonames-IE.txt",
-            "Test-Files/Data/LUCENE-4464.txt",
-            "Test-Files/Data/simple-bbox.txt",
-            "Test-Files/Data/states-bbox.txt",
-            "Test-Files/Data/states-poly.txt",
-            "Test-Files/Data/world-cities-points.txt",
-            "Test-Files/simple-Queries-BBox.txt",
-            "Test-Files/states-Intersects-BBox.txt",
-            "Test-Files/states-IsWithin-BBox.txt"
-          ]
         }
       },
       "dependencies": {
@@ -50,28 +52,7 @@
     "net451": {
       "buildOptions": {
         "debugType": "full",
-        "define": [ "FEATURE_SERIALIZABLE" ],
-        "compile": {
-          "includeFiles": [
-            "../CommonAssemblyInfo.cs"
-          ]
-        },
-        "embed": {
-          "includeFiles": [
-            "Test-Files/cities-Intersects-BBox.txt",
-            "Test-Files/Data/countries-bbox.txt",
-            "Test-Files/Data/countries-poly.txt",
-            "Test-Files/Data/geonames-IE.txt",
-            "Test-Files/Data/LUCENE-4464.txt",
-            "Test-Files/Data/simple-bbox.txt",
-            "Test-Files/Data/states-bbox.txt",
-            "Test-Files/Data/states-poly.txt",
-            "Test-Files/Data/world-cities-points.txt",
-            "Test-Files/simple-Queries-BBox.txt",
-            "Test-Files/states-Intersects-BBox.txt",
-            "Test-Files/states-IsWithin-BBox.txt"
-          ]
-        }
+        "define": [ "FEATURE_SERIALIZABLE" ]
       },
       "dependencies": {
         "Spatial4n.Core.NTS": "0.4.1.1-beta"

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8f98c521/src/Lucene.Net.Tests.Suggest/project.json
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Suggest/project.json b/src/Lucene.Net.Tests.Suggest/project.json
index c8ed119..eaaf8f2 100644
--- a/src/Lucene.Net.Tests.Suggest/project.json
+++ b/src/Lucene.Net.Tests.Suggest/project.json
@@ -1,6 +1,16 @@
 {
   "version": "4.8.0",
   "title": "Lucene.Net.Tests.Suggest",
+  "buildOptions": {
+    "compile": {
+      "includeFiles": [ "../CommonAssemblyInfo.cs" ]
+    },
+    "embed": {
+      "includeFiles": [
+        "Suggest/Top50KWiki.utf8"
+      ]
+    }
+  },
   "dependencies": {
     "dotnet-test-nunit-teamcity": "3.4.0-beta-3",
     "Lucene.Net.Analysis.Common": "4.8.0",
@@ -23,34 +33,16 @@
         "debugType": "portable",
         "define": [ "NETSTANDARD" ],
         "compile": {
-          "includeFiles": [
-            "../CommonAssemblyInfo.cs"
-          ],
           "excludeFiles": [
             "Support/TestApiConsistency.cs"
           ]
-        },
-        "embed": {
-          "includeFiles": [
-            "Suggest/Top50KWiki.utf8"
-          ]
         }
       }
     },
     "net451": {
       "buildOptions": {
         "debugType": "full",
-        "define": [ "FEATURE_SERIALIZABLE", "FEATURE_THREAD_PRIORITY" ],
-        "compile": {
-          "includeFiles": [
-            "../CommonAssemblyInfo.cs"
-          ]
-        },
-        "embed": {
-          "includeFiles": [
-            "Suggest/Top50KWiki.utf8"
-          ]
-        }
+        "define": [ "FEATURE_SERIALIZABLE", "FEATURE_THREAD_PRIORITY" ]
       }
     }
   },

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8f98c521/src/Lucene.Net.Tests/project.json
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/project.json b/src/Lucene.Net.Tests/project.json
index 06e1ced..7b32397 100644
--- a/src/Lucene.Net.Tests/project.json
+++ b/src/Lucene.Net.Tests/project.json
@@ -1,6 +1,57 @@
 {
   "version": "4.8.0",
   "title": "Lucene.Net.Tests",
+  "buildOptions": {
+    "compile": {
+      "includeFiles": [ "../CommonAssemblyInfo.cs" ],
+      "exclude": [ "Util/JunitCompat" ],
+      "excludeFiles": [ "Util/TestMaxFailuresRule.cs" ]
+    },
+    "embed": {
+      "includeFiles": [
+        "Index/bogus24.upgraded.to.36.zip",
+        "Index/index.30.cfs.zip",
+        "Index/index.30.nocfs.zip",
+        "Index/index.31.cfs.zip",
+        "Index/index.31.nocfs.zip",
+        "Index/index.31.optimized.cfs.zip",
+        "Index/index.31.optimized.nocfs.zip",
+        "Index/index.32.cfs.zip",
+        "Index/index.32.nocfs.zip",
+        "Index/index.34.cfs.zip",
+        "Index/index.34.nocfs.zip",
+        "Index/index.36.surrogates.zip",
+        "Index/index.40.cfs.zip",
+        "Index/index.40.nocfs.zip",
+        "Index/index.40.optimized.cfs.zip",
+        "Index/index.40.optimized.nocfs.zip",
+        "Index/index.41.cfs.zip",
+        "Index/index.41.nocfs.zip",
+        "Index/index.42.cfs.zip",
+        "Index/index.42.nocfs.zip",
+        "Index/index.45.cfs.zip",
+        "Index/index.45.nocfs.zip",
+        "Index/index.461.cfs.zip",
+        "Index/index.461.nocfs.zip",
+        "Index/moreterms.40.zip",
+        "Index/unsupported.19.cfs.zip",
+        "Index/unsupported.19.nocfs.zip",
+        "Index/unsupported.20.cfs.zip",
+        "Index/unsupported.20.nocfs.zip",
+        "Index/unsupported.21.cfs.zip",
+        "Index/unsupported.21.nocfs.zip",
+        "Index/unsupported.22.cfs.zip",
+        "Index/unsupported.22.nocfs.zip",
+        "Index/unsupported.23.cfs.zip",
+        "Index/unsupported.23.nocfs.zip",
+        "Index/unsupported.24.cfs.zip",
+        "Index/unsupported.24.nocfs.zip",
+        "Index/unsupported.29.cfs.zip",
+        "Index/unsupported.29.nocfs.zip",
+        "Support/ReadFully.txt"
+      ]
+    }
+  },
   "dependencies": {
     "dotnet-test-nunit-teamcity": "3.4.0-beta-3",
     "Lucene.Net.Codecs": "4.8.0",
@@ -17,60 +68,11 @@
         "debugType": "portable",
         "define": [ "NETSTANDARD", "FEATURE_TASKMERGESCHEDULER" ],
         "compile": {
-          "includeFiles": [
-            "../CommonAssemblyInfo.cs"
-          ],
+          "exclude": [ "Util/JunitCompat" ],
           "excludeFiles": [
             "Support/TestApiConsistency.cs",
             "Support/TestCase.cs",
             "Util/TestMaxFailuresRule.cs"
-          ],
-          "exclude": [
-            "Util/JunitCompat"
-          ]
-        },
-        "embed": {
-          "includeFiles": [
-            "Index/bogus24.upgraded.to.36.zip",
-            "Index/index.30.cfs.zip",
-            "Index/index.30.nocfs.zip",
-            "Index/index.31.cfs.zip",
-            "Index/index.31.nocfs.zip",
-            "Index/index.31.optimized.cfs.zip",
-            "Index/index.31.optimized.nocfs.zip",
-            "Index/index.32.cfs.zip",
-            "Index/index.32.nocfs.zip",
-            "Index/index.34.cfs.zip",
-            "Index/index.34.nocfs.zip",
-            "Index/index.36.surrogates.zip",
-            "Index/index.40.cfs.zip",
-            "Index/index.40.nocfs.zip",
-            "Index/index.40.optimized.cfs.zip",
-            "Index/index.40.optimized.nocfs.zip",
-            "Index/index.41.cfs.zip",
-            "Index/index.41.nocfs.zip",
-            "Index/index.42.cfs.zip",
-            "Index/index.42.nocfs.zip",
-            "Index/index.45.cfs.zip",
-            "Index/index.45.nocfs.zip",
-            "Index/index.461.cfs.zip",
-            "Index/index.461.nocfs.zip",
-            "Index/moreterms.40.zip",
-            "Index/unsupported.19.cfs.zip",
-            "Index/unsupported.19.nocfs.zip",
-            "Index/unsupported.20.cfs.zip",
-            "Index/unsupported.20.nocfs.zip",
-            "Index/unsupported.21.cfs.zip",
-            "Index/unsupported.21.nocfs.zip",
-            "Index/unsupported.22.cfs.zip",
-            "Index/unsupported.22.nocfs.zip",
-            "Index/unsupported.23.cfs.zip",
-            "Index/unsupported.23.nocfs.zip",
-            "Index/unsupported.24.cfs.zip",
-            "Index/unsupported.24.nocfs.zip",
-            "Index/unsupported.29.cfs.zip",
-            "Index/unsupported.29.nocfs.zip",
-            "Support/ReadFully.txt"
           ]
         }
       },
@@ -85,60 +87,7 @@
     "net451": {
       "buildOptions": {
         "debugType": "full",
-        "define": [ "FEATURE_CONCURRENTMERGESCHEDULER", "FEATURE_SERIALIZABLE" ],
-        "compile": {
-          "includeFiles": [
-            "../CommonAssemblyInfo.cs"
-          ],
-          "exclude": [
-            "Util/JunitCompat"
-          ],
-          "excludeFiles": [ "Util/TestMaxFailuresRule.cs" ]
-        },
-        "embed": {
-          "includeFiles": [
-            "Index/bogus24.upgraded.to.36.zip",
-            "Index/index.30.cfs.zip",
-            "Index/index.30.nocfs.zip",
-            "Index/index.31.cfs.zip",
-            "Index/index.31.nocfs.zip",
-            "Index/index.31.optimized.cfs.zip",
-            "Index/index.31.optimized.nocfs.zip",
-            "Index/index.32.cfs.zip",
-            "Index/index.32.nocfs.zip",
-            "Index/index.34.cfs.zip",
-            "Index/index.34.nocfs.zip",
-            "Index/index.36.surrogates.zip",
-            "Index/index.40.cfs.zip",
-            "Index/index.40.nocfs.zip",
-            "Index/index.40.optimized.cfs.zip",
-            "Index/index.40.optimized.nocfs.zip",
-            "Index/index.41.cfs.zip",
-            "Index/index.41.nocfs.zip",
-            "Index/index.42.cfs.zip",
-            "Index/index.42.nocfs.zip",
-            "Index/index.45.cfs.zip",
-            "Index/index.45.nocfs.zip",
-            "Index/index.461.cfs.zip",
-            "Index/index.461.nocfs.zip",
-            "Index/moreterms.40.zip",
-            "Index/unsupported.19.cfs.zip",
-            "Index/unsupported.19.nocfs.zip",
-            "Index/unsupported.20.cfs.zip",
-            "Index/unsupported.20.nocfs.zip",
-            "Index/unsupported.21.cfs.zip",
-            "Index/unsupported.21.nocfs.zip",
-            "Index/unsupported.22.cfs.zip",
-            "Index/unsupported.22.nocfs.zip",
-            "Index/unsupported.23.cfs.zip",
-            "Index/unsupported.23.nocfs.zip",
-            "Index/unsupported.24.cfs.zip",
-            "Index/unsupported.24.nocfs.zip",
-            "Index/unsupported.29.cfs.zip",
-            "Index/unsupported.29.nocfs.zip",
-            "Support/ReadFully.txt"
-          ]
-        }
+        "define": [ "FEATURE_CONCURRENTMERGESCHEDULER", "FEATURE_SERIALIZABLE" ]
       }
     }
   },

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8f98c521/src/Lucene.Net/Support/Deflater.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Support/Deflater.cs b/src/Lucene.Net/Support/Deflater.cs
index 3b24831..019446d 100644
--- a/src/Lucene.Net/Support/Deflater.cs
+++ b/src/Lucene.Net/Support/Deflater.cs
@@ -1,3 +1,4 @@
+#if !NETSTANDARD
 /*
  *
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -138,4 +139,5 @@ namespace Lucene.Net.Support
             get { return getIsNeedingInputMethod(); }
         }
     }
-}
\ No newline at end of file
+}
+#endif
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8f98c521/src/Lucene.Net/Support/Inflater.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Support/Inflater.cs b/src/Lucene.Net/Support/Inflater.cs
index b7118a3..5f38db8 100644
--- a/src/Lucene.Net/Support/Inflater.cs
+++ b/src/Lucene.Net/Support/Inflater.cs
@@ -1,3 +1,4 @@
+#if !NETSTANDARD
 /*
  *
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -110,4 +111,5 @@ namespace Lucene.Net.Support
             resetMethod();
         }
     }
-}
\ No newline at end of file
+}
+#endif
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8f98c521/src/Lucene.Net/Support/SharpZipLib.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Support/SharpZipLib.cs b/src/Lucene.Net/Support/SharpZipLib.cs
index 883f63f..0ae3d06 100644
--- a/src/Lucene.Net/Support/SharpZipLib.cs
+++ b/src/Lucene.Net/Support/SharpZipLib.cs
@@ -1,3 +1,4 @@
+#if NET35
 /*
  *
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -48,4 +49,5 @@ namespace Lucene.Net.Support
             return new Inflater(asm.CreateInstance("ICSharpCode.SharpZipLib.Zip.Compression.Inflater"));
         }
     }
-}
\ No newline at end of file
+}
+#endif
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8f98c521/src/Lucene.Net/Support/StreamUtils.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Support/StreamUtils.cs b/src/Lucene.Net/Support/StreamUtils.cs
index 3925954..142d6f9 100644
--- a/src/Lucene.Net/Support/StreamUtils.cs
+++ b/src/Lucene.Net/Support/StreamUtils.cs
@@ -1,4 +1,5 @@
-using System.IO;
+#if FEATURE_SERIALIZABLE
+using System.IO;
 using System.Runtime.Serialization.Formatters.Binary;
 
 namespace Lucene.Net.Support
@@ -30,3 +31,4 @@ namespace Lucene.Net.Support
         }
     }
 }
+#endif

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/8f98c521/src/Lucene.Net/project.json
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/project.json b/src/Lucene.Net/project.json
index 2ce5d7e..1020317 100644
--- a/src/Lucene.Net/project.json
+++ b/src/Lucene.Net/project.json
@@ -11,24 +11,17 @@
     "repository": { "url": "https://github.com/apache/lucenenet" },
     "tags": [ "lucene.net", "core", "text", "search", "information", "retrieval", "lucene", "apache", "analysis", "index", "query" ]
   },
+  "buildOptions": {
+    "compile": {
+      "includeFiles": [ "../CommonAssemblyInfo.cs" ]
+    }
+  },
   "frameworks": {
     "netstandard1.5": {
       "imports": "dnxcore50",
       "buildOptions": {
         "debugType": "portable",
-        "define": [ "FEATURE_TASKMERGESCHEDULER", "NETSTANDARD" ],
-        "compile": {
-          "includeFiles": [
-            "../CommonAssemblyInfo.cs"
-          ],
-          "excludeFiles": [
-            "Index/ConcurrentMergeScheduler.cs",
-            "Support/Deflater.cs",
-            "Support/Inflater.cs",
-            "Support/SharpZipLib.cs",
-            "Support/StreamUtils.cs"
-          ]
-        }
+        "define": [ "FEATURE_TASKMERGESCHEDULER", "NETSTANDARD" ]
       },
       "dependencies": {
         "Microsoft.Extensions.DependencyModel": "1.0.0-rc2-final",
@@ -53,12 +46,7 @@
           "FEATURE_CONCURRENTMERGESCHEDULER",
           "FEATURE_SERIALIZABLE",
           "FEATURE_THREADPOOL_UNSAFEQUEUEWORKITEM"
-        ],
-        "compile": {
-          "includeFiles": [
-            "../CommonAssemblyInfo.cs"
-          ]
-        }
+        ]
       }
     }
   }


Mime
View raw message