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

Commit 28fffe8

Browse files
authored
Packaging System.ComponentModel.Composition (#25411)
Fixes #11857
1 parent 779171f commit 28fffe8

File tree

5 files changed

+45
-3
lines changed

5 files changed

+45
-3
lines changed

pkg/Microsoft.Private.PackageBaseline/packageIndex.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -811,13 +811,15 @@
811811
"System.ComponentModel.Composition": {
812812
"InboxOn": {
813813
"net45": "4.0.0.0",
814-
"netstandard2.0": "4.0.0.0",
815814
"monoandroid10": "Any",
816815
"monotouch10": "Any",
817816
"xamarinios10": "Any",
818817
"xamarinmac20": "Any",
819818
"xamarintvos10": "Any",
820819
"xamarinwatchos10": "Any"
820+
},
821+
"AssemblyVersionInPackageVersion": {
822+
"4.0.0.0": "4.5.0"
821823
}
822824
},
823825
"System.ComponentModel.Composition.Registration": {
@@ -5603,4 +5605,4 @@
56035605
"System.Xml.XDocument"
56045606
]
56055607
}
5606-
}
5608+
}

pkg/Microsoft.Windows.Compatibility/Microsoft.Windows.Compatibility.pkgproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
<PrereleaseLibraryPackage Include="Microsoft.Win32.Registry" />
2424
<PrereleaseLibraryPackage Include="Microsoft.Win32.Registry.AccessControl" />
2525
<PrereleaseLibraryPackage Include="System.CodeDom" />
26+
<PrereleaseLibraryPackage Include="System.ComponentModel.Composition" />
2627
<PrereleaseLibraryPackage Include="System.Configuration.ConfigurationManager" />
2728
<PrereleaseLibraryPackage Include="System.Data.Odbc" />
2829
<PrereleaseLibraryPackage Include="System.Drawing.Common" />

pkg/descriptions.json

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -339,6 +339,27 @@
339339
"System.ComponentModel.DataAnnotations.KeyAttribute"
340340
]
341341
},
342+
{
343+
"Name": "System.ComponentModel.Composition",
344+
"Description": "This namespace provides classes that constitute the core of the Managed Extensibility Framework, or MEF.",
345+
"CommonTypes": [
346+
"System.ComponentModel.Composition.ChangeRejectedException",
347+
"System.ComponentModel.Composition.CompositionContractMismatchException",
348+
"System.ComponentModel.Composition.CompositionError",
349+
"System.ComponentModel.Composition.CompositionException",
350+
"System.ComponentModel.Composition.ExportAttribute",
351+
"System.ComponentModel.Composition.ImportAttribute",
352+
"System.ComponentModel.Composition.ImportCardinalityMismatchException",
353+
"System.ComponentModel.Composition.Hosting.AggregateCatalog",
354+
"System.ComponentModel.Composition.Hosting.ApplicationCatalog",
355+
"System.ComponentModel.Composition.Hosting.AssemblyCatalog",
356+
"System.ComponentModel.Composition.Hosting.CompositionContainer",
357+
"System.ComponentModel.Composition.Primitives.ComposablePartException",
358+
"System.ComponentModel.Composition.Primitives.ExportDefinition",
359+
"System.ComponentModel.Composition.Primitives.ImportDefinition",
360+
"System.ComponentModel.Composition.ReflectionModel.ReflectionModelServices"
361+
]
362+
},
342363
{
343364
"Name": "System.ComponentModel.EventBasedAsync",
344365
"Description": "Provides support classes and delegates for the event-based asynchronous pattern. Developers should prefer the classes in the System.Threading.Tasks package.",

src/System.ComponentModel.Composition/dir.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
<Import Project="..\dir.props" />
44
<PropertyGroup>
55
<AssemblyVersion>4.0.0.0</AssemblyVersion>
6-
<AssemblyKey>ECMA</AssemblyKey>
6+
<AssemblyKey>MSFT</AssemblyKey>
77
</PropertyGroup>
88
</Project>
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
4+
<ItemGroup>
5+
<ProjectReference Include="..\ref\System.ComponentModel.Composition.csproj">
6+
<SupportedFramework>netcoreapp2.0;net45;$(AllXamarinFrameworks)</SupportedFramework>
7+
</ProjectReference>
8+
<ProjectReference Include="..\src\System.ComponentModel.Composition.csproj" />
9+
<InboxOnTargetFramework Include="net45">
10+
<AsFrameworkReference>true</AsFrameworkReference>
11+
</InboxOnTargetFramework>
12+
<InboxOnTargetFramework Include="$(AllXamarinFrameworks)" />
13+
<File Include="$(PlaceHolderFile)">
14+
<TargetPath>runtimes/win/lib/net45</TargetPath>
15+
</File>
16+
</ItemGroup>
17+
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
18+
</Project>

0 commit comments

Comments
 (0)