Return-Path: X-Original-To: apmail-lucenenet-commits-archive@www.apache.org Delivered-To: apmail-lucenenet-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 417781186E for ; Thu, 17 Jul 2014 00:16:28 +0000 (UTC) Received: (qmail 63055 invoked by uid 500); 17 Jul 2014 00:16:28 -0000 Delivered-To: apmail-lucenenet-commits-archive@lucenenet.apache.org Received: (qmail 62946 invoked by uid 500); 17 Jul 2014 00:16:28 -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 62847 invoked by uid 99); 17 Jul 2014 00:16:27 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Jul 2014 00:16:27 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 97B2E99B80B; Thu, 17 Jul 2014 00:16:27 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: mherndon@apache.org To: commits@lucenenet.apache.org Date: Thu, 17 Jul 2014 00:16:28 -0000 Message-Id: <690728ab141f470b876b773be4924603@git.apache.org> In-Reply-To: <63eb1f0522bc49679901e68ab35ba148@git.apache.org> References: <63eb1f0522bc49679901e68ab35ba148@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/3] git commit: adding apache license to various files. enabling nuget package restore. enhancing read me file adding apache license to various files. enabling nuget package restore. enhancing read me file Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/4ec95a3c Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/4ec95a3c Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/4ec95a3c Branch: refs/heads/pcl Commit: 4ec95a3c97f7d8b9b4df5d164a7cc0456b7c3961 Parents: 0a44fa0 Author: Michael Herndon Authored: Wed Jul 16 19:55:07 2014 -0400 Committer: Michael Herndon Committed: Wed Jul 16 19:55:07 2014 -0400 ---------------------------------------------------------------------- .gitignore | 2 +- .nuget/NuGet.Config | 6 + .nuget/NuGet.targets | 144 +++++++++++++++++++ NuGet.Config | 20 +++ README.md | 57 ++++++-- default.ruleset | 69 --------- src/Lucene.Core/Lucene.Core.csproj | 52 ------- src/Lucene.Core/Lucene.Core.kproj | 32 ----- src/Lucene.Core/project.json | 16 --- src/Lucene.Net.Core/Lucene.Net.Core.csproj | 20 +++ src/Lucene.Net.Core/Lucene.Net.Core.kproj | 20 +++ src/Lucene.Net.Core/default.ruleset | 20 +++ src/Lucene.Net.Core/project.json | 3 +- .../Lucene.Net.Core.Tests.csproj | 24 ++++ .../Lucene.Net.Core.Tests.kproj | 21 ++- test/Lucene.Net.Core.Tests/default.ruleset | 22 ++- test/Lucene.Net.Core.Tests/default1.ruleset | 68 --------- test/Lucene.Net.Core.Tests/packages.config | 20 +++ test/Lucene.Net.Core.Tests/project.json | 1 + .../Lucene.Net.TestFramework.csproj | 26 +++- .../Lucene.Net.TestFramework.kproj | 20 +++ .../Util/LuceneTestCase.cs | 73 ++++++---- test/Lucene.Net.TestFramework/packages.config | 20 +++ test/Lucene.Net.TestFramework/project.json | 1 + 24 files changed, 479 insertions(+), 278 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4ec95a3c/.gitignore ---------------------------------------------------------------------- diff --git a/.gitignore b/.gitignore index a8ad12a..7bd8bd6 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,7 @@ [Oo]bj/ [Bb]in/ TestResults/ -.nuget/ +## enable package restore .nuget/ *.sln.ide/ _ReSharper.*/ packages/ http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4ec95a3c/.nuget/NuGet.Config ---------------------------------------------------------------------- diff --git a/.nuget/NuGet.Config b/.nuget/NuGet.Config new file mode 100644 index 0000000..67f8ea0 --- /dev/null +++ b/.nuget/NuGet.Config @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4ec95a3c/.nuget/NuGet.targets ---------------------------------------------------------------------- diff --git a/.nuget/NuGet.targets b/.nuget/NuGet.targets new file mode 100644 index 0000000..3f8c37b --- /dev/null +++ b/.nuget/NuGet.targets @@ -0,0 +1,144 @@ + + + + $(MSBuildProjectDirectory)\..\ + + + false + + + false + + + true + + + false + + + + + + + + + + + $([System.IO.Path]::Combine($(SolutionDir), ".nuget")) + + + + + $(SolutionDir).nuget + + + + $(MSBuildProjectDirectory)\packages.$(MSBuildProjectName.Replace(' ', '_')).config + $(MSBuildProjectDirectory)\packages.$(MSBuildProjectName).config + + + + $(MSBuildProjectDirectory)\packages.config + $(PackagesProjectConfig) + + + + + $(NuGetToolsPath)\NuGet.exe + @(PackageSource) + + "$(NuGetExePath)" + mono --runtime=v4.0.30319 "$(NuGetExePath)" + + $(TargetDir.Trim('\\')) + + -RequireConsent + -NonInteractive + + "$(SolutionDir) " + "$(SolutionDir)" + + + $(NuGetCommand) install "$(PackagesConfig)" -source "$(PackageSources)" $(NonInteractiveSwitch) $(RequireConsentSwitch) -solutionDir $(PaddedSolutionDir) + $(NuGetCommand) pack "$(ProjectPath)" -Properties "Configuration=$(Configuration);Platform=$(Platform)" $(NonInteractiveSwitch) -OutputDirectory "$(PackageOutputDir)" -symbols + + + + RestorePackages; + $(BuildDependsOn); + + + + + $(BuildDependsOn); + BuildPackage; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4ec95a3c/NuGet.Config ---------------------------------------------------------------------- diff --git a/NuGet.Config b/NuGet.Config index ee9e18c..67502a8 100644 --- a/NuGet.Config +++ b/NuGet.Config @@ -1,4 +1,24 @@ + http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4ec95a3c/README.md ---------------------------------------------------------------------- diff --git a/README.md b/README.md index e8598f5..6c9b150 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,9 @@ -Apache Lucene.Net KVM / PCL +# Apache Lucene.Net For KLR / PCL + +## INTRODUCTION + +This branch is an experimental version of LUCENE.NET being built with Visual Studio 14 for PCL, portable class libraries, and the K10 / KLR (K or cloud Language Runtime for .NET. There will be breaking change and porting to PCL will be challenging. If you're up for a challenge, please contribute. -# INTRODUCTION -------------- Apache Lucene.Net is a C# full-text search engine. Apache Lucene.Net is not a complete application, but rather a code library and API that can easily be used to add search capabilities to applications. @@ -10,14 +12,38 @@ Apache Lucene.Net is compiled against Microsoft .NET Framework 4.0 The Apache Lucene.Net web site is at: http://lucenenet.apache.org +## Getting Started + +### Windows Users + * Install a copy of [http://blogs.msdn.com/b/visualstudio/archive/2014/07/08/visual-studio-14-ctp-2-available.aspx](Visual Studio 14). + * Install [https://chocolatey.org/packages?q=git](git) $ cinst git + * [https://github.com/apache/lucene.net/fork](Fork) a copy of lucene.net on github. + * Clone your copy $ git clone https://github.com/[user]/lucene.net.git + * cd path/to/lucene.net + * git checkout -b pcl origin/pcl + * Open the solution and build the project. Nuget package restore should be enabled. -# OVERVIEW -------------- -This branch is an experimental version of LUCENE.NET being built with Visual Studio 14 for PCL, portable class libraries, and the K10 / KLR (K or cloud Language Runtime for .NET +## Contributing Back +### Articles +Submit any articles and tutorials to the developers list, dev @ lucenenet.apache.org. +### Contributing Code For Lucene.Net 5.0 PCL Branch + * The current branch that is being ported is master on [https://github.com/apache/lucene-solr](lucene-solor). This will change to a tag in the future. + * Create a *task* in [https://issues.apache.org/jira/browse/LUCENENET/](Jira) + * Add a label *patch* + * Set the affects version *Lucene.Net 5.0 PCL* + * State the intended work. + * Acknowledge that the code in the pull request is licensed under Apache 2.0 and is not copied work. + * Follow the internal [http://blogs.msdn.com/b/brada/archive/2005/01/26/361363.aspx](MS code style guides). + * Make sure to submit tests and document code. + * If the pull request lacks tests and documentation, it will take for commiters to get the pull request adjusted and merged. + * *Contributing something is better than nothing* and maybe someone will take the patch / pull request and complete it. + * Put the ticket number in commit messages. i.e. LUCENENET-168 + * Send a pull request with the ticket number to [https://github.com/apache/lucene.net/](github). + * See Also: [http://www.apache.org/dev/contributors](Contributor's Guide) -# Running Tests +## Running Tests * open a command line tool * change the directory to the test project that you wish to run. @@ -28,4 +54,19 @@ This branch is an experimental version of LUCENE.NET being built with Visual Stu ```bash $ cd path/to/lucene.net/tests/Lucene.Net.Core.Tests $ k test - ``` \ No newline at end of file + ``` + + +## Milestone 1 + * Implement Build Scripts with [http://fsharp.github.io/FAKE/](Fake) + * Crossplatform Support. + * Easier than using XML. + * Implement a ci server, possibly appveyor + * Generate Code Documentation. + * Port core, test-framework, and tests for core. + +## Notes + + * *.csproj files exist for the PCL version because the [http://forums.asp.net/p/1996333/5735820.aspx?Re+NETPortable+profile+throws+a+warning+CS8021+No+value+for+RuntimeMetadataVersion+found+](RuntimeMetadataVersion) is not found. Once this issue is resolved, those files will be removed. + + http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4ec95a3c/default.ruleset ---------------------------------------------------------------------- diff --git a/default.ruleset b/default.ruleset deleted file mode 100644 index b431a43..0000000 --- a/default.ruleset +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4ec95a3c/src/Lucene.Core/Lucene.Core.csproj ---------------------------------------------------------------------- diff --git a/src/Lucene.Core/Lucene.Core.csproj b/src/Lucene.Core/Lucene.Core.csproj deleted file mode 100644 index 013eee3..0000000 --- a/src/Lucene.Core/Lucene.Core.csproj +++ /dev/null @@ -1,52 +0,0 @@ - - - - - 11.0 - Debug - AnyCPU - {ed2086bb-bcaf-49da-9c51-c2d777e6dee7} - Library - Properties - Lucene.Core1 - Lucene.Core1 - en-US - 512 - {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Profile259 - v4.5 - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4ec95a3c/src/Lucene.Core/Lucene.Core.kproj ---------------------------------------------------------------------- diff --git a/src/Lucene.Core/Lucene.Core.kproj b/src/Lucene.Core/Lucene.Core.kproj deleted file mode 100644 index 1a6583b..0000000 --- a/src/Lucene.Core/Lucene.Core.kproj +++ /dev/null @@ -1,32 +0,0 @@ - - - - 12.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - Debug - AnyCPU - - - - da771b45-fd68-420e-ba58-4a14cde80afa - Library - Lucene.Core - - - ConsoleDebugger - - - WebDebugger - - - - - 2.0 - - - - - - \ No newline at end of file http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4ec95a3c/src/Lucene.Core/project.json ---------------------------------------------------------------------- diff --git a/src/Lucene.Core/project.json b/src/Lucene.Core/project.json deleted file mode 100644 index 82f555e..0000000 --- a/src/Lucene.Core/project.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "dependencies": { - }, - - "configurations" : { - "net451" : { - "dependencies": { - } - }, - "k10" : { - "dependencies": { - "System.Runtime": "4.0.20.0" - } - } - } -} http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4ec95a3c/src/Lucene.Net.Core/Lucene.Net.Core.csproj ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Core/Lucene.Net.Core.csproj b/src/Lucene.Net.Core/Lucene.Net.Core.csproj index f883f44..e18f5fc 100644 --- a/src/Lucene.Net.Core/Lucene.Net.Core.csproj +++ b/src/Lucene.Net.Core/Lucene.Net.Core.csproj @@ -1,4 +1,24 @@  + http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4ec95a3c/src/Lucene.Net.Core/Lucene.Net.Core.kproj ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Core/Lucene.Net.Core.kproj b/src/Lucene.Net.Core/Lucene.Net.Core.kproj index d5c14b1..8ba0ccd 100644 --- a/src/Lucene.Net.Core/Lucene.Net.Core.kproj +++ b/src/Lucene.Net.Core/Lucene.Net.Core.kproj @@ -1,4 +1,24 @@  + 12.0 http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4ec95a3c/src/Lucene.Net.Core/default.ruleset ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Core/default.ruleset b/src/Lucene.Net.Core/default.ruleset index 58581e6..7770345 100644 --- a/src/Lucene.Net.Core/default.ruleset +++ b/src/Lucene.Net.Core/default.ruleset @@ -1,4 +1,24 @@  + http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4ec95a3c/src/Lucene.Net.Core/project.json ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Core/project.json b/src/Lucene.Net.Core/project.json index 891efc2..09d42b7 100644 --- a/src/Lucene.Net.Core/project.json +++ b/src/Lucene.Net.Core/project.json @@ -1,7 +1,8 @@ { + "licenses": ["apache 2.0"], "dependencies": { }, - + "license": "apache 2.0", "configurations" : { "net451" : { "dependencies": { http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4ec95a3c/test/Lucene.Net.Core.Tests/Lucene.Net.Core.Tests.csproj ---------------------------------------------------------------------- diff --git a/test/Lucene.Net.Core.Tests/Lucene.Net.Core.Tests.csproj b/test/Lucene.Net.Core.Tests/Lucene.Net.Core.Tests.csproj index ddb0f71..758b1e5 100644 --- a/test/Lucene.Net.Core.Tests/Lucene.Net.Core.Tests.csproj +++ b/test/Lucene.Net.Core.Tests/Lucene.Net.Core.Tests.csproj @@ -1,4 +1,24 @@  + @@ -16,6 +36,8 @@ {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} Profile259 v4.5 + ..\..\ + true true @@ -69,7 +91,9 @@ This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + 12.0 @@ -27,7 +47,6 @@ - http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4ec95a3c/test/Lucene.Net.Core.Tests/default.ruleset ---------------------------------------------------------------------- diff --git a/test/Lucene.Net.Core.Tests/default.ruleset b/test/Lucene.Net.Core.Tests/default.ruleset index 80f7fb6..9daf866 100644 --- a/test/Lucene.Net.Core.Tests/default.ruleset +++ b/test/Lucene.Net.Core.Tests/default.ruleset @@ -1,6 +1,26 @@  + - + http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4ec95a3c/test/Lucene.Net.Core.Tests/default1.ruleset ---------------------------------------------------------------------- diff --git a/test/Lucene.Net.Core.Tests/default1.ruleset b/test/Lucene.Net.Core.Tests/default1.ruleset deleted file mode 100644 index 8017df0..0000000 --- a/test/Lucene.Net.Core.Tests/default1.ruleset +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4ec95a3c/test/Lucene.Net.Core.Tests/packages.config ---------------------------------------------------------------------- diff --git a/test/Lucene.Net.Core.Tests/packages.config b/test/Lucene.Net.Core.Tests/packages.config index 8d179a3..b71d5c9 100644 --- a/test/Lucene.Net.Core.Tests/packages.config +++ b/test/Lucene.Net.Core.Tests/packages.config @@ -1,4 +1,24 @@  + http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4ec95a3c/test/Lucene.Net.Core.Tests/project.json ---------------------------------------------------------------------- diff --git a/test/Lucene.Net.Core.Tests/project.json b/test/Lucene.Net.Core.Tests/project.json index fd82053..ac20f75 100644 --- a/test/Lucene.Net.Core.Tests/project.json +++ b/test/Lucene.Net.Core.Tests/project.json @@ -1,4 +1,5 @@ { + "licenses": ["apache 2.0"], "compilationOptions": { "warningsAsErrors": false, "define": ["XUNIT"] http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4ec95a3c/test/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj ---------------------------------------------------------------------- diff --git a/test/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj b/test/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj index 4afee87..678cc40 100644 --- a/test/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj +++ b/test/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj @@ -1,4 +1,24 @@  + @@ -16,13 +36,15 @@ {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} Profile259 v4.5 + ..\..\ + true true full false bin\Debug\ - TRACE;DEBUG;PORTABLE + TRACE;DEBUG;PORTABLE;XUNIT prompt 4 @@ -59,7 +81,9 @@ This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + 12.0 http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4ec95a3c/test/Lucene.Net.TestFramework/Util/LuceneTestCase.cs ---------------------------------------------------------------------- diff --git a/test/Lucene.Net.TestFramework/Util/LuceneTestCase.cs b/test/Lucene.Net.TestFramework/Util/LuceneTestCase.cs index 1e78bd5..4f265e0 100644 --- a/test/Lucene.Net.TestFramework/Util/LuceneTestCase.cs +++ b/test/Lucene.Net.TestFramework/Util/LuceneTestCase.cs @@ -29,64 +29,81 @@ namespace Lucene.Net.TestFramework public class LuceneTestCase { - public LuceneTestCase() - { - } + public LuceneTestCase() + { + } +#if XUNIT + /// + /// Asserts that two object are the same. + /// + /// The expected value. + /// The actual value. [DebuggerHidden] - public static void Ok(bool condition, string message = null, params object[] values) + public static void Same(object expected, object actual) { -#if XUNIT - if (!string.IsNullOrWhiteSpace(message)) - { - var exceptionMessage = message; - - if(values != null && values.Length > 0) - { - exceptionMessage = String.Format(exceptionMessage, values); - } + Assert.Same(expected, actual); + } - Assert.True(condition, exceptionMessage); - } - else - { - Assert.True(condition); - } -#endif + /// + /// Assert that two objects are not the same. + /// + /// The expected value. + /// The actual value. + [DebuggerHidden] + public static void NotSame(object expected, object actual) + { + Assert.NotSame(expected, actual); } [DebuggerHidden] public static void Equal(string expected, string actual) { -#if XUNIT Assert.Equal(expected, actual); -#endif } [DebuggerHidden] public static void Equal(T expected, T actual) { -#if XUNIT Assert.Equal(expected, actual); -#endif } [DebuggerHidden] public static void Equal(IEnumerable expected, IEnumerable actual) { -#if XUNIT Assert.Equal(expected, actual); -#endif + } + + + + [DebuggerHidden] + public static void Ok(bool condition, string message = null, params object[] values) + { + if (!string.IsNullOrWhiteSpace(message)) + { + var exceptionMessage = message; + + if(values != null && values.Length > 0) + { + exceptionMessage = String.Format(exceptionMessage, values); + } + + Assert.True(condition, exceptionMessage); + } + else + { + Assert.True(condition); + } } [DebuggerHidden] public static void Throws(Action code) where T : Exception { -#if XUNIT Assert.Throws(code); -#endif } + + #endif } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4ec95a3c/test/Lucene.Net.TestFramework/packages.config ---------------------------------------------------------------------- diff --git a/test/Lucene.Net.TestFramework/packages.config b/test/Lucene.Net.TestFramework/packages.config index 8d179a3..b71d5c9 100644 --- a/test/Lucene.Net.TestFramework/packages.config +++ b/test/Lucene.Net.TestFramework/packages.config @@ -1,4 +1,24 @@  + http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4ec95a3c/test/Lucene.Net.TestFramework/project.json ---------------------------------------------------------------------- diff --git a/test/Lucene.Net.TestFramework/project.json b/test/Lucene.Net.TestFramework/project.json index cfa4794..87e426c 100644 --- a/test/Lucene.Net.TestFramework/project.json +++ b/test/Lucene.Net.TestFramework/project.json @@ -1,4 +1,5 @@ { + "licenses": ["apache 2.0"], "compilationOptions": { "warningsAsErrors": false, "define": ["XUNIT"]