Lucene.Net.Replicator, Lucene.Net.Replicator.AspNetCore, Lucene.Net.Tests.Replicator: Ported to .NET Standard 1.5/.NET Core 1.0
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/4db2b0ae Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/4db2b0ae Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/4db2b0ae Branch: refs/heads/replicator Commit: 4db2b0ae921e42d9f3aaff5f4fe7a49c1ecb45f1 Parents: 1e6ce74 Author: Shad Storhaug <[email protected]> Authored: Thu Aug 17 05:30:05 2017 +0700 Committer: Shad Storhaug <[email protected]> Committed: Thu Aug 17 05:30:05 2017 +0700 ---------------------------------------------------------------------- Lucene.Net.Portable.sln | 30 +++++ .../Lucene.Net.Replicator.AspNetCore.csproj | 21 +-- ...ucene.Net.Replicator.AspNetCore.project.json | 11 ++ .../Lucene.Net.Replicator.AspNetCore.xproj | 18 +++ .../Properties/AssemblyInfo.cs | 30 ++++- .../packages.config | 9 -- .../project.json | 42 ++++++ .../Lucene.Net.Replicator.csproj | 9 +- .../Lucene.Net.Replicator.project.json | 11 ++ .../Lucene.Net.Replicator.xproj | 18 +++ .../Properties/AssemblyInfo.cs | 21 ++- src/Lucene.Net.Replicator/packages.config | 4 - src/Lucene.Net.Replicator/project.json | 46 +++++++ .../Http/HttpReplicatorTest.cs | 2 +- .../IndexAndTaxonomyReplicationClientTest.cs | 16 +-- .../IndexReplicationClientTest.cs | 10 +- .../IndexRevisionTest.cs | 4 +- .../LocalReplicatorTest.cs | 2 +- .../Lucene.Net.Tests.Replicator.csproj | 134 +------------------ .../Lucene.Net.Tests.Replicator.project.json | 13 ++ .../Lucene.Net.Tests.Replicator.xproj | 21 +++ .../Properties/AssemblyInfo.cs | 23 +++- .../SessionTokenTest.cs | 2 +- src/Lucene.Net.Tests.Replicator/packages.config | 52 ------- src/Lucene.Net.Tests.Replicator/project.json | 43 ++++++ 25 files changed, 351 insertions(+), 241 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4db2b0ae/Lucene.Net.Portable.sln ---------------------------------------------------------------------- diff --git a/Lucene.Net.Portable.sln b/Lucene.Net.Portable.sln index 5dbbd51..bab0ae5 100644 --- a/Lucene.Net.Portable.sln +++ b/Lucene.Net.Portable.sln @@ -111,6 +111,12 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Lucene.Net.Benchmark", "src EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Lucene.Net.Tests.Benchmark", "src\Lucene.Net.Tests.Benchmark\Lucene.Net.Tests.Benchmark.xproj", "{5356412F-8FC5-41D3-83C3-807740B06748}" EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Lucene.Net.Replicator", "src\Lucene.Net.Replicator\Lucene.Net.Replicator.xproj", "{7EF82DA1-570C-41A6-BBF3-E609E9AEE905}" +EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Lucene.Net.Replicator.AspNetCore", "src\Lucene.Net.Replicator.AspNetCore\Lucene.Net.Replicator.AspNetCore.xproj", "{338E63C1-CEAC-47C4-A89A-090C764BE274}" +EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Lucene.Net.Tests.Replicator", "src\Lucene.Net.Tests.Replicator\Lucene.Net.Tests.Replicator.xproj", "{685A1388-5D85-42D0-A98C-4EC3D0C01C5F}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -511,6 +517,30 @@ Global {5356412F-8FC5-41D3-83C3-807740B06748}.Release|Any CPU.Build.0 = Release|Any CPU {5356412F-8FC5-41D3-83C3-807740B06748}.Release|x86.ActiveCfg = Release|Any CPU {5356412F-8FC5-41D3-83C3-807740B06748}.Release|x86.Build.0 = Release|Any CPU + {7EF82DA1-570C-41A6-BBF3-E609E9AEE905}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7EF82DA1-570C-41A6-BBF3-E609E9AEE905}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7EF82DA1-570C-41A6-BBF3-E609E9AEE905}.Debug|x86.ActiveCfg = Debug|Any CPU + {7EF82DA1-570C-41A6-BBF3-E609E9AEE905}.Debug|x86.Build.0 = Debug|Any CPU + {7EF82DA1-570C-41A6-BBF3-E609E9AEE905}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7EF82DA1-570C-41A6-BBF3-E609E9AEE905}.Release|Any CPU.Build.0 = Release|Any CPU + {7EF82DA1-570C-41A6-BBF3-E609E9AEE905}.Release|x86.ActiveCfg = Release|Any CPU + {7EF82DA1-570C-41A6-BBF3-E609E9AEE905}.Release|x86.Build.0 = Release|Any CPU + {338E63C1-CEAC-47C4-A89A-090C764BE274}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {338E63C1-CEAC-47C4-A89A-090C764BE274}.Debug|Any CPU.Build.0 = Debug|Any CPU + {338E63C1-CEAC-47C4-A89A-090C764BE274}.Debug|x86.ActiveCfg = Debug|Any CPU + {338E63C1-CEAC-47C4-A89A-090C764BE274}.Debug|x86.Build.0 = Debug|Any CPU + {338E63C1-CEAC-47C4-A89A-090C764BE274}.Release|Any CPU.ActiveCfg = Release|Any CPU + {338E63C1-CEAC-47C4-A89A-090C764BE274}.Release|Any CPU.Build.0 = Release|Any CPU + {338E63C1-CEAC-47C4-A89A-090C764BE274}.Release|x86.ActiveCfg = Release|Any CPU + {338E63C1-CEAC-47C4-A89A-090C764BE274}.Release|x86.Build.0 = Release|Any CPU + {685A1388-5D85-42D0-A98C-4EC3D0C01C5F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {685A1388-5D85-42D0-A98C-4EC3D0C01C5F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {685A1388-5D85-42D0-A98C-4EC3D0C01C5F}.Debug|x86.ActiveCfg = Debug|Any CPU + {685A1388-5D85-42D0-A98C-4EC3D0C01C5F}.Debug|x86.Build.0 = Debug|Any CPU + {685A1388-5D85-42D0-A98C-4EC3D0C01C5F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {685A1388-5D85-42D0-A98C-4EC3D0C01C5F}.Release|Any CPU.Build.0 = Release|Any CPU + {685A1388-5D85-42D0-A98C-4EC3D0C01C5F}.Release|x86.ActiveCfg = Release|Any CPU + {685A1388-5D85-42D0-A98C-4EC3D0C01C5F}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4db2b0ae/src/Lucene.Net.Replicator.AspNetCore/Lucene.Net.Replicator.AspNetCore.csproj ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Replicator.AspNetCore/Lucene.Net.Replicator.AspNetCore.csproj b/src/Lucene.Net.Replicator.AspNetCore/Lucene.Net.Replicator.AspNetCore.csproj index e4345b0..8d71c07 100644 --- a/src/Lucene.Net.Replicator.AspNetCore/Lucene.Net.Replicator.AspNetCore.csproj +++ b/src/Lucene.Net.Replicator.AspNetCore/Lucene.Net.Replicator.AspNetCore.csproj @@ -30,25 +30,9 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> - <Reference Include="Microsoft.AspNetCore.Http.Abstractions, Version=1.0.3.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL"> - <HintPath>..\..\packages\Microsoft.AspNetCore.Http.Abstractions.1.0.3\lib\net451\Microsoft.AspNetCore.Http.Abstractions.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="Microsoft.AspNetCore.Http.Features, Version=1.0.3.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL"> - <HintPath>..\..\packages\Microsoft.AspNetCore.Http.Features.1.0.3\lib\net451\Microsoft.AspNetCore.Http.Features.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="Microsoft.Extensions.Primitives, Version=1.0.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL"> - <HintPath>..\..\packages\Microsoft.Extensions.Primitives.1.0.1\lib\netstandard1.0\Microsoft.Extensions.Primitives.dll</HintPath> - <Private>True</Private> - </Reference> <Reference Include="System" /> <Reference Include="System.ComponentModel.Composition" /> <Reference Include="System.Core" /> - <Reference Include="System.Text.Encodings.Web, Version=4.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"> - <HintPath>..\..\packages\System.Text.Encodings.Web.4.0.1\lib\netstandard1.0\System.Text.Encodings.Web.dll</HintPath> - <Private>True</Private> - </Reference> <Reference Include="System.Xml.Linq" /> <Reference Include="System.Data.DataSetExtensions" /> <Reference Include="Microsoft.CSharp" /> @@ -61,10 +45,13 @@ <Compile Include="AspNetCoreReplicationResponse.cs" /> <Compile Include="AspNetCoreReplicationServiceExtentions.cs" /> <Compile Include="Properties\AssemblyInfo.cs" /> + <Compile Include="..\CommonAssemblyInfo.cs"> + <Link>Properties\CommonAssemblyInfo.cs</Link> + </Compile> </ItemGroup> <ItemGroup> <None Include="examples.md" /> - <None Include="packages.config" /> + <None Include="Lucene.Net.Replicator.AspNetCore.project.json" /> </ItemGroup> <ItemGroup> <ProjectReference Include="..\Lucene.Net.Replicator\Lucene.Net.Replicator.csproj"> http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4db2b0ae/src/Lucene.Net.Replicator.AspNetCore/Lucene.Net.Replicator.AspNetCore.project.json ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Replicator.AspNetCore/Lucene.Net.Replicator.AspNetCore.project.json b/src/Lucene.Net.Replicator.AspNetCore/Lucene.Net.Replicator.AspNetCore.project.json new file mode 100644 index 0000000..1957363 --- /dev/null +++ b/src/Lucene.Net.Replicator.AspNetCore/Lucene.Net.Replicator.AspNetCore.project.json @@ -0,0 +1,11 @@ +{ + "runtimes": { + "win": {} + }, + "dependencies": { + "Microsoft.AspNetCore.Http.Abstractions": "1.0.3" + }, + "frameworks": { + "net451": {} + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4db2b0ae/src/Lucene.Net.Replicator.AspNetCore/Lucene.Net.Replicator.AspNetCore.xproj ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Replicator.AspNetCore/Lucene.Net.Replicator.AspNetCore.xproj b/src/Lucene.Net.Replicator.AspNetCore/Lucene.Net.Replicator.AspNetCore.xproj new file mode 100644 index 0000000..ac0df83 --- /dev/null +++ b/src/Lucene.Net.Replicator.AspNetCore/Lucene.Net.Replicator.AspNetCore.xproj @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0.25420" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0.25420</VisualStudioVersion> + <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath> + </PropertyGroup> + <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" /> + <PropertyGroup Label="Globals"> + <ProjectGuid>338e63c1-ceac-47c4-a89a-090c764be274</ProjectGuid> + <RootNamespace>Lucene.Net.Replicator.AspNetCore</RootNamespace> + <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath> + <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath> + </PropertyGroup> + <PropertyGroup> + <SchemaVersion>2.0</SchemaVersion> + </PropertyGroup> + <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" /> +</Project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4db2b0ae/src/Lucene.Net.Replicator.AspNetCore/Properties/AssemblyInfo.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Replicator.AspNetCore/Properties/AssemblyInfo.cs b/src/Lucene.Net.Replicator.AspNetCore/Properties/AssemblyInfo.cs index c0e4fd2..f4c3a95 100644 --- a/src/Lucene.Net.Replicator.AspNetCore/Properties/AssemblyInfo.cs +++ b/src/Lucene.Net.Replicator.AspNetCore/Properties/AssemblyInfo.cs @@ -1,4 +1,26 @@ -using System.Reflection; +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * +*/ + +using System; +using System.Reflection; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; @@ -6,12 +28,14 @@ using System.Runtime.InteropServices; // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("Lucene.Net.Replicator.AspNetCore")] -[assembly: AssemblyDescription("AspNetCore implementation of request and response abstractions for the Lucene.Net.Replicator " + - "for the Lucene.Net full - text search engine library from The Apache Software Foundation.")] +[assembly: AssemblyDescription("AspNetCore integration of Lucene.Net.Replicator " + + "for the Lucene.Net full-text search engine library from The Apache Software Foundation.")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyDefaultAlias("Lucene.Net.Replicator.AspNetCore")] [assembly: AssemblyCulture("")] +[assembly: CLSCompliant(true)] + // Setting ComVisible to false makes the types in this assembly not visible // to COM components. If you need to access a type in this assembly from // COM, set the ComVisible attribute to true on that type. http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4db2b0ae/src/Lucene.Net.Replicator.AspNetCore/packages.config ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Replicator.AspNetCore/packages.config b/src/Lucene.Net.Replicator.AspNetCore/packages.config deleted file mode 100644 index 3ffed90..0000000 --- a/src/Lucene.Net.Replicator.AspNetCore/packages.config +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<packages> - <package id="Microsoft.AspNetCore.Http.Abstractions" version="1.0.3" targetFramework="net451" /> - <package id="Microsoft.AspNetCore.Http.Features" version="1.0.3" targetFramework="net451" /> - <package id="Microsoft.Extensions.Primitives" version="1.0.1" targetFramework="net451" /> - <package id="System.Resources.ResourceManager" version="4.0.1" targetFramework="net451" /> - <package id="System.Runtime" version="4.1.0" targetFramework="net451" /> - <package id="System.Text.Encodings.Web" version="4.0.1" targetFramework="net451" /> -</packages> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4db2b0ae/src/Lucene.Net.Replicator.AspNetCore/project.json ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Replicator.AspNetCore/project.json b/src/Lucene.Net.Replicator.AspNetCore/project.json new file mode 100644 index 0000000..23ec8c2 --- /dev/null +++ b/src/Lucene.Net.Replicator.AspNetCore/project.json @@ -0,0 +1,42 @@ +{ + "version": "4.8.0", + "title": "Lucene.Net.Replicator.AspNetCore", + "description": "AspNetCore integration of Lucene.Net.Replicator for the Lucene.Net full-text search engine library from The Apache Software Foundation.", + "authors": [ "The Apache Software Foundation" ], + "packOptions": { + "projectUrl": "http://lucenenet.apache.org/", + "licenseUrl": "https://github.com/apache/lucenenet/blob/master/LICENSE.txt", + "iconUrl": "https://github.com/apache/lucenenet/blob/master/branding/logo/lucene-net-icon-128x128.png?raw=true", + "owners": [ "The Apache Software Foundation" ], + "repository": { "url": "https://github.com/apache/lucenenet" }, + "tags": [ "lucene.net", "core", "text", "search", "information", "retrieval", "lucene", "apache", "analysis", "index", "query", "files", "replication", "replicate", "aspnetcore" ] + }, + "buildOptions": { + "compile": { + "includeFiles": [ "../CommonAssemblyInfo.cs" ] + }, + "nowarn": [ "1591", "1573" ] + }, + "dependencies": { + "Lucene.Net.Replicator": "4.8.0", + "Microsoft.AspNetCore.Http.Abstractions": "1.0.3" + }, + "frameworks": { + "netstandard1.5": { + "imports": "dnxcore50", + "buildOptions": { + "debugType": "portable", + "define": [ "NETSTANDARD" ] + }, + "dependencies": { + "NETStandard.Library": "1.6.0" + } + }, + "net451": { + "buildOptions": { + "debugType": "full", + "define": [ "FEATURE_SERIALIZABLE" ] + } + } + } +} http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4db2b0ae/src/Lucene.Net.Replicator/Lucene.Net.Replicator.csproj ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Replicator/Lucene.Net.Replicator.csproj b/src/Lucene.Net.Replicator/Lucene.Net.Replicator.csproj index 5efeb74..7ea6243 100644 --- a/src/Lucene.Net.Replicator/Lucene.Net.Replicator.csproj +++ b/src/Lucene.Net.Replicator/Lucene.Net.Replicator.csproj @@ -53,10 +53,6 @@ <DefineConstants>$(DefineConstants);FEATURE_SERIALIZABLE</DefineConstants> </PropertyGroup> <ItemGroup> - <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"> - <HintPath>..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath> - <Private>True</Private> - </Reference> <Reference Include="System" /> <Reference Include="System.Core" /> <Reference Include="System.Xml.Linq" /> @@ -86,6 +82,9 @@ <Compile Include="RevisionFile.cs" /> <Compile Include="SessionExpiredException.cs" /> <Compile Include="SessionToken.cs" /> + <Compile Include="..\CommonAssemblyInfo.cs"> + <Link>Properties\CommonAssemblyInfo.cs</Link> + </Compile> </ItemGroup> <ItemGroup> <ProjectReference Include="..\Lucene.Net.Facet\Lucene.Net.Facet.csproj"> @@ -98,7 +97,7 @@ </ProjectReference> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> + <None Include="Lucene.Net.Replicator.project.json" /> </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> </Project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4db2b0ae/src/Lucene.Net.Replicator/Lucene.Net.Replicator.project.json ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Replicator/Lucene.Net.Replicator.project.json b/src/Lucene.Net.Replicator/Lucene.Net.Replicator.project.json new file mode 100644 index 0000000..f19c540 --- /dev/null +++ b/src/Lucene.Net.Replicator/Lucene.Net.Replicator.project.json @@ -0,0 +1,11 @@ +{ + "runtimes": { + "win": {} + }, + "dependencies": { + "Newtonsoft.Json": "9.0.1" + }, + "frameworks": { + "net451": {} + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4db2b0ae/src/Lucene.Net.Replicator/Lucene.Net.Replicator.xproj ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Replicator/Lucene.Net.Replicator.xproj b/src/Lucene.Net.Replicator/Lucene.Net.Replicator.xproj new file mode 100644 index 0000000..1ab83cf --- /dev/null +++ b/src/Lucene.Net.Replicator/Lucene.Net.Replicator.xproj @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0.25420" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0.25420</VisualStudioVersion> + <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath> + </PropertyGroup> + <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" /> + <PropertyGroup Label="Globals"> + <ProjectGuid>7ef82da1-570c-41a6-bbf3-e609e9aee905</ProjectGuid> + <RootNamespace>Lucene.Net.Replicator</RootNamespace> + <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath> + <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath> + </PropertyGroup> + <PropertyGroup> + <SchemaVersion>2.0</SchemaVersion> + </PropertyGroup> + <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" /> +</Project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4db2b0ae/src/Lucene.Net.Replicator/Properties/AssemblyInfo.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Replicator/Properties/AssemblyInfo.cs b/src/Lucene.Net.Replicator/Properties/AssemblyInfo.cs index 6cc1e58..1f1835b 100644 --- a/src/Lucene.Net.Replicator/Properties/AssemblyInfo.cs +++ b/src/Lucene.Net.Replicator/Properties/AssemblyInfo.cs @@ -1,4 +1,21 @@ -using System; +/* +* Licensed to the Apache Software Foundation (ASF) under one or more +* contributor license agreements. See the NOTICE file distributed with +* this work for additional information regarding copyright ownership. +* The ASF licenses this file to You under the Apache License, Version 2.0 +* (the "License"); you may not use this file except in compliance with +* the License. You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +using System; using System.Reflection; using System.Runtime.InteropServices; @@ -6,7 +23,7 @@ using System.Runtime.InteropServices; // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("Lucene.Net.Replicator")] -[assembly: AssemblyDescription("Replicator that allows replication of Lucene.Net files between a server and client(s) " + +[assembly: AssemblyDescription("Replicator that allows replication of files between a server and client(s) " + "for the Lucene.Net full - text search engine library from The Apache Software Foundation.")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyDefaultAlias("Lucene.Net.Replicator")] http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4db2b0ae/src/Lucene.Net.Replicator/packages.config ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Replicator/packages.config b/src/Lucene.Net.Replicator/packages.config deleted file mode 100644 index 3e14be6..0000000 --- a/src/Lucene.Net.Replicator/packages.config +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<packages> - <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net451" /> -</packages> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4db2b0ae/src/Lucene.Net.Replicator/project.json ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Replicator/project.json b/src/Lucene.Net.Replicator/project.json new file mode 100644 index 0000000..11cd0e1 --- /dev/null +++ b/src/Lucene.Net.Replicator/project.json @@ -0,0 +1,46 @@ +{ + "version": "4.8.0", + "title": "Lucene.Net.Replicator", + "description": "Replicator that allows replication of files between a server and client(s) for the Lucene.Net full-text search engine library from The Apache Software Foundation.", + "authors": [ "The Apache Software Foundation" ], + "packOptions": { + "projectUrl": "http://lucenenet.apache.org/", + "licenseUrl": "https://github.com/apache/lucenenet/blob/master/LICENSE.txt", + "iconUrl": "https://github.com/apache/lucenenet/blob/master/branding/logo/lucene-net-icon-128x128.png?raw=true", + "owners": [ "The Apache Software Foundation" ], + "repository": { "url": "https://github.com/apache/lucenenet" }, + "tags": [ "lucene.net", "core", "text", "search", "information", "retrieval", "lucene", "apache", "analysis", "index", "query", "files", "replication", "replicate" ] + }, + "buildOptions": { + "compile": { + "includeFiles": [ "../CommonAssemblyInfo.cs" ] + }, + "nowarn": [ "1591", "1573" ] + }, + "dependencies": { + "Lucene.Net": "4.8.0", + "Lucene.Net.Facet": "4.8.0", + "Newtonsoft.Json": "9.0.1" + }, + "frameworks": { + "netstandard1.5": { + "imports": "dnxcore50", + "buildOptions": { + "debugType": "portable", + "define": [ "NETSTANDARD" ] + }, + "dependencies": { + "NETStandard.Library": "1.6.0" + } + }, + "net451": { + "buildOptions": { + "debugType": "full", + "define": [ "FEATURE_SERIALIZABLE" ] + }, + "frameworkAssemblies": { + "System.Net.Http": "4.0.0.0" + } + } + } +} http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4db2b0ae/src/Lucene.Net.Tests.Replicator/Http/HttpReplicatorTest.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.Replicator/Http/HttpReplicatorTest.cs b/src/Lucene.Net.Tests.Replicator/Http/HttpReplicatorTest.cs index 564eceb..b3061ad 100644 --- a/src/Lucene.Net.Tests.Replicator/Http/HttpReplicatorTest.cs +++ b/src/Lucene.Net.Tests.Replicator/Http/HttpReplicatorTest.cs @@ -95,7 +95,7 @@ namespace Lucene.Net.Replicator.Http public void TestBasic() { IReplicator replicator = new HttpReplicator(host, port, ReplicationService.REPLICATION_CONTEXT + "/s1", server.CreateHandler()); - ReplicationClient client = new ReplicationClient(replicator, new IndexReplicationHandler(handlerIndexDir, null), + ReplicationClient client = new ReplicationClient(replicator, new IndexReplicationHandler(handlerIndexDir, null), new PerSessionDirectoryFactory(clientWorkDir.FullName)); PublishRevision(1); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4db2b0ae/src/Lucene.Net.Tests.Replicator/IndexAndTaxonomyReplicationClientTest.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.Replicator/IndexAndTaxonomyReplicationClientTest.cs b/src/Lucene.Net.Tests.Replicator/IndexAndTaxonomyReplicationClientTest.cs index 4b93b49..3a77760 100644 --- a/src/Lucene.Net.Tests.Replicator/IndexAndTaxonomyReplicationClientTest.cs +++ b/src/Lucene.Net.Tests.Replicator/IndexAndTaxonomyReplicationClientTest.cs @@ -303,7 +303,7 @@ namespace Lucene.Net.Replicator // where the handler overwrites an existing index file, but // there's nothing currently we can do about it, unless we don't // use MDW. - handlerIndexDir.PreventDoubleWrite=(false); + handlerIndexDir.PreventDoubleWrite = (false); handlerTaxoDir.PreventDoubleWrite = (false); // wrap sourceDirFactory to return a MockDirWrapper so we can simulate errors @@ -330,12 +330,12 @@ namespace Lucene.Net.Replicator // disable errors -- maybe randomness didn't exhaust all allowed failures, // and we don't want e.g. CheckIndex to hit false errors. - handlerIndexDir.MaxSizeInBytes=(0); - handlerIndexDir.RandomIOExceptionRate=(0.0); - handlerIndexDir.RandomIOExceptionRateOnOpen=(0.0); - handlerTaxoDir.MaxSizeInBytes=(0); - handlerTaxoDir.RandomIOExceptionRate=(0.0); - handlerTaxoDir.RandomIOExceptionRateOnOpen=(0.0); + handlerIndexDir.MaxSizeInBytes = (0); + handlerIndexDir.RandomIOExceptionRate = (0.0); + handlerIndexDir.RandomIOExceptionRateOnOpen = (0.0); + handlerTaxoDir.MaxSizeInBytes = (0); + handlerTaxoDir.RandomIOExceptionRate = (0.0); + handlerTaxoDir.RandomIOExceptionRateOnOpen = (0.0); } private class SourceDirectoryFactoryAnonymousInnerClass : ISourceDirectoryFactory @@ -378,7 +378,7 @@ namespace Lucene.Net.Replicator { // handler should fail if (Random().nextBoolean()) { // index dir fail - test.handlerIndexDir.MaxSizeInBytes=(handlerIndexMaxSize); + test.handlerIndexDir.MaxSizeInBytes = (handlerIndexMaxSize); test.handlerIndexDir.RandomIOExceptionRate = (handlerIndexExRate); test.handlerIndexDir.RandomIOExceptionRateOnOpen = (handlerIndexExRate); handlerIndexMaxSize *= 2; http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4db2b0ae/src/Lucene.Net.Tests.Replicator/IndexReplicationClientTest.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.Replicator/IndexReplicationClientTest.cs b/src/Lucene.Net.Tests.Replicator/IndexReplicationClientTest.cs index 4e816a4..65f416b 100644 --- a/src/Lucene.Net.Tests.Replicator/IndexReplicationClientTest.cs +++ b/src/Lucene.Net.Tests.Replicator/IndexReplicationClientTest.cs @@ -263,8 +263,8 @@ namespace Lucene.Net.Replicator // disable errors -- maybe randomness didn't exhaust all allowed failures, // and we don't want e.g. CheckIndex to hit false errors. handlerDir.MaxSizeInBytes = 0; - handlerDir.RandomIOExceptionRate=0.0; - handlerDir.RandomIOExceptionRateOnOpen=0.0; + handlerDir.RandomIOExceptionRate = 0.0; + handlerDir.RandomIOExceptionRateOnOpen = 0.0; } private class SourceDirectoryFactoryAnonymousInnerClass : ISourceDirectoryFactory @@ -377,11 +377,13 @@ namespace Lucene.Net.Replicator } } } - } else { + } + else + { throw exception; } } } - + } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4db2b0ae/src/Lucene.Net.Tests.Replicator/IndexRevisionTest.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.Replicator/IndexRevisionTest.cs b/src/Lucene.Net.Tests.Replicator/IndexRevisionTest.cs index 22d88be..cea6e51 100644 --- a/src/Lucene.Net.Tests.Replicator/IndexRevisionTest.cs +++ b/src/Lucene.Net.Tests.Replicator/IndexRevisionTest.cs @@ -145,8 +145,8 @@ namespace Lucene.Net.Replicator IndexInput src = dir.OpenInput(file.FileName, IOContext.READ_ONCE); Stream @in = rev.Open(source, file.FileName); assertEquals(src.Length, @in.Length); - byte[] srcBytes = new byte[(int) src.Length]; - byte[] inBytes = new byte[(int) src.Length]; + byte[] srcBytes = new byte[(int)src.Length]; + byte[] inBytes = new byte[(int)src.Length]; int offset = 0; if (Random().nextBoolean()) { http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4db2b0ae/src/Lucene.Net.Tests.Replicator/LocalReplicatorTest.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.Replicator/LocalReplicatorTest.cs b/src/Lucene.Net.Tests.Replicator/LocalReplicatorTest.cs index 65f37bc..0a73674 100644 --- a/src/Lucene.Net.Tests.Replicator/LocalReplicatorTest.cs +++ b/src/Lucene.Net.Tests.Replicator/LocalReplicatorTest.cs @@ -68,7 +68,7 @@ namespace Lucene.Net.Replicator { assertNull(replicator.CheckForUpdate(null)); } - + [Test] public void TestObtainFileAlreadyClosed() { http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4db2b0ae/src/Lucene.Net.Tests.Replicator/Lucene.Net.Tests.Replicator.csproj ---------------------------------------------------------------------- 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 41cb28d..cb21da7 100644 --- a/src/Lucene.Net.Tests.Replicator/Lucene.Net.Tests.Replicator.csproj +++ b/src/Lucene.Net.Tests.Replicator/Lucene.Net.Tests.Replicator.csproj @@ -30,137 +30,9 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> - <Reference Include="Microsoft.AspNetCore.Hosting, Version=1.0.3.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL"> - <HintPath>..\..\packages\Microsoft.AspNetCore.Hosting.1.0.3\lib\net451\Microsoft.AspNetCore.Hosting.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="Microsoft.AspNetCore.Hosting.Abstractions, Version=1.0.3.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL"> - <HintPath>..\..\packages\Microsoft.AspNetCore.Hosting.Abstractions.1.0.3\lib\net451\Microsoft.AspNetCore.Hosting.Abstractions.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="Microsoft.AspNetCore.Hosting.Server.Abstractions, Version=1.0.3.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL"> - <HintPath>..\..\packages\Microsoft.AspNetCore.Hosting.Server.Abstractions.1.0.3\lib\net451\Microsoft.AspNetCore.Hosting.Server.Abstractions.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="Microsoft.AspNetCore.Http, Version=1.0.3.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL"> - <HintPath>..\..\packages\Microsoft.AspNetCore.Http.1.0.3\lib\net451\Microsoft.AspNetCore.Http.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="Microsoft.AspNetCore.Http.Abstractions, Version=1.0.3.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL"> - <HintPath>..\..\packages\Microsoft.AspNetCore.Http.Abstractions.1.0.3\lib\net451\Microsoft.AspNetCore.Http.Abstractions.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="Microsoft.AspNetCore.Http.Extensions, Version=1.0.3.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL"> - <HintPath>..\..\packages\Microsoft.AspNetCore.Http.Extensions.1.0.3\lib\net451\Microsoft.AspNetCore.Http.Extensions.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="Microsoft.AspNetCore.Http.Features, Version=1.0.3.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL"> - <HintPath>..\..\packages\Microsoft.AspNetCore.Http.Features.1.0.3\lib\net451\Microsoft.AspNetCore.Http.Features.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="Microsoft.AspNetCore.TestHost, Version=1.0.3.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL"> - <HintPath>..\..\packages\Microsoft.AspNetCore.TestHost.1.0.3\lib\net451\Microsoft.AspNetCore.TestHost.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="Microsoft.AspNetCore.WebUtilities, Version=1.0.3.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL"> - <HintPath>..\..\packages\Microsoft.AspNetCore.WebUtilities.1.0.3\lib\net451\Microsoft.AspNetCore.WebUtilities.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="Microsoft.Extensions.Configuration, Version=1.0.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL"> - <HintPath>..\..\packages\Microsoft.Extensions.Configuration.1.0.2\lib\netstandard1.1\Microsoft.Extensions.Configuration.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="Microsoft.Extensions.Configuration.Abstractions, Version=1.0.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL"> - <HintPath>..\..\packages\Microsoft.Extensions.Configuration.Abstractions.1.0.2\lib\netstandard1.0\Microsoft.Extensions.Configuration.Abstractions.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="Microsoft.Extensions.Configuration.EnvironmentVariables, Version=1.0.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL"> - <HintPath>..\..\packages\Microsoft.Extensions.Configuration.EnvironmentVariables.1.0.2\lib\net451\Microsoft.Extensions.Configuration.EnvironmentVariables.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="Microsoft.Extensions.DependencyInjection, Version=1.0.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL"> - <HintPath>..\..\packages\Microsoft.Extensions.DependencyInjection.1.0.2\lib\netstandard1.1\Microsoft.Extensions.DependencyInjection.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=1.0.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL"> - <HintPath>..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.1.0.2\lib\netstandard1.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="Microsoft.Extensions.FileProviders.Abstractions, Version=1.0.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL"> - <HintPath>..\..\packages\Microsoft.Extensions.FileProviders.Abstractions.1.0.1\lib\netstandard1.0\Microsoft.Extensions.FileProviders.Abstractions.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="Microsoft.Extensions.FileProviders.Physical, Version=1.0.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL"> - <HintPath>..\..\packages\Microsoft.Extensions.FileProviders.Physical.1.0.1\lib\net451\Microsoft.Extensions.FileProviders.Physical.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="Microsoft.Extensions.FileSystemGlobbing, Version=1.0.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL"> - <HintPath>..\..\packages\Microsoft.Extensions.FileSystemGlobbing.1.0.1\lib\net451\Microsoft.Extensions.FileSystemGlobbing.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="Microsoft.Extensions.Logging, Version=1.0.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL"> - <HintPath>..\..\packages\Microsoft.Extensions.Logging.1.0.2\lib\netstandard1.1\Microsoft.Extensions.Logging.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=1.0.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL"> - <HintPath>..\..\packages\Microsoft.Extensions.Logging.Abstractions.1.0.2\lib\netstandard1.1\Microsoft.Extensions.Logging.Abstractions.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="Microsoft.Extensions.ObjectPool, Version=1.0.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL"> - <HintPath>..\..\packages\Microsoft.Extensions.ObjectPool.1.0.1\lib\net451\Microsoft.Extensions.ObjectPool.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="Microsoft.Extensions.Options, Version=1.0.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL"> - <HintPath>..\..\packages\Microsoft.Extensions.Options.1.0.2\lib\netstandard1.0\Microsoft.Extensions.Options.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="Microsoft.Extensions.PlatformAbstractions, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL"> - <HintPath>..\..\packages\Microsoft.Extensions.PlatformAbstractions.1.0.0\lib\net451\Microsoft.Extensions.PlatformAbstractions.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="Microsoft.Extensions.Primitives, Version=1.0.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL"> - <HintPath>..\..\packages\Microsoft.Extensions.Primitives.1.0.1\lib\netstandard1.0\Microsoft.Extensions.Primitives.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="Microsoft.Net.Http.Headers, Version=1.0.3.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL"> - <HintPath>..\..\packages\Microsoft.Net.Http.Headers.1.0.3\lib\netstandard1.1\Microsoft.Net.Http.Headers.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"> - <HintPath>..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="nunit.framework, Version=3.5.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL"> - <HintPath>..\..\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll</HintPath> - <Private>True</Private> - </Reference> <Reference Include="System" /> - <Reference Include="System.Buffers, Version=4.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"> - <HintPath>..\..\packages\System.Buffers.4.0.0\lib\netstandard1.1\System.Buffers.dll</HintPath> - <Private>True</Private> - </Reference> - <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.ComponentModel.Composition" /> <Reference Include="System.Core" /> - <Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"> - <HintPath>..\..\packages\System.Diagnostics.DiagnosticSource.4.0.0\lib\portable-net45+win8+wpa81\System.Diagnostics.DiagnosticSource.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="System.Reflection.Metadata, Version=1.3.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> - <HintPath>..\..\packages\System.Reflection.Metadata.1.3.0\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> - <HintPath>..\..\packages\System.Runtime.InteropServices.RuntimeInformation.4.0.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="System.Text.Encodings.Web, Version=4.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"> - <HintPath>..\..\packages\System.Text.Encodings.Web.4.0.1\lib\netstandard1.0\System.Text.Encodings.Web.dll</HintPath> - <Private>True</Private> - </Reference> <Reference Include="System.Xml.Linq" /> <Reference Include="System.Data.DataSetExtensions" /> <Reference Include="Microsoft.CSharp" /> @@ -184,9 +56,6 @@ <Compile Include="SessionTokenTest.cs" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> - </ItemGroup> - <ItemGroup> <ProjectReference Include="..\Lucene.Net.Facet\Lucene.Net.Facet.csproj"> <Project>{48F7884A-9454-4E88-8413-9D35992CB440}</Project> <Name>Lucene.Net.Facet</Name> @@ -211,6 +80,9 @@ <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <ItemGroup> + <None Include="Lucene.Net.Tests.Replicator.project.json" /> + </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. Other similar extension points exist, see Microsoft.Common.targets. http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4db2b0ae/src/Lucene.Net.Tests.Replicator/Lucene.Net.Tests.Replicator.project.json ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.Replicator/Lucene.Net.Tests.Replicator.project.json b/src/Lucene.Net.Tests.Replicator/Lucene.Net.Tests.Replicator.project.json new file mode 100644 index 0000000..4a31f14 --- /dev/null +++ b/src/Lucene.Net.Tests.Replicator/Lucene.Net.Tests.Replicator.project.json @@ -0,0 +1,13 @@ +{ + "runtimes": { + "win": {} + }, + "dependencies": { + "Microsoft.AspNetCore.TestHost": "1.0.3", + "Newtonsoft.Json": "9.0.1", + "NUnit": "3.5.0" + }, + "frameworks": { + "net451": {} + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4db2b0ae/src/Lucene.Net.Tests.Replicator/Lucene.Net.Tests.Replicator.xproj ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.Replicator/Lucene.Net.Tests.Replicator.xproj b/src/Lucene.Net.Tests.Replicator/Lucene.Net.Tests.Replicator.xproj new file mode 100644 index 0000000..02b9bb3 --- /dev/null +++ b/src/Lucene.Net.Tests.Replicator/Lucene.Net.Tests.Replicator.xproj @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0.25420" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0.25420</VisualStudioVersion> + <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath> + </PropertyGroup> + <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" /> + <PropertyGroup Label="Globals"> + <ProjectGuid>685a1388-5d85-42d0-a98c-4ec3d0c01c5f</ProjectGuid> + <RootNamespace>Lucene.Net.Replicator</RootNamespace> + <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath> + <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath> + </PropertyGroup> + <PropertyGroup> + <SchemaVersion>2.0</SchemaVersion> + </PropertyGroup> + <ItemGroup> + <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" /> + </ItemGroup> + <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" /> +</Project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4db2b0ae/src/Lucene.Net.Tests.Replicator/Properties/AssemblyInfo.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.Replicator/Properties/AssemblyInfo.cs b/src/Lucene.Net.Tests.Replicator/Properties/AssemblyInfo.cs index 457c56c..b71db2a 100644 --- a/src/Lucene.Net.Tests.Replicator/Properties/AssemblyInfo.cs +++ b/src/Lucene.Net.Tests.Replicator/Properties/AssemblyInfo.cs @@ -1,4 +1,25 @@ -using System.Reflection; +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * +*/ + +using System.Reflection; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4db2b0ae/src/Lucene.Net.Tests.Replicator/SessionTokenTest.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.Replicator/SessionTokenTest.cs b/src/Lucene.Net.Tests.Replicator/SessionTokenTest.cs index 5f01824..46fd22c 100644 --- a/src/Lucene.Net.Tests.Replicator/SessionTokenTest.cs +++ b/src/Lucene.Net.Tests.Replicator/SessionTokenTest.cs @@ -58,6 +58,6 @@ namespace Lucene.Net.Replicator IOUtils.Dispose(writer, directory); } - + } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4db2b0ae/src/Lucene.Net.Tests.Replicator/packages.config ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.Replicator/packages.config b/src/Lucene.Net.Tests.Replicator/packages.config deleted file mode 100644 index 1f96d54..0000000 --- a/src/Lucene.Net.Tests.Replicator/packages.config +++ /dev/null @@ -1,52 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<packages> - <package id="Microsoft.AspNetCore.Hosting" version="1.0.3" targetFramework="net451" /> - <package id="Microsoft.AspNetCore.Hosting.Abstractions" version="1.0.3" targetFramework="net451" /> - <package id="Microsoft.AspNetCore.Hosting.Server.Abstractions" version="1.0.3" targetFramework="net451" /> - <package id="Microsoft.AspNetCore.Http" version="1.0.3" targetFramework="net451" /> - <package id="Microsoft.AspNetCore.Http.Abstractions" version="1.0.3" targetFramework="net451" /> - <package id="Microsoft.AspNetCore.Http.Extensions" version="1.0.3" targetFramework="net451" /> - <package id="Microsoft.AspNetCore.Http.Features" version="1.0.3" targetFramework="net451" /> - <package id="Microsoft.AspNetCore.TestHost" version="1.0.3" targetFramework="net451" /> - <package id="Microsoft.AspNetCore.WebUtilities" version="1.0.3" targetFramework="net451" /> - <package id="Microsoft.Extensions.Configuration" version="1.0.2" targetFramework="net451" /> - <package id="Microsoft.Extensions.Configuration.Abstractions" version="1.0.2" targetFramework="net451" /> - <package id="Microsoft.Extensions.Configuration.EnvironmentVariables" version="1.0.2" targetFramework="net451" /> - <package id="Microsoft.Extensions.DependencyInjection" version="1.0.2" targetFramework="net451" /> - <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="1.0.2" targetFramework="net451" /> - <package id="Microsoft.Extensions.FileProviders.Abstractions" version="1.0.1" targetFramework="net451" /> - <package id="Microsoft.Extensions.FileProviders.Physical" version="1.0.1" targetFramework="net451" /> - <package id="Microsoft.Extensions.FileSystemGlobbing" version="1.0.1" targetFramework="net451" /> - <package id="Microsoft.Extensions.Logging" version="1.0.2" targetFramework="net451" /> - <package id="Microsoft.Extensions.Logging.Abstractions" version="1.0.2" targetFramework="net451" /> - <package id="Microsoft.Extensions.ObjectPool" version="1.0.1" targetFramework="net451" /> - <package id="Microsoft.Extensions.Options" version="1.0.2" targetFramework="net451" /> - <package id="Microsoft.Extensions.PlatformAbstractions" version="1.0.0" targetFramework="net451" /> - <package id="Microsoft.Extensions.Primitives" version="1.0.1" targetFramework="net451" /> - <package id="Microsoft.Net.Http.Headers" version="1.0.3" targetFramework="net451" /> - <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net451" /> - <package id="NUnit" version="3.5.0" targetFramework="net451" /> - <package id="System.Buffers" version="4.0.0" targetFramework="net451" /> - <package id="System.Collections" version="4.0.11" targetFramework="net451" /> - <package id="System.Collections.Concurrent" version="4.0.12" targetFramework="net451" /> - <package id="System.Collections.Immutable" version="1.2.0" targetFramework="net451" /> - <package id="System.ComponentModel" version="4.0.1" targetFramework="net451" /> - <package id="System.Diagnostics.Contracts" version="4.0.1" targetFramework="net451" /> - <package id="System.Diagnostics.Debug" version="4.0.11" targetFramework="net451" /> - <package id="System.Diagnostics.DiagnosticSource" version="4.0.0" targetFramework="net451" /> - <package id="System.Globalization" version="4.0.11" targetFramework="net451" /> - <package id="System.IO" version="4.1.0" targetFramework="net451" /> - <package id="System.Linq" version="4.1.0" targetFramework="net451" /> - <package id="System.Linq.Expressions" version="4.1.1" targetFramework="net451" /> - <package id="System.Reflection" version="4.1.0" targetFramework="net451" /> - <package id="System.Reflection.Metadata" version="1.3.0" targetFramework="net451" /> - <package id="System.Resources.ResourceManager" version="4.0.1" targetFramework="net451" /> - <package id="System.Runtime" version="4.1.0" targetFramework="net451" /> - <package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net451" /> - <package id="System.Runtime.InteropServices" version="4.1.0" targetFramework="net451" /> - <package id="System.Runtime.InteropServices.RuntimeInformation" version="4.0.0" targetFramework="net451" /> - <package id="System.Text.Encoding" version="4.0.11" targetFramework="net451" /> - <package id="System.Text.Encodings.Web" version="4.0.1" targetFramework="net451" /> - <package id="System.Threading" version="4.0.11" targetFramework="net451" /> - <package id="System.Threading.Tasks" version="4.0.11" targetFramework="net451" /> -</packages> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4db2b0ae/src/Lucene.Net.Tests.Replicator/project.json ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.Replicator/project.json b/src/Lucene.Net.Tests.Replicator/project.json new file mode 100644 index 0000000..b37a362 --- /dev/null +++ b/src/Lucene.Net.Tests.Replicator/project.json @@ -0,0 +1,43 @@ +{ + "version": "4.8.0", + "title": "Lucene.Net.Tests.Replicator", + "buildOptions": { + "compile": { + "includeFiles": [ "../CommonAssemblyInfo.cs" ] + }, + "embed": { + "includeFiles": [ + ] + } + }, + "dependencies": { + "dotnet-test-nunit-teamcity": "3.4.0-beta-3", + "Lucene.Net.Replicator": "4.8.0", + "Lucene.Net.Replicator.AspNetCore": "4.8.0", + "Lucene.Net.TestFramework": "4.8.0", + "Microsoft.AspNetCore.TestHost": "1.0.3", + "Newtonsoft.Json": "9.0.1", + "NUnit": "3.5.0" + }, + "testRunner": "nunit-teamcity", + "frameworks": { + "netcoreapp1.0": { + "imports": "dnxcore50", + "buildOptions": { + "debugType": "portable", + "define": [ "NETSTANDARD" ] + } + }, + "net451": { + "buildOptions": { + "debugType": "full", + "define": [ "FEATURE_SERIALIZABLE" ] + } + } + }, + + "runtimes": { + "win7-x86": {}, + "win7-x64": {} + } +}
