Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit 62bc5bd

Browse files
dsplaisteddsplaisted
committed
Move duplicated code in System.Composition into common folder
1 parent 63f15b5 commit 62bc5bd

20 files changed

+901
-211
lines changed

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

Lines changed: 1 addition & 1 deletion
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 renamed to ‎src/Common/src/Microsoft/Internal/Assumes.cs

Lines changed: 0 additions & 1 deletion
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

Lines changed: 82 additions & 0 deletions
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

Lines changed: 126 additions & 0 deletions
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/System.Composition.Convention/src/Microsoft/Internal/Requires.cs renamed to ‎src/Common/src/Microsoft/Internal/Requires.cs

Lines changed: 1 addition & 1 deletion
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.Convention/src/Strings.resx

Lines changed: 0 additions & 6 deletions
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>

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

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
<ProjectGuid>{E6592FAD-10B5-4B56-9287-D72DD136992F}</ProjectGuid>
77
<OutputType>Library</OutputType>
88
<AppDesignerFolder>Properties</AppDesignerFolder>
9-
<RootNamespace>System.Composition.Convention</RootNamespace>
109
<AssemblyName>System.Composition.Convention</AssemblyName>
1110
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1211
<TargetFrameworkProfile>Profile259</TargetFrameworkProfile>
@@ -21,20 +20,32 @@
2120
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2221
</PropertyGroup>
2322
<ItemGroup>
23+
<Compile Include="..\..\Common\src\Microsoft\Internal\Assumes.cs">
24+
<Link>Microsoft\Internal\Assumes.cs</Link>
25+
</Compile>
26+
<Compile Include="..\..\Common\src\Microsoft\Internal\Assumes.InternalErrorException.cs">
27+
<Link>Microsoft\Internal\Assumes.InternalErrorException.cs</Link>
28+
</Compile>
29+
<Compile Include="..\..\Common\src\Microsoft\Internal\CommonStrings.Designer.cs">
30+
<Link>Microsoft\Internal\CommonStrings.Designer.cs</Link>
31+
<AutoGen>True</AutoGen>
32+
<DesignTime>True</DesignTime>
33+
<DependentUpon>CommonStrings.resx</DependentUpon>
34+
</Compile>
35+
<Compile Include="..\..\Common\src\Microsoft\Internal\Requires.cs">
36+
<Link>Microsoft\Internal\Requires.cs</Link>
37+
</Compile>
2438
<Compile Include="Microsoft\Composition\Diagnostics\CompositionTrace.cs" />
2539
<Compile Include="Microsoft\Composition\Diagnostics\CompositionTraceId.cs" />
2640
<Compile Include="Microsoft\Composition\Diagnostics\CompositionTraceSource.cs" />
2741
<Compile Include="Microsoft\Composition\Diagnostics\SilverlightTraceWriter.cs" />
2842
<Compile Include="Microsoft\Composition\Diagnostics\TraceSourceTraceWriter.cs" />
2943
<Compile Include="Microsoft\Composition\Diagnostics\TraceWriter.cs" />
30-
<Compile Include="Microsoft\Internal\Assumes.cs" />
31-
<Compile Include="Microsoft\Internal\Assumes.InternalErrorException.cs" />
3244
<Compile Include="Microsoft\Internal\AttributeServices.cs" />
3345
<Compile Include="Microsoft\Internal\Lock.cs" />
3446
<Compile Include="Microsoft\Internal\Lock.Reader.cs" />
3547
<Compile Include="Microsoft\Internal\Lock.Writer.cs" />
3648
<Compile Include="Microsoft\Internal\ReflectionServices.cs" />
37-
<Compile Include="Microsoft\Internal\Requires.cs" />
3849
<Compile Include="Properties\AssemblyInfo.cs" />
3950
<Compile Include="Strings.Designer.cs" />
4051
<Compile Include="System\Composition\Convention\ConventionBuilder.cs" />
@@ -46,6 +57,12 @@
4657
<Compile Include="System\Composition\ExceptionBuilder.cs" />
4758
</ItemGroup>
4859
<ItemGroup>
60+
<EmbeddedResource Include="..\..\Common\src\Microsoft\Internal\CommonStrings.resx">
61+
<Link>Microsoft\Internal\CommonStrings.resx</Link>
62+
<Generator>ResXFileCodeGenerator</Generator>
63+
<LastGenOutput>CommonStrings.Designer.cs</LastGenOutput>
64+
<CustomToolNamespace>Microsoft.Internal</CustomToolNamespace>
65+
</EmbeddedResource>
4966
<EmbeddedResource Include="Strings.resx" />
5067
</ItemGroup>
5168
<ItemGroup>

‎src/System.Composition.Hosting/src/Microsoft/Internal/Assumes.InternalErrorException.cs

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

0 commit comments

Comments
 (0)