lucenenet-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nightowl...@apache.org
Subject [6/8] lucenenet git commit: Removed NET451 compilation symbol because it is used the same as !NETSTANDARD
Date Sat, 08 Apr 2017 15:48:26 GMT
Removed NET451 compilation symbol because it is used the same as !NETSTANDARD


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

Branch: refs/heads/api-work
Commit: 815627427674aeae7e38f316ae5698330b0af6cc
Parents: 1743c9d
Author: Shad Storhaug <shad@shadstorhaug.com>
Authored: Fri Apr 7 22:51:37 2017 +0700
Committer: Shad Storhaug <shad@shadstorhaug.com>
Committed: Sat Apr 8 22:47:49 2017 +0700

----------------------------------------------------------------------
 src/Lucene.Net.Analysis.Common/Lucene.Net.Analysis.Common.csproj | 2 +-
 src/Lucene.Net.Analysis.Common/project.json                      | 2 +-
 src/Lucene.Net.Tests/Lucene.Net.Tests.csproj                     | 2 +-
 src/Lucene.Net.Tests/Support/TestToStringUtils.cs                | 4 ++--
 src/Lucene.Net/Lucene.Net.csproj                                 | 2 +-
 src/Lucene.Net/Support/CultureContext.cs                         | 4 ++--
 6 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucenenet/blob/81562742/src/Lucene.Net.Analysis.Common/Lucene.Net.Analysis.Common.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Analysis.Common/Lucene.Net.Analysis.Common.csproj b/src/Lucene.Net.Analysis.Common/Lucene.Net.Analysis.Common.csproj
index 7c169e4..9deaa25 100644
--- a/src/Lucene.Net.Analysis.Common/Lucene.Net.Analysis.Common.csproj
+++ b/src/Lucene.Net.Analysis.Common/Lucene.Net.Analysis.Common.csproj
@@ -31,7 +31,7 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup>
-    <DefineConstants>$(DefineConstants);NET451;FEATURE_CLONEABLE;FEATURE_DTD_PROCESSING;FEATURE_SERIALIZABLE</DefineConstants>
+    <DefineConstants>$(DefineConstants);FEATURE_CLONEABLE;FEATURE_DTD_PROCESSING;FEATURE_SERIALIZABLE</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.VisualBasic" />

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/81562742/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 321e026..5672a4c 100644
--- a/src/Lucene.Net.Analysis.Common/project.json
+++ b/src/Lucene.Net.Analysis.Common/project.json
@@ -56,7 +56,7 @@
         "System.Xml.Linq": "4.0.0.0"
       },
       "buildOptions": {
-        "define": [ "NET451", "FEATURE_CLONEABLE", "FEATURE_DTD_PROCESSING", "FEATURE_SERIALIZABLE"
]
+        "define": [ "FEATURE_CLONEABLE", "FEATURE_DTD_PROCESSING", "FEATURE_SERIALIZABLE"
]
       }
     }
   }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/81562742/src/Lucene.Net.Tests/Lucene.Net.Tests.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/Lucene.Net.Tests.csproj b/src/Lucene.Net.Tests/Lucene.Net.Tests.csproj
index e73854d..6bb76fe 100644
--- a/src/Lucene.Net.Tests/Lucene.Net.Tests.csproj
+++ b/src/Lucene.Net.Tests/Lucene.Net.Tests.csproj
@@ -34,7 +34,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <RootNamespace>Lucene.Net.Tests</RootNamespace>
-    <DefineConstants>$(DefineConstants);NET451;FEATURE_SERIALIZABLE</DefineConstants>
+    <DefineConstants>$(DefineConstants);FEATURE_SERIALIZABLE</DefineConstants>
   </PropertyGroup>
   <PropertyGroup>
     <StartupObject />

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/81562742/src/Lucene.Net.Tests/Support/TestToStringUtils.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/Support/TestToStringUtils.cs b/src/Lucene.Net.Tests/Support/TestToStringUtils.cs
index cfb6496..04af516 100644
--- a/src/Lucene.Net.Tests/Support/TestToStringUtils.cs
+++ b/src/Lucene.Net.Tests/Support/TestToStringUtils.cs
@@ -29,7 +29,7 @@ namespace Lucene.Net.Support
 
         public override void TearDown()
         {
-#if NET451
+#if !NETSTANDARD
             Thread.CurrentThread.CurrentCulture = originalCulture;
 #else
             CultureInfo.CurrentCulture = originalCulture;
@@ -54,7 +54,7 @@ namespace Lucene.Net.Support
 
             foreach (CultureInfo culture in cultures)
             {
-#if NET451
+#if !NETSTANDARD
                 Thread.CurrentThread.CurrentCulture = culture;
 #else
                 CultureInfo.CurrentCulture = culture;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/81562742/src/Lucene.Net/Lucene.Net.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Lucene.Net.csproj b/src/Lucene.Net/Lucene.Net.csproj
index 756bfe7..d28a1a8 100644
--- a/src/Lucene.Net/Lucene.Net.csproj
+++ b/src/Lucene.Net/Lucene.Net.csproj
@@ -33,7 +33,7 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup>
-    <DefineConstants>$(DefineConstants);NET451;FEATURE_CLONEABLE;FEATURE_SERIALIZABLE;FEATURE_THREADPOOL_UNSAFEQUEUEWORKITEM</DefineConstants>
+    <DefineConstants>$(DefineConstants);FEATURE_CLONEABLE;FEATURE_SERIALIZABLE;FEATURE_THREADPOOL_UNSAFEQUEUEWORKITEM</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/81562742/src/Lucene.Net/Support/CultureContext.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Support/CultureContext.cs b/src/Lucene.Net/Support/CultureContext.cs
index f01085a..b1a52f9 100644
--- a/src/Lucene.Net/Support/CultureContext.cs
+++ b/src/Lucene.Net/Support/CultureContext.cs
@@ -51,7 +51,7 @@ namespace Lucene.Net.Support
             this.originalUICulture = CultureInfo.CurrentUICulture;
 
             // Set both the culture and UI culture for this context.
-#if NET451
+#if !NETSTANDARD
             Thread.CurrentThread.CurrentCulture = culture;
             Thread.CurrentThread.CurrentUICulture = uiCulture;
 #else
@@ -77,7 +77,7 @@ namespace Lucene.Net.Support
         public void RestoreOriginalCulture()
         {
             // Restore the culture to the way it was before the constructor was called.
-#if NET451
+#if !NETSTANDARD
             Thread.CurrentThread.CurrentCulture = originalCulture;
             Thread.CurrentThread.CurrentUICulture = originalUICulture;
 #else


Mime
View raw message