Skip to content

Commit 5748afb

Browse files
[release/8.0-staging] Include PDB for all TfmRuntimeSpecificPackageFile (#112140)
* Include PDB for all TfmRuntimeSpecificPackageFile Previously this would only include the PDB for the primary output which missed any other additions to TfmRuntimeSpecificPackageFile - such as those from references or packages. * Update System.Diagnostics.EventLog.csproj --------- Co-authored-by: Eric StJohn <[email protected]>
1 parent bbfb162 commit 5748afb

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

eng/packaging.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@
148148
<TfmSpecificPackageFile Include="@(TfmRuntimeSpecificPackageFile)"
149149
PackagePath="runtimes\$(_packageTargetRuntime)\$(BuildOutputTargetFolder)\$(_targetFrameworkWithoutSuffix)\" />
150150
<!-- Create the item and use its metadata separately to avoid MSB4120. See https://aka.ms/msbuild/metadata-self-ref for more info. -->
151-
<_RuntimeSymbolPath Include="$(RuntimeSymbolPath)" />
151+
<_RuntimeSymbolPath Include="@(TfmRuntimeSpecificPackageFile->'%(RootDir)%(Directory)%(FileName).pdb')" Condition="'%(TfmRuntimeSpecificPackageFile.Extension)' == '.dll'" KeepMetadata="None" />
152152
<TfmSpecificDebugSymbolsFile Include="@(_RuntimeSymbolPath)"
153153
TargetPath="/runtimes/$(_packageTargetRuntime)/$(BuildOutputTargetFolder)/$(_targetFrameworkWithoutSuffix)/%(_RuntimeSymbolPath.Filename)%(_RuntimeSymbolPath.Extension)"
154154
TargetFramework="$(_targetFrameworkWithoutSuffix)"

src/libraries/System.Diagnostics.EventLog/src/System.Diagnostics.EventLog.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppPrevious)-windows;$(NetCoreAppPrevious);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
44
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
55
<IsPackable>true</IsPackable>
6-
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
7-
<ServicingVersion>1</ServicingVersion>
6+
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
7+
<ServicingVersion>2</ServicingVersion>
88
<PackageDescription>Provides the System.Diagnostics.EventLog class, which allows the applications to use the Windows event log service.
99

1010
Commonly Used Types:

0 commit comments

Comments
 (0)