Skip to content

Commit c2a5929

Browse files
dsplaistedrajansingh10
dsplaisted
authored and
rajansingh10
committed
Apply code review feedback for System.Composition
* Use ReaderWriterLockSlim * Move duplicated code into common folder * Use EmptyArray<T> instead of new T[0] * Fix CLS Compliance error in System.Composition test library (See dotnet/roslyn#4293: CLS Compliance warning CS3016 is reported on non-public members) * Rename SilverlightTraceWriter.cs to DebuggerTraceWriter.cs * Use CommonPath build property to include common files * Remove unnecessary AssemblyInfo.cs files * Remove unused private constant in System.Composition.AttributedModel
1 parent d21bfa1 commit c2a5929

File tree

50 files changed

+333
-448
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+333
-448
lines changed

‎src/System.Composition.Convention/src/Microsoft/Internal/Assumes.InternalErrorException.cs ‎src/Common/src/Microsoft/Internal/Assumes.InternalErrorException.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ internal partial class Assumes
1515
private sealed class InternalErrorException : Exception
1616
{
1717
public InternalErrorException(string message)
18-
: base(string.Format(CultureInfo.CurrentCulture, Strings.InternalExceptionMessage, message))
18+
: base(string.Format(CultureInfo.CurrentCulture, CommonStrings.Diagnostic_InternalExceptionMessage, message))
1919
{
2020
}
2121
}

‎src/System.Composition.Convention/src/Microsoft/Internal/Assumes.cs ‎src/Common/src/Microsoft/Internal/Assumes.cs

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
33

44
using System;
5-
using System.ComponentModel;
65
using System.Diagnostics;
76
using System.Diagnostics.CodeAnalysis;
87
using System.Globalization;

‎src/Common/src/Microsoft/Internal/CommonStrings.Designer.cs

+82
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Common/src/Microsoft/Internal/CommonStrings.resx

+126
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,126 @@
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="ArgumentException_EmptyString" xml:space="preserve">
121+
<value>'{0}' cannot be an empty string ("").</value>
122+
</data>
123+
<data name="Diagnostic_InternalExceptionMessage" xml:space="preserve">
124+
<value>Internal error occurred. Additional information: '{0}'.</value>
125+
</data>
126+
</root>

‎src/Common/src/Microsoft/Internal/EmptyArray.cs

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
// Copyright (c) Microsoft. All rights reserved.
2+
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
3+
4+
using System;
5+
using System.Collections.Generic;
6+
using System.Composition;
7+
using System.Diagnostics;
8+
using System.Diagnostics.Contracts;
9+
using System.Globalization;
10+
using System.Reflection;
11+
12+
namespace Microsoft.Internal
13+
{
14+
internal static class EmptyArray<T>
15+
{
16+
public static readonly T[] Value = new T[0];
17+
}
18+
}

‎src/System.Composition.Convention/src/Microsoft/Internal/Requires.cs ‎src/Common/src/Microsoft/Internal/Requires.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public static void NotNullOrEmpty(string value, string parameterName)
3333

3434
if (value.Length == 0)
3535
{
36-
throw new ArgumentException(string.Format(CultureInfo.CurrentCulture, Strings.ArgumentException_EmptyString, parameterName), parameterName);
36+
throw new ArgumentException(string.Format(CultureInfo.CurrentCulture, CommonStrings.ArgumentException_EmptyString, parameterName), parameterName);
3737
}
3838
Contract.EndContractBlock();
3939
}

‎src/System.Composition.AttributedModel/src/Properties/AssemblyInfo.cs

-18
This file was deleted.

‎src/System.Composition.AttributedModel/src/System.Composition.AttributedModel.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2121
</PropertyGroup>
2222
<ItemGroup>
23-
<Compile Include="Properties\AssemblyInfo.cs" />
23+
2424
<Compile Include="System\Composition\Convention\AttributedModelProvider.cs" />
2525
<Compile Include="System\Composition\ExportAttribute.cs" />
2626
<Compile Include="System\Composition\ExportMetadataAttribute.cs" />

‎src/System.Composition.AttributedModel/src/System/Composition/SharingBoundaryAttribute.cs

-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ public sealed class SharingBoundaryAttribute : Attribute
2424
{
2525
private readonly string[] _sharingBoundaryNames;
2626

27-
private const string SharingBoundaryImportMetadataConstraintName = "SharingBoundaryNames";
28-
2927
/// <summary>
3028
/// Construct a <see cref="SharingBoundaryAttribute"/> for the specified boundary names.
3129
/// </summary>

‎src/System.Composition.Convention/src/Microsoft/Composition/Diagnostics/SilverlightTraceWriter.cs ‎src/System.Composition.Convention/src/Microsoft/Composition/Diagnostics/DebuggerTraceWriter.cs

File renamed without changes.

‎src/System.Composition.Convention/src/Microsoft/Internal/Lock.cs

-35
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ namespace Microsoft.Internal
1111
{
1212
internal sealed class Lock : IDisposable
1313
{
14-
#if FEATURE_SLIMLOCK
1514
private readonly ReaderWriterLockSlim _thisLock = new ReaderWriterLockSlim(LockRecursionPolicy.NoRecursion);
1615
private int _isDisposed = 0;
1716
public void EnterReadLock()
@@ -41,39 +40,5 @@ public void Dispose()
4140
_thisLock.Dispose();
4241
}
4342
}
44-
45-
#else
46-
// ReaderWriterLockSlim is not yet implemented on SilverLight
47-
// Satisfies our requirements until it is implemented
48-
private readonly object _thisLock = new object();
49-
50-
public Lock()
51-
{
52-
}
53-
54-
public void EnterReadLock()
55-
{
56-
Monitor.Enter(_thisLock);
57-
}
58-
59-
public void EnterWriteLock()
60-
{
61-
Monitor.Enter(_thisLock);
62-
}
63-
64-
public void ExitReadLock()
65-
{
66-
Monitor.Exit(_thisLock);
67-
}
68-
69-
public void ExitWriteLock()
70-
{
71-
Monitor.Exit(_thisLock);
72-
}
73-
74-
public void Dispose()
75-
{
76-
}
77-
#endif //FEATURE_SLIMLOCK
7843
}
7944
}

‎src/System.Composition.Convention/src/Properties/AssemblyInfo.cs

-18
This file was deleted.

‎src/System.Composition.Convention/src/Strings.resx

-6
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,6 @@
117117
<resheader name="writer">
118118
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119
</resheader>
120-
<data name="ArgumentException_EmptyString" xml:space="preserve">
121-
<value>'{0}' cannot be an empty string ("").</value>
122-
</data>
123120
<data name="ArgumentOutOfRange_InvalidEnumInSet" xml:space="preserve">
124121
<value>The value of argument '{0}' ({1}) is not supported. Allowed values are : '{2}'.</value>
125122
</data>
@@ -129,9 +126,6 @@
129126
<data name="Argument_ExpressionMustBePropertyMember" xml:space="preserve">
130127
<value>The value of argument '{0}' is not supported. The expression must be a property member expression.</value>
131128
</data>
132-
<data name="InternalExceptionMessage" xml:space="preserve">
133-
<value>Internal error occurred. Additional information: '{0}'.</value>
134-
</data>
135129
<data name="Registration_ConstructorConventionOverridden" xml:space="preserve">
136130
<value>A constructor selection convention that would apply to Type '{0}' has been overridden by attributes applied in the source file or by a prior convention.</value>
137131
</data>

0 commit comments

Comments
 (0)