diff --git a/Nuget/Westwind.Globalization.Web/Westwind.Globalization.Web.3.0.0-preview1-1.nupkg b/Nuget/Westwind.Globalization.Web/Westwind.Globalization.Web.3.0.0-preview1-1.nupkg deleted file mode 100644 index edebea04..00000000 Binary files a/Nuget/Westwind.Globalization.Web/Westwind.Globalization.Web.3.0.0-preview1-1.nupkg and /dev/null differ diff --git a/Nuget/Westwind.Globalization.Web/Westwind.Globalization.Web.nuspec b/Nuget/Westwind.Globalization.Web/Westwind.Globalization.Web.nuspec index 4900f115..8d56b140 100644 --- a/Nuget/Westwind.Globalization.Web/Westwind.Globalization.Web.nuspec +++ b/Nuget/Westwind.Globalization.Web/Westwind.Globalization.Web.nuspec @@ -2,7 +2,7 @@ Westwind.Globalization.Web - 3.0.0-beta1-0 + 3.0.0-preview2-11 West Wind Globalization Web for ASP.NET Rick Strahl,West Wind Technologies https://github.com/RickStrahl/Westwind.Globalization#license @@ -17,7 +17,7 @@ en-US Localization,Translation,Globalization,Resources - + diff --git a/Nuget/Westwind.Globalization.Web/content/LocalizationAdmin/bower.json b/Nuget/Westwind.Globalization.Web/content/LocalizationAdmin/bower.json index a896902b..2bcb42f0 100644 --- a/Nuget/Westwind.Globalization.Web/content/LocalizationAdmin/bower.json +++ b/Nuget/Westwind.Globalization.Web/content/LocalizationAdmin/bower.json @@ -1,6 +1,6 @@ { "name": "LocalizationAdmin", - "version": "2.0.60", + "version": "3.0.5", "homepage": "https://github.com/RickStrahl/Westwind.Globalization", "authors": [ "Rick Strahl " @@ -21,6 +21,7 @@ "bootstrap": "~3.3.2", "font-awesome": "~4.4.0", "lodash": "~3.0.1", - "ng-file-upload": "~3.2.4" + "ng-file-upload": "~3.2.4", + "jquery": "~2.1.3" } } diff --git a/Nuget/Westwind.Globalization.Web/content/web.config.transform b/Nuget/Westwind.Globalization.Web/content/web.config.transform index 71cd6874..a7fc14ff 100644 --- a/Nuget/Westwind.Globalization.Web/content/web.config.transform +++ b/Nuget/Westwind.Globalization.Web/content/web.config.transform @@ -13,12 +13,8 @@ - - - - - + @@ -33,8 +29,7 @@ - - + \ No newline at end of file diff --git a/Readme.md b/Readme.md index d9693f5b..fd7a919c 100644 --- a/Readme.md +++ b/Readme.md @@ -33,8 +33,6 @@ Version 3.0 adds support for the 2.0 versions of .NET Standard, .NET Core and AS * Westwind.Globalization.Sample *(net45)* * Westwind.Globalization.Sample.AspNetCore *(netcore2.0)* - - ### Installation Installation is different depending on which version of .NET you are running under. **.NET Core** and **Full Framework** use different project types and NuGet Packages for the Web support. diff --git a/src/Net45/Westwind.Globalization.Web/Properties/AssemblyInfo.cs b/src/Net45/Westwind.Globalization.Web/Properties/AssemblyInfo.cs index 4ce6d99a..52694444 100644 --- a/src/Net45/Westwind.Globalization.Web/Properties/AssemblyInfo.cs +++ b/src/Net45/Westwind.Globalization.Web/Properties/AssemblyInfo.cs @@ -37,4 +37,4 @@ // 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("3.0.10")] \ No newline at end of file +[assembly: AssemblyVersion("3.0.11")] \ No newline at end of file diff --git a/src/NetCore/Westwind.Globalization.AspnetCore/Westwind.Globalization.AspnetCore.csproj b/src/NetCore/Westwind.Globalization.AspnetCore/Westwind.Globalization.AspnetCore.csproj index 11abf8b1..bd729c53 100644 --- a/src/NetCore/Westwind.Globalization.AspnetCore/Westwind.Globalization.AspnetCore.csproj +++ b/src/NetCore/Westwind.Globalization.AspnetCore/Westwind.Globalization.AspnetCore.csproj @@ -2,7 +2,7 @@ netstandard2.0 - 3.0.0-beta1-0 + 3.0.0-preview2-11 Rick Strahl West Wind Technologies Westwind.Globalization @@ -22,7 +22,8 @@ This library is required for using Westwind.Globalization in most ASP.NET Web Pr Github ASP.NET Core Localization Translation Globalization Resources true - 3.0.10.0 + 3.0.11.0 + 3.0.0.0 diff --git a/src/Westwind.Globalization/Westwind.Globalization.csproj b/src/Westwind.Globalization/Westwind.Globalization.csproj index fe694399..c6e20fa1 100644 --- a/src/Westwind.Globalization/Westwind.Globalization.csproj +++ b/src/Westwind.Globalization/Westwind.Globalization.csproj @@ -10,7 +10,7 @@ - 3.0.0-beta1-0 + 3.0.0-preview2-11 Rick Strahl West Wind Technologies West Wind Globalization provides custom data driven .NET ResourceManagers and ResourceProviders for both plain .NET and ASP.NET applications as well as serving JavaScript resources from .NET resources. There's also a a rich real time Web Resource editor that can update resources live but you'll need the Web NuGet package for that feature to light up. @@ -31,7 +31,7 @@ If you want to use ASP.NET ResourceProviders, JavaScript resources from .NET Res true .NET Standard 2.0 and .NET Core Support false - 3.0.10.0 + 3.0.11.0