Skip to content

Commit a6f350f

Browse files
maryamariyanmaryamariyan
authoredNov 10, 2017
Adding System.ComponentModel.Composition (dotnet/corefx#24921)
Adding System.ComponentModel.Composition - Ports MEF1 sources - Removes extra lines - Removes all [ContractArgumentValidator] attributes - Replaces old header formats with the usual 3 line license comment in all cs and resx files - Removing code block on true condition of FEATURE_CAS_APTCA - Slight update to sln file - Deleting calls to DemandMemberAccessIfNeeded apis - Simplifies BinaryCompatibility class - Changes Requires.NotNull(element, "element"); to Requires.NotNull(element, typeof(element)); - Removes commented out ifdefs and removing suppressmessage Microsoft.Contracts - Adding private access modifier to unspecified consts and other missing fields - Fixing configuration for netcoreapp - Defines constant FEATURE_TRACING - Removes SecuritySafeCritical annotation - Removes SLIM_LOCK - Removes FEATURE_REFLECTIONONLY, keeping the code it wraps. - Removes FEATURE_REFLECTIONCONTEXT, keeping the code it wraps. - Removes code in the if block of CONTRACTS_FULL - Removes the BinaryCompatibility class and the TargetsAtLeast_Desktop_V4_5 flag, since it is always true. - Removes FEATURE_ADVANCEDREFLECTION, keeping the code it wraps. - Removes MEF_FEATURE_INITIALIZATION, keeping the code it wraps - Removes FEATURE_REFLECTIONFILEIO, keeping the code it wraps. - Change the src project settings to not run apicompat - Adding comment reasoning why we skipped apicompat. also adding netcoreapp config - Updating configuration and removing ApiCompatBaseline file - Update src project - Simplifying Configurations.props files - Removes blank line on csproj and adding Condition to not include compile items when not netstandard - Removes S.CM.C netfx reference from netfxreference.props - Removes index entry in packageIndex - Suppress S.CM.C error - Adds missing ApplicationCatalog. Removing ifdef conditions, Adding APIs to ref - Code formatting for whitespaces on AssemblyCatalog.cs file - Removes uap entry from the inbox list for this S.CM.C in packageindex.json - Disable the tests in netfx which are hitting issue 24903 - Fixing tests in System.ComponentModel.Composition - Formatting whitespace and indentation - Removing this keyword - Removing blank line between switch case lines - Adding the netstandard configuration in the csproj for VS to understand the build configurations Commit migrated from dotnet/corefx@6bac408
1 parent 9637601 commit a6f350f

File tree

214 files changed

+26518
-10
lines changed

Some content is hidden

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

214 files changed

+26518
-10
lines changed
 

‎src/libraries/Common/src/Microsoft/Internal/Requires.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,14 @@
44

55
using System;
66
using System.Collections.Generic;
7-
using System.Composition;
87
using System.Diagnostics;
98
using System.Diagnostics.Contracts;
109
using System.Globalization;
1110
using System.Reflection;
1211

1312
namespace Microsoft.Internal
1413
{
15-
internal static class Requires
14+
internal static partial class Requires
1615
{
1716
[DebuggerStepThrough]
1817
[ContractArgumentValidator]

‎src/libraries/System.ComponentModel.Composition/System.ComponentModel.Composition.sln

+76
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.27031.1
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{F4E00E91-9197-4740-9F8A-FC4E7CAF77C4}"
7+
EndProject
8+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{39B5128A-71B2-4182-965B-F85C5D2FFDCC}"
9+
EndProject
10+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{9F0F13B9-6400-4FCE-9CEF-F0597538A889}"
11+
EndProject
12+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.ComponentModel.Composition", "ref\System.ComponentModel.Composition.csproj", "{DD3B8052-CE03-4159-8311-1CE1382C51B0}"
13+
EndProject
14+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.ComponentModel.Composition", "src\System.ComponentModel.Composition.csproj", "{2D694AC8-A12F-4622-9405-74E20EC40C3A}"
15+
EndProject
16+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.ComponentModel.Composition.Tests", "tests\System.ComponentModel.Composition.Tests.csproj", "{59F4682D-C41D-45A7-9798-16C75525BB1D}"
17+
EndProject
18+
Global
19+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
20+
netcoreapp-Debug|Any CPU = netcoreapp-Debug|Any CPU
21+
netcoreapp-Release|Any CPU = netcoreapp-Release|Any CPU
22+
netcoreapp-Windows_NT-Debug|Any CPU = netcoreapp-Windows_NT-Debug|Any CPU
23+
netcoreapp-Windows_NT-Release|Any CPU = netcoreapp-Windows_NT-Release|Any CPU
24+
netfx-Debug|Any CPU = netfx-Debug|Any CPU
25+
netfx-Release|Any CPU = netfx-Release|Any CPU
26+
EndGlobalSection
27+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
28+
{DD3B8052-CE03-4159-8311-1CE1382C51B0}.netcoreapp-Debug|Any CPU.ActiveCfg = netstandard-Release|Any CPU
29+
{DD3B8052-CE03-4159-8311-1CE1382C51B0}.netcoreapp-Debug|Any CPU.Build.0 = netstandard-Release|Any CPU
30+
{DD3B8052-CE03-4159-8311-1CE1382C51B0}.netcoreapp-Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU
31+
{DD3B8052-CE03-4159-8311-1CE1382C51B0}.netcoreapp-Release|Any CPU.Build.0 = netstandard-Release|Any CPU
32+
{DD3B8052-CE03-4159-8311-1CE1382C51B0}.netcoreapp-Windows_NT-Debug|Any CPU.ActiveCfg = netstandard-Release|Any CPU
33+
{DD3B8052-CE03-4159-8311-1CE1382C51B0}.netcoreapp-Windows_NT-Debug|Any CPU.Build.0 = netstandard-Release|Any CPU
34+
{DD3B8052-CE03-4159-8311-1CE1382C51B0}.netcoreapp-Windows_NT-Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU
35+
{DD3B8052-CE03-4159-8311-1CE1382C51B0}.netcoreapp-Windows_NT-Release|Any CPU.Build.0 = netstandard-Release|Any CPU
36+
{DD3B8052-CE03-4159-8311-1CE1382C51B0}.netfx-Debug|Any CPU.ActiveCfg = netstandard-Release|Any CPU
37+
{DD3B8052-CE03-4159-8311-1CE1382C51B0}.netfx-Debug|Any CPU.Build.0 = netstandard-Release|Any CPU
38+
{DD3B8052-CE03-4159-8311-1CE1382C51B0}.netfx-Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU
39+
{DD3B8052-CE03-4159-8311-1CE1382C51B0}.netfx-Release|Any CPU.Build.0 = netstandard-Release|Any CPU
40+
{2D694AC8-A12F-4622-9405-74E20EC40C3A}.netcoreapp-Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
41+
{2D694AC8-A12F-4622-9405-74E20EC40C3A}.netcoreapp-Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
42+
{2D694AC8-A12F-4622-9405-74E20EC40C3A}.netcoreapp-Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
43+
{2D694AC8-A12F-4622-9405-74E20EC40C3A}.netcoreapp-Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
44+
{2D694AC8-A12F-4622-9405-74E20EC40C3A}.netcoreapp-Windows_NT-Debug|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
45+
{2D694AC8-A12F-4622-9405-74E20EC40C3A}.netcoreapp-Windows_NT-Debug|Any CPU.Build.0 = netcoreapp-Release|Any CPU
46+
{2D694AC8-A12F-4622-9405-74E20EC40C3A}.netcoreapp-Windows_NT-Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
47+
{2D694AC8-A12F-4622-9405-74E20EC40C3A}.netcoreapp-Windows_NT-Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
48+
{2D694AC8-A12F-4622-9405-74E20EC40C3A}.netfx-Debug|Any CPU.ActiveCfg = netcoreapp2.0-Release|Any CPU
49+
{2D694AC8-A12F-4622-9405-74E20EC40C3A}.netfx-Debug|Any CPU.Build.0 = netcoreapp2.0-Release|Any CPU
50+
{2D694AC8-A12F-4622-9405-74E20EC40C3A}.netfx-Release|Any CPU.ActiveCfg = netcoreapp2.0-Release|Any CPU
51+
{2D694AC8-A12F-4622-9405-74E20EC40C3A}.netfx-Release|Any CPU.Build.0 = netcoreapp2.0-Release|Any CPU
52+
{59F4682D-C41D-45A7-9798-16C75525BB1D}.netcoreapp-Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
53+
{59F4682D-C41D-45A7-9798-16C75525BB1D}.netcoreapp-Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
54+
{59F4682D-C41D-45A7-9798-16C75525BB1D}.netcoreapp-Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
55+
{59F4682D-C41D-45A7-9798-16C75525BB1D}.netcoreapp-Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
56+
{59F4682D-C41D-45A7-9798-16C75525BB1D}.netcoreapp-Windows_NT-Debug|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
57+
{59F4682D-C41D-45A7-9798-16C75525BB1D}.netcoreapp-Windows_NT-Debug|Any CPU.Build.0 = netcoreapp-Release|Any CPU
58+
{59F4682D-C41D-45A7-9798-16C75525BB1D}.netcoreapp-Windows_NT-Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
59+
{59F4682D-C41D-45A7-9798-16C75525BB1D}.netcoreapp-Windows_NT-Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
60+
{59F4682D-C41D-45A7-9798-16C75525BB1D}.netfx-Debug|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
61+
{59F4682D-C41D-45A7-9798-16C75525BB1D}.netfx-Debug|Any CPU.Build.0 = netcoreapp-Release|Any CPU
62+
{59F4682D-C41D-45A7-9798-16C75525BB1D}.netfx-Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
63+
{59F4682D-C41D-45A7-9798-16C75525BB1D}.netfx-Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
64+
EndGlobalSection
65+
GlobalSection(SolutionProperties) = preSolution
66+
HideSolutionNode = FALSE
67+
EndGlobalSection
68+
GlobalSection(NestedProjects) = preSolution
69+
{DD3B8052-CE03-4159-8311-1CE1382C51B0} = {F4E00E91-9197-4740-9F8A-FC4E7CAF77C4}
70+
{2D694AC8-A12F-4622-9405-74E20EC40C3A} = {39B5128A-71B2-4182-965B-F85C5D2FFDCC}
71+
{59F4682D-C41D-45A7-9798-16C75525BB1D} = {9F0F13B9-6400-4FCE-9CEF-F0597538A889}
72+
EndGlobalSection
73+
GlobalSection(ExtensibilityGlobals) = postSolution
74+
SolutionGuid = {232C1147-A4C8-4C3D-B31A-6BD6C4065507}
75+
EndGlobalSection
76+
EndGlobal

0 commit comments

Comments
 (0)