Skip to content

Commit 40901d6

Browse files
authored
Correct System.Diagnostics.EventLog.Messages workaround for servicing (#29363)
- previous workaround didn't handle `'$(IsServicingBuild)' == 'true'` case
1 parent 66dcea7 commit 40901d6

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

eng/SharedFramework.External.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@
6060
three do not. This is likely about our public APIs i.e. external compilation requirements.
6161
-->
6262
<_TransitiveExternalAspNetCoreAppReference Include="System.Diagnostics.EventLog" Version="$(SystemDiagnosticsEventLogVersion)" />
63-
<_TransitiveExternalAspNetCoreAppReference Include="System.Diagnostics.EventLog.Messages" Version="$(SystemDiagnosticsEventLogVersion)" />
6463
<_TransitiveExternalAspNetCoreAppReference Include="System.Security.Permissions" Version="$(SystemSecurityPermissionsVersion)" />
6564
<_TransitiveExternalAspNetCoreAppReference Include="System.Windows.Extensions" Version="$(SystemWindowsExtensionsVersion)" />
6665
</ItemGroup>

src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,15 @@
1212
<!-- Ignore aspnetcorev2_inprocess because tests expect only managed assemblies in this item group. -->
1313
<_SharedFrameworkBinariesFromRepo Include="@(AspNetCoreAppReference);@(AspNetCoreAppReferenceAndPackage)" />
1414

15-
<_ExpectedSharedFrameworkBinaries Include="@(_SharedFrameworkBinariesFromRepo);@(ExternalAspNetCoreAppReference);@(_TransitiveExternalAspNetCoreAppReference)" />
15+
<!--
16+
Special-case System.Diagnostics.EventLog.Messages.dll because that assembly name does _not_ match a
17+
package. Can't mention it in @(ExternalAspNetCoreAppReference) or underlying
18+
@(_TransitiveExternalAspNetCoreAppReference) without thoroughly confusing eng/targets/ResolveReferences.targets.
19+
-->
20+
<_ExpectedSharedFrameworkBinaries Include="@(_SharedFrameworkBinariesFromRepo);
21+
@(ExternalAspNetCoreAppReference);
22+
@(_TransitiveExternalAspNetCoreAppReference);
23+
System.Diagnostics.EventLog.Messages" />
1624
<_ExpectedSharedFrameworkBinaries Condition="'$(TargetOsName)' == 'win' AND '$(TargetArchitecture)' != 'arm'" Include="aspnetcorev2_inprocess" />
1725

1826
<AssemblyAttribute Include="Microsoft.AspNetCore.TestData">

0 commit comments

Comments
 (0)