From d1aa9055ce3a5c9ae0b7f80bf05f8efb1ae4119b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 22 Apr 2019 16:37:47 -0700 Subject: [PATCH 1/2] Update dependencies from dotnet/arcade and re-generate reference source code (dotnet/extensions#1458) \n\nCommit migrated from https://github.com/dotnet/extensions/commit/996c25be271fa2a42e535fcddec22471d746432f --- ...ions.Diagnostics.HealthChecks.Abstractions.netstandard2.0.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/HealthChecks/Abstractions/ref/Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions.netstandard2.0.cs b/src/HealthChecks/Abstractions/ref/Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions.netstandard2.0.cs index b229ca0d53..8c53adc275 100644 --- a/src/HealthChecks/Abstractions/ref/Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions.netstandard2.0.cs +++ b/src/HealthChecks/Abstractions/ref/Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions.netstandard2.0.cs @@ -57,9 +57,9 @@ namespace Microsoft.Extensions.Diagnostics.HealthChecks } public enum HealthStatus { + Unhealthy = 0, Degraded = 1, Healthy = 2, - Unhealthy = 0, } public partial interface IHealthCheck { From 3a1330b7acadbe0885d5e69db747adf48e2f1529 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Fri, 3 May 2019 12:04:29 -0700 Subject: [PATCH 2/2] Enable resx source generation (dotnet/extensions#1635) \n\nCommit migrated from https://github.com/dotnet/extensions/commit/ad92508be6fd31d5c7b9b4f643382a14ab7ffbce --- .../src/Properties/Resources.Designer.cs | 62 ------------------- 1 file changed, 62 deletions(-) delete mode 100644 src/Localization/Localization/src/Properties/Resources.Designer.cs diff --git a/src/Localization/Localization/src/Properties/Resources.Designer.cs b/src/Localization/Localization/src/Properties/Resources.Designer.cs deleted file mode 100644 index 1123d648ad..0000000000 --- a/src/Localization/Localization/src/Properties/Resources.Designer.cs +++ /dev/null @@ -1,62 +0,0 @@ -// -namespace Microsoft.Extensions.Localization -{ - using System.Globalization; - using System.Reflection; - using System.Resources; - - internal static class Resources - { - private static readonly ResourceManager _resourceManager - = new ResourceManager("Microsoft.Extensions.Localization.Resources", typeof(Resources).GetTypeInfo().Assembly); - - /// - /// The manifest '{0}' was not found. - /// - internal static string Localization_MissingManifest - { - get { return GetString("Localization_MissingManifest"); } - } - - /// - /// The manifest '{0}' was not found. - /// - internal static string FormatLocalization_MissingManifest(object p0) - { - return string.Format(CultureInfo.CurrentCulture, GetString("Localization_MissingManifest"), p0); - } - - /// - /// No manifests exist for the current culture. - /// - internal static string Localization_MissingManifest_Parent - { - get { return GetString("Localization_MissingManifest_Parent"); } - } - - /// - /// No manifests exist for the current culture. - /// - internal static string FormatLocalization_MissingManifest_Parent() - { - return GetString("Localization_MissingManifest_Parent"); - } - - private static string GetString(string name, params string[] formatterNames) - { - var value = _resourceManager.GetString(name); - - System.Diagnostics.Debug.Assert(value != null); - - if (formatterNames != null) - { - for (var i = 0; i < formatterNames.Length; i++) - { - value = value.Replace("{" + formatterNames[i] + "}", "{" + i + "}"); - } - } - - return value; - } - } -}