diff options
| author | Eric StJohn <ericstj@microsoft.com> | 2020-12-15 20:33:01 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-15 20:33:01 +0300 |
| commit | 29c0438754e8f4bd6098f88ebeff7e59f9dda14b (patch) | |
| tree | 931f28b3ddfc1d907bebd65d14b88cb68101216b /eng/versioning.targets | |
| parent | e29b83934e7ceef9905f82bd6328cbc72db2278b (diff) | |
Make EventLog work without .NETFramework (#45884)
* Make EventLog work without .NETFramework
* Use a project file instead of targets to create message DLL
* Add EventLogMessagesTests
* Address feedback
* Exclude EventLogMessage tests on net48
* Apply code review feedback
Also fix one test which would fail on machine without .NETFramework.
* Fix HelpLink test
Diffstat (limited to 'eng/versioning.targets')
| -rw-r--r-- | eng/versioning.targets | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/eng/versioning.targets b/eng/versioning.targets index 2fa9a8eb3e1..4a14c7e0c2d 100644 --- a/eng/versioning.targets +++ b/eng/versioning.targets @@ -23,7 +23,7 @@ </ItemGroup> <!-- Adds SupportedOSPlatform attribute for Windows Specific libraries --> - <ItemGroup Condition="'$(IsWindowsSpecific)' == 'true' and '$(IsTestProject)' != 'true'"> + <ItemGroup Condition="'$(IsWindowsSpecific)' == 'true' and '$(IsTestProject)' != 'true' and '$(IncludePlatformAttributes)' != 'false'"> <AssemblyAttribute Include="System.Runtime.Versioning.SupportedOSPlatform"> <_Parameter1>windows</_Parameter1> </AssemblyAttribute> @@ -42,7 +42,7 @@ <_unsupportedOSPlatforms Include="$(UnsupportedOSPlatforms)" /> </ItemGroup> - <Target Name="AddUnsupportedOSPlatformAttribute" BeforeTargets="GenerateAssemblyInfo" AfterTargets="PrepareForBuild" Condition="'@(_unsupportedOSPlatforms)' != '' and '$(IsTestProject)' != 'true'"> + <Target Name="AddUnsupportedOSPlatformAttribute" BeforeTargets="GenerateAssemblyInfo" AfterTargets="PrepareForBuild" Condition="'@(_unsupportedOSPlatforms)' != '' and '$(IsTestProject)' != 'true' and '$(IncludePlatformAttributes)' != 'false'"> <ItemGroup> <AssemblyAttribute Include="System.Runtime.Versioning.UnsupportedOSPlatform"> <_Parameter1>%(_unsupportedOSPlatforms.Identity)</_Parameter1> |