From a5ffd9b7e674a704e6fec1ae007a9ff4e9424310 Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Wed, 14 Mar 2018 15:34:30 -0700 Subject: [PATCH] Set 2.0 baselines --- build/dependencies.props | 2 +- korebuild-lock.txt | 4 +- .../baseline.netcore.json | 2 +- .../baseline.netcore.json | 28 +- .../breakingchanges.netcore.json | 32 --- .../baseline.netcore.json | 34 ++- .../baseline.netcore.json | 240 +++++++++++++----- .../breakingchanges.netcore.json | 22 -- 8 files changed, 239 insertions(+), 125 deletions(-) delete mode 100644 src/Microsoft.AspNetCore.Localization/breakingchanges.netcore.json delete mode 100644 src/Microsoft.Extensions.Localization/breakingchanges.netcore.json diff --git a/build/dependencies.props b/build/dependencies.props index b98ef098ac..46ad5b6c9b 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -3,7 +3,7 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.1.0-preview2-15742 + 2.1.0-preview2-15744 2.1.0-preview2-30355 2.1.0-preview2-30355 2.1.0-preview2-30355 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index e40ef6651b..f531e7b0f7 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.1.0-preview2-15742 -commithash:21fbb0f2c3fe4a9216e2d59632b98cfd7d685962 +version:2.1.0-preview2-15744 +commithash:9e15cb6062ab5b9790d3fa699e018543a6950713 diff --git a/src/Microsoft.AspNetCore.Localization.Routing/baseline.netcore.json b/src/Microsoft.AspNetCore.Localization.Routing/baseline.netcore.json index 2338cfd244..96b71c8cf9 100644 --- a/src/Microsoft.AspNetCore.Localization.Routing/baseline.netcore.json +++ b/src/Microsoft.AspNetCore.Localization.Routing/baseline.netcore.json @@ -1,5 +1,5 @@ { - "AssemblyIdentity": "Microsoft.AspNetCore.Localization.Routing, Version=1.1.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60", + "AssemblyIdentity": "Microsoft.AspNetCore.Localization.Routing, Version=2.0.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60", "Types": [ { "Name": "Microsoft.AspNetCore.Localization.Routing.RouteDataRequestCultureProvider", diff --git a/src/Microsoft.AspNetCore.Localization/baseline.netcore.json b/src/Microsoft.AspNetCore.Localization/baseline.netcore.json index 2f58fa1110..6339ea0cc2 100644 --- a/src/Microsoft.AspNetCore.Localization/baseline.netcore.json +++ b/src/Microsoft.AspNetCore.Localization/baseline.netcore.json @@ -1,5 +1,5 @@ { - "AssemblyIdentity": "Microsoft.AspNetCore.Localization, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60", + "AssemblyIdentity": "Microsoft.AspNetCore.Localization, Version=2.0.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60", "Types": [ { "Name": "Microsoft.AspNetCore.Builder.ApplicationBuilderExtensions", @@ -429,7 +429,7 @@ "Kind": "Method", "Name": "get_Cultures", "Parameters": [], - "ReturnType": "System.Collections.Generic.IList", + "ReturnType": "System.Collections.Generic.IList", "Visibility": "Public", "GenericParameter": [] }, @@ -437,7 +437,7 @@ "Kind": "Method", "Name": "get_UICultures", "Parameters": [], - "ReturnType": "System.Collections.Generic.IList", + "ReturnType": "System.Collections.Generic.IList", "Visibility": "Public", "GenericParameter": [] }, @@ -447,7 +447,7 @@ "Parameters": [ { "Name": "culture", - "Type": "System.String" + "Type": "Microsoft.Extensions.Primitives.StringSegment" } ], "Visibility": "Public", @@ -459,11 +459,11 @@ "Parameters": [ { "Name": "culture", - "Type": "System.String" + "Type": "Microsoft.Extensions.Primitives.StringSegment" }, { "Name": "uiCulture", - "Type": "System.String" + "Type": "Microsoft.Extensions.Primitives.StringSegment" } ], "Visibility": "Public", @@ -475,7 +475,7 @@ "Parameters": [ { "Name": "cultures", - "Type": "System.Collections.Generic.IList" + "Type": "System.Collections.Generic.IList" } ], "Visibility": "Public", @@ -487,11 +487,11 @@ "Parameters": [ { "Name": "cultures", - "Type": "System.Collections.Generic.IList" + "Type": "System.Collections.Generic.IList" }, { "Name": "uiCultures", - "Type": "System.Collections.Generic.IList" + "Type": "System.Collections.Generic.IList" } ], "Visibility": "Public", @@ -757,6 +757,16 @@ "Parameters": [], "Visibility": "Protected", "GenericParameter": [] + }, + { + "Kind": "Field", + "Name": "NullProviderCultureResult", + "Parameters": [], + "ReturnType": "System.Threading.Tasks.Task", + "Static": true, + "ReadOnly": true, + "Visibility": "Protected", + "GenericParameter": [] } ], "GenericParameters": [] diff --git a/src/Microsoft.AspNetCore.Localization/breakingchanges.netcore.json b/src/Microsoft.AspNetCore.Localization/breakingchanges.netcore.json deleted file mode 100644 index 5568b582c6..0000000000 --- a/src/Microsoft.AspNetCore.Localization/breakingchanges.netcore.json +++ /dev/null @@ -1,32 +0,0 @@ -[ - { - "TypeId": "public class Microsoft.AspNetCore.Localization.ProviderCultureResult", - "MemberId": "public .ctor(System.Collections.Generic.IList cultures)", - "Kind": "Removal" - }, - { - "TypeId": "public class Microsoft.AspNetCore.Localization.ProviderCultureResult", - "MemberId": "public .ctor(System.Collections.Generic.IList cultures, System.Collections.Generic.IList uiCultures)", - "Kind": "Removal" - }, - { - "TypeId": "public class Microsoft.AspNetCore.Localization.ProviderCultureResult", - "MemberId": "public .ctor(System.String culture)", - "Kind": "Removal" - }, - { - "TypeId": "public class Microsoft.AspNetCore.Localization.ProviderCultureResult", - "MemberId": "public .ctor(System.String culture, System.String uiCulture)", - "Kind": "Removal" - }, - { - "TypeId": "public class Microsoft.AspNetCore.Localization.ProviderCultureResult", - "MemberId": "public System.Collections.Generic.IList get_Cultures()", - "Kind": "Removal" - }, - { - "TypeId": "public class Microsoft.AspNetCore.Localization.ProviderCultureResult", - "MemberId": "public System.Collections.Generic.IList get_UICultures()", - "Kind": "Removal" - } -] \ No newline at end of file diff --git a/src/Microsoft.Extensions.Localization.Abstractions/baseline.netcore.json b/src/Microsoft.Extensions.Localization.Abstractions/baseline.netcore.json index 0479720dbd..2ddb41c805 100644 --- a/src/Microsoft.Extensions.Localization.Abstractions/baseline.netcore.json +++ b/src/Microsoft.Extensions.Localization.Abstractions/baseline.netcore.json @@ -1,5 +1,5 @@ { - "AssemblyIdentity": "Microsoft.Extensions.Localization.Abstractions, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60", + "AssemblyIdentity": "Microsoft.Extensions.Localization.Abstractions, Version=2.0.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60", "Types": [ { "Name": "Microsoft.Extensions.Localization.IStringLocalizer", @@ -163,6 +163,14 @@ "Visibility": "Public", "GenericParameter": [] }, + { + "Kind": "Method", + "Name": "get_SearchedLocation", + "Parameters": [], + "ReturnType": "System.String", + "Visibility": "Public", + "GenericParameter": [] + }, { "Kind": "Method", "Name": "ToString", @@ -208,6 +216,30 @@ ], "Visibility": "Public", "GenericParameter": [] + }, + { + "Kind": "Constructor", + "Name": ".ctor", + "Parameters": [ + { + "Name": "name", + "Type": "System.String" + }, + { + "Name": "value", + "Type": "System.String" + }, + { + "Name": "resourceNotFound", + "Type": "System.Boolean" + }, + { + "Name": "searchedLocation", + "Type": "System.String" + } + ], + "Visibility": "Public", + "GenericParameter": [] } ], "GenericParameters": [] diff --git a/src/Microsoft.Extensions.Localization/baseline.netcore.json b/src/Microsoft.Extensions.Localization/baseline.netcore.json index 9714e0de1d..f7f2afc675 100644 --- a/src/Microsoft.Extensions.Localization/baseline.netcore.json +++ b/src/Microsoft.Extensions.Localization/baseline.netcore.json @@ -1,5 +1,5 @@ { - "AssemblyIdentity": "Microsoft.Extensions.Localization, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60", + "AssemblyIdentity": "Microsoft.Extensions.Localization, Version=2.0.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60", "Types": [ { "Name": "Microsoft.Extensions.DependencyInjection.LocalizationServiceCollectionExtensions", @@ -110,6 +110,36 @@ ], "GenericParameters": [] }, + { + "Name": "Microsoft.Extensions.Localization.ResourceLocationAttribute", + "Visibility": "Public", + "Kind": "Class", + "BaseType": "System.Attribute", + "ImplementedInterfaces": [], + "Members": [ + { + "Kind": "Method", + "Name": "get_ResourceLocation", + "Parameters": [], + "ReturnType": "System.String", + "Visibility": "Public", + "GenericParameter": [] + }, + { + "Kind": "Constructor", + "Name": ".ctor", + "Parameters": [ + { + "Name": "resourceLocation", + "Type": "System.String" + } + ], + "Visibility": "Public", + "GenericParameter": [] + } + ], + "GenericParameters": [] + }, { "Name": "Microsoft.Extensions.Localization.ResourceManagerStringLocalizer", "Visibility": "Public", @@ -237,6 +267,10 @@ { "Name": "resourceNamesCache", "Type": "Microsoft.Extensions.Localization.IResourceNamesCache" + }, + { + "Name": "logger", + "Type": "Microsoft.Extensions.Logging.ILogger" } ], "Visibility": "Public", @@ -261,6 +295,38 @@ { "Name": "resourceNamesCache", "Type": "Microsoft.Extensions.Localization.IResourceNamesCache" + }, + { + "Name": "logger", + "Type": "Microsoft.Extensions.Logging.ILogger" + } + ], + "Visibility": "Public", + "GenericParameter": [] + }, + { + "Kind": "Constructor", + "Name": ".ctor", + "Parameters": [ + { + "Name": "resourceManager", + "Type": "System.Resources.ResourceManager" + }, + { + "Name": "resourceStringProvider", + "Type": "Microsoft.Extensions.Localization.Internal.IResourceStringProvider" + }, + { + "Name": "baseName", + "Type": "System.String" + }, + { + "Name": "resourceNamesCache", + "Type": "Microsoft.Extensions.Localization.IResourceNamesCache" + }, + { + "Name": "logger", + "Type": "Microsoft.Extensions.Logging.ILogger" } ], "Visibility": "Public", @@ -277,6 +343,60 @@ "Microsoft.Extensions.Localization.IStringLocalizerFactory" ], "Members": [ + { + "Kind": "Method", + "Name": "GetResourcePrefix", + "Parameters": [ + { + "Name": "typeInfo", + "Type": "System.Reflection.TypeInfo" + } + ], + "ReturnType": "System.String", + "Virtual": true, + "Visibility": "Protected", + "GenericParameter": [] + }, + { + "Kind": "Method", + "Name": "GetResourcePrefix", + "Parameters": [ + { + "Name": "typeInfo", + "Type": "System.Reflection.TypeInfo" + }, + { + "Name": "baseNamespace", + "Type": "System.String" + }, + { + "Name": "resourcesRelativePath", + "Type": "System.String" + } + ], + "ReturnType": "System.String", + "Virtual": true, + "Visibility": "Protected", + "GenericParameter": [] + }, + { + "Kind": "Method", + "Name": "GetResourcePrefix", + "Parameters": [ + { + "Name": "baseResourceName", + "Type": "System.String" + }, + { + "Name": "baseNamespace", + "Type": "System.String" + } + ], + "ReturnType": "System.String", + "Virtual": true, + "Visibility": "Protected", + "GenericParameter": [] + }, { "Kind": "Method", "Name": "Create", @@ -313,17 +433,71 @@ "Visibility": "Public", "GenericParameter": [] }, + { + "Kind": "Method", + "Name": "CreateResourceManagerStringLocalizer", + "Parameters": [ + { + "Name": "assembly", + "Type": "System.Reflection.Assembly" + }, + { + "Name": "baseName", + "Type": "System.String" + } + ], + "ReturnType": "Microsoft.Extensions.Localization.ResourceManagerStringLocalizer", + "Virtual": true, + "Visibility": "Protected", + "GenericParameter": [] + }, + { + "Kind": "Method", + "Name": "GetResourcePrefix", + "Parameters": [ + { + "Name": "location", + "Type": "System.String" + }, + { + "Name": "baseName", + "Type": "System.String" + }, + { + "Name": "resourceLocation", + "Type": "System.String" + } + ], + "ReturnType": "System.String", + "Virtual": true, + "Visibility": "Protected", + "GenericParameter": [] + }, + { + "Kind": "Method", + "Name": "GetResourceLocationAttribute", + "Parameters": [ + { + "Name": "assembly", + "Type": "System.Reflection.Assembly" + } + ], + "ReturnType": "Microsoft.Extensions.Localization.ResourceLocationAttribute", + "Virtual": true, + "Visibility": "Protected", + "GenericParameter": [] + }, { "Kind": "Constructor", "Name": ".ctor", "Parameters": [ - { - "Name": "hostingEnvironment", - "Type": "Microsoft.AspNetCore.Hosting.IHostingEnvironment" - }, { "Name": "localizationOptions", "Type": "Microsoft.Extensions.Options.IOptions" + }, + { + "Name": "loggerFactory", + "Type": "Microsoft.Extensions.Logging.ILoggerFactory" } ], "Visibility": "Public", @@ -415,6 +589,10 @@ { "Name": "culture", "Type": "System.Globalization.CultureInfo" + }, + { + "Name": "logger", + "Type": "Microsoft.Extensions.Logging.ILogger" } ], "Visibility": "Public", @@ -460,58 +638,6 @@ } ], "GenericParameters": [] - }, - { - "Name": "Microsoft.Extensions.Localization.Internal.AssemblyWrapper", - "Visibility": "Public", - "Kind": "Class", - "ImplementedInterfaces": [], - "Members": [ - { - "Kind": "Method", - "Name": "get_Assembly", - "Parameters": [], - "ReturnType": "System.Reflection.Assembly", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "get_FullName", - "Parameters": [], - "ReturnType": "System.String", - "Virtual": true, - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "GetManifestResourceStream", - "Parameters": [ - { - "Name": "name", - "Type": "System.String" - } - ], - "ReturnType": "System.IO.Stream", - "Virtual": true, - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Constructor", - "Name": ".ctor", - "Parameters": [ - { - "Name": "assembly", - "Type": "System.Reflection.Assembly" - } - ], - "Visibility": "Public", - "GenericParameter": [] - } - ], - "GenericParameters": [] } ] } \ No newline at end of file diff --git a/src/Microsoft.Extensions.Localization/breakingchanges.netcore.json b/src/Microsoft.Extensions.Localization/breakingchanges.netcore.json deleted file mode 100644 index 5098d4cee4..0000000000 --- a/src/Microsoft.Extensions.Localization/breakingchanges.netcore.json +++ /dev/null @@ -1,22 +0,0 @@ -[ - { - "TypeId": "public class Microsoft.Extensions.Localization.ResourceManagerStringLocalizerFactory : Microsoft.Extensions.Localization.IStringLocalizerFactory", - "MemberId": "public .ctor(Microsoft.AspNetCore.Hosting.IHostingEnvironment hostingEnvironment, Microsoft.Extensions.Options.IOptions localizationOptions)", - "Kind": "Removal" - }, - { - "TypeId": "public class Microsoft.Extensions.Localization.ResourceManagerStringLocalizer : Microsoft.Extensions.Localization.IStringLocalizer", - "MemberId": "public .ctor(System.Resources.ResourceManager resourceManager, Microsoft.Extensions.Localization.Internal.AssemblyWrapper resourceAssemblyWrapper, System.String baseName, Microsoft.Extensions.Localization.IResourceNamesCache resourceNamesCache)", - "Kind": "Removal" - }, - { - "TypeId": "public class Microsoft.Extensions.Localization.ResourceManagerStringLocalizer : Microsoft.Extensions.Localization.IStringLocalizer", - "MemberId": "public .ctor(System.Resources.ResourceManager resourceManager, System.Reflection.Assembly resourceAssembly, System.String baseName, Microsoft.Extensions.Localization.IResourceNamesCache resourceNamesCache)", - "Kind": "Removal" - }, - { - "TypeId": "public class Microsoft.Extensions.Localization.ResourceManagerWithCultureStringLocalizer : Microsoft.Extensions.Localization.ResourceManagerStringLocalizer", - "MemberId": "public .ctor(System.Resources.ResourceManager resourceManager, System.Reflection.Assembly resourceAssembly, System.String baseName, Microsoft.Extensions.Localization.IResourceNamesCache resourceNamesCache, System.Globalization.CultureInfo culture)", - "Kind": "Removal" - } -] \ No newline at end of file