New version

csteeg · Mar 10, 2015 · 8276b2e · 8276b2e
1 parent 16065b8
commit 8276b2e
Show file tree

Hide file tree

Showing 12 changed files with 57 additions and 47 deletions.
diff --git a/Src/Commons.InversionOfControl.Unity/Properties/AssemblyInfo.cs b/Src/Commons.InversionOfControl.Unity/Properties/AssemblyInfo.cs
@@ -32,7 +32,7 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.2.3.0")]
-[assembly: AssemblyFileVersion("2.2.3.0")]
+[assembly: AssemblyVersion("2.3.0.0")]
+[assembly: AssemblyFileVersion("2.3.0.0")]
 
 [assembly: AssemblyKeyFileAttribute("../../BoC.snk")]
diff --git a/.../Glass.Mapper.Sc.CodeFirst.config.example → .../Glass.Mapper.Sc.CodeFirst.config.example b/.../Glass.Mapper.Sc.CodeFirst.config.example → .../Glass.Mapper.Sc.CodeFirst.config.example
diff --git a/...ig/Include/BoC/Glass.Mapper.Sc.Mvc.Config → .../Include/Glass/Glass.Mapper.Sc.Mvc.config b/...ig/Include/BoC/Glass.Mapper.Sc.Mvc.Config → .../Include/Glass/Glass.Mapper.Sc.Mvc.config
diff --git a/Src/Commons.Persistence.Sitecore/BoC.Persistence.SitecoreGlass.csproj b/Src/Commons.Persistence.Sitecore/BoC.Persistence.SitecoreGlass.csproj
@@ -37,33 +37,34 @@
   <ItemGroup>
     <Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Castle.Core.3.3.1\lib\net45\Castle.Core.dll</HintPath>
+      <HintPath>..\..\packages\Castle.Core.3.3.3\lib\net45\Castle.Core.dll</HintPath>
     </Reference>
     <Reference Include="Castle.Windsor, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\packages\Castle.Windsor.3.3.0\lib\net45\Castle.Windsor.dll</HintPath>
     </Reference>
-    <Reference Include="Glass.Mapper, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Glass.Mapper, Version=3.5.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\BoC.Glass.Mapper.1.0.3\lib\net45\Glass.Mapper.dll</HintPath>
+      <HintPath>..\..\packages\BoC.Glass.Mapper.3.5.0\lib\net45\Glass.Mapper.dll</HintPath>
     </Reference>
-    <Reference Include="Glass.Mapper.Sc, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Glass.Mapper.Sc, Version=3.5.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\BoC.Glass.Mapper.Sc.1.0.3\lib\net45\Glass.Mapper.Sc.dll</HintPath>
+      <HintPath>..\..\packages\BoC.Glass.Mapper.Sc.3.5.0\lib\net45\Glass.Mapper.Sc.dll</HintPath>
     </Reference>
-    <Reference Include="Glass.Mapper.Sc.CastleWindsor, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Glass.Mapper.Sc.CastleWindsor, Version=3.5.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\BoC.Glass.Mapper.Sc.CastleWindsor.1.0.3\lib\net45\Glass.Mapper.Sc.CastleWindsor.dll</HintPath>
+      <HintPath>..\..\packages\BoC.Glass.Mapper.Sc.CastleWindsor.3.5.0\lib\net45\Glass.Mapper.Sc.CastleWindsor.dll</HintPath>
     </Reference>
-    <Reference Include="Glass.Mapper.Sc.ContentSearch, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Glass.Mapper.Sc.ContentSearch.LuceneProvider, Version=3.5.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\BoC.Glass.Mapper.Sc.ContentSearch.1.0.3\lib\net45\Glass.Mapper.Sc.ContentSearch.dll</HintPath>
+      <HintPath>..\..\packages\BoC.Glass.Mapper.Sc.ContentSearch.LuceneProvider.3.5.0\lib\net45\Glass.Mapper.Sc.ContentSearch.LuceneProvider.dll</HintPath>
     </Reference>
-    <Reference Include="Glass.Mapper.Sc.ContentSearch.LuceneProvider, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Glass.Mapper.Sc.Mvc, Version=3.5.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\BoC.Glass.Mapper.Sc.ContentSearch.LuceneProvider.1.0.3\lib\net45\Glass.Mapper.Sc.ContentSearch.LuceneProvider.dll</HintPath>
+      <HintPath>..\..\packages\BoC.Glass.Mapper.Sc.Mvc-5.3.5.0\lib\net45\Glass.Mapper.Sc.Mvc.dll</HintPath>
     </Reference>
-    <Reference Include="ICSharpCode.SharpZipLib">
+    <Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
     </Reference>
     <Reference Include="Lucene.Net, Version=3.0.3.0, Culture=neutral, PublicKeyToken=85089178b9ac3181, processorArchitecture=MSIL">
@@ -88,6 +89,10 @@
       <HintPath>..\..\lib\Sitecore\Sitecore.Mvc.dll</HintPath>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Collections.Immutable, Version=1.0.34.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <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.Web" />
@@ -122,7 +127,7 @@
     <Reference Include="System.Xml" />
     <Reference Include="WebActivatorEx, Version=2.0.0.0, Culture=neutral, PublicKeyToken=7b26dc2a43f6a0d4, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\WebActivatorEx.2.0\lib\net40\WebActivatorEx.dll</HintPath>
+      <HintPath>..\..\packages\WebActivatorEx.2.0.6\lib\net40\WebActivatorEx.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -161,8 +166,8 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
-    <Content Include="App_Config\Include\BoC\Glass.Mapper.Sc.CodeFirst.config.example" />
-    <Content Include="App_Config\Include\BoC\Glass.Mapper.Sc.Mvc.Config" />
+    <None Include="App_Config\Include\Glass\Glass.Mapper.Sc.CodeFirst.config.example" />
+    <None Include="App_Config\Include\Glass\Glass.Mapper.Sc.Mvc.config" />
     <None Include="BoC.Persistence.SitecoreGlass.nuspec" />
     <None Include="packages.config" />
   </ItemGroup>

diff --git a/Src/Commons.Persistence.Sitecore/BoC.Persistence.SitecoreGlass.nuspec b/Src/Commons.Persistence.Sitecore/BoC.Persistence.SitecoreGlass.nuspec
@@ -16,18 +16,18 @@
     <dependencies>
       <dependency id="BoC" version="2.3.0" />
       <dependency id="BoC.Logging.Sitecore" version="2.2.0" />
-      <dependency id="BoC.Glass.Mapper" version="1.0.3" />
-      <dependency id="BoC.Glass.Mapper.Sc" version="1.0.3" />
-      <dependency id="BoC.Glass.Mapper.Sc.Mvc-5" version="1.0.3" />
-      <dependency id="BoC.Glass.Mapper.Sc.CastleWindsor" version="1.0.3" />
-      <dependency id="BoC.Glass.Mapper.Sc.ContentSearch" version="1.0.3" />
-      <dependency id="BoC.Glass.Mapper.Sc.ContentSearch.LuceneProvider" version="1.0.3" />
-      <dependency id="Castle.Core" version="3.3.0" />
+      <dependency id="BoC.Glass.Mapper" version="3.5.1" />
+      <dependency id="BoC.Glass.Mapper.Sc" version="3.5.1" />
+      <dependency id="BoC.Glass.Mapper.Sc.Mvc-5" version="3.5.1" />
+      <dependency id="BoC.Glass.Mapper.Sc.CastleWindsor" version="3.5.1" />
+      <dependency id="BoC.Glass.Mapper.Sc.ContentSearch" version="3.5.1" />
+      <dependency id="BoC.Glass.Mapper.Sc.ContentSearch.LuceneProvider" version="3.5.1" />
+      <dependency id="Castle.Core" version="3.3.3" />
       <dependency id="Castle.Windsor" version="3.3.0" />
       <dependency id="Lucene.Net" version="3.0.3" />
       <dependency id="Microsoft.AspNet.Mvc" version="5.2.2" />
-      <dependency id="Microsoft.AspNet.Razor" version="3.1.2" />
-      <dependency id="Microsoft.AspNet.WebPages" version="3.1.2" />
+      <dependency id="Microsoft.AspNet.Razor" version="3.2.2" />
+      <dependency id="Microsoft.AspNet.WebPages" version="3.2.2" />
       <dependency id="Microsoft.Web.Infrastructure" version="1.0.0.0" />
       <dependency id="SharpZipLib" version="0.86.0" />
       <dependency id="WebActivatorEx" version="2.0" />

diff --git a/Src/Commons.Persistence.Sitecore/Initialize/InitBoc.cs b/Src/Commons.Persistence.Sitecore/Initialize/InitBoc.cs
@@ -1,7 +1,5 @@
-using BoC.Persistence.SitecoreGlass.DefaultSetupTasks;
-using BoC.Persistence.SitecoreGlass.Initialize;
+using BoC.Persistence.SitecoreGlass.Initialize;
 using BoC.Web;
-using Sitecore.Pipelines;
 
 [assembly: WebActivatorEx.PostApplicationStartMethod(typeof(InitBoc), "Start")]
 [assembly: WebActivatorEx.PreApplicationStartMethod(typeof(InitBoc), "Disable")]
@@ -16,7 +14,7 @@ public static void Start()
         }
         public static void Disable()
         {
-            //disable startup init of BoC, need to go after sitecore, so do it in a pipeline
+            //disable startup init of BoC, need to go after sitecore, so do it in a pipeline or in postapplicationstartup if the pipeline version hasn't been triggered
             ApplicationStarterHttpModule.Disabled = true;
         }
     }

diff --git a/Src/Commons.Persistence.Sitecore/Properties/AssemblyInfo.cs b/Src/Commons.Persistence.Sitecore/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.3.0.0")]
-[assembly: AssemblyFileVersion("2.3.0.0")]
+[assembly: AssemblyVersion("2.5.3.0")]
+[assembly: AssemblyFileVersion("2.5.3.0")]
diff --git a/Src/Commons.Persistence.Sitecore/app.config b/Src/Commons.Persistence.Sitecore/app.config
@@ -11,8 +11,8 @@
         <bindingRedirect oldVersion="0.0.0.0-5.2.2.0" newVersion="5.2.2.0" />
       </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" />
+        <assemblyIdentity name="Castle.Windsor" publicKeyToken="407dd0808d44fbdc" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.3.0.0" newVersion="3.3.0.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>

diff --git a/Src/Commons.Persistence.Sitecore/packages.config b/Src/Commons.Persistence.Sitecore/packages.config
@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="BoC.Glass.Mapper" version="1.0.3" targetFramework="net45" />
-  <package id="BoC.Glass.Mapper.Sc" version="1.0.3" targetFramework="net45" />
-  <package id="BoC.Glass.Mapper.Sc.CastleWindsor" version="1.0.3" targetFramework="net45" />
-  <package id="BoC.Glass.Mapper.Sc.ContentSearch" version="1.0.3" targetFramework="net45" />
-  <package id="BoC.Glass.Mapper.Sc.ContentSearch.LuceneProvider" version="1.0.3" targetFramework="net45" />
-  <package id="Castle.Core" version="3.3.1" targetFramework="net45" />
+  <package id="BoC.Glass.Mapper" version="3.5.0" targetFramework="net45" />
+  <package id="BoC.Glass.Mapper.Sc" version="3.5.0" targetFramework="net45" />
+  <package id="BoC.Glass.Mapper.Sc.CastleWindsor" version="3.5.0" targetFramework="net45" />
+  <package id="BoC.Glass.Mapper.Sc.ContentSearch.LuceneProvider" version="3.5.0" targetFramework="net45" />
+  <package id="BoC.Glass.Mapper.Sc.Mvc-5" version="3.5.0" targetFramework="net45" />
+  <package id="Castle.Core" version="3.3.3" targetFramework="net45" />
   <package id="Castle.Windsor" version="3.3.0" targetFramework="net45" />
   <package id="Lucene.Net" version="3.0.3" targetFramework="net45" />
   <package id="Microsoft.AspNet.Mvc" version="5.2.2" targetFramework="net45" />
   <package id="Microsoft.AspNet.Razor" version="3.2.2" targetFramework="net45" />
   <package id="Microsoft.AspNet.WebPages" version="3.2.2" targetFramework="net45" />
+  <package id="Microsoft.Bcl.Immutable" version="1.0.34" targetFramework="net45" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
   <package id="SharpZipLib" version="0.86.0" targetFramework="net45" />
-  <package id="WebActivatorEx" version="2.0" targetFramework="net45" />
+  <package id="WebActivatorEx" version="2.0.6" targetFramework="net45" />
 </packages>
diff --git a/Src/Commons.Persistence.UmbracoGlass/BoC.Persistence.UmbracoGlass.csproj b/Src/Commons.Persistence.UmbracoGlass/BoC.Persistence.UmbracoGlass.csproj
@@ -41,8 +41,9 @@
     <Reference Include="businesslogic">
       <HintPath>..\..\packages\UmbracoCms.Core.7.0.4\lib\businesslogic.dll</HintPath>
     </Reference>
-    <Reference Include="Castle.Core">
-      <HintPath>..\..\packages\Castle.Core.3.2.0\lib\net45\Castle.Core.dll</HintPath>
+    <Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\packages\Castle.Core.3.3.3\lib\net45\Castle.Core.dll</HintPath>
     </Reference>
     <Reference Include="ClientDependency.Core">
       <HintPath>..\..\packages\UmbracoCms.Core.7.0.4\lib\ClientDependency.Core.dll</HintPath>
@@ -62,8 +63,9 @@
     <Reference Include="Examine">
       <HintPath>..\..\packages\UmbracoCms.Core.7.0.4\lib\Examine.dll</HintPath>
     </Reference>
-    <Reference Include="Glass.Mapper">
-      <HintPath>..\..\packages\Glass.Mapper.3.0.13.25\lib\net45\Glass.Mapper.dll</HintPath>
+    <Reference Include="Glass.Mapper, Version=3.0.14.27, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\packages\Glass.Mapper.3.0.14.27\lib\net45\Glass.Mapper.dll</HintPath>
     </Reference>
     <Reference Include="Glass.Mapper.Umb">
       <HintPath>..\..\packages\Glass.Mapper.Umb.3.0.6.9\lib\net45\Glass.Mapper.Umb.dll</HintPath>

diff --git a/Src/Commons.Persistence.UmbracoGlass/app.config b/Src/Commons.Persistence.UmbracoGlass/app.config
@@ -18,6 +18,10 @@
         <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Castle.Core" publicKeyToken="407dd0808d44fbdc" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.3.0.0" newVersion="3.3.0.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>
diff --git a/Src/Commons.Persistence.UmbracoGlass/packages.config b/Src/Commons.Persistence.UmbracoGlass/packages.config
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="AutoMapper" version="3.0.0" targetFramework="net45" />
-  <package id="Castle.Core" version="3.2.0" targetFramework="net45" />
+  <package id="Castle.Core" version="3.3.3" targetFramework="net45" />
   <package id="ClientDependency" version="1.7.0.3" targetFramework="net45" />
   <package id="ClientDependency-Mvc" version="1.7.0.3" targetFramework="net45" />
-  <package id="Glass.Mapper" version="3.0.13.25" targetFramework="net45" />
+  <package id="Glass.Mapper" version="3.0.14.27" targetFramework="net45" />
   <package id="Glass.Mapper.Umb" version="3.0.6.9" targetFramework="net45" />
   <package id="HtmlAgilityPack" version="1.4.6" targetFramework="net45" />
   <package id="Lucene.Net" version="2.9.4.1" targetFramework="net45" />