From commits-return-6336-archive-asf-public=cust-asf.ponee.io@lucenenet.apache.org Thu Jul 11 15:42:59 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id 0E07E1804BB for ; Thu, 11 Jul 2019 17:42:57 +0200 (CEST) Received: (qmail 62953 invoked by uid 500); 11 Jul 2019 15:42:57 -0000 Mailing-List: contact commits-help@lucenenet.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: lucene-net-dev@lucenenet.apache.org Delivered-To: mailing list commits@lucenenet.apache.org Received: (qmail 62479 invoked by uid 99); 11 Jul 2019 15:42:56 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 11 Jul 2019 15:42:56 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 280F985E13; Thu, 11 Jul 2019 15:42:56 +0000 (UTC) Date: Thu, 11 Jul 2019 15:43:06 +0000 To: "commits@lucenenet.apache.org" Subject: [lucenenet] 11/12: Upgrade test target from .NET Core 2.0 to .NET Core 2.1 to support icu.net (see: https://github.com/sillsdev/icu-dotnet/issues/118) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: nightowl888@apache.org In-Reply-To: <156285977576.32449.17287307736849120410@gitbox.apache.org> References: <156285977576.32449.17287307736849120410@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: lucenenet X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Rev: dbb983f33c645156400792db3aaf3827354782ad X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20190711154256.280F985E13@gitbox.apache.org> This is an automated email from the ASF dual-hosted git repository. nightowl888 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/lucenenet.git commit dbb983f33c645156400792db3aaf3827354782ad Author: Shad Storhaug AuthorDate: Thu Jul 11 18:26:40 2019 +0700 Upgrade test target from .NET Core 2.0 to .NET Core 2.1 to support icu.net (see: https://github.com/sillsdev/icu-dotnet/issues/118) --- TestTargetFramework.proj | 4 ++-- build/build.ps1 | 2 +- .../Lucene.Net.Tests.Analysis.Common.csproj | 2 +- .../Lucene.Net.Tests.Analysis.Kuromoji.csproj | 2 +- .../Lucene.Net.Tests.Analysis.Phonetic.csproj | 2 +- .../Lucene.Net.Tests.Analysis.SmartCn.csproj | 4 ++-- .../Lucene.Net.Tests.Analysis.Stempel.csproj | 2 +- src/Lucene.Net.Tests.Benchmark/Lucene.Net.Tests.Benchmark.csproj | 2 +- .../Lucene.Net.Tests.Classification.csproj | 2 +- src/Lucene.Net.Tests.Codecs/Lucene.Net.Tests.Codecs.csproj | 2 +- src/Lucene.Net.Tests.Demo/Lucene.Net.Tests.Demo.csproj | 2 +- src/Lucene.Net.Tests.Expressions/Lucene.Net.Tests.Expressions.csproj | 2 +- src/Lucene.Net.Tests.Facet/Lucene.Net.Tests.Facet.csproj | 2 +- src/Lucene.Net.Tests.Grouping/Lucene.Net.Tests.Grouping.csproj | 2 +- src/Lucene.Net.Tests.Highlighter/Lucene.Net.Tests.Highlighter.csproj | 2 +- src/Lucene.Net.Tests.Join/Lucene.Net.Tests.Join.csproj | 2 +- src/Lucene.Net.Tests.Memory/Lucene.Net.Tests.Memory.csproj | 2 +- src/Lucene.Net.Tests.Misc/Lucene.Net.Tests.Misc.csproj | 2 +- src/Lucene.Net.Tests.Queries/Lucene.Net.Tests.Queries.csproj | 2 +- src/Lucene.Net.Tests.QueryParser/Lucene.Net.Tests.QueryParser.csproj | 2 +- src/Lucene.Net.Tests.Replicator/Lucene.Net.Tests.Replicator.csproj | 2 +- src/Lucene.Net.Tests.Sandbox/Lucene.Net.Tests.Sandbox.csproj | 2 +- src/Lucene.Net.Tests.Spatial/Lucene.Net.Tests.Spatial.csproj | 2 +- src/Lucene.Net.Tests.Suggest/Lucene.Net.Tests.Suggest.csproj | 2 +- src/Lucene.Net.Tests/Lucene.Net.Tests.csproj | 2 +- src/Lucene.Net.Tests/Support/TestLurchTableThreading.cs | 4 ++-- src/dotnet/Lucene.Net.Tests.ICU/Lucene.Net.Tests.ICU.csproj | 2 +- src/dotnet/tools/Lucene.Net.Tests.Cli/Lucene.Net.Tests.Cli.csproj | 2 +- 28 files changed, 31 insertions(+), 31 deletions(-) diff --git a/TestTargetFramework.proj b/TestTargetFramework.proj index 65f5d9c..12b4d0c 100644 --- a/TestTargetFramework.proj +++ b/TestTargetFramework.proj @@ -28,12 +28,12 @@ this setting only affects the test projects. --> - netcoreapp2.0 + netcoreapp2.1 - netcoreapp2.0;netcoreapp1.0;net451 + netcoreapp2.1;netcoreapp1.0;net451 diff --git a/build/build.ps1 b/build/build.ps1 index 30a46f5..1f96b29 100644 --- a/build/build.ps1 +++ b/build/build.ps1 @@ -48,7 +48,7 @@ properties { [string]$product_name = "Lucene.Net" #test paramters - [string]$frameworks_to_test = "netcoreapp2.0,netcoreapp1.0,net451" + [string]$frameworks_to_test = "netcoreapp2.1,netcoreapp1.0,net451" [string]$where = "" } diff --git a/src/Lucene.Net.Tests.Analysis.Common/Lucene.Net.Tests.Analysis.Common.csproj b/src/Lucene.Net.Tests.Analysis.Common/Lucene.Net.Tests.Analysis.Common.csproj index 896c8a4..a938523 100644 --- a/src/Lucene.Net.Tests.Analysis.Common/Lucene.Net.Tests.Analysis.Common.csproj +++ b/src/Lucene.Net.Tests.Analysis.Common/Lucene.Net.Tests.Analysis.Common.csproj @@ -43,7 +43,7 @@ - + $(DefineConstants);NETSTANDARD portable diff --git a/src/Lucene.Net.Tests.Analysis.Kuromoji/Lucene.Net.Tests.Analysis.Kuromoji.csproj b/src/Lucene.Net.Tests.Analysis.Kuromoji/Lucene.Net.Tests.Analysis.Kuromoji.csproj index 4c81168..cfe3de3 100644 --- a/src/Lucene.Net.Tests.Analysis.Kuromoji/Lucene.Net.Tests.Analysis.Kuromoji.csproj +++ b/src/Lucene.Net.Tests.Analysis.Kuromoji/Lucene.Net.Tests.Analysis.Kuromoji.csproj @@ -43,7 +43,7 @@ - + portable diff --git a/src/Lucene.Net.Tests.Analysis.Phonetic/Lucene.Net.Tests.Analysis.Phonetic.csproj b/src/Lucene.Net.Tests.Analysis.Phonetic/Lucene.Net.Tests.Analysis.Phonetic.csproj index 3800dad..36c5c51 100644 --- a/src/Lucene.Net.Tests.Analysis.Phonetic/Lucene.Net.Tests.Analysis.Phonetic.csproj +++ b/src/Lucene.Net.Tests.Analysis.Phonetic/Lucene.Net.Tests.Analysis.Phonetic.csproj @@ -39,7 +39,7 @@ - + $(DefineConstants);NETSTANDARD portable diff --git a/src/Lucene.Net.Tests.Analysis.SmartCn/Lucene.Net.Tests.Analysis.SmartCn.csproj b/src/Lucene.Net.Tests.Analysis.SmartCn/Lucene.Net.Tests.Analysis.SmartCn.csproj index ce055c7..aaca15c 100644 --- a/src/Lucene.Net.Tests.Analysis.SmartCn/Lucene.Net.Tests.Analysis.SmartCn.csproj +++ b/src/Lucene.Net.Tests.Analysis.SmartCn/Lucene.Net.Tests.Analysis.SmartCn.csproj @@ -39,11 +39,11 @@ - - + portable diff --git a/src/Lucene.Net.Tests.Analysis.Stempel/Lucene.Net.Tests.Analysis.Stempel.csproj b/src/Lucene.Net.Tests.Analysis.Stempel/Lucene.Net.Tests.Analysis.Stempel.csproj index b322b15..4c9ec15 100644 --- a/src/Lucene.Net.Tests.Analysis.Stempel/Lucene.Net.Tests.Analysis.Stempel.csproj +++ b/src/Lucene.Net.Tests.Analysis.Stempel/Lucene.Net.Tests.Analysis.Stempel.csproj @@ -43,7 +43,7 @@ - + portable diff --git a/src/Lucene.Net.Tests.Benchmark/Lucene.Net.Tests.Benchmark.csproj b/src/Lucene.Net.Tests.Benchmark/Lucene.Net.Tests.Benchmark.csproj index 9c7e331..4340456 100644 --- a/src/Lucene.Net.Tests.Benchmark/Lucene.Net.Tests.Benchmark.csproj +++ b/src/Lucene.Net.Tests.Benchmark/Lucene.Net.Tests.Benchmark.csproj @@ -50,7 +50,7 @@ - + portable diff --git a/src/Lucene.Net.Tests.Classification/Lucene.Net.Tests.Classification.csproj b/src/Lucene.Net.Tests.Classification/Lucene.Net.Tests.Classification.csproj index d1b3d28..3f13d8e 100644 --- a/src/Lucene.Net.Tests.Classification/Lucene.Net.Tests.Classification.csproj +++ b/src/Lucene.Net.Tests.Classification/Lucene.Net.Tests.Classification.csproj @@ -40,7 +40,7 @@ - + portable diff --git a/src/Lucene.Net.Tests.Codecs/Lucene.Net.Tests.Codecs.csproj b/src/Lucene.Net.Tests.Codecs/Lucene.Net.Tests.Codecs.csproj index df0ec4a..a57069c 100644 --- a/src/Lucene.Net.Tests.Codecs/Lucene.Net.Tests.Codecs.csproj +++ b/src/Lucene.Net.Tests.Codecs/Lucene.Net.Tests.Codecs.csproj @@ -40,7 +40,7 @@ - + $(DefineConstants);NETSTANDARD portable diff --git a/src/Lucene.Net.Tests.Demo/Lucene.Net.Tests.Demo.csproj b/src/Lucene.Net.Tests.Demo/Lucene.Net.Tests.Demo.csproj index 57ca48f..703a56a 100644 --- a/src/Lucene.Net.Tests.Demo/Lucene.Net.Tests.Demo.csproj +++ b/src/Lucene.Net.Tests.Demo/Lucene.Net.Tests.Demo.csproj @@ -43,7 +43,7 @@ - + portable diff --git a/src/Lucene.Net.Tests.Expressions/Lucene.Net.Tests.Expressions.csproj b/src/Lucene.Net.Tests.Expressions/Lucene.Net.Tests.Expressions.csproj index 3e451ac..a1dce95 100644 --- a/src/Lucene.Net.Tests.Expressions/Lucene.Net.Tests.Expressions.csproj +++ b/src/Lucene.Net.Tests.Expressions/Lucene.Net.Tests.Expressions.csproj @@ -40,7 +40,7 @@ - + portable diff --git a/src/Lucene.Net.Tests.Facet/Lucene.Net.Tests.Facet.csproj b/src/Lucene.Net.Tests.Facet/Lucene.Net.Tests.Facet.csproj index 789251a..f900ad3 100644 --- a/src/Lucene.Net.Tests.Facet/Lucene.Net.Tests.Facet.csproj +++ b/src/Lucene.Net.Tests.Facet/Lucene.Net.Tests.Facet.csproj @@ -40,7 +40,7 @@ - + $(DefineConstants);FEATURE_THREAD_PRIORITY portable diff --git a/src/Lucene.Net.Tests.Grouping/Lucene.Net.Tests.Grouping.csproj b/src/Lucene.Net.Tests.Grouping/Lucene.Net.Tests.Grouping.csproj index 7f0cdc3..0b28f35 100644 --- a/src/Lucene.Net.Tests.Grouping/Lucene.Net.Tests.Grouping.csproj +++ b/src/Lucene.Net.Tests.Grouping/Lucene.Net.Tests.Grouping.csproj @@ -40,7 +40,7 @@ - + portable diff --git a/src/Lucene.Net.Tests.Highlighter/Lucene.Net.Tests.Highlighter.csproj b/src/Lucene.Net.Tests.Highlighter/Lucene.Net.Tests.Highlighter.csproj index c36ce77..424dda5 100644 --- a/src/Lucene.Net.Tests.Highlighter/Lucene.Net.Tests.Highlighter.csproj +++ b/src/Lucene.Net.Tests.Highlighter/Lucene.Net.Tests.Highlighter.csproj @@ -44,7 +44,7 @@ - + portable diff --git a/src/Lucene.Net.Tests.Join/Lucene.Net.Tests.Join.csproj b/src/Lucene.Net.Tests.Join/Lucene.Net.Tests.Join.csproj index a5f3a1f..f6d3cc2 100644 --- a/src/Lucene.Net.Tests.Join/Lucene.Net.Tests.Join.csproj +++ b/src/Lucene.Net.Tests.Join/Lucene.Net.Tests.Join.csproj @@ -40,7 +40,7 @@ - + portable diff --git a/src/Lucene.Net.Tests.Memory/Lucene.Net.Tests.Memory.csproj b/src/Lucene.Net.Tests.Memory/Lucene.Net.Tests.Memory.csproj index 07f7174..27c9718 100644 --- a/src/Lucene.Net.Tests.Memory/Lucene.Net.Tests.Memory.csproj +++ b/src/Lucene.Net.Tests.Memory/Lucene.Net.Tests.Memory.csproj @@ -44,7 +44,7 @@ - + portable diff --git a/src/Lucene.Net.Tests.Misc/Lucene.Net.Tests.Misc.csproj b/src/Lucene.Net.Tests.Misc/Lucene.Net.Tests.Misc.csproj index 92d8788..69d2bec 100644 --- a/src/Lucene.Net.Tests.Misc/Lucene.Net.Tests.Misc.csproj +++ b/src/Lucene.Net.Tests.Misc/Lucene.Net.Tests.Misc.csproj @@ -39,7 +39,7 @@ - + portable diff --git a/src/Lucene.Net.Tests.Queries/Lucene.Net.Tests.Queries.csproj b/src/Lucene.Net.Tests.Queries/Lucene.Net.Tests.Queries.csproj index 5648955..9566cc0 100644 --- a/src/Lucene.Net.Tests.Queries/Lucene.Net.Tests.Queries.csproj +++ b/src/Lucene.Net.Tests.Queries/Lucene.Net.Tests.Queries.csproj @@ -39,7 +39,7 @@ - + portable diff --git a/src/Lucene.Net.Tests.QueryParser/Lucene.Net.Tests.QueryParser.csproj b/src/Lucene.Net.Tests.QueryParser/Lucene.Net.Tests.QueryParser.csproj index a32b4e0..2087e79 100644 --- a/src/Lucene.Net.Tests.QueryParser/Lucene.Net.Tests.QueryParser.csproj +++ b/src/Lucene.Net.Tests.QueryParser/Lucene.Net.Tests.QueryParser.csproj @@ -44,7 +44,7 @@ - + portable diff --git a/src/Lucene.Net.Tests.Replicator/Lucene.Net.Tests.Replicator.csproj b/src/Lucene.Net.Tests.Replicator/Lucene.Net.Tests.Replicator.csproj index 11c0566..d54a8d7 100644 --- a/src/Lucene.Net.Tests.Replicator/Lucene.Net.Tests.Replicator.csproj +++ b/src/Lucene.Net.Tests.Replicator/Lucene.Net.Tests.Replicator.csproj @@ -45,7 +45,7 @@ - + portable diff --git a/src/Lucene.Net.Tests.Sandbox/Lucene.Net.Tests.Sandbox.csproj b/src/Lucene.Net.Tests.Sandbox/Lucene.Net.Tests.Sandbox.csproj index df6d0cd..6493551 100644 --- a/src/Lucene.Net.Tests.Sandbox/Lucene.Net.Tests.Sandbox.csproj +++ b/src/Lucene.Net.Tests.Sandbox/Lucene.Net.Tests.Sandbox.csproj @@ -44,7 +44,7 @@ - + portable diff --git a/src/Lucene.Net.Tests.Spatial/Lucene.Net.Tests.Spatial.csproj b/src/Lucene.Net.Tests.Spatial/Lucene.Net.Tests.Spatial.csproj index bf09c91..84b07d6 100644 --- a/src/Lucene.Net.Tests.Spatial/Lucene.Net.Tests.Spatial.csproj +++ b/src/Lucene.Net.Tests.Spatial/Lucene.Net.Tests.Spatial.csproj @@ -48,7 +48,7 @@ - + portable diff --git a/src/Lucene.Net.Tests.Suggest/Lucene.Net.Tests.Suggest.csproj b/src/Lucene.Net.Tests.Suggest/Lucene.Net.Tests.Suggest.csproj index bd3ea86..e494488 100644 --- a/src/Lucene.Net.Tests.Suggest/Lucene.Net.Tests.Suggest.csproj +++ b/src/Lucene.Net.Tests.Suggest/Lucene.Net.Tests.Suggest.csproj @@ -45,7 +45,7 @@ - + $(DefineConstants);FEATURE_THREAD_PRIORITY portable diff --git a/src/Lucene.Net.Tests/Lucene.Net.Tests.csproj b/src/Lucene.Net.Tests/Lucene.Net.Tests.csproj index 68802c7..b660bd1 100644 --- a/src/Lucene.Net.Tests/Lucene.Net.Tests.csproj +++ b/src/Lucene.Net.Tests/Lucene.Net.Tests.csproj @@ -49,7 +49,7 @@ - + $(DefineConstants);NETSTANDARD;FEATURE_CONCURRENTMERGESCHEDULER;FEATURE_SERIALIZABLE portable diff --git a/src/Lucene.Net.Tests/Support/TestLurchTableThreading.cs b/src/Lucene.Net.Tests/Support/TestLurchTableThreading.cs index 08cb7a9..389696b 100644 --- a/src/Lucene.Net.Tests/Support/TestLurchTableThreading.cs +++ b/src/Lucene.Net.Tests/Support/TestLurchTableThreading.cs @@ -77,7 +77,7 @@ namespace Lucene.Net.Support // LUCENENET TODO: For some reason, this logic depends on the underlying // implementation of Guid.NewGuid(), which has changed in .NET Core 2.0. // But the functionality of LurchTable seems unaffected by this change. -#if !NETCOREAPP2_0 +#if !NETCOREAPP2_1 [Test, LuceneNetSpecific] public void TestGuidHashCollision() { @@ -248,7 +248,7 @@ namespace Lucene.Net.Support ); Guid result = new Guid(bytes); -#if !NETCOREAPP2_0 +#if !NETCOREAPP2_1 Assert.AreEqual(guid.GetHashCode(), result.GetHashCode()); #endif return result; diff --git a/src/dotnet/Lucene.Net.Tests.ICU/Lucene.Net.Tests.ICU.csproj b/src/dotnet/Lucene.Net.Tests.ICU/Lucene.Net.Tests.ICU.csproj index ac05443..f34ad67 100644 --- a/src/dotnet/Lucene.Net.Tests.ICU/Lucene.Net.Tests.ICU.csproj +++ b/src/dotnet/Lucene.Net.Tests.ICU/Lucene.Net.Tests.ICU.csproj @@ -64,7 +64,7 @@ - + $(DefineConstants);NETSTANDARD portable diff --git a/src/dotnet/tools/Lucene.Net.Tests.Cli/Lucene.Net.Tests.Cli.csproj b/src/dotnet/tools/Lucene.Net.Tests.Cli/Lucene.Net.Tests.Cli.csproj index 0635091..43ccffb 100644 --- a/src/dotnet/tools/Lucene.Net.Tests.Cli/Lucene.Net.Tests.Cli.csproj +++ b/src/dotnet/tools/Lucene.Net.Tests.Cli/Lucene.Net.Tests.Cli.csproj @@ -44,7 +44,7 @@ - + portable