Skip to content

Commit

Permalink
Adding System.ComponentModel.Composition (dotnet/corefx#24921)
Browse files Browse the repository at this point in the history
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
  • Loading branch information
maryamariyan authored Nov 10, 2017
1 parent 9637601 commit a6f350f
Show file tree
Hide file tree
Showing 214 changed files with 26,518 additions and 10 deletions.
3 changes: 1 addition & 2 deletions src/libraries/Common/src/Microsoft/Internal/Requires.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,14 @@

using System;
using System.Collections.Generic;
using System.Composition;
using System.Diagnostics;
using System.Diagnostics.Contracts;
using System.Globalization;
using System.Reflection;

namespace Microsoft.Internal
{
internal static class Requires
internal static partial class Requires
{
[DebuggerStepThrough]
[ContractArgumentValidator]
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.27031.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{F4E00E91-9197-4740-9F8A-FC4E7CAF77C4}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{39B5128A-71B2-4182-965B-F85C5D2FFDCC}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{9F0F13B9-6400-4FCE-9CEF-F0597538A889}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.ComponentModel.Composition", "ref\System.ComponentModel.Composition.csproj", "{DD3B8052-CE03-4159-8311-1CE1382C51B0}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.ComponentModel.Composition", "src\System.ComponentModel.Composition.csproj", "{2D694AC8-A12F-4622-9405-74E20EC40C3A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.ComponentModel.Composition.Tests", "tests\System.ComponentModel.Composition.Tests.csproj", "{59F4682D-C41D-45A7-9798-16C75525BB1D}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
netcoreapp-Debug|Any CPU = netcoreapp-Debug|Any CPU
netcoreapp-Release|Any CPU = netcoreapp-Release|Any CPU
netcoreapp-Windows_NT-Debug|Any CPU = netcoreapp-Windows_NT-Debug|Any CPU
netcoreapp-Windows_NT-Release|Any CPU = netcoreapp-Windows_NT-Release|Any CPU
netfx-Debug|Any CPU = netfx-Debug|Any CPU
netfx-Release|Any CPU = netfx-Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{DD3B8052-CE03-4159-8311-1CE1382C51B0}.netcoreapp-Debug|Any CPU.ActiveCfg = netstandard-Release|Any CPU
{DD3B8052-CE03-4159-8311-1CE1382C51B0}.netcoreapp-Debug|Any CPU.Build.0 = netstandard-Release|Any CPU
{DD3B8052-CE03-4159-8311-1CE1382C51B0}.netcoreapp-Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU
{DD3B8052-CE03-4159-8311-1CE1382C51B0}.netcoreapp-Release|Any CPU.Build.0 = netstandard-Release|Any CPU
{DD3B8052-CE03-4159-8311-1CE1382C51B0}.netcoreapp-Windows_NT-Debug|Any CPU.ActiveCfg = netstandard-Release|Any CPU
{DD3B8052-CE03-4159-8311-1CE1382C51B0}.netcoreapp-Windows_NT-Debug|Any CPU.Build.0 = netstandard-Release|Any CPU
{DD3B8052-CE03-4159-8311-1CE1382C51B0}.netcoreapp-Windows_NT-Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU
{DD3B8052-CE03-4159-8311-1CE1382C51B0}.netcoreapp-Windows_NT-Release|Any CPU.Build.0 = netstandard-Release|Any CPU
{DD3B8052-CE03-4159-8311-1CE1382C51B0}.netfx-Debug|Any CPU.ActiveCfg = netstandard-Release|Any CPU
{DD3B8052-CE03-4159-8311-1CE1382C51B0}.netfx-Debug|Any CPU.Build.0 = netstandard-Release|Any CPU
{DD3B8052-CE03-4159-8311-1CE1382C51B0}.netfx-Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU
{DD3B8052-CE03-4159-8311-1CE1382C51B0}.netfx-Release|Any CPU.Build.0 = netstandard-Release|Any CPU
{2D694AC8-A12F-4622-9405-74E20EC40C3A}.netcoreapp-Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
{2D694AC8-A12F-4622-9405-74E20EC40C3A}.netcoreapp-Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
{2D694AC8-A12F-4622-9405-74E20EC40C3A}.netcoreapp-Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
{2D694AC8-A12F-4622-9405-74E20EC40C3A}.netcoreapp-Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
{2D694AC8-A12F-4622-9405-74E20EC40C3A}.netcoreapp-Windows_NT-Debug|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
{2D694AC8-A12F-4622-9405-74E20EC40C3A}.netcoreapp-Windows_NT-Debug|Any CPU.Build.0 = netcoreapp-Release|Any CPU
{2D694AC8-A12F-4622-9405-74E20EC40C3A}.netcoreapp-Windows_NT-Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
{2D694AC8-A12F-4622-9405-74E20EC40C3A}.netcoreapp-Windows_NT-Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
{2D694AC8-A12F-4622-9405-74E20EC40C3A}.netfx-Debug|Any CPU.ActiveCfg = netcoreapp2.0-Release|Any CPU
{2D694AC8-A12F-4622-9405-74E20EC40C3A}.netfx-Debug|Any CPU.Build.0 = netcoreapp2.0-Release|Any CPU
{2D694AC8-A12F-4622-9405-74E20EC40C3A}.netfx-Release|Any CPU.ActiveCfg = netcoreapp2.0-Release|Any CPU
{2D694AC8-A12F-4622-9405-74E20EC40C3A}.netfx-Release|Any CPU.Build.0 = netcoreapp2.0-Release|Any CPU
{59F4682D-C41D-45A7-9798-16C75525BB1D}.netcoreapp-Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
{59F4682D-C41D-45A7-9798-16C75525BB1D}.netcoreapp-Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
{59F4682D-C41D-45A7-9798-16C75525BB1D}.netcoreapp-Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
{59F4682D-C41D-45A7-9798-16C75525BB1D}.netcoreapp-Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
{59F4682D-C41D-45A7-9798-16C75525BB1D}.netcoreapp-Windows_NT-Debug|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
{59F4682D-C41D-45A7-9798-16C75525BB1D}.netcoreapp-Windows_NT-Debug|Any CPU.Build.0 = netcoreapp-Release|Any CPU
{59F4682D-C41D-45A7-9798-16C75525BB1D}.netcoreapp-Windows_NT-Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
{59F4682D-C41D-45A7-9798-16C75525BB1D}.netcoreapp-Windows_NT-Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
{59F4682D-C41D-45A7-9798-16C75525BB1D}.netfx-Debug|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
{59F4682D-C41D-45A7-9798-16C75525BB1D}.netfx-Debug|Any CPU.Build.0 = netcoreapp-Release|Any CPU
{59F4682D-C41D-45A7-9798-16C75525BB1D}.netfx-Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
{59F4682D-C41D-45A7-9798-16C75525BB1D}.netfx-Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{DD3B8052-CE03-4159-8311-1CE1382C51B0} = {F4E00E91-9197-4740-9F8A-FC4E7CAF77C4}
{2D694AC8-A12F-4622-9405-74E20EC40C3A} = {39B5128A-71B2-4182-965B-F85C5D2FFDCC}
{59F4682D-C41D-45A7-9798-16C75525BB1D} = {9F0F13B9-6400-4FCE-9CEF-F0597538A889}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {232C1147-A4C8-4C3D-B31A-6BD6C4065507}
EndGlobalSection
EndGlobal
8 changes: 8 additions & 0 deletions src/libraries/System.ComponentModel.Composition/dir.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\dir.props" />
<PropertyGroup>
<AssemblyVersion>4.0.0.0</AssemblyVersion>
<AssemblyKey>ECMA</AssemblyKey>
</PropertyGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<BuildConfigurations>
netstandard;
</BuildConfigurations>
</PropertyGroup>
</Project>
Loading

0 comments on commit a6f350f

Please sign in to comment.