From aceb402685e5390c7810d05e2ee9ae4c913c2691 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20Hompus?= <michael@hompus.nl>
Date: Wed, 21 Aug 2024 22:41:13 +0200
Subject: [PATCH 1/3] Provide System.Composition.AttributedModel package readme

---
 .../src/PACKAGE.md                            | 139 ++++++++++++++++++
 .../src/System.Composition.csproj             |   2 +-
 2 files changed, 140 insertions(+), 1 deletion(-)
 create mode 100644 src/libraries/System.Composition.AttributedModel/src/PACKAGE.md

diff --git a/src/libraries/System.Composition.AttributedModel/src/PACKAGE.md b/src/libraries/System.Composition.AttributedModel/src/PACKAGE.md
new file mode 100644
index 00000000000000..930728053bc75b
--- /dev/null
+++ b/src/libraries/System.Composition.AttributedModel/src/PACKAGE.md
@@ -0,0 +1,139 @@
+## About
+
+<!-- A description of the package and where one can find more documentation -->
+
+`System.Composition.AttributedModel` is part of the Managed Extensibility Framework (MEF) 2.0, a composition library for .NET that enables dependency injection through attributes.
+
+This package provides the foundational attributes that allow you to declare parts for composition, such as imports, exports, and metadata.
+It is used to mark classes, properties, methods, and constructors for MEF's discovery and composition process.
+
+## Key Features
+
+<!-- The key features of this package -->
+
+* Provides attributes for declaring composable parts, importing dependencies, metadata, and creating shared or non-shared parts
+
+## How to Use
+
+<!-- A compelling example on how to use this package with code, as well as any specific guidelines for when to use the package -->
+
+Mark classes for export and import using attributes.
+
+```csharp
+using System.Composition;
+using System.Composition.Hosting;
+
+var configuration = new ContainerConfiguration()
+    .WithPart<Service>()
+    .WithPart<Application>();
+
+using CompositionHost container = configuration.CreateContainer();
+
+Application app = container.GetExport<Application>();
+app.Service.Execute();
+// Service is running!
+
+[Export]
+public class Application
+{
+    [Import]
+    public Service Service { get; set; }
+}
+
+[Export]
+public class Service
+{
+    public void Execute() => Console.WriteLine("Service is running!");
+}
+```
+
+Metadata can be used to differentiate between multiple exports of the same contract.
+
+```csharp
+using System.Composition;
+using System.Composition.Hosting;
+
+ContainerConfiguration configuration = new ContainerConfiguration()
+    .WithPart<FileLogger>()
+    .WithPart<ConsoleLogger>()
+    .WithPart<Application>();
+
+using CompositionHost container = configuration.CreateContainer();
+
+Application app = container.GetExport<Application>();
+app.Run();
+// Using FileLogger to log.
+// FileLogger: Hello, World!
+// Using ConsoleLogger to log.
+// ConsoleLogger: Hello, World!
+
+public interface ILogger
+{
+    void Log(string message);
+}
+
+[Export(typeof(ILogger))]
+[ExportMetadata("Name", "FileLogger")]
+public class FileLogger : ILogger
+{
+    public void Log(string message) => Console.WriteLine($"FileLogger: {message}");
+}
+
+[Export(typeof(ILogger))]
+[ExportMetadata("Name", "ConsoleLogger")]
+public class ConsoleLogger : ILogger
+{
+    public void Log(string message) => Console.WriteLine($"ConsoleLogger: {message}");
+}
+
+[Export]
+public class Application
+{
+    [ImportMany]
+    public required IEnumerable<Lazy<ILogger, IDictionary<string, object>>> Loggers { get; set; }
+
+    public void Run()
+    {
+        foreach (var logger in Loggers)
+        {
+            var name = logger.Metadata["Name"];
+
+            Console.WriteLine($"Using {name} to log.");
+            logger.Value.Log("Hello, World!");
+        }
+    }
+}
+```
+
+## Main Types
+
+<!-- The main types provided in this library -->
+
+The main types provided by this library are:
+
+* `System.Composition.ExportAttribute`
+* `System.Composition.ImportAttribute`
+* `System.Composition.ExportMetadataAttribute`
+
+## Additional Documentation
+
+<!-- Links to further documentation. Remove conceptual documentation if not available for the library. -->
+
+* [API documentation](https://learn.microsoft.com/dotnet/api/system.composition.attributedmodel)
+* [Managed Extensibility Framework (MEF)](https://learn.microsoft.com/dotnet/framework/mef/)
+
+## Related Packages
+
+<!-- The related packages associated with this package -->
+
+* [System.Composition.Convention](https://www.nuget.org/packages/System.Composition.Convention)
+* [System.Composition.Hosting](https://www.nuget.org/packages/System.Composition.Hosting)
+* [System.Composition.Runtime](https://www.nuget.org/packages/System.Composition.Runtime)
+* [System.Composition.TypedParts](https://www.nuget.org/packages/System.Composition.TypedParts)
+
+## Feedback & Contributing
+
+<!-- How to provide feedback on this package and contribute to it -->
+
+System.Composition.AttributedModel is released as open source under the [MIT license](https://licenses.nuget.org/MIT).
+Bug reports and contributions are welcome at [the GitHub repository](https://github.com/dotnet/runtime).
diff --git a/src/libraries/System.Composition/src/System.Composition.csproj b/src/libraries/System.Composition/src/System.Composition.csproj
index a360f80b58e2b9..9066d9212d8675 100644
--- a/src/libraries/System.Composition/src/System.Composition.csproj
+++ b/src/libraries/System.Composition/src/System.Composition.csproj
@@ -8,7 +8,7 @@
     <NoWarn>$(NoWarn);NU5128</NoWarn>
     <!-- Reference dependencies to persiste them in the project's project.assets.json file which is used to calculate package dependencies. -->
     <NoTargetsDoNotReferenceOutputAssemblies>false</NoTargetsDoNotReferenceOutputAssemblies>
-    <PackageDescription>Provides a version of the Managed Extensibility Framework (MEF) that is lightweight and specifically optimized for high throughput scenarios, such as the web.</PackageDescription>
+    <PackageDescription>Provides the foundational attributes that allow you to declare parts for composition, such as imports, exports, and metadata with the Managed Extensibility Framework (MEF).</PackageDescription>
     <!-- TODO https://github.com/dotnet/runtime/issues/90400: Annotate for nullable reference types -->
     <Nullable>disable</Nullable>
     <NoWarn>$(NoWarn);nullable</NoWarn>

From a1c6d4f15dddcc0e9632d76a83d7e1934786cca3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20Hompus?= <michael@hompus.nl>
Date: Mon, 26 Aug 2024 18:12:17 +0200
Subject: [PATCH 2/3] Improve after feedback

---
 .../System.Composition.AttributedModel/src/PACKAGE.md        | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/libraries/System.Composition.AttributedModel/src/PACKAGE.md b/src/libraries/System.Composition.AttributedModel/src/PACKAGE.md
index 930728053bc75b..57bbc8bf0329b7 100644
--- a/src/libraries/System.Composition.AttributedModel/src/PACKAGE.md
+++ b/src/libraries/System.Composition.AttributedModel/src/PACKAGE.md
@@ -2,7 +2,7 @@
 
 <!-- A description of the package and where one can find more documentation -->
 
-`System.Composition.AttributedModel` is part of the Managed Extensibility Framework (MEF) 2.0, a composition library for .NET that enables dependency injection through attributes.
+`System.Composition.AttributedModel` is part of the Managed Extensibility Framework (MEF) 2.0, a composition library for .NET that enables dependency injection through attributes or conventions.
 
 This package provides the foundational attributes that allow you to declare parts for composition, such as imports, exports, and metadata.
 It is used to mark classes, properties, methods, and constructors for MEF's discovery and composition process.
@@ -119,13 +119,14 @@ The main types provided by this library are:
 
 <!-- Links to further documentation. Remove conceptual documentation if not available for the library. -->
 
-* [API documentation](https://learn.microsoft.com/dotnet/api/system.composition.attributedmodel)
+* [API documentation](https://learn.microsoft.com/dotnet/api/system.composition)
 * [Managed Extensibility Framework (MEF)](https://learn.microsoft.com/dotnet/framework/mef/)
 
 ## Related Packages
 
 <!-- The related packages associated with this package -->
 
+* [System.Composition](https://www.nuget.org/packages/System.Composition)
 * [System.Composition.Convention](https://www.nuget.org/packages/System.Composition.Convention)
 * [System.Composition.Hosting](https://www.nuget.org/packages/System.Composition.Hosting)
 * [System.Composition.Runtime](https://www.nuget.org/packages/System.Composition.Runtime)

From 89b6cba923f671982815b8f115e62445d6e603bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20Hompus?= <michael@hompus.nl>
Date: Wed, 4 Sep 2024 21:58:43 +0200
Subject: [PATCH 3/3] Set correct PackageDescription

---
 .../src/System.Composition.AttributedModel.csproj        | 9 +--------
 .../System.Composition/src/System.Composition.csproj     | 2 +-
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/libraries/System.Composition.AttributedModel/src/System.Composition.AttributedModel.csproj b/src/libraries/System.Composition.AttributedModel/src/System.Composition.AttributedModel.csproj
index 21e5bd32d21de9..44856544cf5ddf 100644
--- a/src/libraries/System.Composition.AttributedModel/src/System.Composition.AttributedModel.csproj
+++ b/src/libraries/System.Composition.AttributedModel/src/System.Composition.AttributedModel.csproj
@@ -5,17 +5,10 @@
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <UseCompilerGeneratedDocXmlFile>false</UseCompilerGeneratedDocXmlFile>
     <IsPackable>true</IsPackable>
-    <PackageDescription>Provides common attributes used by System.Composition types.
-
-Commonly Used Types:
-System.Composition.ExportAttribute
-System.Composition.ImportAttribute
-System.Composition.Convention.AttributedModelProvider</PackageDescription>
+    <PackageDescription>Provides the foundational attributes that allow you to declare parts for composition, such as imports, exports, and metadata with the Managed Extensibility Framework (MEF).</PackageDescription>
     <!-- TODO https://github.com/dotnet/runtime/issues/90400: Annotate for nullable reference types -->
     <Nullable>disable</Nullable>
     <NoWarn>$(NoWarn);nullable</NoWarn>
-    <!-- TODO: Add package README file: https://github.com/dotnet/runtime/issues/99358 -->
-    <EnableDefaultPackageReadmeFile>false</EnableDefaultPackageReadmeFile>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/libraries/System.Composition/src/System.Composition.csproj b/src/libraries/System.Composition/src/System.Composition.csproj
index 9066d9212d8675..a360f80b58e2b9 100644
--- a/src/libraries/System.Composition/src/System.Composition.csproj
+++ b/src/libraries/System.Composition/src/System.Composition.csproj
@@ -8,7 +8,7 @@
     <NoWarn>$(NoWarn);NU5128</NoWarn>
     <!-- Reference dependencies to persiste them in the project's project.assets.json file which is used to calculate package dependencies. -->
     <NoTargetsDoNotReferenceOutputAssemblies>false</NoTargetsDoNotReferenceOutputAssemblies>
-    <PackageDescription>Provides the foundational attributes that allow you to declare parts for composition, such as imports, exports, and metadata with the Managed Extensibility Framework (MEF).</PackageDescription>
+    <PackageDescription>Provides a version of the Managed Extensibility Framework (MEF) that is lightweight and specifically optimized for high throughput scenarios, such as the web.</PackageDescription>
     <!-- TODO https://github.com/dotnet/runtime/issues/90400: Annotate for nullable reference types -->
     <Nullable>disable</Nullable>
     <NoWarn>$(NoWarn);nullable</NoWarn>