From aca6c8e87b2b3f114eb36a0c475c1a9629ff070e Mon Sep 17 00:00:00 2001 From: Erik Nilsson Date: Mon, 4 Dec 2017 19:06:46 +0100 Subject: [PATCH 1/2] Updated for episerver 11.2.1 and .net framework 4.6.1 --- .gitignore | 4 + .../EPiCode.BlobConverter.csproj | 166 +++++++---------- .../EPiCode.BlobConverter.nuspec | 4 +- .../Properties/AssemblyInfo.cs | 4 +- src/EPiCode.BlobConverter/packages.config | 26 +-- .../EPiCode.SqlBlobProvider.csproj | 168 ++++++------------ .../EPiCode.SqlBlobProvider.nuspec | 4 +- .../NonSeekableMemoryStream.cs | 5 +- .../Properties/AssemblyInfo.cs | 4 +- .../SqlBlobExportJob.cs | 10 +- .../SqlBlobModelRepository.cs | 11 +- .../SqlBlobProvider.cs | 8 +- src/EPiCode.SqlBlobProvider/packages.config | 26 +-- 13 files changed, 172 insertions(+), 268 deletions(-) diff --git a/.gitignore b/.gitignore index 3cbe13b..6ee3f70 100644 --- a/.gitignore +++ b/.gitignore @@ -159,3 +159,7 @@ src/BlobConverter/NuGet.exe src/EPiCode.BlobConverter/NuGet.exe src/EPiCode.SqlBlobProvider/EPiCode.SqlBlobProvider.1.0.0.0.nupkg src/EPiCode.SqlBlobProvider/NuGet.exe +/src/EPiCode.SqlBlobProvider/EPiCode.SqlBlobProvider.1.5.0.nupkg +/src/EPiCode.SqlBlobProvider/app.config +/src/EPiCode.BlobConverter/app.config +/src/.vs/EPiCode.SqlBlobProvider/v15/sqlite3/storage.ide diff --git a/src/EPiCode.BlobConverter/EPiCode.BlobConverter.csproj b/src/EPiCode.BlobConverter/EPiCode.BlobConverter.csproj index 91d73f6..da94cb8 100644 --- a/src/EPiCode.BlobConverter/EPiCode.BlobConverter.csproj +++ b/src/EPiCode.BlobConverter/EPiCode.BlobConverter.csproj @@ -9,7 +9,7 @@ Properties EPiCode.BlobConverter EPiCode.BlobConverter - v4.5 + v4.6.1 512 ..\ @@ -39,132 +39,87 @@ + - - ..\packages\Castle.Core.3.2.2\lib\net45\Castle.Core.dll - True - - - ..\packages\Castle.Windsor.3.2.1\lib\net45\Castle.Windsor.dll - True - - - ..\packages\EPiServer.CMS.Core.9.0.0\lib\net45\EPiServer.dll - True - - - ..\packages\EPiServer.Framework.9.0.0\lib\net45\EPiServer.ApplicationModules.dll - True + + ..\packages\Castle.Core.4.2.1\lib\net45\Castle.Core.dll - - ..\packages\EPiServer.CMS.UI.Core.9.0.0\lib\net45\EPiServer.Cms.Shell.UI.dll - True + + ..\packages\Castle.Windsor.4.1.0\lib\net45\Castle.Windsor.dll - - ..\packages\EPiServer.CMS.Core.9.0.0\lib\net45\EPiServer.Configuration.dll - True + + ..\packages\EPiServer.CMS.Core.11.2.1\lib\net461\EPiServer.dll - - ..\packages\EPiServer.Framework.9.0.0\lib\net45\EPiServer.Data.dll - True + + ..\packages\EPiServer.Framework.11.2.1\lib\net461\EPiServer.ApplicationModules.dll - - ..\packages\EPiServer.Framework.9.0.0\lib\net45\EPiServer.Data.Cache.dll - True + + ..\packages\EPiServer.Framework.11.2.1\lib\net461\EPiServer.Data.dll - - ..\packages\EPiServer.CMS.Core.9.0.0\lib\net45\EPiServer.Enterprise.dll - True + + ..\packages\EPiServer.Framework.11.2.1\lib\net461\EPiServer.Data.Cache.dll - - ..\packages\EPiServer.Framework.9.0.0\lib\net45\EPiServer.Events.dll - True - - - ..\packages\EPiServer.Framework.9.0.0\lib\net45\EPiServer.Framework.dll - True - - - ..\packages\EPiServer.CMS.Core.9.0.0\lib\net45\EPiServer.ImageLibrary.dll - True - - - ..\packages\EPiServer.Framework.9.0.0\lib\net45\EPiServer.Licensing.dll - True - - - ..\packages\EPiServer.CMS.Core.9.0.0\lib\net45\EPiServer.LinkAnalyzer.dll - True - - - ..\packages\EPiServer.Framework.9.0.0\lib\net45\EPiServer.Shell.dll - True + + ..\packages\EPiServer.CMS.Core.11.2.1\lib\net461\EPiServer.Enterprise.dll - - ..\packages\EPiServer.CMS.UI.Core.9.0.0\lib\net45\EPiServer.Shell.UI.dll - True + + ..\packages\EPiServer.Framework.11.2.1\lib\net461\EPiServer.Events.dll - - ..\packages\EPiServer.CMS.UI.Core.9.0.0\lib\net45\EPiServer.UI.dll - True + + ..\packages\EPiServer.Framework.11.2.1\lib\net461\EPiServer.Framework.dll - - ..\packages\EPiServer.CMS.Core.9.0.0\lib\net45\EPiServer.Web.WebControls.dll - True + + ..\packages\EPiServer.Framework.11.2.1\lib\net461\EPiServer.Licensing.dll - - ..\packages\EPiServer.CMS.Core.9.0.0\lib\net45\EPiServer.XForms.dll - True + + ..\packages\EPiServer.CMS.Core.11.2.1\lib\net461\EPiServer.LinkAnalyzer.dll ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll True - - ..\packages\Newtonsoft.Json.5.0.8\lib\net45\Newtonsoft.Json.dll - True - - - ..\packages\structuremap-signed.3.1.6.186\lib\net40\StructureMap.dll - True - - - ..\packages\structuremap-signed.3.1.6.186\lib\net40\StructureMap.Net4.dll - True - - - ..\packages\structuremap.web-signed.3.1.6.186\lib\net40\StructureMap.Web.dll - True + + ..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll + + ..\packages\System.ComponentModel.Annotations.4.4.0\lib\net461\System.ComponentModel.Annotations.dll + + - - ..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.Helpers.dll - True + + + + ..\packages\System.Data.SqlClient.4.4.0\lib\net461\System.Data.SqlClient.dll - - ..\packages\Microsoft.AspNet.Mvc.4.0.30506.0\lib\net40\System.Web.Mvc.dll - True + + + + + + ..\packages\System.Security.AccessControl.4.4.0\lib\net461\System.Security.AccessControl.dll - - ..\packages\Microsoft.AspNet.Razor.2.0.30506.0\lib\net40\System.Web.Razor.dll - True + + ..\packages\System.Security.Cryptography.Xml.4.4.0\lib\net461\System.Security.Cryptography.Xml.dll - - ..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.dll - True + + ..\packages\System.Security.Permissions.4.4.0\lib\net461\System.Security.Permissions.dll - - ..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.Deployment.dll - True + + ..\packages\System.Security.Principal.Windows.4.4.0\lib\net461\System.Security.Principal.Windows.dll + + + ..\packages\System.Threading.AccessControl.4.4.0\lib\net461\System.Threading.AccessControl.dll - - ..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.Razor.dll + + ..\packages\Microsoft.Tpl.Dataflow.4.5.24\lib\portable-net45+win8+wpa81\System.Threading.Tasks.Dataflow.dll True + + @@ -175,20 +130,19 @@ - + $(MSBuildProjectDirectory)\..\..\ $(SolutionDir)\.nuget\NuGet.exe $(SolutionDir)\EPiCode.BlobConverter\EPiCode.BlobConverter.nuspec - - - + + + "$(NuGetExe)" pack "$(NuspecFile)" -OutputDirectory "$(OutDir.TrimEnd('\\'))" -Properties Configuration=$(Configuration) - - - - + + + - - $(MSBuildProjectDirectory)\..\..\ - $(ProjectDir)$(ProjectName).nuspec - - - + + + $(MSBuildProjectDirectory)\..\..\ + $(ProjectDir)$(ProjectName).nuspec + +