From 9ad4ef7a4ee4c29d776bb8aaeb0df57794cae912 Mon Sep 17 00:00:00 2001 From: Jeff Handley Date: Tue, 13 Apr 2021 18:36:59 -0700 Subject: [PATCH] Refactor build to use SupportedOSPlatforms instead of IsWindowsSpecific --- eng/targetframeworksuffix.props | 11 +++++--- eng/versioning.targets | 27 ++++++++++--------- src/libraries/Directory.Build.targets | 9 ++++--- .../Directory.Build.props | 2 +- .../Directory.Build.props | 2 +- .../Directory.Build.props | 2 +- .../System.Data.OleDb/Directory.Build.props | 2 +- .../Directory.Build.props | 2 +- ...ystem.Diagnostics.EventLog.Messages.csproj | 3 ++- .../Directory.Build.props | 2 +- .../Directory.Build.props | 2 +- .../Directory.Build.props | 2 +- .../Directory.Build.props | 2 +- .../Directory.Build.props | 2 +- .../System.Management/Directory.Build.props | 2 +- .../Directory.Build.props | 2 +- .../Directory.Build.props | 2 +- .../Directory.Build.props | 2 +- .../Directory.Build.props | 2 +- .../Directory.Build.props | 2 +- .../Directory.Build.props | 2 +- .../System.Speech/Directory.Build.props | 2 +- .../Directory.Build.props | 2 +- .../Directory.Build.props | 2 +- .../Directory.Build.props | 2 +- 25 files changed, 50 insertions(+), 42 deletions(-) diff --git a/eng/targetframeworksuffix.props b/eng/targetframeworksuffix.props index 00d2acfd4607c8..ccbf1aa2883664 100644 --- a/eng/targetframeworksuffix.props +++ b/eng/targetframeworksuffix.props @@ -1,18 +1,21 @@ - + true true + + + 0.0 $(TargetFrameworkSuffix) 1.0 $(TargetFrameworkSuffix),Version=$(TargetPlatformVersion) - - 0.0 - + diff --git a/eng/versioning.targets b/eng/versioning.targets index 9c4e3ea8119c73..9981f73a0beae9 100644 --- a/eng/versioning.targets +++ b/eng/versioning.targets @@ -25,13 +25,6 @@ - - - - <_Parameter1>windows - - - true @@ -57,29 +50,37 @@ - - <_unsupportedOSPlatforms Include="$(UnsupportedOSPlatforms)" /> - <_supportedOSPlatforms Include="$(SupportedOSPlatforms)" /> - - + + + <_unsupportedOSPlatforms Include="$(UnsupportedOSPlatforms)" /> + <_supportedOSPlatforms Include="$(SupportedOSPlatforms)" /> + + + <_Parameter1>%(_unsupportedOSPlatforms.Identity) + + + + <_Parameter1>%(_supportedOSPlatforms.Identity) + + + diff --git a/src/libraries/Directory.Build.targets b/src/libraries/Directory.Build.targets index a04a93dfb0d6be..142c9dc38faee6 100644 --- a/src/libraries/Directory.Build.targets +++ b/src/libraries/Directory.Build.targets @@ -133,12 +133,12 @@ <_ExcludeAPIList>$([MSBuild]::NormalizePath('$(MSBuildProjectDirectory)', '..', 'ref', 'ReferenceSourceExcludeApi.txt')) <_ExcludeAttributesList>$(RepositoryEngineeringDir)DefaultGenApiDocIds.txt - <_LicenseHeaderTxtPath>$(RepositoryEngineeringDir)LicenseHeader.txt + <_LicenseHeaderTxtPath>$(RepositoryEngineeringDir)LicenseHeader.txt $([MSBuild]::NormalizePath('$(MSBuildProjectDirectory)', '..', 'ref', '$(AssemblyName).cs')) $(GenAPIAdditionalParameters) --exclude-attributes-list "$(_ExcludeAttributesList)" $(GenAPIAdditionalParameters) --exclude-api-list "$(_ExcludeAPIList)" $(GenAPIAdditionalParameters) --header-file "$(_LicenseHeaderTxtPath)" - $(GenAPIAdditionalParameters) --lang-version "$(LangVersion)" + $(GenAPIAdditionalParameters) --lang-version "$(LangVersion)" $(GenAPIAdditionalParameters) --follow-type-forwards @@ -232,7 +232,10 @@ - + + diff --git a/src/libraries/Microsoft.Win32.Registry.AccessControl/Directory.Build.props b/src/libraries/Microsoft.Win32.Registry.AccessControl/Directory.Build.props index 8a271f2d2dc7c1..5b3ced549dce7d 100644 --- a/src/libraries/Microsoft.Win32.Registry.AccessControl/Directory.Build.props +++ b/src/libraries/Microsoft.Win32.Registry.AccessControl/Directory.Build.props @@ -2,7 +2,7 @@ Microsoft - true + windows Provides support for managing access and audit control lists for Microsoft.Win32.RegistryKey. Commonly Used Types: diff --git a/src/libraries/Microsoft.Win32.Registry/Directory.Build.props b/src/libraries/Microsoft.Win32.Registry/Directory.Build.props index c50e990b26aa92..e02d0c28b4c563 100644 --- a/src/libraries/Microsoft.Win32.Registry/Directory.Build.props +++ b/src/libraries/Microsoft.Win32.Registry/Directory.Build.props @@ -3,7 +3,7 @@ Microsoft true - true + windows Provides support for accessing and modifying the Windows Registry. Commonly Used Types: diff --git a/src/libraries/Microsoft.Win32.SystemEvents/Directory.Build.props b/src/libraries/Microsoft.Win32.SystemEvents/Directory.Build.props index 5e287db1f7dbf5..adc78052397f3e 100644 --- a/src/libraries/Microsoft.Win32.SystemEvents/Directory.Build.props +++ b/src/libraries/Microsoft.Win32.SystemEvents/Directory.Build.props @@ -2,7 +2,7 @@ Open - true + windows Provides access to Windows system event notifications. Commonly Used Types: diff --git a/src/libraries/System.Data.OleDb/Directory.Build.props b/src/libraries/System.Data.OleDb/Directory.Build.props index 0740fc0e0616da..9396a1560ae036 100644 --- a/src/libraries/System.Data.OleDb/Directory.Build.props +++ b/src/libraries/System.Data.OleDb/Directory.Build.props @@ -1,7 +1,7 @@  - true + windows Provides a collection of classes for OLEDB. Commonly Used Types: diff --git a/src/libraries/System.Diagnostics.EventLog/Directory.Build.props b/src/libraries/System.Diagnostics.EventLog/Directory.Build.props index 1a6dfe406b9244..7725657d8f0918 100644 --- a/src/libraries/System.Diagnostics.EventLog/Directory.Build.props +++ b/src/libraries/System.Diagnostics.EventLog/Directory.Build.props @@ -3,7 +3,7 @@ Open true - true + windows Provides the System.Diagnostics.EventLog class, which allows the applications to use the windows event log service. Commonly Used Types: diff --git a/src/libraries/System.Diagnostics.EventLog/src/Messages/System.Diagnostics.EventLog.Messages.csproj b/src/libraries/System.Diagnostics.EventLog/src/Messages/System.Diagnostics.EventLog.Messages.csproj index 88b9c7bf13b56c..d2ad06b758f4ab 100644 --- a/src/libraries/System.Diagnostics.EventLog/src/Messages/System.Diagnostics.EventLog.Messages.csproj +++ b/src/libraries/System.Diagnostics.EventLog/src/Messages/System.Diagnostics.EventLog.Messages.csproj @@ -2,6 +2,7 @@ netstandard2.0 EventLogMessages.res - false + + \ No newline at end of file diff --git a/src/libraries/System.Diagnostics.PerformanceCounter/Directory.Build.props b/src/libraries/System.Diagnostics.PerformanceCounter/Directory.Build.props index efc6f82f50d5d4..a3b1dbe5348680 100644 --- a/src/libraries/System.Diagnostics.PerformanceCounter/Directory.Build.props +++ b/src/libraries/System.Diagnostics.PerformanceCounter/Directory.Build.props @@ -2,7 +2,7 @@ Open - true + windows Provides the System.Diagnostics.PerformanceCounter class, which allows access to Windows performance counters. Commonly Used Types: diff --git a/src/libraries/System.DirectoryServices.AccountManagement/Directory.Build.props b/src/libraries/System.DirectoryServices.AccountManagement/Directory.Build.props index 49935e3b7ff17d..6330f7657a9d8b 100644 --- a/src/libraries/System.DirectoryServices.AccountManagement/Directory.Build.props +++ b/src/libraries/System.DirectoryServices.AccountManagement/Directory.Build.props @@ -6,7 +6,7 @@ to a different assembly. --> 4.0.0.0 ECMA - true + windows Provides uniform access and manipulation of user, computer, and group security principals across the multiple principal stores: Active Directory Domain Services (AD DS), Active Directory Lightweight Directory Services (AD LDS), and Machine SAM (MSAM). \ No newline at end of file diff --git a/src/libraries/System.DirectoryServices/Directory.Build.props b/src/libraries/System.DirectoryServices/Directory.Build.props index 5bae8d07324381..515ff1188cb404 100644 --- a/src/libraries/System.DirectoryServices/Directory.Build.props +++ b/src/libraries/System.DirectoryServices/Directory.Build.props @@ -6,7 +6,7 @@ to a different assembly. --> 4.0.0.0 Microsoft - true + windows Provides easy access to Active Directory Domain Services. Commonly Used Types: diff --git a/src/libraries/System.IO.FileSystem.AccessControl/Directory.Build.props b/src/libraries/System.IO.FileSystem.AccessControl/Directory.Build.props index 90833f46b5497c..64a6b75c96c406 100644 --- a/src/libraries/System.IO.FileSystem.AccessControl/Directory.Build.props +++ b/src/libraries/System.IO.FileSystem.AccessControl/Directory.Build.props @@ -2,7 +2,7 @@ Microsoft - true + windows Provides types for managing access and audit control lists for files and directories. Commonly Used Types: diff --git a/src/libraries/System.IO.Pipes.AccessControl/Directory.Build.props b/src/libraries/System.IO.Pipes.AccessControl/Directory.Build.props index 8164e1cad73e2a..735766f4aa1013 100644 --- a/src/libraries/System.IO.Pipes.AccessControl/Directory.Build.props +++ b/src/libraries/System.IO.Pipes.AccessControl/Directory.Build.props @@ -2,7 +2,7 @@ Microsoft - true + windows Provides types for managing access and audit control lists for pipes. Commonly Used Types: diff --git a/src/libraries/System.Management/Directory.Build.props b/src/libraries/System.Management/Directory.Build.props index ed110445b25b61..585ccbed5666a7 100644 --- a/src/libraries/System.Management/Directory.Build.props +++ b/src/libraries/System.Management/Directory.Build.props @@ -6,7 +6,7 @@ to a different assembly. --> 4.0.0.0 Microsoft - true + windows Provides access to a rich set of management information and management events about the system, devices, and applications instrumented to the Windows Management Instrumentation (WMI) infrastructure. Commonly Used Types: diff --git a/src/libraries/System.Net.Http.WinHttpHandler/Directory.Build.props b/src/libraries/System.Net.Http.WinHttpHandler/Directory.Build.props index 99a763e0b07f2b..3e2214c257c43b 100644 --- a/src/libraries/System.Net.Http.WinHttpHandler/Directory.Build.props +++ b/src/libraries/System.Net.Http.WinHttpHandler/Directory.Build.props @@ -2,7 +2,7 @@ Microsoft - true + windows Provides a message handler for HttpClient based on the WinHTTP interface of Windows. While similar to HttpClientHandler, it provides developers more granular control over the application's HTTP communication than the HttpClientHandler. Commonly Used Types: diff --git a/src/libraries/System.Security.AccessControl/Directory.Build.props b/src/libraries/System.Security.AccessControl/Directory.Build.props index e191f1b665fa31..8ea1b05c85d43a 100644 --- a/src/libraries/System.Security.AccessControl/Directory.Build.props +++ b/src/libraries/System.Security.AccessControl/Directory.Build.props @@ -3,7 +3,7 @@ Microsoft true - true + windows Provides base classes that enable managing access and audit control lists on securable objects. Commonly Used Types: diff --git a/src/libraries/System.Security.Cryptography.Cng/Directory.Build.props b/src/libraries/System.Security.Cryptography.Cng/Directory.Build.props index 876bc6c63df9c1..5939d69e457ff9 100644 --- a/src/libraries/System.Security.Cryptography.Cng/Directory.Build.props +++ b/src/libraries/System.Security.Cryptography.Cng/Directory.Build.props @@ -3,7 +3,7 @@ Microsoft true - true + windows Provides cryptographic algorithm implementations and key management with Windows Cryptographic Next Generation API (CNG). Commonly Used Types: diff --git a/src/libraries/System.Security.Cryptography.ProtectedData/Directory.Build.props b/src/libraries/System.Security.Cryptography.ProtectedData/Directory.Build.props index ef0a180c6cca8e..ff0a08d67b9ee8 100644 --- a/src/libraries/System.Security.Cryptography.ProtectedData/Directory.Build.props +++ b/src/libraries/System.Security.Cryptography.ProtectedData/Directory.Build.props @@ -2,7 +2,7 @@ Microsoft - true + windows Provides access to Windows Data Protection Api. Commonly Used Types: diff --git a/src/libraries/System.Security.Principal.Windows/Directory.Build.props b/src/libraries/System.Security.Principal.Windows/Directory.Build.props index d677e7eccd6bd4..b08e4ac5e46c1e 100644 --- a/src/libraries/System.Security.Principal.Windows/Directory.Build.props +++ b/src/libraries/System.Security.Principal.Windows/Directory.Build.props @@ -3,7 +3,7 @@ Microsoft true - true + windows Provides classes for retrieving the current Windows user and for interacting with Windows users and groups. Commonly Used Types: diff --git a/src/libraries/System.ServiceProcess.ServiceController/Directory.Build.props b/src/libraries/System.ServiceProcess.ServiceController/Directory.Build.props index 8eced5a68bb9f2..66fb490a4f73e9 100644 --- a/src/libraries/System.ServiceProcess.ServiceController/Directory.Build.props +++ b/src/libraries/System.ServiceProcess.ServiceController/Directory.Build.props @@ -2,7 +2,7 @@ Microsoft - true + windows Provides the System.ServiceProcess.ServiceContainer class, which allows you to connect to a running or stopped service, manipulate it, or get information about it. Commonly Used Types: diff --git a/src/libraries/System.Speech/Directory.Build.props b/src/libraries/System.Speech/Directory.Build.props index c2d795d727d5b3..8083b78b106581 100644 --- a/src/libraries/System.Speech/Directory.Build.props +++ b/src/libraries/System.Speech/Directory.Build.props @@ -6,7 +6,7 @@ to a different assembly. --> 4.0.0.0 MicrosoftShared - true + windows Provides types to perform speech synthesis and speech recognition. Commonly Used Types diff --git a/src/libraries/System.Threading.AccessControl/Directory.Build.props b/src/libraries/System.Threading.AccessControl/Directory.Build.props index bde06e85f552c7..08a7cd78b0919c 100644 --- a/src/libraries/System.Threading.AccessControl/Directory.Build.props +++ b/src/libraries/System.Threading.AccessControl/Directory.Build.props @@ -2,7 +2,7 @@ Microsoft - true + windows Provides support for managing access and audit control lists for synchronization primitives. Commonly Used Types: diff --git a/src/libraries/System.Threading.Overlapped/Directory.Build.props b/src/libraries/System.Threading.Overlapped/Directory.Build.props index 33e65b7cb46516..709a22a7537088 100644 --- a/src/libraries/System.Threading.Overlapped/Directory.Build.props +++ b/src/libraries/System.Threading.Overlapped/Directory.Build.props @@ -2,6 +2,6 @@ Microsoft - true + windows \ No newline at end of file diff --git a/src/libraries/System.Windows.Extensions/Directory.Build.props b/src/libraries/System.Windows.Extensions/Directory.Build.props index 7a9f6a073150ac..025f072b49a432 100644 --- a/src/libraries/System.Windows.Extensions/Directory.Build.props +++ b/src/libraries/System.Windows.Extensions/Directory.Build.props @@ -2,7 +2,7 @@ Open - true + windows Provides miscellaneous Windows-specific types Commonly Used Types: