huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Downgrade to stable packages

This commit is contained in:
Nate McMaster 2017-02-14 16:03:53 -08:00 committed by Pranav K
parent eb7d365ce5
commit 11922f9ef2
7 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build/common.props
View File

@ -1,4 +1,5 @@
<Project> <Project>
<Import Project="dependencies.props" />
<Import Project="..\version.props" /> <Import Project="..\version.props" />
<PropertyGroup> <PropertyGroup>
@ -7,8 +8,6 @@
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)Key.snk</AssemblyOriginatorKeyFile> <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)Key.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly> <SignAssembly>true</SignAssembly>
<PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign> <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
<NetCoreAppImplicitPackageVersion>1.2.0-*</NetCoreAppImplicitPackageVersion>
<NetStandardImplicitPackageVersion>1.6.2-*</NetStandardImplicitPackageVersion>
<VersionSuffix Condition="'$(VersionSuffix)'!='' AND '$(BuildNumber)' != ''">$(VersionSuffix)-$(BuildNumber)</VersionSuffix> <VersionSuffix Condition="'$(VersionSuffix)'!='' AND '$(BuildNumber)' != ''">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
</PropertyGroup> </PropertyGroup>

6
build/dependencies.props Normal file
View File

@ -0,0 +1,6 @@
<Project>
<PropertyGroup>
<NetStandardImplicitPackageVersion>1.6.1</NetStandardImplicitPackageVersion>
<CoreFxVersion>4.3.0</CoreFxVersion>
</PropertyGroup>
</Project>

2
src/Microsoft.Extensions.Localization.Abstractions/Microsoft.Extensions.Localization.Abstractions.csproj
View File

@ -15,7 +15,7 @@ Microsoft.Extensions.Localization.IStringLocalizer&lt;T&gt;</Description>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.CSharp" Version="4.4.0-*" /> <PackageReference Include="Microsoft.CSharp" Version="$(CoreFxVersion)" />
</ItemGroup> </ItemGroup>
</Project> </Project>

2
src/Microsoft.Extensions.Localization/Microsoft.Extensions.Localization.csproj
View File

@ -18,7 +18,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' "> <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
<PackageReference Include="System.Resources.Reader" Version="4.4.0-*" /> <PackageReference Include="System.Resources.Reader" Version="$(CoreFxVersion)" />
</ItemGroup> </ItemGroup>
</Project> </Project>

4
test/LocalizationWebsite/StartupResourcesAtRootFolder.cs
View File

@ -3,6 +3,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Globalization; using System.Globalization;
using System.Reflection;
using LocalizationWebsite.Models; using LocalizationWebsite.Models;
using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http;
@ -42,7 +43,8 @@ namespace LocalizationWebsite
} }
}); });
var stringLocalizer = stringLocalizerFactory.Create("Test", location: typeof(LocalizationWebsite.StartupResourcesAtRootFolder).Assembly.GetName().Name); var location = typeof(LocalizationWebsite.StartupResourcesAtRootFolder).GetTypeInfo().Assembly.GetName().Name;
var stringLocalizer = stringLocalizerFactory.Create("Test", location: location);
app.Run(async (context) => app.Run(async (context) =>
{ {

2
test/LocalizationWebsite/StartupResourcesInFolder.cs
View File

@ -43,7 +43,7 @@ namespace LocalizationWebsite
} }
}); });
var assemblyName = typeof(StartupResourcesInFolder).Assembly.GetName().Name; var assemblyName = typeof(StartupResourcesInFolder).GetTypeInfo().Assembly.GetName().Name;
var stringLocalizer = stringLocalizerFactory.Create("Test", assemblyName); var stringLocalizer = stringLocalizerFactory.Create("Test", assemblyName);
app.Run(async (context) => app.Run(async (context) =>

3
test/Microsoft.Extensions.Localization.Tests/Microsoft.Extensions.Localization.Tests.csproj
View File

@ -16,8 +16,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' "> <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">
<PackageReference Include="System.Diagnostics.TraceSource" Version="4.4.0-*" /> <PackageReference Include="System.Resources.Writer" Version="$(CoreFxVersion)" />
<PackageReference Include="System.Resources.Writer" Version="4.4.0-*" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>