Skip to content

Commit

Permalink
Bump version to 1.4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
gmarz committed Jan 28, 2015
1 parent 1d9ec08 commit 191d7ae
Show file tree
Hide file tree
Showing 21 changed files with 132 additions and 244 deletions.
4 changes: 2 additions & 2 deletions build/Elasticsearch.Net.Connection.HttpClient.nuspec
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>Elasticsearch.Net.Connection.HttpClient</id>
<version>1.3.0</version>
<version>1.4.0</version>
<title>Elasticsearch.Net.Connection.HttpClient - IConnection implementation that uses Http</title>
<authors>Elasticsearch Inc. and contributors</authors>
<owners>Elasticsearch Inc.</owners>
Expand All @@ -13,7 +13,7 @@
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>An IConnection implementation that uses System.Net.Http.HttpClient to talk with elasticsearch</description>
<dependencies>
<dependency id="Elasticsearch.Net" version="1.3.0"/>
<dependency id="Elasticsearch.Net" version="1.4.0"/>
</dependencies>
<tags>elasticsearch elastic search lucene thrift nest</tags>
</metadata>
Expand Down
4 changes: 2 additions & 2 deletions build/Elasticsearch.Net.Connection.Thrift.nuspec
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>Elasticsearch.Net.Connection.Thrift</id>
<version>1.3.0</version>
<version>1.4.0</version>
<title>Elasticsearch.Net.Connection.Thrift - Thrift support for Elasticsearch.Net</title>
<authors>Elasticsearch Inc. and contributors</authors>
<owners>Elasticsearch Inc.</owners>
Expand All @@ -13,7 +13,7 @@
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>An IConnection implementation that utilizes Apache Thrift to talk with elasticsearch</description>
<dependencies>
<dependency id="Elasticsearch.Net" version="1.3.0"/>
<dependency id="Elasticsearch.Net" version="1.4.0"/>
</dependencies>
<tags>elasticsearch elastic search lucene thrift nest</tags>
</metadata>
Expand Down
4 changes: 2 additions & 2 deletions build/Elasticsearch.Net.JsonNET.nuspec
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>Elasticsearch.Net.JsonNET</id>
<version>1.3.0</version>
<version>1.4.0</version>
<title>Elasticsearch.Net.JsonNET - Json.NET serializer for the low level elasticsearch client</title>
<authors>Elasticsearch Inc. and contributors</authors>
<owners>Elasticsearch Inc.</owners>
Expand All @@ -13,7 +13,7 @@
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>This package is only useful if you use the low level client ONLY and do not use NEST but would like to use JSON.NET as your serializer</description>
<dependencies>
<dependency id="Elasticsearch.Net" version="1.3.0"/>
<dependency id="Elasticsearch.Net" version="1.4.0"/>
<dependency id="Newtonsoft.Json" version="6.0.1"/>
</dependencies>
<tags>elasticsearch elastic search lucene thrift nest</tags>
Expand Down
2 changes: 1 addition & 1 deletion build/Elasticsearch.Net.nuspec
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>Elasticsearch.Net</id>
<version>1.3.0</version>
<version>1.4.0</version>
<title>Elasticsearch.Net - official low level elasticsearch client</title>
<authors>Elasticsearch Inc. and contributors</authors>
<owners>Elasticsearch Inc.</owners>
Expand Down
4 changes: 2 additions & 2 deletions build/NEST.nuspec
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>NEST</id>
<version>1.3.0</version>
<version>1.4.0</version>
<title>NEST - Elasticsearch Client</title>
<authors>Elasticsearch Inc. and contributors</authors>
<owners>Elasticsearch Inc.</owners>
Expand All @@ -13,7 +13,7 @@
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>Elasticsearch client, strongly typed interface to Elasticsearch. Fluent request builder, mapped responses and powerful query dsl. Uses and exposes Elasticsearch.Net</description>
<dependencies>
<dependency id="Elasticsearch.Net" version="1.3.0"/>
<dependency id="Elasticsearch.Net" version="1.4.0"/>
<dependency id="Newtonsoft.Json" version="6.0.1" />
</dependencies>
<tags>elasticsearch elastic search lucene nest</tags>
Expand Down
154 changes: 51 additions & 103 deletions packages/RazorMachine/tools/App.config
Original file line number Diff line number Diff line change
@@ -1,113 +1,61 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0"?>
<!--
This configuration shows how you could add your xipton.razor configuration to your default application configuration.
This explicit configuration equals the xipton.razor default configuration, so, if you do not configure anything at all, a configuration like this is loaded.
You also could load any configuration by an xml string or by an xml file name. Please take a look at the example code for an example.
-->
<configuration>

<configSections>
<section name="xipton.razor.config" type="Xipton.Razor.Config.XmlConfigurationSection, Xipton.Razor, Version=2.6.1.0, Culture=neutral, PublicKeyToken=563e02c711ac8b7e" />
<!-- If not signed: <section name="xipton.razor.config" type="Xipton.Razor.Config.XmlConfigurationSection, Xipton.Razor"/> -->
<section name="xipton.razor.config" type="Xipton.Razor.Config.XmlConfigurationSection, Xipton.Razor, Version=2.6.1.0, Culture=neutral, PublicKeyToken=563e02c711ac8b7e"/>
<!-- If not signed: <section name="xipton.razor.config" type="Xipton.Razor.Config.XmlConfigurationSection, Xipton.Razor"/> -->
</configSections>

<xipton.razor.config>
<xipton.razor>
<rootOperator path="/" />
<templates baseType="Xipton.Razor.TemplateBase`1" language="C#" defaultExtension=".cshtml" autoIncludeName="_viewStart" sharedLocation="~/Shared" includeGeneratedSourceCode="false" htmlEncode="true" />
<!-- references included by generated template assemblies -->
<references>
<clear />
<add reference="mscorlib.dll" />
<add reference="system.dll" />
<add reference="system.core.dll" />
<add reference="microsoft.csharp.dll" />
<add reference="*.dll" />
<add reference="*.exe" />
</references>
<!-- namespaces included by default in generated template code -->
<namespaces>
<clear />
<add namespace="System" />
<add namespace="System.Collections" />
<add namespace="System.Collections.Generic" />
<add namespace="System.Dynamic" />
<add namespace="System.IO" />
<add namespace="System.Linq" />
<add namespace="Xipton.Razor.Extension" />
</namespaces>
<!-- content providers are probed in same order as they are defined below -->
<contentProviders>
<add type="Xipton.Razor.Core.ContentProvider.FileContentProvider" rootFolder="./Views" />
<!-- <add type="Xipton.Razor.Core.ContentProvider.EmbeddedResourceContentProvider" resourceAssembly="Xipton.Razor.Example, Version=2.6.1.0, Culture=neutral, PublicKeyToken=null" rootNameSpace="Xipton.Razor.Example.Embedded"/> -->
<!-- Using assembly file name: <add type="Xipton.Razor.Core.ContentProvider.EmbeddedResourceContentProvider" resourceAssembly="Xipton.Razor.Example.exe" rootNameSpace="Xipton.Razor.Example.Embedded"/> -->
</contentProviders>
</xipton.razor>
<xipton.razor>

<rootOperator path="/"/>

<templates
baseType="Xipton.Razor.TemplateBase`1"
language="C#"
defaultExtension=".cshtml"
autoIncludeName="_viewStart"
sharedLocation="~/Shared"
includeGeneratedSourceCode="false"
htmlEncode="true"/>

<!-- references included by generated template assemblies -->
<references>
<clear/>
<add reference="mscorlib.dll"/>
<add reference="system.dll"/>
<add reference="system.core.dll"/>
<add reference="microsoft.csharp.dll"/>
<add reference="*.dll"/>
<add reference="*.exe"/>
</references>

<!-- namespaces included by default in generated template code -->
<namespaces>
<clear/>
<add namespace="System"/>
<add namespace="System.Collections"/>
<add namespace="System.Collections.Generic"/>
<add namespace="System.Dynamic"/>
<add namespace="System.IO"/>
<add namespace="System.Linq"/>
<add namespace="Xipton.Razor.Extension"/>
</namespaces>

<!-- content providers are probed in same order as they are defined below -->
<contentProviders>
<add type="Xipton.Razor.Core.ContentProvider.FileContentProvider" rootFolder="./Views"/>
<!-- <add type="Xipton.Razor.Core.ContentProvider.EmbeddedResourceContentProvider" resourceAssembly="Xipton.Razor.Example, Version=2.6.1.0, Culture=neutral, PublicKeyToken=null" rootNameSpace="Xipton.Razor.Example.Embedded"/> -->
<!-- Using assembly file name: <add type="Xipton.Razor.Core.ContentProvider.EmbeddedResourceContentProvider" resourceAssembly="Xipton.Razor.Example.exe" rootNameSpace="Xipton.Razor.Example.Embedded"/> -->
</contentProviders>

</xipton.razor>
</xipton.razor.config>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="AppDomainToolkit" publicKeyToken="8dae03be2742d213" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.0.4.1" newVersion="1.0.4.1" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Autofac.Extras.FakeItEasy" publicKeyToken="17863af14b0044da" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.3.0.0" newVersion="3.3.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="FakeItEasy" publicKeyToken="eff28e2146d5fd2c" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.18.0.0" newVersion="1.18.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="FluentAssertions" publicKeyToken="33f2691a05b67b6a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="FluentAssertions.WindowsPhone" publicKeyToken="33f2691a05b67b6a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="FluentAssertions.Silverlight" publicKeyToken="33f2691a05b67b6a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.VisualStudio.QualityTools.UnitTesting.Silverlight" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.0.5.0" newVersion="2.0.5.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Moq" publicKeyToken="69f491c39445e920" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.1312.1622" newVersion="4.2.1312.1622" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Moq.Silverlight" publicKeyToken="69f491c39445e920" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.1312.1622" newVersion="4.2.1312.1622" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="nunit.framework" publicKeyToken="96d09a1eb7f44a77" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.6.3.13283" newVersion="2.6.3.13283" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Web.Razor" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Xipton.Razor" publicKeyToken="563e02c711ac8b7e" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.6.1.0" newVersion="2.6.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="ShellProgressBar" publicKeyToken="9bdeb49e926d68fa" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.0.0.0" newVersion="1.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="YamlDotNet" publicKeyToken="2b53052c5884d7a1" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.0.1.41986" newVersion="2.0.1.41986" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>

</configuration>
102 changes: 21 additions & 81 deletions packages/RazorMachine/tools/web.config
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8" ?>
<!--
Xipton.Razor v2.6.1
Expand Down Expand Up @@ -40,6 +40,7 @@ instead of the @model directive.
<section name="pages" type="System.Web.WebPages.Razor.Configuration.RazorPagesSection, System.Web.WebPages.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
</sectionGroup>
</configSections>

<system.web.webPages.razor>
<host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
<!--
Expand All @@ -49,103 +50,42 @@ instead of the @model directive.
-->
<pages pageBaseType="Xipton.Razor.TemplateBase, Xipton.Razor, Version=2.6.1.0, Culture=neutral, PublicKeyToken=563e02c711ac8b7e">
<namespaces>
<add namespace="System" />
<add namespace="System.Collections" />
<add namespace="System.Collections.Generic" />
<add namespace="System.Dynamic" />
<add namespace="System.IO" />
<add namespace="System.Linq" />
<add namespace="SchemaExposer" />
<add namespace="SchemaExposer.Naming" />
<add namespace="Xipton.Razor.Extension" />
<add namespace="System"/>
<add namespace="System.Collections"/>
<add namespace="System.Collections.Generic"/>
<add namespace="System.Dynamic"/>
<add namespace="System.IO"/>
<add namespace="System.Linq"/>
<add namespace="SchemaExposer"/>
<add namespace="SchemaExposer.Naming"/>
<add namespace="Xipton.Razor.Extension"/>
</namespaces>
</pages>
</system.web.webPages.razor>

<system.web>
<compilation targetFramework="4.0">
<assemblies>
<add assembly="System.Data.Linq, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
<add assembly="System.Data.Linq, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
<add assembly="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />

<!--
the next element is required when using (as a reference from your project) the signed Xipton.Razor that has been installed inside the GAC (check information at top)
If you use a direct project reference to Xipton.Razor.csproj you must remove it.
-->
<add assembly="Xipton.Razor, Version=2.6.1.0, Culture=neutral, PublicKeyToken=563e02c711ac8b7e" />

</assemblies>
</compilation>
</system.web>

<appSettings>
<add key="webpages:Version" value="1.0.0.0" />
<add key="webpages:Version" value="1.0.0.0"/>
</appSettings>


<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" />
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
</startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="AppDomainToolkit" publicKeyToken="8dae03be2742d213" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.0.4.1" newVersion="1.0.4.1" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Autofac.Extras.FakeItEasy" publicKeyToken="17863af14b0044da" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.3.0.0" newVersion="3.3.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="FakeItEasy" publicKeyToken="eff28e2146d5fd2c" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.18.0.0" newVersion="1.18.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="FluentAssertions" publicKeyToken="33f2691a05b67b6a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="FluentAssertions.WindowsPhone" publicKeyToken="33f2691a05b67b6a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="FluentAssertions.Silverlight" publicKeyToken="33f2691a05b67b6a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.VisualStudio.QualityTools.UnitTesting.Silverlight" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.0.5.0" newVersion="2.0.5.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Moq" publicKeyToken="69f491c39445e920" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.1312.1622" newVersion="4.2.1312.1622" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Moq.Silverlight" publicKeyToken="69f491c39445e920" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.1312.1622" newVersion="4.2.1312.1622" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="nunit.framework" publicKeyToken="96d09a1eb7f44a77" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.6.3.13283" newVersion="2.6.3.13283" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Web.Razor" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Xipton.Razor" publicKeyToken="563e02c711ac8b7e" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.6.1.0" newVersion="2.6.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="ShellProgressBar" publicKeyToken="9bdeb49e926d68fa" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.0.0.0" newVersion="1.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="YamlDotNet" publicKeyToken="2b53052c5884d7a1" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.0.1.41986" newVersion="2.0.1.41986" />
</dependentAssembly>
</assemblyBinding>
</runtime>

</configuration>
Loading

0 comments on commit 191d7ae

Please sign in to comment.