Skip to content

Commit 68c515d

Browse files
davidfowldavidfowl
authored
Merge branch 'master' into merge/release/3.1-to-master\n\nCommit migrated from dotnet/extensions@5179960 
2 parents 1e214e5 + 3d9fb14 commit 68c515d

File tree

15 files changed

+213
-12
lines changed

15 files changed

+213
-12
lines changed

‎src/HealthChecks/Abstractions/src/HealthReport.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public HealthReport(IReadOnlyDictionary<string, HealthReportEntry> entries, Time
3434

3535
/// <summary>
3636
/// Gets a <see cref="HealthStatus"/> representing the aggregate status of all the health checks. The value of <see cref="Status"/>
37-
/// will be the most servere status reported by a health check. If no checks were executed, the value is always <see cref="HealthStatus.Healthy"/>.
37+
/// will be the most severe status reported by a health check. If no checks were executed, the value is always <see cref="HealthStatus.Healthy"/>.
3838
/// </summary>
3939
public HealthStatus Status { get; }
4040

‎src/Localization/Localization/src/ResourceManagerStringLocalizerFactory.cs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,8 @@ protected virtual string GetResourcePrefix(TypeInfo typeInfo, string baseNamespa
101101
else
102102
{
103103
// This expectation is defined by dotnet's automatic resource storage.
104-
// We have to conform to "{RootNamespace}.{ResourceLocation}.{FullTypeName - AssemblyName}".
105-
var assemblyName = new AssemblyName(typeInfo.Assembly.FullName).Name;
106-
return baseNamespace + "." + resourcesRelativePath + TrimPrefix(typeInfo.FullName, assemblyName + ".");
104+
// We have to conform to "{RootNamespace}.{ResourceLocation}.{FullTypeName - RootNamespace}".
105+
return baseNamespace + "." + resourcesRelativePath + TrimPrefix(typeInfo.FullName, baseNamespace + ".");
107106
}
108107
}
109108

@@ -267,4 +266,4 @@ private static string TrimPrefix(string name, string prefix)
267266
return name;
268267
}
269268
}
270-
}
269+
}

‎src/Localization/Localization/test/Microsoft.Extensions.Localization.RootNamespace.Tests/AssemblyInfo.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
using System.Reflection;
2+
using Microsoft.Extensions.Localization;
3+
4+
[assembly: ResourceLocation("Resources")]
5+
[assembly: RootNamespace("LocalizationTest.Abc")]

‎src/Localization/Localization/test/Microsoft.Extensions.Localization.RootNamespace.Tests/Controllers/ValuesController.cs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
// Copyright (c) .NET Foundation. All rights reserved.
2+
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
3+
4+
namespace LocalizationTest.Abc.Controllers
5+
{
6+
public class ValuesController
7+
{
8+
}
9+
}

‎src/Localization/Localization/test/Microsoft.Extensions.Localization.RootNamespace.Tests/Microsoft.Extensions.Localization.RootNamespace.Tests.csproj

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<PropertyGroup>
3+
<TargetFrameworks>$(DefaultNetCoreTargetFramework);net472</TargetFrameworks>
4+
<RootNamespace>LocalizationTest.Abc</RootNamespace>
5+
</PropertyGroup>
6+
<ItemGroup>
7+
<Compile Remove="NewFolder\**" />
8+
<EmbeddedResource Remove="NewFolder\**" />
9+
<None Remove="NewFolder\**" />
10+
</ItemGroup>
11+
12+
<ItemGroup>
13+
<Reference Include="Microsoft.Extensions.Localization.Abstractions" />
14+
<Reference Include="Microsoft.Extensions.Localization" />
15+
<Reference Include="Microsoft.Extensions.Logging.Abstractions" />
16+
<Reference Include="Microsoft.Extensions.Logging.Testing" />
17+
<Reference Include="Microsoft.Extensions.Options" />
18+
</ItemGroup>
19+
20+
<ItemGroup>
21+
<EmbeddedResource Update="ValuesController.resx">
22+
<Generator>ResXFileCodeGenerator</Generator>
23+
<LastGenOutput>ValuesController.Designer.cs</LastGenOutput>
24+
</EmbeddedResource>
25+
</ItemGroup>
26+
</Project>

‎src/Localization/Localization/test/Microsoft.Extensions.Localization.RootNamespace.Tests/Resources/Controllers/ValuesController.resx

Lines changed: 123 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,123 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<root>
3+
<!--
4+
Microsoft ResX Schema
5+
6+
Version 2.0
7+
8+
The primary goals of this format is to allow a simple XML format
9+
that is mostly human readable. The generation and parsing of the
10+
various data types are done through the TypeConverter classes
11+
associated with the data types.
12+
13+
Example:
14+
15+
... ado.net/XML headers & schema ...
16+
<resheader name="resmimetype">text/microsoft-resx</resheader>
17+
<resheader name="version">2.0</resheader>
18+
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
19+
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
20+
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
21+
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
22+
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
23+
<value>[base64 mime encoded serialized .NET Framework object]</value>
24+
</data>
25+
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
26+
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
27+
<comment>This is a comment</comment>
28+
</data>
29+
30+
There are any number of "resheader" rows that contain simple
31+
name/value pairs.
32+
33+
Each data row contains a name, and value. The row also contains a
34+
type or mimetype. Type corresponds to a .NET class that support
35+
text/value conversion through the TypeConverter architecture.
36+
Classes that don't support this are serialized and stored with the
37+
mimetype set.
38+
39+
The mimetype is used for serialized objects, and tells the
40+
ResXResourceReader how to depersist the object. This is currently not
41+
extensible. For a given mimetype the value must be set accordingly:
42+
43+
Note - application/x-microsoft.net.object.binary.base64 is the format
44+
that the ResXResourceWriter will generate, however the reader can
45+
read any of the formats listed below.
46+
47+
mimetype: application/x-microsoft.net.object.binary.base64
48+
value : The object must be serialized with
49+
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
50+
: and then encoded with base64 encoding.
51+
52+
mimetype: application/x-microsoft.net.object.soap.base64
53+
value : The object must be serialized with
54+
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
55+
: and then encoded with base64 encoding.
56+
57+
mimetype: application/x-microsoft.net.object.bytearray.base64
58+
value : The object must be serialized into a byte array
59+
: using a System.ComponentModel.TypeConverter
60+
: and then encoded with base64 encoding.
61+
-->
62+
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
63+
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
64+
<xsd:element name="root" msdata:IsDataSet="true">
65+
<xsd:complexType>
66+
<xsd:choice maxOccurs="unbounded">
67+
<xsd:element name="metadata">
68+
<xsd:complexType>
69+
<xsd:sequence>
70+
<xsd:element name="value" type="xsd:string" minOccurs="0" />
71+
</xsd:sequence>
72+
<xsd:attribute name="name" use="required" type="xsd:string" />
73+
<xsd:attribute name="type" type="xsd:string" />
74+
<xsd:attribute name="mimetype" type="xsd:string" />
75+
<xsd:attribute ref="xml:space" />
76+
</xsd:complexType>
77+
</xsd:element>
78+
<xsd:element name="assembly">
79+
<xsd:complexType>
80+
<xsd:attribute name="alias" type="xsd:string" />
81+
<xsd:attribute name="name" type="xsd:string" />
82+
</xsd:complexType>
83+
</xsd:element>
84+
<xsd:element name="data">
85+
<xsd:complexType>
86+
<xsd:sequence>
87+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
88+
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
89+
</xsd:sequence>
90+
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
91+
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
92+
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
93+
<xsd:attribute ref="xml:space" />
94+
</xsd:complexType>
95+
</xsd:element>
96+
<xsd:element name="resheader">
97+
<xsd:complexType>
98+
<xsd:sequence>
99+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
100+
</xsd:sequence>
101+
<xsd:attribute name="name" type="xsd:string" use="required" />
102+
</xsd:complexType>
103+
</xsd:element>
104+
</xsd:choice>
105+
</xsd:complexType>
106+
</xsd:element>
107+
</xsd:schema>
108+
<resheader name="resmimetype">
109+
<value>text/microsoft-resx</value>
110+
</resheader>
111+
<resheader name="version">
112+
<value>2.0</value>
113+
</resheader>
114+
<resheader name="reader">
115+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116+
</resheader>
117+
<resheader name="writer">
118+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119+
</resheader>
120+
<data name="String1" xml:space="preserve">
121+
<value>ValFromResource</value>
122+
</data>
123+
</root>

‎src/Localization/Localization/test/Microsoft.Extensions.Localization.RootNamespace.Tests/StringLocalizerOfTRootNamespaceTest.cs

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
// Copyright (c) .NET Foundation. All rights reserved.
2+
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
3+
4+
using LocalizationTest.Abc.Controllers;
5+
using Microsoft.Extensions.Logging.Abstractions;
6+
using Microsoft.Extensions.Options;
7+
using Moq;
8+
using Xunit;
9+
10+
namespace Microsoft.Extensions.Localization.RootNamespace.Tests
11+
{
12+
public class StringLocalizerOfTRootNamespaceTest
13+
{
14+
[Fact]
15+
public void RootNamespace()
16+
{
17+
var locOptions = new LocalizationOptions();
18+
var options = new Mock<IOptions<LocalizationOptions>>();
19+
options.Setup(o => o.Value).Returns(locOptions);
20+
var factory = new ResourceManagerStringLocalizerFactory(options.Object, NullLoggerFactory.Instance);
21+
22+
var valuesLoc = factory.Create(typeof(ValuesController));
23+
Assert.Equal("ValFromResource", valuesLoc["String1"]);
24+
}
25+
}
26+
}

‎src/Localization/Localization/test/LocalizationServiceCollectionExtensionsTest.cs renamed to ‎src/Localization/Localization/test/Microsoft.Extensions.Localization.Tests/LocalizationServiceCollectionExtensionsTest.cs

File renamed without changes.

‎src/Localization/Localization/test/Microsoft.Extensions.Localization.Tests.csproj renamed to ‎src/Localization/Localization/test/Microsoft.Extensions.Localization.Tests/Microsoft.Extensions.Localization.Tests.csproj

File renamed without changes.

‎src/Localization/Localization/test/Microsoft.Extensions.Localization.Tests/Model.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
// This namespace for test resources with alternative RootNamespace
2+
namespace MyNamespace
3+
{
4+
public class Model
5+
{
6+
7+
}
8+
}

0 commit comments

Comments
 (0)