diff --git a/eng/versioning.targets b/eng/versioning.targets index efb7af48b76cb5..3aec5952541daf 100644 --- a/eng/versioning.targets +++ b/eng/versioning.targets @@ -22,23 +22,25 @@ - - - - <_Parameter1>windows - + + + <_supportedOSPlatforms Include="$(AssemblySupportedOSPlatformAttributes)" /> + <_unsupportedOSPlatforms Include="$(AssemblyUnsupportedOSPlatformAttributes)" Condition="'$(_assemblySupportedOSPlatformAttributesOverride)' != 'true'" /> - - <_unsupportedOSPlatforms Include="$(UnsupportedOSPlatforms)" /> - - - + - + + + <_Parameter1>%(_supportedOSPlatforms.Identity) + + + <_Parameter1>%(_unsupportedOSPlatforms.Identity) + - + diff --git a/src/libraries/Microsoft.Extensions.Hosting/src/Host.cs b/src/libraries/Microsoft.Extensions.Hosting/src/Host.cs index f1d095ab0c7e23..c26aee9153c659 100644 --- a/src/libraries/Microsoft.Extensions.Hosting/src/Host.cs +++ b/src/libraries/Microsoft.Extensions.Hosting/src/Host.cs @@ -111,8 +111,11 @@ public static IHostBuilder CreateDefaultBuilder(string[] args) if (isWindows) { +#pragma warning disable CA1416 // Platform compat analyzer // Add the EventLogLoggerProvider on windows machines logging.AddEventLog(); +#pragma warning restore CA1416 // Platform compat analyzer + } logging.Configure(options => diff --git a/src/libraries/Microsoft.Extensions.Logging.EventLog/ref/Microsoft.Extensions.Logging.EventLog.csproj b/src/libraries/Microsoft.Extensions.Logging.EventLog/ref/Microsoft.Extensions.Logging.EventLog.csproj index 41ab6a29cfaf49..4308166c933318 100644 --- a/src/libraries/Microsoft.Extensions.Logging.EventLog/ref/Microsoft.Extensions.Logging.EventLog.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.EventLog/ref/Microsoft.Extensions.Logging.EventLog.csproj @@ -1,6 +1,7 @@ netstandard2.0;net461 + windows diff --git a/src/libraries/Microsoft.Extensions.Logging.EventLog/src/Microsoft.Extensions.Logging.EventLog.csproj b/src/libraries/Microsoft.Extensions.Logging.EventLog/src/Microsoft.Extensions.Logging.EventLog.csproj index 9ae5802d972d1a..bdc142c15ca2be 100644 --- a/src/libraries/Microsoft.Extensions.Logging.EventLog/src/Microsoft.Extensions.Logging.EventLog.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.EventLog/src/Microsoft.Extensions.Logging.EventLog.csproj @@ -3,6 +3,7 @@ netstandard2.0;net461 true + windows diff --git a/src/libraries/Microsoft.Win32.Registry.AccessControl/Directory.Build.props b/src/libraries/Microsoft.Win32.Registry.AccessControl/Directory.Build.props index 33e65b7cb46516..983c525000396f 100644 --- a/src/libraries/Microsoft.Win32.Registry.AccessControl/Directory.Build.props +++ b/src/libraries/Microsoft.Win32.Registry.AccessControl/Directory.Build.props @@ -2,6 +2,6 @@ Microsoft - true + windows \ No newline at end of file diff --git a/src/libraries/Microsoft.Win32.Registry/Directory.Build.props b/src/libraries/Microsoft.Win32.Registry/Directory.Build.props index 33e65b7cb46516..983c525000396f 100644 --- a/src/libraries/Microsoft.Win32.Registry/Directory.Build.props +++ b/src/libraries/Microsoft.Win32.Registry/Directory.Build.props @@ -2,6 +2,6 @@ Microsoft - true + windows \ No newline at end of file diff --git a/src/libraries/Microsoft.Win32.SystemEvents/Directory.Build.props b/src/libraries/Microsoft.Win32.SystemEvents/Directory.Build.props index 2f8a8940e012a3..9cda6897812c22 100644 --- a/src/libraries/Microsoft.Win32.SystemEvents/Directory.Build.props +++ b/src/libraries/Microsoft.Win32.SystemEvents/Directory.Build.props @@ -2,6 +2,6 @@ Open - true + windows \ No newline at end of file diff --git a/src/libraries/System.Data.Odbc/Directory.Build.props b/src/libraries/System.Data.Odbc/Directory.Build.props index 4784967b7f86ac..374d373973ccd8 100644 --- a/src/libraries/System.Data.Odbc/Directory.Build.props +++ b/src/libraries/System.Data.Odbc/Directory.Build.props @@ -2,7 +2,6 @@ Open - true - browser + browser \ No newline at end of file diff --git a/src/libraries/System.Data.OleDb/Directory.Build.props b/src/libraries/System.Data.OleDb/Directory.Build.props index cef5ef637b168b..77e629a6c3b9b7 100644 --- a/src/libraries/System.Data.OleDb/Directory.Build.props +++ b/src/libraries/System.Data.OleDb/Directory.Build.props @@ -1,6 +1,6 @@  - true + windows \ No newline at end of file diff --git a/src/libraries/System.Diagnostics.EventLog/Directory.Build.props b/src/libraries/System.Diagnostics.EventLog/Directory.Build.props index 2f8a8940e012a3..9cda6897812c22 100644 --- a/src/libraries/System.Diagnostics.EventLog/Directory.Build.props +++ b/src/libraries/System.Diagnostics.EventLog/Directory.Build.props @@ -2,6 +2,6 @@ Open - true + windows \ 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 2f8a8940e012a3..9cda6897812c22 100644 --- a/src/libraries/System.Diagnostics.PerformanceCounter/Directory.Build.props +++ b/src/libraries/System.Diagnostics.PerformanceCounter/Directory.Build.props @@ -2,6 +2,6 @@ Open - true + windows \ No newline at end of file diff --git a/src/libraries/System.DirectoryServices.AccountManagement/Directory.Build.props b/src/libraries/System.DirectoryServices.AccountManagement/Directory.Build.props index e6b3574d56878a..5ae5653515c730 100644 --- a/src/libraries/System.DirectoryServices.AccountManagement/Directory.Build.props +++ b/src/libraries/System.DirectoryServices.AccountManagement/Directory.Build.props @@ -6,6 +6,6 @@ to a different assembly. --> 4.0.0.0 ECMA - true + windows \ No newline at end of file diff --git a/src/libraries/System.DirectoryServices.Protocols/Directory.Build.props b/src/libraries/System.DirectoryServices.Protocols/Directory.Build.props index cad73bcaafa103..a63a775e02f4de 100644 --- a/src/libraries/System.DirectoryServices.Protocols/Directory.Build.props +++ b/src/libraries/System.DirectoryServices.Protocols/Directory.Build.props @@ -6,7 +6,6 @@ to a different assembly. --> 4.0.0.0 Microsoft - true - browser + browser \ 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 d5f3585d0abb0b..7ef0bee9ab6420 100644 --- a/src/libraries/System.DirectoryServices/Directory.Build.props +++ b/src/libraries/System.DirectoryServices/Directory.Build.props @@ -6,6 +6,6 @@ to a different assembly. --> 4.0.0.0 Microsoft - true + windows \ No newline at end of file diff --git a/src/libraries/System.Drawing.Common/Directory.Build.props b/src/libraries/System.Drawing.Common/Directory.Build.props index 4784967b7f86ac..374d373973ccd8 100644 --- a/src/libraries/System.Drawing.Common/Directory.Build.props +++ b/src/libraries/System.Drawing.Common/Directory.Build.props @@ -2,7 +2,6 @@ Open - true - browser + browser \ No newline at end of file diff --git a/src/libraries/System.IO.FileSystem.AccessControl/Directory.Build.props b/src/libraries/System.IO.FileSystem.AccessControl/Directory.Build.props index 33e65b7cb46516..983c525000396f 100644 --- a/src/libraries/System.IO.FileSystem.AccessControl/Directory.Build.props +++ b/src/libraries/System.IO.FileSystem.AccessControl/Directory.Build.props @@ -2,6 +2,6 @@ Microsoft - true + windows \ No newline at end of file diff --git a/src/libraries/System.IO.Pipes.AccessControl/Directory.Build.props b/src/libraries/System.IO.Pipes.AccessControl/Directory.Build.props index 33e65b7cb46516..983c525000396f 100644 --- a/src/libraries/System.IO.Pipes.AccessControl/Directory.Build.props +++ b/src/libraries/System.IO.Pipes.AccessControl/Directory.Build.props @@ -2,6 +2,6 @@ Microsoft - true + windows \ No newline at end of file diff --git a/src/libraries/System.IO.Ports/Directory.Build.props b/src/libraries/System.IO.Ports/Directory.Build.props index 4784967b7f86ac..374d373973ccd8 100644 --- a/src/libraries/System.IO.Ports/Directory.Build.props +++ b/src/libraries/System.IO.Ports/Directory.Build.props @@ -2,7 +2,6 @@ Open - true - browser + browser \ No newline at end of file diff --git a/src/libraries/System.Management/Directory.Build.props b/src/libraries/System.Management/Directory.Build.props index d5f3585d0abb0b..7ef0bee9ab6420 100644 --- a/src/libraries/System.Management/Directory.Build.props +++ b/src/libraries/System.Management/Directory.Build.props @@ -6,6 +6,6 @@ to a different assembly. --> 4.0.0.0 Microsoft - true + windows \ No newline at end of file diff --git a/src/libraries/System.Net.Http.WinHttpHandler/Directory.Build.props b/src/libraries/System.Net.Http.WinHttpHandler/Directory.Build.props index 33e65b7cb46516..983c525000396f 100644 --- a/src/libraries/System.Net.Http.WinHttpHandler/Directory.Build.props +++ b/src/libraries/System.Net.Http.WinHttpHandler/Directory.Build.props @@ -2,6 +2,6 @@ Microsoft - true + windows \ No newline at end of file diff --git a/src/libraries/System.Net.Mail/Directory.Build.props b/src/libraries/System.Net.Mail/Directory.Build.props index 4784967b7f86ac..374d373973ccd8 100644 --- a/src/libraries/System.Net.Mail/Directory.Build.props +++ b/src/libraries/System.Net.Mail/Directory.Build.props @@ -2,7 +2,6 @@ Open - true - browser + browser \ No newline at end of file diff --git a/src/libraries/System.Net.NetworkInformation/Directory.Build.props b/src/libraries/System.Net.NetworkInformation/Directory.Build.props index ce244cbea56199..f499e8dc29a4b4 100644 --- a/src/libraries/System.Net.NetworkInformation/Directory.Build.props +++ b/src/libraries/System.Net.NetworkInformation/Directory.Build.props @@ -2,7 +2,6 @@ Microsoft - true - browser + browser \ No newline at end of file diff --git a/src/libraries/System.Net.Ping/Directory.Build.props b/src/libraries/System.Net.Ping/Directory.Build.props index ce244cbea56199..f499e8dc29a4b4 100644 --- a/src/libraries/System.Net.Ping/Directory.Build.props +++ b/src/libraries/System.Net.Ping/Directory.Build.props @@ -2,7 +2,6 @@ Microsoft - true - browser + browser \ No newline at end of file diff --git a/src/libraries/System.Net.Requests/Directory.Build.props b/src/libraries/System.Net.Requests/Directory.Build.props index ce244cbea56199..f499e8dc29a4b4 100644 --- a/src/libraries/System.Net.Requests/Directory.Build.props +++ b/src/libraries/System.Net.Requests/Directory.Build.props @@ -2,7 +2,6 @@ Microsoft - true - browser + browser \ No newline at end of file diff --git a/src/libraries/System.Net.Security/Directory.Build.props b/src/libraries/System.Net.Security/Directory.Build.props index ce244cbea56199..f499e8dc29a4b4 100644 --- a/src/libraries/System.Net.Security/Directory.Build.props +++ b/src/libraries/System.Net.Security/Directory.Build.props @@ -2,7 +2,6 @@ Microsoft - true - browser + browser \ No newline at end of file diff --git a/src/libraries/System.Net.Sockets/Directory.Build.props b/src/libraries/System.Net.Sockets/Directory.Build.props index ce244cbea56199..7562009d73d4d0 100644 --- a/src/libraries/System.Net.Sockets/Directory.Build.props +++ b/src/libraries/System.Net.Sockets/Directory.Build.props @@ -2,7 +2,6 @@ Microsoft - true - browser + browser - \ No newline at end of file + diff --git a/src/libraries/System.Net.Sockets/src/System/Net/Sockets/TCPListener.cs b/src/libraries/System.Net.Sockets/src/System/Net/Sockets/TCPListener.cs index 6c623fec1cfb99..68c550b09a6387 100644 --- a/src/libraries/System.Net.Sockets/src/System/Net/Sockets/TCPListener.cs +++ b/src/libraries/System.Net.Sockets/src/System/Net/Sockets/TCPListener.cs @@ -262,6 +262,7 @@ public static TcpListener Create(int port) return listener; } + [SupportedOSPlatform("windows")] private void SetIPProtectionLevel(bool allowed) => _serverSocket!.SetIPProtectionLevel(allowed ? IPProtectionLevel.Unrestricted : IPProtectionLevel.EdgeRestricted); @@ -274,7 +275,7 @@ private void CreateNewSocketIfNeeded() _serverSocket.ExclusiveAddressUse = true; } - if (_allowNatTraversal != null) + if (_allowNatTraversal != null && OperatingSystem.IsWindows()) { SetIPProtectionLevel(_allowNatTraversal.GetValueOrDefault()); _allowNatTraversal = null; // Reset value to avoid affecting more sockets diff --git a/src/libraries/System.Net.WebClient/Directory.Build.props b/src/libraries/System.Net.WebClient/Directory.Build.props index 4784967b7f86ac..374d373973ccd8 100644 --- a/src/libraries/System.Net.WebClient/Directory.Build.props +++ b/src/libraries/System.Net.WebClient/Directory.Build.props @@ -2,7 +2,6 @@ Open - true - browser + browser \ No newline at end of file diff --git a/src/libraries/System.Security.AccessControl/Directory.Build.props b/src/libraries/System.Security.AccessControl/Directory.Build.props index 33e65b7cb46516..983c525000396f 100644 --- a/src/libraries/System.Security.AccessControl/Directory.Build.props +++ b/src/libraries/System.Security.AccessControl/Directory.Build.props @@ -2,6 +2,6 @@ Microsoft - true + windows \ No newline at end of file diff --git a/src/libraries/System.Security.Cryptography.Cng/Directory.Build.props b/src/libraries/System.Security.Cryptography.Cng/Directory.Build.props index 33e65b7cb46516..983c525000396f 100644 --- a/src/libraries/System.Security.Cryptography.Cng/Directory.Build.props +++ b/src/libraries/System.Security.Cryptography.Cng/Directory.Build.props @@ -2,6 +2,6 @@ Microsoft - true + windows \ No newline at end of file diff --git a/src/libraries/System.Security.Cryptography.Csp/Directory.Build.props b/src/libraries/System.Security.Cryptography.Csp/Directory.Build.props index ce244cbea56199..f499e8dc29a4b4 100644 --- a/src/libraries/System.Security.Cryptography.Csp/Directory.Build.props +++ b/src/libraries/System.Security.Cryptography.Csp/Directory.Build.props @@ -2,7 +2,6 @@ Microsoft - true - browser + browser \ No newline at end of file diff --git a/src/libraries/System.Security.Cryptography.Encoding/Directory.Build.props b/src/libraries/System.Security.Cryptography.Encoding/Directory.Build.props index ce244cbea56199..f499e8dc29a4b4 100644 --- a/src/libraries/System.Security.Cryptography.Encoding/Directory.Build.props +++ b/src/libraries/System.Security.Cryptography.Encoding/Directory.Build.props @@ -2,7 +2,6 @@ Microsoft - true - browser + browser \ No newline at end of file diff --git a/src/libraries/System.Security.Cryptography.OpenSsl/Directory.Build.props b/src/libraries/System.Security.Cryptography.OpenSsl/Directory.Build.props index 05ae3c4dc8f2ca..a6f5cb84cc6a1f 100644 --- a/src/libraries/System.Security.Cryptography.OpenSsl/Directory.Build.props +++ b/src/libraries/System.Security.Cryptography.OpenSsl/Directory.Build.props @@ -3,6 +3,6 @@ Microsoft true - windows;browser + windows;browser \ No newline at end of file diff --git a/src/libraries/System.Security.Cryptography.Pkcs/Directory.Build.props b/src/libraries/System.Security.Cryptography.Pkcs/Directory.Build.props index 1f799d605feb93..7562009d73d4d0 100644 --- a/src/libraries/System.Security.Cryptography.Pkcs/Directory.Build.props +++ b/src/libraries/System.Security.Cryptography.Pkcs/Directory.Build.props @@ -2,7 +2,6 @@ Microsoft - true - browser + browser diff --git a/src/libraries/System.Security.Cryptography.Primitives/Directory.Build.props b/src/libraries/System.Security.Cryptography.Primitives/Directory.Build.props index ce244cbea56199..f499e8dc29a4b4 100644 --- a/src/libraries/System.Security.Cryptography.Primitives/Directory.Build.props +++ b/src/libraries/System.Security.Cryptography.Primitives/Directory.Build.props @@ -2,7 +2,6 @@ Microsoft - true - browser + browser \ No newline at end of file diff --git a/src/libraries/System.Security.Cryptography.ProtectedData/Directory.Build.props b/src/libraries/System.Security.Cryptography.ProtectedData/Directory.Build.props index 33e65b7cb46516..4531f991ab717f 100644 --- a/src/libraries/System.Security.Cryptography.ProtectedData/Directory.Build.props +++ b/src/libraries/System.Security.Cryptography.ProtectedData/Directory.Build.props @@ -2,6 +2,6 @@ Microsoft - true + windows - \ No newline at end of file + diff --git a/src/libraries/System.Security.Cryptography.X509Certificates/Directory.Build.props b/src/libraries/System.Security.Cryptography.X509Certificates/Directory.Build.props index ce244cbea56199..f499e8dc29a4b4 100644 --- a/src/libraries/System.Security.Cryptography.X509Certificates/Directory.Build.props +++ b/src/libraries/System.Security.Cryptography.X509Certificates/Directory.Build.props @@ -2,7 +2,6 @@ Microsoft - true - browser + browser \ No newline at end of file diff --git a/src/libraries/System.Security.Cryptography.Xml/Directory.Build.props b/src/libraries/System.Security.Cryptography.Xml/Directory.Build.props index 4784967b7f86ac..374d373973ccd8 100644 --- a/src/libraries/System.Security.Cryptography.Xml/Directory.Build.props +++ b/src/libraries/System.Security.Cryptography.Xml/Directory.Build.props @@ -2,7 +2,6 @@ Open - true - browser + browser \ No newline at end of file diff --git a/src/libraries/System.Security.Principal.Windows/Directory.Build.props b/src/libraries/System.Security.Principal.Windows/Directory.Build.props index 33e65b7cb46516..983c525000396f 100644 --- a/src/libraries/System.Security.Principal.Windows/Directory.Build.props +++ b/src/libraries/System.Security.Principal.Windows/Directory.Build.props @@ -2,6 +2,6 @@ Microsoft - true + windows \ No newline at end of file diff --git a/src/libraries/System.ServiceProcess.ServiceController/Directory.Build.props b/src/libraries/System.ServiceProcess.ServiceController/Directory.Build.props index 33e65b7cb46516..983c525000396f 100644 --- a/src/libraries/System.ServiceProcess.ServiceController/Directory.Build.props +++ b/src/libraries/System.ServiceProcess.ServiceController/Directory.Build.props @@ -2,6 +2,6 @@ Microsoft - true + windows \ No newline at end of file diff --git a/src/libraries/System.Threading.AccessControl/Directory.Build.props b/src/libraries/System.Threading.AccessControl/Directory.Build.props index 33e65b7cb46516..983c525000396f 100644 --- a/src/libraries/System.Threading.AccessControl/Directory.Build.props +++ b/src/libraries/System.Threading.AccessControl/Directory.Build.props @@ -2,6 +2,6 @@ Microsoft - true + windows \ No newline at end of file diff --git a/src/libraries/System.Threading.Overlapped/Directory.Build.props b/src/libraries/System.Threading.Overlapped/Directory.Build.props index 33e65b7cb46516..983c525000396f 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 2f8a8940e012a3..9cda6897812c22 100644 --- a/src/libraries/System.Windows.Extensions/Directory.Build.props +++ b/src/libraries/System.Windows.Extensions/Directory.Build.props @@ -2,6 +2,6 @@ Open - true + windows \ No newline at end of file