Skip to content

Commit

Permalink
Merge pull request SolrNet#328 from gjunge/solrcloud
Browse files Browse the repository at this point in the history 
Update SolrCloud branch + bump version
  • Loading branch information
@xmorera
xmorera authored Nov 2, 2017
2 parents fe39de2 + 14ec966 commit 7484745
Show file tree
Hide file tree
Showing 152 changed files with 2,707 additions and 1,166 deletions.
34 changes: 25 additions & 9 deletions AutofacContrib.SolrNet.Tests/AutofacContrib.SolrNet.Tests.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\xunit.runner.visualstudio.2.3.1\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\packages\xunit.runner.visualstudio.2.3.1\build\net20\xunit.runner.visualstudio.props')" />
<Import Project="..\packages\xunit.core.2.3.1\build\xunit.core.props" Condition="Exists('..\packages\xunit.core.2.3.1\build\xunit.core.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
Expand All @@ -15,6 +17,8 @@
<TargetFrameworkProfile />
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand Down Expand Up @@ -44,14 +48,14 @@
<Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
<HintPath>..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll</HintPath>
</Reference>
<Reference Include="xunit.assert, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
<HintPath>..\packages\xunit.assert.2.2.0\lib\netstandard1.1\xunit.assert.dll</HintPath>
<Reference Include="xunit.assert, Version=2.3.1.3858, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
<HintPath>..\packages\xunit.assert.2.3.1\lib\netstandard1.1\xunit.assert.dll</HintPath>
</Reference>
<Reference Include="xunit.core, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
<HintPath>..\packages\xunit.extensibility.core.2.2.0\lib\netstandard1.1\xunit.core.dll</HintPath>
<Reference Include="xunit.core, Version=2.3.1.3858, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
<HintPath>..\packages\xunit.extensibility.core.2.3.1\lib\netstandard1.1\xunit.core.dll</HintPath>
</Reference>
<Reference Include="xunit.execution.desktop, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
<HintPath>..\packages\xunit.extensibility.execution.2.2.0\lib\net452\xunit.execution.desktop.dll</HintPath>
<Reference Include="xunit.execution.desktop, Version=2.3.1.3858, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
<HintPath>..\packages\xunit.extensibility.execution.2.3.1\lib\net452\xunit.execution.desktop.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand All @@ -65,9 +69,9 @@
<Project>{931CEB14-556F-4893-A8D9-C7C6DACA444F}</Project>
<Name>AutofacContrib.SolrNet</Name>
</ProjectReference>
<ProjectReference Include="..\SolrNet.Tests\SolrNet.Tests.csproj">
<Project>{F3FE6EF5-CF5C-4461-8691-4A498A463FD5}</Project>
<Name>SolrNet.Tests</Name>
<ProjectReference Include="..\SolrNet.Tests.Common\SolrNet.Tests.Common.csproj">
<Project>{48da5170-b96e-485c-941d-0d7797dca0ef}</Project>
<Name>SolrNet.Tests.Common</Name>
</ProjectReference>
<ProjectReference Include="..\SolrNet\SolrNet.csproj">
<Project>{CEEB8690-3E08-4440-B647-787A58E71CFA}</Project>
Expand All @@ -86,7 +90,19 @@
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
<ItemGroup>
<Analyzer Include="..\packages\xunit.analyzers.0.7.0\analyzers\dotnet\cs\xunit.analyzers.dll" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\xunit.core.2.3.1\build\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.core.2.3.1\build\xunit.core.props'))" />
<Error Condition="!Exists('..\packages\xunit.core.2.3.1\build\xunit.core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.core.2.3.1\build\xunit.core.targets'))" />
<Error Condition="!Exists('..\packages\xunit.runner.visualstudio.2.3.1\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.runner.visualstudio.2.3.1\build\net20\xunit.runner.visualstudio.props'))" />
</Target>
<Import Project="..\packages\xunit.core.2.3.1\build\xunit.core.targets" Condition="Exists('..\packages\xunit.core.2.3.1\build\xunit.core.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.
<Target Name="BeforeBuild">
Expand Down
15 changes: 8 additions & 7 deletions AutofacContrib.SolrNet.Tests/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="xunit" version="2.2.0" targetFramework="net46" />
<package id="xunit.abstractions" version="2.0.1" targetFramework="net46" />
<package id="xunit.assert" version="2.2.0" targetFramework="net46" />
<package id="xunit.core" version="2.2.0" targetFramework="net46" />
<package id="xunit.extensibility.core" version="2.2.0" targetFramework="net46" />
<package id="xunit.extensibility.execution" version="2.2.0" targetFramework="net46" />
<package id="xunit.runner.visualstudio" version="2.2.0" targetFramework="net46" developmentDependency="true" />
<package id="Autofac" version="4.6.1" targetFramework="net46" />
<package id="xunit" version="2.3.1" targetFramework="net46" />
<package id="xunit.abstractions" version="2.0.1" targetFramework="net46" />
<package id="xunit.analyzers" version="0.7.0" targetFramework="net46" />
<package id="xunit.assert" version="2.3.1" targetFramework="net46" />
<package id="xunit.core" version="2.3.1" targetFramework="net46" />
<package id="xunit.extensibility.core" version="2.3.1" targetFramework="net46" />
<package id="xunit.extensibility.execution" version="2.3.1" targetFramework="net46" />
<package id="xunit.runner.visualstudio" version="2.3.1" targetFramework="net46" developmentDependency="true" />
</packages>
4 changes: 2 additions & 2 deletions AutofacContrib.SolrNet/AutofacContrib.SolrNet.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>SolrNet.Autofac</id>
<version>0.8.1</version>
<version>1.0.0</version>
<title>SolrNet.Autofac</title>
<authors>Mauricio Scheffer and contributors</authors>
<owners>Mauricio Scheffer</owners>
Expand All @@ -12,7 +12,7 @@
<description>Autofac module for SolrNet</description>
<language>en-US</language>
<dependencies>
<dependency id="SolrNet.Core" version="[0.8.1]" />
<dependency id="SolrNet.Core" version="1.0.0" />
<dependency id="Autofac" version="4.6.1" />
</dependencies>
</metadata>
Expand Down
4 changes: 2 additions & 2 deletions AutofacContrib.SolrNet/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
[assembly: AssemblyDescription("AutofacContrib.SolrNet")]
[assembly: AssemblyProduct("AutofacContrib.SolrNet")]
[assembly: AssemblyCopyright("Copyright Mauricio Scheffer 2007-2017")]
[assembly: AssemblyVersion("0.6.1.1001")]
[assembly: AssemblyFileVersion("0.6.1.1001")]
[assembly: AssemblyVersion("1.0.0")]
[assembly: AssemblyFileVersion("1.0.0.*")]
[assembly: AssemblyInformationalVersion("4758ae1c6550363fb060857db120ff3aed438052")]
[assembly: AssemblyDelaySign(false)]

Expand Down
13 changes: 1 addition & 12 deletions Castle.Facilities.SolrNetIntegration.Tests/App.config
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Castle.DynamicProxy2" publicKeyToken="407dd0808d44fbdc" culture="neutral" />
<bindingRedirect oldVersion="2.0.3.0" newVersion="2.2.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Castle.Core" publicKeyToken="407dd0808d44fbdc" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>

<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" /></startup></configuration>
43 changes: 31 additions & 12 deletions Castle.Facilities.SolrNetIntegration.Tests/Castle.Facilities.SolrNetIntegration.Tests.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\xunit.runner.visualstudio.2.3.1\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\packages\xunit.runner.visualstudio.2.3.1\build\net20\xunit.runner.visualstudio.props')" />
<Import Project="..\packages\xunit.core.2.3.1\build\xunit.core.props" Condition="Exists('..\packages\xunit.core.2.3.1\build\xunit.core.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
Expand Down Expand Up @@ -34,6 +36,8 @@
<BootstrapperEnabled>true</BootstrapperEnabled>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand All @@ -57,16 +61,19 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="Castle.Core, Version=4.1.1.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
<HintPath>..\packages\Castle.Core.4.1.1\lib\net45\Castle.Core.dll</HintPath>
<Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
<HintPath>..\packages\Castle.Core.4.2.1\lib\net45\Castle.Core.dll</HintPath>
</Reference>
<Reference Include="Castle.Windsor, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
<HintPath>..\packages\Castle.Windsor.4.0.0\lib\net45\Castle.Windsor.dll</HintPath>
<HintPath>..\packages\Castle.Windsor.4.1.0\lib\net45\Castle.Windsor.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Configuration" />
<Reference Include="System.Core">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
<Reference Include="System.Runtime.Remoting" />
<Reference Include="System.Web" />
<Reference Include="System.Xml.Linq">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
Expand All @@ -75,14 +82,14 @@
<Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
<HintPath>..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll</HintPath>
</Reference>
<Reference Include="xunit.assert, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
<HintPath>..\packages\xunit.assert.2.2.0\lib\netstandard1.1\xunit.assert.dll</HintPath>
<Reference Include="xunit.assert, Version=2.3.1.3858, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
<HintPath>..\packages\xunit.assert.2.3.1\lib\netstandard1.1\xunit.assert.dll</HintPath>
</Reference>
<Reference Include="xunit.core, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
<HintPath>..\packages\xunit.extensibility.core.2.2.0\lib\netstandard1.1\xunit.core.dll</HintPath>
<Reference Include="xunit.core, Version=2.3.1.3858, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
<HintPath>..\packages\xunit.extensibility.core.2.3.1\lib\netstandard1.1\xunit.core.dll</HintPath>
</Reference>
<Reference Include="xunit.execution.desktop, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
<HintPath>..\packages\xunit.extensibility.execution.2.2.0\lib\net452\xunit.execution.desktop.dll</HintPath>
<Reference Include="xunit.execution.desktop, Version=2.3.1.3858, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
<HintPath>..\packages\xunit.extensibility.execution.2.3.1\lib\net452\xunit.execution.desktop.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand All @@ -95,9 +102,9 @@
<Project>{0F21F5B6-5986-4301-B0F7-FD9800DB8091}</Project>
<Name>Castle.Facilities.SolrNetIntegration</Name>
</ProjectReference>
<ProjectReference Include="..\SolrNet.Tests\SolrNet.Tests.csproj">
<Project>{F3FE6EF5-CF5C-4461-8691-4A498A463FD5}</Project>
<Name>SolrNet.Tests</Name>
<ProjectReference Include="..\SolrNet.Tests.Common\SolrNet.Tests.Common.csproj">
<Project>{48DA5170-B96E-485C-941D-0D7797DCA0EF}</Project>
<Name>SolrNet.Tests.Common</Name>
</ProjectReference>
<ProjectReference Include="..\SolrNet\SolrNet.csproj">
<Project>{CEEB8690-3E08-4440-B647-787A58E71CFA}</Project>
Expand Down Expand Up @@ -131,7 +138,19 @@
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
<ItemGroup>
<Analyzer Include="..\packages\xunit.analyzers.0.7.0\analyzers\dotnet\cs\xunit.analyzers.dll" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\xunit.core.2.3.1\build\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.core.2.3.1\build\xunit.core.props'))" />
<Error Condition="!Exists('..\packages\xunit.core.2.3.1\build\xunit.core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.core.2.3.1\build\xunit.core.targets'))" />
<Error Condition="!Exists('..\packages\xunit.runner.visualstudio.2.3.1\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.runner.visualstudio.2.3.1\build\net20\xunit.runner.visualstudio.props'))" />
</Target>
<Import Project="..\packages\xunit.core.2.3.1\build\xunit.core.targets" Condition="Exists('..\packages\xunit.core.2.3.1\build\xunit.core.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.
<Target Name="BeforeBuild">
Expand Down
17 changes: 9 additions & 8 deletions Castle.Facilities.SolrNetIntegration.Tests/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="xunit" version="2.2.0" targetFramework="net46" />
<package id="Castle.Core" version="4.2.1" targetFramework="net46" />
<package id="Castle.Windsor" version="4.1.0" targetFramework="net46" />
<package id="xunit" version="2.3.1" targetFramework="net46" />
<package id="xunit.abstractions" version="2.0.1" targetFramework="net46" />
<package id="xunit.assert" version="2.2.0" targetFramework="net46" />
<package id="xunit.core" version="2.2.0" targetFramework="net46" />
<package id="xunit.extensibility.core" version="2.2.0" targetFramework="net46" />
<package id="xunit.extensibility.execution" version="2.2.0" targetFramework="net46" />
<package id="xunit.runner.visualstudio" version="2.2.0" targetFramework="net46" developmentDependency="true" />
<package id="Castle.Core" version="4.1.1" targetFramework="net46" />
<package id="Castle.Windsor" version="4.0.0" targetFramework="net46" />
<package id="xunit.analyzers" version="0.7.0" targetFramework="net46" />
<package id="xunit.assert" version="2.3.1" targetFramework="net46" />
<package id="xunit.core" version="2.3.1" targetFramework="net46" />
<package id="xunit.extensibility.core" version="2.3.1" targetFramework="net46" />
<package id="xunit.extensibility.execution" version="2.3.1" targetFramework="net46" />
<package id="xunit.runner.visualstudio" version="2.3.1" targetFramework="net46" developmentDependency="true" />
</packages>
Loading

0 comments on commit 7484745

Please sign in to comment.