diff --git a/build/common.props b/build/common.props index e9df5204ba..7fe563d377 100644 --- a/build/common.props +++ b/build/common.props @@ -1,4 +1,5 @@ + @@ -7,8 +8,6 @@ $(MSBuildThisFileDirectory)Key.snk true true - 1.2.0-* - 1.6.2-* $(VersionSuffix)-$(BuildNumber) diff --git a/build/dependencies.props b/build/dependencies.props new file mode 100644 index 0000000000..e704edaec0 --- /dev/null +++ b/build/dependencies.props @@ -0,0 +1,6 @@ + + + 1.6.1 + 4.3.0 + + diff --git a/src/Microsoft.Extensions.Localization.Abstractions/Microsoft.Extensions.Localization.Abstractions.csproj b/src/Microsoft.Extensions.Localization.Abstractions/Microsoft.Extensions.Localization.Abstractions.csproj index a6f2e6a71d..9aa583a2ab 100644 --- a/src/Microsoft.Extensions.Localization.Abstractions/Microsoft.Extensions.Localization.Abstractions.csproj +++ b/src/Microsoft.Extensions.Localization.Abstractions/Microsoft.Extensions.Localization.Abstractions.csproj @@ -15,7 +15,7 @@ Microsoft.Extensions.Localization.IStringLocalizer<T> - + diff --git a/src/Microsoft.Extensions.Localization/Microsoft.Extensions.Localization.csproj b/src/Microsoft.Extensions.Localization/Microsoft.Extensions.Localization.csproj index 11d971a8f9..191888177f 100644 --- a/src/Microsoft.Extensions.Localization/Microsoft.Extensions.Localization.csproj +++ b/src/Microsoft.Extensions.Localization/Microsoft.Extensions.Localization.csproj @@ -18,7 +18,7 @@ - + diff --git a/test/LocalizationWebsite/StartupResourcesAtRootFolder.cs b/test/LocalizationWebsite/StartupResourcesAtRootFolder.cs index 3a80a387c5..47a9e32c88 100644 --- a/test/LocalizationWebsite/StartupResourcesAtRootFolder.cs +++ b/test/LocalizationWebsite/StartupResourcesAtRootFolder.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Globalization; +using System.Reflection; using LocalizationWebsite.Models; using Microsoft.AspNetCore.Builder; 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) => { diff --git a/test/LocalizationWebsite/StartupResourcesInFolder.cs b/test/LocalizationWebsite/StartupResourcesInFolder.cs index 8c54ee74fd..52f47ce67b 100644 --- a/test/LocalizationWebsite/StartupResourcesInFolder.cs +++ b/test/LocalizationWebsite/StartupResourcesInFolder.cs @@ -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); app.Run(async (context) => diff --git a/test/Microsoft.Extensions.Localization.Tests/Microsoft.Extensions.Localization.Tests.csproj b/test/Microsoft.Extensions.Localization.Tests/Microsoft.Extensions.Localization.Tests.csproj index 27d9c31bac..8356b9a5da 100644 --- a/test/Microsoft.Extensions.Localization.Tests/Microsoft.Extensions.Localization.Tests.csproj +++ b/test/Microsoft.Extensions.Localization.Tests/Microsoft.Extensions.Localization.Tests.csproj @@ -16,8 +16,7 @@ - - +