diff --git a/Tests/DbLocalizationProvider.EPiServer.Sample/App_Data/EPiServerDB_3f986989.mdf b/Tests/DbLocalizationProvider.EPiServer.Sample/App_Data/EPiServerDB_3f986989.mdf index 446bd8a8..f2f5fd9d 100644 Binary files a/Tests/DbLocalizationProvider.EPiServer.Sample/App_Data/EPiServerDB_3f986989.mdf and b/Tests/DbLocalizationProvider.EPiServer.Sample/App_Data/EPiServerDB_3f986989.mdf differ diff --git a/Tests/DbLocalizationProvider.EPiServer.Sample/App_Data/EPiServerDB_3f986989_log.ldf b/Tests/DbLocalizationProvider.EPiServer.Sample/App_Data/EPiServerDB_3f986989_log.ldf index ceb6316e..6cee7d9b 100644 Binary files a/Tests/DbLocalizationProvider.EPiServer.Sample/App_Data/EPiServerDB_3f986989_log.ldf and b/Tests/DbLocalizationProvider.EPiServer.Sample/App_Data/EPiServerDB_3f986989_log.ldf differ diff --git a/Tests/DbLocalizationProvider.EPiServer.Sample/App_Start/InitLocalization.cs b/Tests/DbLocalizationProvider.EPiServer.Sample/App_Start/InitLocalization.cs index 2714d366..b56e52ee 100644 --- a/Tests/DbLocalizationProvider.EPiServer.Sample/App_Start/InitLocalization.cs +++ b/Tests/DbLocalizationProvider.EPiServer.Sample/App_Start/InitLocalization.cs @@ -1,6 +1,7 @@ using EPiServer.Core; using EPiServer.Framework; using EPiServer.Framework.Initialization; +using InitializationModule = EPiServer.Web.InitializationModule; namespace DbLocalizationProvider.EPiServer.Sample { diff --git a/Tests/DbLocalizationProvider.EPiServer.Sample/DbLocalizationProvider.EPiServer.Sample.csproj b/Tests/DbLocalizationProvider.EPiServer.Sample/DbLocalizationProvider.EPiServer.Sample.csproj index 45cf42ff..ef55819b 100644 --- a/Tests/DbLocalizationProvider.EPiServer.Sample/DbLocalizationProvider.EPiServer.Sample.csproj +++ b/Tests/DbLocalizationProvider.EPiServer.Sample/DbLocalizationProvider.EPiServer.Sample.csproj @@ -56,6 +56,21 @@ ..\..\packages\Castle.Windsor.3.3.0\lib\net45\Castle.Windsor.dll True + + ..\..\packages\LocalizationProvider.2.6.0\lib\net45\DbLocalizationProvider.dll + + + ..\..\packages\LocalizationProvider.Abstractions.2.6.0\lib\net45\DbLocalizationProvider.Abstractions.dll + + + ..\..\packages\DbLocalizationProvider.AdminUI.EPiServer.3.3.0\lib\net452\DbLocalizationProvider.AdminUI.EPiServer.dll + + + ..\..\packages\DbLocalizationProvider.EPiServer.3.3.0\lib\net452\DbLocalizationProvider.EPiServer.dll + + + ..\..\packages\DbLocalizationProvider.EPiServer.JsResourceHandler.3.3.0\lib\net452\DbLocalizationProvider.EPiServer.JsResourceHandler.dll + ..\..\packages\EntityFramework.6.1.2\lib\net45\EntityFramework.dll True @@ -293,28 +308,6 @@ Web.config - - - {5453bed3-0a29-414c-9535-57264c1f37e9} - DbLocalizationProvider.Abstractions - - - {aa5fcd04-8113-4f0b-8e8e-5cf365b3d245} - DbLocalizationProvider.AdminUI.EPiServer - - - {809f8979-893d-4145-9397-133e3b547e05} - DbLocalizationProvider.EPiServer.JsResourceHandler - - - {86cbfec7-8763-4bba-b760-0a0c977c8c36} - DbLocalizationProvider.EPiServer - - - {17ca5d23-46c3-44b1-8fa6-0f40b2e447ba} - DbLocalizationProvider - - diff --git a/Tests/DbLocalizationProvider.EPiServer.Sample/Views/StartPage/Index.cshtml b/Tests/DbLocalizationProvider.EPiServer.Sample/Views/StartPage/Index.cshtml index 70cc77af..3e5e7606 100644 --- a/Tests/DbLocalizationProvider.EPiServer.Sample/Views/StartPage/Index.cshtml +++ b/Tests/DbLocalizationProvider.EPiServer.Sample/Views/StartPage/Index.cshtml @@ -16,8 +16,7 @@ title @Html.GetTranslations(typeof(MyProject.MyResources), alias: "m", debug: true) - @**@ - + @Html.GetTranslations(typeof(MyProject.AlternativeResources), alias: "ar", debug: true)
CurrentUICulture: @CultureInfo.CurrentUICulture.Name
diff --git a/Tests/DbLocalizationProvider.EPiServer.Sample/Web.config b/Tests/DbLocalizationProvider.EPiServer.Sample/Web.config index be36a594..8c0c3460 100644 --- a/Tests/DbLocalizationProvider.EPiServer.Sample/Web.config +++ b/Tests/DbLocalizationProvider.EPiServer.Sample/Web.config @@ -278,9 +278,9 @@ - + - + diff --git a/Tests/DbLocalizationProvider.EPiServer.Sample/modules/_protected/DbLocalizationProvider.AdminUI.EPiServer/DbLocalizationProvider.AdminUI.EPiServer.zip b/Tests/DbLocalizationProvider.EPiServer.Sample/modules/_protected/DbLocalizationProvider.AdminUI.EPiServer/DbLocalizationProvider.AdminUI.EPiServer.zip new file mode 100644 index 00000000..1581d5b4 Binary files /dev/null and b/Tests/DbLocalizationProvider.EPiServer.Sample/modules/_protected/DbLocalizationProvider.AdminUI.EPiServer/DbLocalizationProvider.AdminUI.EPiServer.zip differ diff --git a/Tests/DbLocalizationProvider.EPiServer.Sample/packages.config b/Tests/DbLocalizationProvider.EPiServer.Sample/packages.config index 44b946db..4104eccf 100644 --- a/Tests/DbLocalizationProvider.EPiServer.Sample/packages.config +++ b/Tests/DbLocalizationProvider.EPiServer.Sample/packages.config @@ -2,9 +2,9 @@ - - - + + + @@ -14,8 +14,8 @@ - - + + diff --git a/Tests/DbLocalizationProvider.MigrationTool.Tests/DbLocalizationProvider.MigrationTool.Tests.csproj b/Tests/DbLocalizationProvider.MigrationTool.Tests/DbLocalizationProvider.MigrationTool.Tests.csproj index 04a09fdf..bfcc9db3 100644 --- a/Tests/DbLocalizationProvider.MigrationTool.Tests/DbLocalizationProvider.MigrationTool.Tests.csproj +++ b/Tests/DbLocalizationProvider.MigrationTool.Tests/DbLocalizationProvider.MigrationTool.Tests.csproj @@ -33,8 +33,8 @@ 4 - - ..\..\packages\LocalizationProvider.Abstractions.2.5.0\lib\net45\DbLocalizationProvider.Abstractions.dll + + ..\..\packages\LocalizationProvider.Abstractions.2.6.0\lib\net45\DbLocalizationProvider.Abstractions.dll diff --git a/Tests/DbLocalizationProvider.MigrationTool.Tests/packages.config b/Tests/DbLocalizationProvider.MigrationTool.Tests/packages.config index 287c6bf4..407956eb 100644 --- a/Tests/DbLocalizationProvider.MigrationTool.Tests/packages.config +++ b/Tests/DbLocalizationProvider.MigrationTool.Tests/packages.config @@ -1,6 +1,6 @@  - + diff --git a/Tests/DbLocalizationProvider.MvcSample/App_Data/DbLocalizationProvider.MvcSample.mdf b/Tests/DbLocalizationProvider.MvcSample/App_Data/DbLocalizationProvider.MvcSample.mdf index dc2ab353..50317d90 100644 Binary files a/Tests/DbLocalizationProvider.MvcSample/App_Data/DbLocalizationProvider.MvcSample.mdf and b/Tests/DbLocalizationProvider.MvcSample/App_Data/DbLocalizationProvider.MvcSample.mdf differ diff --git a/Tests/DbLocalizationProvider.MvcSample/App_Data/DbLocalizationProvider.MvcSample_log.ldf b/Tests/DbLocalizationProvider.MvcSample/App_Data/DbLocalizationProvider.MvcSample_log.ldf index b1ae34eb..00f43c28 100644 Binary files a/Tests/DbLocalizationProvider.MvcSample/App_Data/DbLocalizationProvider.MvcSample_log.ldf and b/Tests/DbLocalizationProvider.MvcSample/App_Data/DbLocalizationProvider.MvcSample_log.ldf differ diff --git a/Tests/DbLocalizationProvider.MvcSample/DbLocalizationProvider.MvcSample.csproj b/Tests/DbLocalizationProvider.MvcSample/DbLocalizationProvider.MvcSample.csproj index 84235a4d..2496a400 100644 --- a/Tests/DbLocalizationProvider.MvcSample/DbLocalizationProvider.MvcSample.csproj +++ b/Tests/DbLocalizationProvider.MvcSample/DbLocalizationProvider.MvcSample.csproj @@ -43,6 +43,15 @@ 4 + + ..\..\packages\LocalizationProvider.2.6.0\lib\net45\DbLocalizationProvider.dll + + + ..\..\packages\LocalizationProvider.Abstractions.2.6.0\lib\net45\DbLocalizationProvider.Abstractions.dll + + + ..\..\packages\LocalizationProvider.AdminUI.2.6.0\lib\net45\DbLocalizationProvider.AdminUI.dll + ..\..\packages\EntityFramework.6.1.2\lib\net45\EntityFramework.dll True @@ -60,14 +69,27 @@ ..\..\packages\Microsoft.Owin.3.0.1\lib\net45\Microsoft.Owin.dll True + + ..\..\packages\Microsoft.Owin.FileSystems.3.0.0\lib\net45\Microsoft.Owin.FileSystems.dll + ..\..\packages\Microsoft.Owin.Host.SystemWeb.3.0.0\lib\net45\Microsoft.Owin.Host.SystemWeb.dll True + + ..\..\packages\Microsoft.Owin.StaticFiles.3.0.0\lib\net45\Microsoft.Owin.StaticFiles.dll + + + ..\..\packages\Newtonsoft.Json.5.0.8\lib\net45\Newtonsoft.Json.dll + ..\..\packages\Owin.1.0\lib\net40\Owin.dll True + + + ..\..\packages\Microsoft.AspNet.WebApi.Client.5.0.0\lib\net45\System.Net.Http.Formatting.dll + @@ -77,6 +99,12 @@ + + ..\..\packages\Microsoft.AspNet.WebApi.Core.5.0.0\lib\net45\System.Web.Http.dll + + + ..\..\packages\Microsoft.AspNet.WebApi.Owin.5.0.0\lib\net45\System.Web.Http.Owin.dll + @@ -149,20 +177,6 @@ - - - {5453bed3-0a29-414c-9535-57264c1f37e9} - DbLocalizationProvider.Abstractions - - - {8f0618d8-8200-45e9-9d1e-b268e98e0a84} - DbLocalizationProvider.AdminUI - - - {17ca5d23-46c3-44b1-8fa6-0f40b2e447ba} - DbLocalizationProvider - - 10.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) diff --git a/Tests/DbLocalizationProvider.MvcSample/Web.config b/Tests/DbLocalizationProvider.MvcSample/Web.config index 60af87a6..a0af4716 100644 --- a/Tests/DbLocalizationProvider.MvcSample/Web.config +++ b/Tests/DbLocalizationProvider.MvcSample/Web.config @@ -24,7 +24,12 @@ - + + + + + + diff --git a/Tests/DbLocalizationProvider.MvcSample/packages.config b/Tests/DbLocalizationProvider.MvcSample/packages.config index 9c0e066f..8d956df0 100644 --- a/Tests/DbLocalizationProvider.MvcSample/packages.config +++ b/Tests/DbLocalizationProvider.MvcSample/packages.config @@ -1,14 +1,22 @@  - + + + + + + + + + \ No newline at end of file diff --git a/build-packages.ps1 b/build-packages.ps1 index 39eacfcf..9bc769ad 100644 --- a/build-packages.ps1 +++ b/build-packages.ps1 @@ -1,3 +1,5 @@ +Add-Type -assembly "system.io.compression.filesystem" + cd .\.nuget .\nuget.exe pack ..\src\DbLocalizationProvider.Abstractions\DbLocalizationProvider.Abstractions.csproj -Properties Configuration=Release @@ -5,7 +7,15 @@ cd .\.nuget .\nuget.exe pack ..\src\DbLocalizationProvider.AdminUI\DbLocalizationProvider.AdminUI.csproj -Properties Configuration=Release .\nuget.exe pack ..\src\DbLocalizationProvider.EPiServer\DbLocalizationProvider.EPiServer.csproj -Properties Configuration=Release + +$moduleName = "DbLocalizationProvider.AdminUI.EPiServer" +$source = $PSScriptRoot + "\src\" + $moduleName + "\modules\_protected\" + $moduleName +$destination = $PSScriptRoot + "\src\" + $moduleName + "\" + $moduleName + ".zip" + +If(Test-path $destination) {Remove-item $destination} +[io.compression.zipfile]::CreateFromDirectory($Source, $destination) + .\nuget.exe pack ..\src\DbLocalizationProvider.AdminUI.EPiServer\DbLocalizationProvider.AdminUI.EPiServer.csproj -Properties Configuration=Release .\nuget.exe pack ..\src\DbLocalizationProvider.MigrationTool\DbLocalizationProvider.MigrationTool.csproj -Properties Configuration=Release -tool .\nuget.exe pack ..\src\DbLocalizationProvider.EPiServer.JsResourceHandler\DbLocalizationProvider.EPiServer.JsResourceHandler.csproj -Properties Configuration=Release -cd ..\ \ No newline at end of file +cd ..\ diff --git a/src/DbLocalizationProvider.Abstractions/Properties/AssemblyInfo.cs b/src/DbLocalizationProvider.Abstractions/Properties/AssemblyInfo.cs index a235eda7..55d38f08 100644 --- a/src/DbLocalizationProvider.Abstractions/Properties/AssemblyInfo.cs +++ b/src/DbLocalizationProvider.Abstractions/Properties/AssemblyInfo.cs @@ -4,6 +4,7 @@ [assembly: AssemblyTitle("DbLocalizationProvider.Abstractions")] [assembly: AssemblyDescription("Abstractions for Database driven localization provider.")] [assembly: Guid("5453bed3-0a29-414c-9535-57264c1f37e9")] -[assembly: AssemblyVersion("2.5.0.0")] -[assembly: AssemblyFileVersion("2.5.0.0")] -[assembly: AssemblyInformationalVersion("2.5.0")] +[assembly: AssemblyVersion("2.6.0.0")] +[assembly: AssemblyFileVersion("2.6.0.0")] +[assembly: AssemblyInformationalVersion("2.6.0")] + diff --git a/src/DbLocalizationProvider.AdminUI.EPiServer/DbLocalizationProvider.AdminUI.EPiServer.csproj b/src/DbLocalizationProvider.AdminUI.EPiServer/DbLocalizationProvider.AdminUI.EPiServer.csproj index 3ac57182..a08f9463 100644 --- a/src/DbLocalizationProvider.AdminUI.EPiServer/DbLocalizationProvider.AdminUI.EPiServer.csproj +++ b/src/DbLocalizationProvider.AdminUI.EPiServer/DbLocalizationProvider.AdminUI.EPiServer.csproj @@ -42,6 +42,15 @@ ..\..\packages\Castle.Windsor.3.3.0\lib\net45\Castle.Windsor.dll True + + ..\..\packages\LocalizationProvider.2.6.0\lib\net45\DbLocalizationProvider.dll + + + ..\..\packages\LocalizationProvider.Abstractions.2.6.0\lib\net45\DbLocalizationProvider.Abstractions.dll + + + ..\..\packages\DbLocalizationProvider.EPiServer.3.3.0\lib\net452\DbLocalizationProvider.EPiServer.dll + ..\..\packages\EntityFramework.6.1.2\lib\net45\EntityFramework.dll True @@ -216,6 +225,7 @@ + ASPXCodeBehind @@ -242,20 +252,6 @@ - - - {5453bed3-0a29-414c-9535-57264c1f37e9} - DbLocalizationProvider.Abstractions - - - {86cbfec7-8763-4bba-b760-0a0c977c8c36} - DbLocalizationProvider.EPiServer - - - {17ca5d23-46c3-44b1-8fa6-0f40b2e447ba} - DbLocalizationProvider - - diff --git a/src/DbLocalizationProvider.AdminUI.EPiServer/DbLocalizationProvider.AdminUI.EPiServer.nuspec b/src/DbLocalizationProvider.AdminUI.EPiServer/DbLocalizationProvider.AdminUI.EPiServer.nuspec index 2636f270..700cdc43 100644 --- a/src/DbLocalizationProvider.AdminUI.EPiServer/DbLocalizationProvider.AdminUI.EPiServer.nuspec +++ b/src/DbLocalizationProvider.AdminUI.EPiServer/DbLocalizationProvider.AdminUI.EPiServer.nuspec @@ -14,9 +14,6 @@ Inital version of DbLocalizationProvider AdminUI package for EPiServer Copyright 2017 (c) Valdis Iljuconoks, Tech Fellow Localization EPiServer Provider DbLocalization DbLocalizationProvider LocalizationProvider AdminUI UI - - - diff --git a/src/DbLocalizationProvider.AdminUI.EPiServer/DbLocalizationProvider.AdminUI.EPiServer.zip b/src/DbLocalizationProvider.AdminUI.EPiServer/DbLocalizationProvider.AdminUI.EPiServer.zip index 17b63da0..1581d5b4 100644 Binary files a/src/DbLocalizationProvider.AdminUI.EPiServer/DbLocalizationProvider.AdminUI.EPiServer.zip and b/src/DbLocalizationProvider.AdminUI.EPiServer/DbLocalizationProvider.AdminUI.EPiServer.zip differ diff --git a/src/DbLocalizationProvider.AdminUI.EPiServer/Properties/AssemblyInfo.cs b/src/DbLocalizationProvider.AdminUI.EPiServer/Properties/AssemblyInfo.cs index 18248311..1eaa8acb 100644 --- a/src/DbLocalizationProvider.AdminUI.EPiServer/Properties/AssemblyInfo.cs +++ b/src/DbLocalizationProvider.AdminUI.EPiServer/Properties/AssemblyInfo.cs @@ -2,8 +2,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyTitle("DbLocalizationProvider.AdminUI.EPiServer")] -[assembly: AssemblyDescription("DbLocalizationProvider management user interface for EPServer")] +[assembly: AssemblyDescription("DbLocalizationProvider management user interface for EPiServer")] [assembly: Guid("aa5fcd04-8113-4f0b-8e8e-5cf365b3d245")] -[assembly: AssemblyVersion("3.2.1.0")] -[assembly: AssemblyFileVersion("3.2.1.0")] -[assembly: AssemblyInformationalVersion("3.2.1")] +[assembly: AssemblyVersion("3.3.0.0")] +[assembly: AssemblyFileVersion("3.3.0.0")] +[assembly: AssemblyInformationalVersion("3.3.0")] diff --git a/src/DbLocalizationProvider.AdminUI.EPiServer/app.config b/src/DbLocalizationProvider.AdminUI.EPiServer/app.config new file mode 100644 index 00000000..44298137 --- /dev/null +++ b/src/DbLocalizationProvider.AdminUI.EPiServer/app.config @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/src/DbLocalizationProvider.AdminUI.EPiServer/packages.config b/src/DbLocalizationProvider.AdminUI.EPiServer/packages.config index 6e1c9151..df3309b3 100644 --- a/src/DbLocalizationProvider.AdminUI.EPiServer/packages.config +++ b/src/DbLocalizationProvider.AdminUI.EPiServer/packages.config @@ -2,11 +2,13 @@ + - + + diff --git a/src/DbLocalizationProvider.AdminUI/DbLocalizationProvider.AdminUI.csproj b/src/DbLocalizationProvider.AdminUI/DbLocalizationProvider.AdminUI.csproj index 71b792b8..7ff166f1 100644 --- a/src/DbLocalizationProvider.AdminUI/DbLocalizationProvider.AdminUI.csproj +++ b/src/DbLocalizationProvider.AdminUI/DbLocalizationProvider.AdminUI.csproj @@ -43,6 +43,12 @@ ..\..\packages\Castle.Windsor.3.2.0\lib\net45\Castle.Windsor.dll True + + ..\..\packages\LocalizationProvider.2.6.0\lib\net45\DbLocalizationProvider.dll + + + ..\..\packages\LocalizationProvider.Abstractions.2.6.0\lib\net45\DbLocalizationProvider.Abstractions.dll + ..\..\packages\EntityFramework.6.1.2\lib\net45\EntityFramework.dll True @@ -238,16 +244,6 @@ Designer - - - {5453bed3-0a29-414c-9535-57264c1f37e9} - DbLocalizationProvider.Abstractions - - - {17ca5d23-46c3-44b1-8fa6-0f40b2e447ba} - DbLocalizationProvider - - diff --git a/src/DbLocalizationProvider.AdminUI/DbLocalizationProvider.AdminUI.nuspec b/src/DbLocalizationProvider.AdminUI/DbLocalizationProvider.AdminUI.nuspec index 4515bd45..ed0597c6 100644 --- a/src/DbLocalizationProvider.AdminUI/DbLocalizationProvider.AdminUI.nuspec +++ b/src/DbLocalizationProvider.AdminUI/DbLocalizationProvider.AdminUI.nuspec @@ -13,8 +13,8 @@ Inital version of LocalizationProvider AdminUI package Copyright 2017 (c) Valdis Iljuconoks, Tech Fellow Localization Provider DbLocalization DbLocalizationProvider LocalizationProvider AdminUI Administration UI - - - + \ No newline at end of file diff --git a/src/DbLocalizationProvider.AdminUI/Properties/AssemblyInfo.cs b/src/DbLocalizationProvider.AdminUI/Properties/AssemblyInfo.cs index 713f5b6e..4c4654a0 100644 --- a/src/DbLocalizationProvider.AdminUI/Properties/AssemblyInfo.cs +++ b/src/DbLocalizationProvider.AdminUI/Properties/AssemblyInfo.cs @@ -4,6 +4,6 @@ [assembly: AssemblyTitle("DbLocalizationProvider.AdminUI")] [assembly: AssemblyDescription("Administration User Interface for LocalizationProvider")] [assembly: Guid("8f0618d8-8200-45e9-9d1e-b268e98e0a84")] -[assembly: AssemblyVersion("2.5.0.0")] -[assembly: AssemblyFileVersion("2.5.0.0")] -[assembly: AssemblyInformationalVersion("2.5.0")] +[assembly: AssemblyVersion("2.6.0.0")] +[assembly: AssemblyFileVersion("2.6.0.0")] +[assembly: AssemblyInformationalVersion("2.6.0")] diff --git a/src/DbLocalizationProvider.AdminUI/packages.config b/src/DbLocalizationProvider.AdminUI/packages.config index 83a69b84..0b856693 100644 --- a/src/DbLocalizationProvider.AdminUI/packages.config +++ b/src/DbLocalizationProvider.AdminUI/packages.config @@ -1,7 +1,8 @@  - + + diff --git a/src/DbLocalizationProvider.EPiServer.JsResourceHandler/DbLocalizationProvider.EPiServer.JsResourceHandler.csproj b/src/DbLocalizationProvider.EPiServer.JsResourceHandler/DbLocalizationProvider.EPiServer.JsResourceHandler.csproj index 6aaa1566..e1cef263 100644 --- a/src/DbLocalizationProvider.EPiServer.JsResourceHandler/DbLocalizationProvider.EPiServer.JsResourceHandler.csproj +++ b/src/DbLocalizationProvider.EPiServer.JsResourceHandler/DbLocalizationProvider.EPiServer.JsResourceHandler.csproj @@ -40,11 +40,14 @@ ..\..\packages\Castle.Windsor.3.3.0\lib\net45\Castle.Windsor.dll - - ..\..\packages\LocalizationProvider.Abstractions.2.5.0\lib\net45\DbLocalizationProvider.Abstractions.dll + + ..\..\packages\LocalizationProvider.2.6.0\lib\net45\DbLocalizationProvider.dll - - ..\..\packages\DbLocalizationProvider.EPiServer.3.2.0\lib\net452\DbLocalizationProvider.EPiServer.dll + + ..\..\packages\LocalizationProvider.Abstractions.2.6.0\lib\net45\DbLocalizationProvider.Abstractions.dll + + + ..\..\packages\DbLocalizationProvider.EPiServer.3.3.0\lib\net452\DbLocalizationProvider.EPiServer.dll ..\..\packages\EntityFramework.6.1.2\lib\net45\EntityFramework.dll @@ -161,12 +164,6 @@ - - - {17ca5d23-46c3-44b1-8fa6-0f40b2e447ba} - DbLocalizationProvider - - diff --git a/src/DbLocalizationProvider.EPiServer.JsResourceHandler/DbLocalizationProvider.EPiServer.JsResourceHandler.nuspec b/src/DbLocalizationProvider.EPiServer.JsResourceHandler/DbLocalizationProvider.EPiServer.JsResourceHandler.nuspec index b79dfdee..17db992a 100644 --- a/src/DbLocalizationProvider.EPiServer.JsResourceHandler/DbLocalizationProvider.EPiServer.JsResourceHandler.nuspec +++ b/src/DbLocalizationProvider.EPiServer.JsResourceHandler/DbLocalizationProvider.EPiServer.JsResourceHandler.nuspec @@ -14,9 +14,5 @@ Inital version of DbLocalizationProvider JsResourceHandler package for EPiServer Copyright 2017 (c) Valdis Iljuconoks, Tech Fellow Localization EPiServer Provider DbLocalization DbLocalizationProvider LocalizationProvider - - - - \ No newline at end of file diff --git a/src/DbLocalizationProvider.EPiServer.JsResourceHandler/Properties/AssemblyInfo.cs b/src/DbLocalizationProvider.EPiServer.JsResourceHandler/Properties/AssemblyInfo.cs index 210dca93..97b57775 100644 --- a/src/DbLocalizationProvider.EPiServer.JsResourceHandler/Properties/AssemblyInfo.cs +++ b/src/DbLocalizationProvider.EPiServer.JsResourceHandler/Properties/AssemblyInfo.cs @@ -8,6 +8,6 @@ [assembly: AssemblyTitle("DbLocalizationProvider.EPiServer.JsResourceHandler")] [assembly: AssemblyDescription("Initial version of Javascript resource handler based on DbLocalizationProvider resources")] [assembly: Guid("809f8979-893d-4145-9397-133e3b547e05")] -[assembly: AssemblyVersion("3.2.1.0")] -[assembly: AssemblyFileVersion("3.2.1.0")] -[assembly: AssemblyInformationalVersion("3.2.1")] +[assembly: AssemblyVersion("3.3.0.0")] +[assembly: AssemblyFileVersion("3.3.0.0")] +[assembly: AssemblyInformationalVersion("3.3.0")] diff --git a/src/DbLocalizationProvider.EPiServer.JsResourceHandler/packages.config b/src/DbLocalizationProvider.EPiServer.JsResourceHandler/packages.config index cb47295b..46ffac0f 100644 --- a/src/DbLocalizationProvider.EPiServer.JsResourceHandler/packages.config +++ b/src/DbLocalizationProvider.EPiServer.JsResourceHandler/packages.config @@ -2,12 +2,12 @@ - + - - + + diff --git a/src/DbLocalizationProvider.EPiServer/App.config b/src/DbLocalizationProvider.EPiServer/App.config index 282ddbca..a268cce1 100644 --- a/src/DbLocalizationProvider.EPiServer/App.config +++ b/src/DbLocalizationProvider.EPiServer/App.config @@ -68,6 +68,10 @@ + + + + \ No newline at end of file diff --git a/src/DbLocalizationProvider.EPiServer/DbLocalizationProvider.EPiServer.csproj b/src/DbLocalizationProvider.EPiServer/DbLocalizationProvider.EPiServer.csproj index b8770c49..8173cd1c 100644 --- a/src/DbLocalizationProvider.EPiServer/DbLocalizationProvider.EPiServer.csproj +++ b/src/DbLocalizationProvider.EPiServer/DbLocalizationProvider.EPiServer.csproj @@ -42,8 +42,11 @@ ..\..\packages\Castle.Windsor.3.3.0\lib\net45\Castle.Windsor.dll True - - ..\..\packages\LocalizationProvider.Abstractions.2.5.0\lib\net45\DbLocalizationProvider.Abstractions.dll + + ..\..\packages\LocalizationProvider.2.6.0\lib\net45\DbLocalizationProvider.dll + + + ..\..\packages\LocalizationProvider.Abstractions.2.6.0\lib\net45\DbLocalizationProvider.Abstractions.dll ..\..\packages\EntityFramework.6.1.2\lib\net45\EntityFramework.dll @@ -113,6 +116,9 @@ ..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll True + + ..\..\packages\Owin.1.0\lib\net40\Owin.dll + ..\..\packages\structuremap-signed.3.1.6.186\lib\net40\StructureMap.dll True @@ -183,12 +189,6 @@ - - - {17ca5d23-46c3-44b1-8fa6-0f40b2e447ba} - DbLocalizationProvider - - diff --git a/src/DbLocalizationProvider.EPiServer/DbLocalizationProvider.EPiServer.nuspec b/src/DbLocalizationProvider.EPiServer/DbLocalizationProvider.EPiServer.nuspec index 98e9854f..21982322 100644 --- a/src/DbLocalizationProvider.EPiServer/DbLocalizationProvider.EPiServer.nuspec +++ b/src/DbLocalizationProvider.EPiServer/DbLocalizationProvider.EPiServer.nuspec @@ -14,9 +14,6 @@ Inital version of DbLocalizationProvider package for EPiServer Copyright 2017 (c) Valdis Iljuconoks, Tech Fellow Localization EPiServer Provider DbLocalization DbLocalizationProvider LocalizationProvider - - - diff --git a/src/DbLocalizationProvider.EPiServer/Properties/AssemblyInfo.cs b/src/DbLocalizationProvider.EPiServer/Properties/AssemblyInfo.cs index c64ad6b5..db0b483d 100644 --- a/src/DbLocalizationProvider.EPiServer/Properties/AssemblyInfo.cs +++ b/src/DbLocalizationProvider.EPiServer/Properties/AssemblyInfo.cs @@ -4,6 +4,6 @@ [assembly: AssemblyTitle("DbLocalizationProvider.EPiServer")] [assembly: AssemblyDescription("Database driven LocalizationProvider for EPiServer")] [assembly: Guid("86cbfec7-8763-4bba-b760-0a0c977c8c36")] -[assembly: AssemblyVersion("3.2.0.0")] -[assembly: AssemblyFileVersion("3.2.0.0")] -[assembly: AssemblyInformationalVersion("3.2.0")] +[assembly: AssemblyVersion("3.3.0.0")] +[assembly: AssemblyFileVersion("3.3.0.0")] +[assembly: AssemblyInformationalVersion("3.3.0")] diff --git a/src/DbLocalizationProvider.EPiServer/packages.config b/src/DbLocalizationProvider.EPiServer/packages.config index e7e07bed..62c53578 100644 --- a/src/DbLocalizationProvider.EPiServer/packages.config +++ b/src/DbLocalizationProvider.EPiServer/packages.config @@ -5,13 +5,15 @@ - + + + \ No newline at end of file diff --git a/src/DbLocalizationProvider.MigrationTool/DbLocalizationProvider.MigrationTool.csproj b/src/DbLocalizationProvider.MigrationTool/DbLocalizationProvider.MigrationTool.csproj index d762f858..24803099 100644 --- a/src/DbLocalizationProvider.MigrationTool/DbLocalizationProvider.MigrationTool.csproj +++ b/src/DbLocalizationProvider.MigrationTool/DbLocalizationProvider.MigrationTool.csproj @@ -53,8 +53,8 @@ - - ..\..\packages\LocalizationProvider.Abstractions.2.5.0\lib\net45\DbLocalizationProvider.Abstractions.dll + + ..\..\packages\LocalizationProvider.Abstractions.2.6.0\lib\net45\DbLocalizationProvider.Abstractions.dll ..\..\packages\EntityFramework.6.1.2\lib\net45\EntityFramework.dll diff --git a/src/DbLocalizationProvider.MigrationTool/LocalizationProvider.MigrationTool.nuspec b/src/DbLocalizationProvider.MigrationTool/LocalizationProvider.MigrationTool.nuspec index e418513a..c6c779c9 100644 --- a/src/DbLocalizationProvider.MigrationTool/LocalizationProvider.MigrationTool.nuspec +++ b/src/DbLocalizationProvider.MigrationTool/LocalizationProvider.MigrationTool.nuspec @@ -13,6 +13,8 @@ Inital version of DbLocalizationProvider migration tool for EPiServer Copyright 2017 (c) Valdis Iljuconoks, Tech Fellow Localization EPiServer Provider DbLocalization DbLocalizationProvider LocalizationProvider Migration + + diff --git a/src/DbLocalizationProvider.MigrationTool/Properties/AssemblyInfo.cs b/src/DbLocalizationProvider.MigrationTool/Properties/AssemblyInfo.cs index 63cf6f75..15e8f753 100644 --- a/src/DbLocalizationProvider.MigrationTool/Properties/AssemblyInfo.cs +++ b/src/DbLocalizationProvider.MigrationTool/Properties/AssemblyInfo.cs @@ -5,8 +5,8 @@ [assembly: AssemblyTitle("DbLocalizationProvider.MigrationTool")] [assembly: AssemblyDescription("Migration tool to move Xml resources to database")] [assembly: Guid("5227c16b-342c-4097-a9ed-295cdd164a61")] -[assembly: AssemblyVersion("3.2.1.0")] -[assembly: AssemblyFileVersion("3.2.1.0")] -[assembly: AssemblyInformationalVersion("3.2.1")] +[assembly: AssemblyVersion("3.3.0.0")] +[assembly: AssemblyFileVersion("3.3.0.0")] +[assembly: AssemblyInformationalVersion("3.3.0")] [assembly: InternalsVisibleTo("DbLocalizationProvider.MigrationTool.Tests")] diff --git a/src/DbLocalizationProvider.MigrationTool/packages.config b/src/DbLocalizationProvider.MigrationTool/packages.config index 60f7dcce..884f7dcc 100644 --- a/src/DbLocalizationProvider.MigrationTool/packages.config +++ b/src/DbLocalizationProvider.MigrationTool/packages.config @@ -1,7 +1,7 @@  - + \ No newline at end of file diff --git a/src/DbLocalizationProvider/DbLocalizationProvider.csproj b/src/DbLocalizationProvider/DbLocalizationProvider.csproj index 9975767a..7d0921a8 100644 --- a/src/DbLocalizationProvider/DbLocalizationProvider.csproj +++ b/src/DbLocalizationProvider/DbLocalizationProvider.csproj @@ -35,6 +35,9 @@ bin\Release\DbLocalizationProvider.xml + + ..\..\packages\LocalizationProvider.Abstractions.2.6.0\lib\net45\DbLocalizationProvider.Abstractions.dll + ..\..\packages\EntityFramework.6.1.2\lib\net45\EntityFramework.dll True @@ -200,12 +203,6 @@ 201702192145132_AddResourceKeyIndex.cs - - - {5453bed3-0a29-414c-9535-57264c1f37e9} - DbLocalizationProvider.Abstractions - - diff --git a/src/DbLocalizationProvider/Properties/AssemblyInfo.cs b/src/DbLocalizationProvider/Properties/AssemblyInfo.cs index d1bf441e..ef211a10 100644 --- a/src/DbLocalizationProvider/Properties/AssemblyInfo.cs +++ b/src/DbLocalizationProvider/Properties/AssemblyInfo.cs @@ -5,9 +5,9 @@ [assembly: AssemblyTitle("DbLocalizationProvider")] [assembly: AssemblyDescription("Database driven localization provider")] [assembly: Guid("17ca5d23-46c3-44b1-8fa6-0f40b2e447ba")] -[assembly: AssemblyVersion("2.5.2.0")] -[assembly: AssemblyFileVersion("2.5.2.0")] -[assembly: AssemblyInformationalVersion("2.5.2")] +[assembly: AssemblyVersion("2.6.0.0")] +[assembly: AssemblyFileVersion("2.6.0.0")] +[assembly: AssemblyInformationalVersion("2.6.0")] [assembly: InternalsVisibleTo("DbLocalizationProvider.EPiServer")] [assembly: InternalsVisibleTo("DbLocalizationProvider.EPiServer.JsResourceHandler")] diff --git a/src/DbLocalizationProvider/packages.config b/src/DbLocalizationProvider/packages.config index 15fe46db..4b59e6d3 100644 --- a/src/DbLocalizationProvider/packages.config +++ b/src/DbLocalizationProvider/packages.config @@ -1,7 +1,7 @@  - +