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

Merge branch 'master' into merge/release/3.0-preview5-to-master\n\nCommit migrated from aee3a063c1

This commit is contained in:
Doug Bunting 2019-05-04 18:59:23 -07:00 committed by GitHub
parent 83d45900f6 3a1330b7ac
commit 2a056d0d7c
2 changed files with 1 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/HealthChecks/Abstractions/ref/Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions.netstandard2.0.cs
View File

@ -57,9 +57,9 @@ namespace Microsoft.Extensions.Diagnostics.HealthChecks
} }
public enum HealthStatus public enum HealthStatus
{ {
Unhealthy = 0,
Degraded = 1, Degraded = 1,
Healthy = 2, Healthy = 2,
Unhealthy = 0,
} }
public partial interface IHealthCheck public partial interface IHealthCheck
{ {

62
src/Localization/Localization/src/Properties/Resources.Designer.cs generated
View File

@ -1,62 +0,0 @@
// <auto-generated />
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);
/// <summary>
/// The manifest '{0}' was not found.
/// </summary>
internal static string Localization_MissingManifest
{
get { return GetString("Localization_MissingManifest"); }
}
/// <summary>
/// The manifest '{0}' was not found.
/// </summary>
internal static string FormatLocalization_MissingManifest(object p0)
{
return string.Format(CultureInfo.CurrentCulture, GetString("Localization_MissingManifest"), p0);
}
/// <summary>
/// No manifests exist for the current culture.
/// </summary>
internal static string Localization_MissingManifest_Parent
{
get { return GetString("Localization_MissingManifest_Parent"); }
}
/// <summary>
/// No manifests exist for the current culture.
/// </summary>
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;
}
}
}