You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucenenet.apache.org by sy...@apache.org on 2016/07/16 21:46:55 UTC
[1/3] lucenenet git commit: Clean unused references
Repository: lucenenet
Updated Branches:
refs/heads/analysis-work 30804e0c1 -> 2561993d7
Clean unused references
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/46be1f11
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/46be1f11
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/46be1f11
Branch: refs/heads/analysis-work
Commit: 46be1f1102a3736e1381b0cce1babb555ff28595
Parents: 0af102e
Author: Itamar Syn-Hershko <it...@code972.com>
Authored: Fri Jul 15 00:31:02 2016 +0300
Committer: Itamar Syn-Hershko <it...@code972.com>
Committed: Fri Jul 15 00:32:17 2016 +0300
----------------------------------------------------------------------
src/Lucene.Net.Core/Lucene.Net.csproj | 3 ---
src/Lucene.Net.Core/packages.config | 2 --
src/Lucene.Net.TestFramework/packages.config | 1 -
src/Lucene.Net.Tests/packages.config | 1 -
4 files changed, 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/46be1f11/src/Lucene.Net.Core/Lucene.Net.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Lucene.Net.csproj b/src/Lucene.Net.Core/Lucene.Net.csproj
index d52e4b0..62ba04c 100644
--- a/src/Lucene.Net.Core/Lucene.Net.csproj
+++ b/src/Lucene.Net.Core/Lucene.Net.csproj
@@ -39,9 +39,6 @@
<ItemGroup>
<Reference Include="Microsoft.CSharp" />
<Reference Include="System" />
- <Reference Include="System.Collections.Immutable">
- <HintPath>..\..\packages\Microsoft.Bcl.Immutable.1.0.34\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
- </Reference>
<Reference Include="System.configuration" />
<Reference Include="System.Core" />
<Reference Include="System.Data" />
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/46be1f11/src/Lucene.Net.Core/packages.config
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/packages.config b/src/Lucene.Net.Core/packages.config
index 40ec27e..6b8deb9 100644
--- a/src/Lucene.Net.Core/packages.config
+++ b/src/Lucene.Net.Core/packages.config
@@ -1,5 +1,3 @@
\ufeff<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="Microsoft.Bcl.Immutable" version="1.0.34" targetFramework="net451" />
- <package id="SharpZipLib" version="0.86.0" targetFramework="net40-Client" />
</packages>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/46be1f11/src/Lucene.Net.TestFramework/packages.config
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/packages.config b/src/Lucene.Net.TestFramework/packages.config
index 7a698ab..967502d 100644
--- a/src/Lucene.Net.TestFramework/packages.config
+++ b/src/Lucene.Net.TestFramework/packages.config
@@ -1,5 +1,4 @@
\ufeff<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="NUnit" version="2.6.3" targetFramework="net40" />
- <package id="SharpZipLib" version="0.86.0" targetFramework="net40" />
</packages>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/46be1f11/src/Lucene.Net.Tests/packages.config
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/packages.config b/src/Lucene.Net.Tests/packages.config
index 7a698ab..967502d 100644
--- a/src/Lucene.Net.Tests/packages.config
+++ b/src/Lucene.Net.Tests/packages.config
@@ -1,5 +1,4 @@
\ufeff<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="NUnit" version="2.6.3" targetFramework="net40" />
- <package id="SharpZipLib" version="0.86.0" targetFramework="net40" />
</packages>
\ No newline at end of file
[3/3] lucenenet git commit: Merge remote-tracking branch
'origin/master' into analysis-work
Posted by sy...@apache.org.
Merge remote-tracking branch 'origin/master' into analysis-work
# Conflicts:
# src/Lucene.Net.Core/packages.config
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/2561993d
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/2561993d
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/2561993d
Branch: refs/heads/analysis-work
Commit: 2561993d7e11d9e8933c0f5e1cb1bf2737b1f9d2
Parents: 30804e0 1d8582f
Author: Itamar Syn-Hershko <it...@code972.com>
Authored: Sat Jul 16 23:46:41 2016 +0300
Committer: Itamar Syn-Hershko <it...@code972.com>
Committed: Sat Jul 16 23:46:41 2016 +0300
----------------------------------------------------------------------
src/Lucene.Net.Core/Lucene.Net.csproj | 4 ++++
src/Lucene.Net.Core/packages.config | 3 ++-
2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/2561993d/src/Lucene.Net.Core/packages.config
----------------------------------------------------------------------
diff --cc src/Lucene.Net.Core/packages.config
index 6b8deb9,5d1cb40..aade4f9
--- a/src/Lucene.Net.Core/packages.config
+++ b/src/Lucene.Net.Core/packages.config
@@@ -1,3 -1,4 +1,4 @@@
\ufeff<?xml version="1.0" encoding="utf-8"?>
<packages>
- </packages>
+ <package id="System.Collections.Immutable" version="1.2.0" targetFramework="net451" />
-</packages>
++</packages>
[2/3] lucenenet git commit: Fixing compilation
Posted by sy...@apache.org.
Fixing compilation
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/1d8582f2
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/1d8582f2
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/1d8582f2
Branch: refs/heads/analysis-work
Commit: 1d8582f2c65c7e7d3f62d803250943457cb75223
Parents: 46be1f1
Author: Itamar Syn-Hershko <it...@code972.com>
Authored: Fri Jul 15 00:59:19 2016 +0300
Committer: Itamar Syn-Hershko <it...@code972.com>
Committed: Fri Jul 15 00:59:19 2016 +0300
----------------------------------------------------------------------
src/Lucene.Net.Core/Lucene.Net.csproj | 4 ++++
src/Lucene.Net.Core/packages.config | 1 +
2 files changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1d8582f2/src/Lucene.Net.Core/Lucene.Net.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Lucene.Net.csproj b/src/Lucene.Net.Core/Lucene.Net.csproj
index 62ba04c..51b08af 100644
--- a/src/Lucene.Net.Core/Lucene.Net.csproj
+++ b/src/Lucene.Net.Core/Lucene.Net.csproj
@@ -39,6 +39,10 @@
<ItemGroup>
<Reference Include="Microsoft.CSharp" />
<Reference Include="System" />
+ <Reference Include="System.Collections.Immutable, Version=1.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+ <HintPath>..\..\packages\System.Collections.Immutable.1.2.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
+ <Private>True</Private>
+ </Reference>
<Reference Include="System.configuration" />
<Reference Include="System.Core" />
<Reference Include="System.Data" />
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1d8582f2/src/Lucene.Net.Core/packages.config
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/packages.config b/src/Lucene.Net.Core/packages.config
index 6b8deb9..5d1cb40 100644
--- a/src/Lucene.Net.Core/packages.config
+++ b/src/Lucene.Net.Core/packages.config
@@ -1,3 +1,4 @@
\ufeff<?xml version="1.0" encoding="utf-8"?>
<packages>
+ <package id="System.Collections.Immutable" version="1.2.0" targetFramework="net451" />
</packages>
\ No newline at end of file