Skip to content

Commit

Permalink
3.0.0-preview2-11
Browse files Browse the repository at this point in the history
  • Loading branch information
RickStrahl committed Nov 14, 2017
1 parent d599c65 commit 4a60f79
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 18 deletions.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata>
<id>Westwind.Globalization.Web</id>
<version>3.0.0-beta1-0</version>
<version>3.0.0-preview2-11</version>
<title>West Wind Globalization Web for ASP.NET</title>
<authors>Rick Strahl,West Wind Technologies</authors>
<licenseUrl>https://github.com/RickStrahl/Westwind.Globalization#license</licenseUrl>
Expand All @@ -17,7 +17,7 @@
<language>en-US</language>
<tags>Localization,Translation,Globalization,Resources</tags>
<dependencies>
<dependency id="Westwind.Globalization" version="3.0.0-beta1-0" />
<dependency id="Westwind.Globalization" version="3.0.0-preview2-11" />
<dependency id="Westwind.Web" version="2.76" />
</dependencies>
</metadata>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "LocalizationAdmin",
"version": "2.0.60",
"version": "3.0.5",
"homepage": "https://github.com/RickStrahl/Westwind.Globalization",
"authors": [
"Rick Strahl <[email protected]>"
Expand All @@ -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"
}
}
9 changes: 2 additions & 7 deletions Nuget/Westwind.Globalization.Web/content/web.config.transform
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,8 @@
<add namespace="Westwind.Globalization" />
</namespaces>
</pages>
<httpHandlers>
<add verb="GET" path="JavaScriptResourceHandler.axd" type="Westwind.Globalization.JavaScriptResourceHandler,Westwind.Globalization.Web"/>
</httpHandlers>
</system.web>
<system.webServer>
<validation validateIntegratedModeConfiguration="false" />
<system.webServer>
<handlers>
<add name="JavaScriptResourceHandler" verb="GET" path="JavascriptResourceHandler.axd" type="Westwind.Globalization.JavaScriptResourceHandler,Westwind.Globalization.Web"/>
</handlers>
Expand All @@ -33,8 +29,7 @@
<add key="ResxBaseFolder" value="~/Properties/" />
<add key="AddMissingResources" value="False" />
<add key="LocalizationFormWebPath" value="~/LocalizationAdmin/" />
<add key="BingClientId" value="" />
<add key="BingClientSecret" value="" />
<add key="BingClientId" value="" />
</DbResourceConfiguration>

</configuration>
2 changes: 0 additions & 2 deletions Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@ Version 3.0 adds support for the 2.0 versions of .NET Standard, .NET Core and AS
* Westwind.Globalization.Sample <small>*(net45)*</small>
* Westwind.Globalization.Sample.AspNetCore <small>*(netcore2.0)*</small>



<a name="nuget"></a>
### 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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
[assembly: AssemblyVersion("3.0.11")]
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<Version>3.0.0-beta1-0</Version>
<Version>3.0.0-preview2-11</Version>
<Authors>Rick Strahl</Authors>
<Company>West Wind Technologies</Company>
<Product>Westwind.Globalization</Product>
Expand All @@ -22,7 +22,8 @@ This library is required for using Westwind.Globalization in most ASP.NET Web Pr
<RepositoryType>Github</RepositoryType>
<PackageTags>ASP.NET Core Localization Translation Globalization Resources</PackageTags>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<FileVersion>3.0.10.0</FileVersion>
<FileVersion>3.0.11.0</FileVersion>
<AssemblyVersion>3.0.0.0</AssemblyVersion>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
Expand Down
4 changes: 2 additions & 2 deletions src/Westwind.Globalization/Westwind.Globalization.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

<PropertyGroup>
<!-- <TargetFrameworks>netstandard2.0;net45</TargetFrameworks> -->
<Version>3.0.0-beta1-0</Version>
<Version>3.0.0-preview2-11</Version>
<Authors>Rick Strahl</Authors>
<Company>West Wind Technologies</Company>
<Description>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.
Expand All @@ -31,7 +31,7 @@ If you want to use ASP.NET ResourceProviders, JavaScript resources from .NET Res
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<PackageReleaseNotes>.NET Standard 2.0 and .NET Core Support</PackageReleaseNotes>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
<FileVersion>3.0.10.0</FileVersion>
<FileVersion>3.0.11.0</FileVersion>
</PropertyGroup>

<ItemGroup>
Expand Down

0 comments on commit 4a60f79

Please sign in to comment.