Skip to content

Commit 07296bf

Browse files
authored
Auto-generate parts of the PackageOverrides file (#5080)
Fixes #4998 Depends on dotnet/runtime#115477
1 parent 66210f6 commit 07296bf

File tree

2 files changed

+6
-17
lines changed

2 files changed

+6
-17
lines changed

src/windowsdesktop/src/sfx/Directory.Build.targets

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,14 @@
5252
<PropertyGroup>
5353
<PackageOverridesInputPath>$(MSBuildThisFileDirectory)PackageOverrides.txt</PackageOverridesInputPath>
5454
<PackageOverridesOutputPath>$(BaseOutputPath)PackageOverrides.txt</PackageOverridesOutputPath>
55+
56+
<!-- Add the RuntimeWindowsDesktopPackageLibrary item information from the Microsoft.Internal.Runtime.WindowsDesktop.Transport package. -->
57+
<RuntimeWindowsDesktopPackageLibraries>@(RuntimeWindowsDesktopPackageLibrary->'%(PackageId)|%(PackageVersion)', '
58+
')</RuntimeWindowsDesktopPackageLibraries>
5559
</PropertyGroup>
5660

5761
<ItemGroup>
58-
<CreatePackageOverridesTemplateProperty Include="ProductVersion=$(Version)" />
62+
<CreatePackageOverridesTemplateProperty Include="RuntimeWindowsDesktopPackageLibraries=$(RuntimeWindowsDesktopPackageLibraries)" />
5963
</ItemGroup>
6064

6165
<GenerateFileFromTemplate
Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1 @@
1-
Microsoft.Win32.Registry.AccessControl|${ProductVersion}
2-
Microsoft.Win32.SystemEvents|${ProductVersion}
3-
System.CodeDom|${ProductVersion}
4-
System.Configuration.ConfigurationManager|${ProductVersion}
5-
System.Diagnostics.EventLog|${ProductVersion}
6-
System.Diagnostics.PerformanceCounter|${ProductVersion}
7-
System.DirectoryServices|${ProductVersion}
8-
System.Drawing.Common|${ProductVersion}
9-
System.Formats.Nrbf|${ProductVersion}
10-
System.IO.Packaging|${ProductVersion}
11-
System.Security.Cryptography.Pkcs|${ProductVersion}
12-
System.Security.Cryptography.ProtectedData|${ProductVersion}
13-
System.Security.Cryptography.Xml|${ProductVersion}
14-
System.Security.Permissions|${ProductVersion}
15-
System.Threading.AccessControl|${ProductVersion}
16-
System.Windows.Extensions|${ProductVersion}
1+
${RuntimeWindowsDesktopPackageLibraries}

0 commit comments

Comments
 (0)