Skip to content

Commit 7fc86ff

Browse files
hughbestephentoub
hughbe
authored and
stephentoub
committed
Use SR in System.Composition.Convention (dotnet/corefx#21499)
Commit migrated from dotnet/corefx@f94866d
1 parent 99a5878 commit 7fc86ff

5 files changed

Lines changed: 14 additions & 229 deletions

File tree

‎src/libraries/System.Composition.Convention/src/Microsoft/Composition/Diagnostics/CompositionTrace.cs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ internal static void Registration_ConstructorConventionOverridden(Type type)
1717
if (CompositionTraceSource.CanWriteInformation)
1818
{
1919
CompositionTraceSource.WriteInformation(CompositionTraceId.Registration_ConstructorConventionOverridden,
20-
Strings.Registration_ConstructorConventionOverridden,
20+
SR.Registration_ConstructorConventionOverridden,
2121
type.FullName);
2222
}
2323
}
@@ -29,7 +29,7 @@ internal static void Registration_TypeExportConventionOverridden(Type type)
2929
if (CompositionTraceSource.CanWriteWarning)
3030
{
3131
CompositionTraceSource.WriteWarning(CompositionTraceId.Registration_TypeExportConventionOverridden,
32-
Strings.Registration_TypeExportConventionOverridden,
32+
SR.Registration_TypeExportConventionOverridden,
3333
type.FullName);
3434
}
3535
}
@@ -41,7 +41,7 @@ internal static void Registration_MemberExportConventionOverridden(Type type, Me
4141
if (CompositionTraceSource.CanWriteWarning)
4242
{
4343
CompositionTraceSource.WriteWarning(CompositionTraceId.Registration_MemberExportConventionOverridden,
44-
Strings.Registration_MemberExportConventionOverridden,
44+
SR.Registration_MemberExportConventionOverridden,
4545
member.Name, type.FullName);
4646
}
4747
}
@@ -53,7 +53,7 @@ internal static void Registration_MemberImportConventionOverridden(Type type, Me
5353
if (CompositionTraceSource.CanWriteWarning)
5454
{
5555
CompositionTraceSource.WriteWarning(CompositionTraceId.Registration_MemberImportConventionOverridden,
56-
Strings.Registration_MemberImportConventionOverridden,
56+
SR.Registration_MemberImportConventionOverridden,
5757
member.Name, type.FullName);
5858
}
5959
}
@@ -65,7 +65,7 @@ internal static void Registration_OnSatisfiedImportNotificationOverridden(Type t
6565
if (CompositionTraceSource.CanWriteWarning)
6666
{
6767
CompositionTraceSource.WriteWarning(CompositionTraceId.Registration_OnSatisfiedImportNotificationOverridden,
68-
Strings.Registration_OnSatisfiedImportNotificationOverridden,
68+
SR.Registration_OnSatisfiedImportNotificationOverridden,
6969
member.Name, type.FullName);
7070
}
7171
}
@@ -77,7 +77,7 @@ internal static void Registration_PartCreationConventionOverridden(Type type)
7777
if (CompositionTraceSource.CanWriteWarning)
7878
{
7979
CompositionTraceSource.WriteWarning(CompositionTraceId.Registration_PartCreationConventionOverridden,
80-
Strings.Registration_PartCreationConventionOverridden,
80+
SR.Registration_PartCreationConventionOverridden,
8181
type.FullName);
8282
}
8383
}
@@ -89,7 +89,7 @@ internal static void Registration_MemberImportConventionMatchedTwice(Type type,
8989
if (CompositionTraceSource.CanWriteWarning)
9090
{
9191
CompositionTraceSource.WriteWarning(CompositionTraceId.Registration_MemberImportConventionMatchedTwice,
92-
Strings.Registration_MemberImportConventionMatchedTwice,
92+
SR.Registration_MemberImportConventionMatchedTwice,
9393
member.Name, type.FullName);
9494
}
9595
}
@@ -101,7 +101,7 @@ internal static void Registration_PartMetadataConventionOverridden(Type type)
101101
if (CompositionTraceSource.CanWriteWarning)
102102
{
103103
CompositionTraceSource.WriteWarning(CompositionTraceId.Registration_PartMetadataConventionOverridden,
104-
Strings.Registration_PartMetadataConventionOverridden,
104+
SR.Registration_PartMetadataConventionOverridden,
105105
type.FullName);
106106
}
107107
}
@@ -113,7 +113,7 @@ internal static void Registration_ParameterImportConventionOverridden(ParameterI
113113
if (CompositionTraceSource.CanWriteWarning)
114114
{
115115
CompositionTraceSource.WriteWarning(CompositionTraceId.Registration_ParameterImportConventionOverridden,
116-
Strings.Registration_ParameterImportConventionOverridden,
116+
SR.Registration_ParameterImportConventionOverridden,
117117
parameter.Name, constructor.Name);
118118
}
119119
}

src/libraries/System.Composition.Convention/src/Strings.resx renamed to src/libraries/System.Composition.Convention/src/Resources/Strings.resx

File renamed without changes.

‎src/libraries/System.Composition.Convention/src/Strings.Designer.cs‎

Lines changed: 0 additions & 203 deletions
This file was deleted.

‎src/libraries/System.Composition.Convention/src/System.Composition.Convention.csproj‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<ProjectGuid>{E6592FAD-10B5-4B56-9287-D72DD136992F}</ProjectGuid>
66
<AppDesignerFolder>Properties</AppDesignerFolder>
77
<AssemblyName>System.Composition.Convention</AssemblyName>
8-
<DefineConstants Condition="'$(TargetGroup)' == 'netstandard1.0'">$(DefineConstants);netstandard10</DefineConstants>
8+
<DefineConstants Condition="'$(TargetGroup)' == 'netstandard1.0'">$(DefineConstants);netstandard10</DefineConstants>
99
<PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard1.0'">netstandard1.0;portable-net45+win8+wp8+wpa81</PackageTargetFramework>
1010
</PropertyGroup>
1111
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" />
@@ -39,7 +39,6 @@
3939
<Compile Include="Microsoft\Composition\Diagnostics\TraceWriter.cs" />
4040
<Compile Include="Microsoft\Internal\AttributeServices.cs" />
4141
<Compile Include="Microsoft\Internal\ReflectionServices.cs" />
42-
<Compile Include="Strings.Designer.cs" />
4342
<Compile Include="System\Composition\Convention\ConventionBuilder.cs" />
4443
<Compile Include="System\Composition\Convention\ExportConventionBuilder.cs" />
4544
<Compile Include="System\Composition\Convention\ImportConventionBuilder.cs" />
@@ -55,7 +54,6 @@
5554
<LastGenOutput>CommonStrings.Designer.cs</LastGenOutput>
5655
<CustomToolNamespace>Microsoft.Internal</CustomToolNamespace>
5756
</EmbeddedResource>
58-
<EmbeddedResource Include="Strings.resx" />
5957
</ItemGroup>
6058
<ItemGroup>
6159
<ProjectReference Include="..\..\System.Composition.AttributedModel\src\System.Composition.AttributedModel.csproj">

‎src/libraries/System.Composition.Convention/src/System/Composition/ExceptionBuilder.cs‎

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33
// See the LICENSE file in the project root for more information.
44

5-
using System;
6-
using System.Globalization;
7-
using System.Reflection;
8-
95
using Microsoft.Internal;
106

117
namespace System.Composition
@@ -14,30 +10,24 @@ internal static class ExceptionBuilder
1410
{
1511
public static ArgumentException Argument_ExpressionMustBeNew(string parameterName)
1612
{
17-
return CreateArgumentException(Strings.Argument_ExpressionMustBeNew, parameterName);
13+
return CreateArgumentException(SR.Argument_ExpressionMustBeNew, parameterName);
1814
}
1915

2016
public static ArgumentException Argument_ExpressionMustBePropertyMember(string parameterName)
2117
{
22-
return CreateArgumentException(Strings.Argument_ExpressionMustBePropertyMember, parameterName);
18+
return CreateArgumentException(SR.Argument_ExpressionMustBePropertyMember, parameterName);
2319
}
2420

25-
2621
public static ArgumentException Argument_ExpressionMustBeVoidMethodWithNoArguments(string methodName)
2722
{
28-
return CreateArgumentException(Strings.Argument_ExpressionMustBeVoidMethodWithNoArguments, methodName);
23+
return CreateArgumentException(SR.Argument_ExpressionMustBeVoidMethodWithNoArguments, methodName);
2924
}
3025

3126
private static ArgumentException CreateArgumentException(string message, string parameterName)
3227
{
3328
Assumes.NotNull(parameterName);
3429

35-
return new ArgumentException(Format(message, parameterName), parameterName);
36-
}
37-
38-
private static string Format(string format, params string[] arguments)
39-
{
40-
return String.Format(CultureInfo.CurrentCulture, format, arguments);
30+
return new ArgumentException(SR.Format(message, parameterName), parameterName);
4131
}
4232
}
4333
}

0 commit comments

Comments
 (0)