|
| 1 | +From 8111a47893a3536e5332817c78b9fdd1e59542bd Mon Sep 17 00:00:00 2001 |
| 2 | +From: Davis Goodin < [email protected]> |
| 3 | +Date: Mon, 23 Nov 2020 18:42:37 -0600 |
| 4 | +Subject: [PATCH] Make Microsoft.Win32.SystemEvents explicit ref |
| 5 | + |
| 6 | +Change Microsoft.Win32.SystemEvents from |
| 7 | +_TransitiveExternalAspNetCoreAppReference to |
| 8 | +ExternalAspNetCoreAppReference. Normally SystemEvents is brought in by |
| 9 | +System.Drawing.Common as a transitive ref, but in source-build, |
| 10 | +System.Drawing.Common doesn't have this reference. Ideally this will be |
| 11 | +fixed in dotnet/runtime, but for now this is a more straightforward |
| 12 | +place to patch the reference. |
| 13 | + |
| 14 | +Without this, the ASP.NET Core shared framework ends up missing the |
| 15 | +SystemEvents assembly, making it potentially unable to run some |
| 16 | +applications built using the Microsoft-built SDK. |
| 17 | +--- |
| 18 | + eng/SharedFramework.External.props | 2 +- |
| 19 | + 1 file changed, 1 insertion(+), 1 deletion(-) |
| 20 | + |
| 21 | +diff --git a/eng/SharedFramework.External.props b/eng/SharedFramework.External.props |
| 22 | +index a43f82e803..246678e723 100644 |
| 23 | +--- a/eng/SharedFramework.External.props |
| 24 | ++++ b/eng/SharedFramework.External.props |
| 25 | +@@ -40,6 +40,7 @@ |
| 26 | + <ExternalAspNetCoreAppReference Include="Microsoft.Extensions.Options.DataAnnotations" Version="$(MicrosoftExtensionsOptionsDataAnnotationsPackageVersion)" /> |
| 27 | + <ExternalAspNetCoreAppReference Include="Microsoft.Extensions.Options" Version="$(MicrosoftExtensionsOptionsPackageVersion)" /> |
| 28 | + <ExternalAspNetCoreAppReference Include="Microsoft.Extensions.Primitives" Version="$(MicrosoftExtensionsPrimitivesPackageVersion)" /> |
| 29 | ++ <ExternalAspNetCoreAppReference Include="Microsoft.Win32.SystemEvents" Version="$(MicrosoftWin32SystemEventsPackageVersion)" /> |
| 30 | + <ExternalAspNetCoreAppReference Include="System.IO.Pipelines" Version="$(SystemIOPipelinesPackageVersion)" /> |
| 31 | + <ExternalAspNetCoreAppReference Include="System.Security.Cryptography.Xml" Version="$(SystemSecurityCryptographyXmlPackageVersion)" /> |
| 32 | + |
| 33 | +@@ -52,7 +53,6 @@ |
| 34 | + |
| 35 | + If these are needed as direct dependencies, it is okay to change them to ExternalAspNetCoreAppReference and move up into sections above. |
| 36 | + --> |
| 37 | +- <_TransitiveExternalAspNetCoreAppReference Include="Microsoft.Win32.SystemEvents" Version="$(MicrosoftWin32SystemEventsPackageVersion)" /> |
| 38 | + <_TransitiveExternalAspNetCoreAppReference Include="System.Drawing.Common" Version="$(SystemDrawingCommonPackageVersion)" /> |
| 39 | + <_TransitiveExternalAspNetCoreAppReference Include="System.Security.Cryptography.Pkcs" Version="$(SystemSecurityCryptographyPkcsPackageVersion)" /> |
| 40 | + <!-- |
| 41 | +-- |
| 42 | +2.25.4 |
| 43 | + |
0 commit comments