From 7e1abcc55c84586ce329904498e0a826c4cf07ad Mon Sep 17 00:00:00 2001
From: Buyaa Namnan <bunamnan@microsoft.com>
Date: Mon, 30 Nov 2020 10:09:00 -0800
Subject: [PATCH 1/3] Enable MSBuild Supported attributes except for Browser
 build

---
 eng/versioning.targets                        | 10 +++----
 .../src/Resources/Strings.resx                |  8 ++++--
 .../System.DirectoryServices.Protocols.csproj |  4 ++-
 .../Protocols/common/DirectoryControl.cs      | 19 +------------
 .../Protocols/common/QuotaControl.Linux.cs    | 26 ++++++++++++++++++
 .../Protocols/common/QuotaControl.Windows.cs  | 27 +++++++++++++++++++
 6 files changed, 67 insertions(+), 27 deletions(-)
 create mode 100644 src/libraries/System.DirectoryServices.Protocols/src/System/DirectoryServices/Protocols/common/QuotaControl.Linux.cs
 create mode 100644 src/libraries/System.DirectoryServices.Protocols/src/System/DirectoryServices/Protocols/common/QuotaControl.Windows.cs

diff --git a/eng/versioning.targets b/eng/versioning.targets
index 3177b48b0ba6d..5a3a0422e63ff 100644
--- a/eng/versioning.targets
+++ b/eng/versioning.targets
@@ -22,8 +22,8 @@
     </AssemblyMetadata>
   </ItemGroup>
 
-  <!-- Adds SupportedOSPlatform attribute for Windows Specific libraries and Windows targets -->
-  <ItemGroup Condition="('$(IsWindowsSpecific)' == 'true' or '$(TargetsWindows)' == 'true') and '$(IsTestProject)' != 'true'">
+  <!-- Adds SupportedOSPlatform attribute for Windows Specific libraries -->
+  <ItemGroup Condition="'$(IsWindowsSpecific)' == 'true' and '$(IsTestProject)' != 'true'">
     <AssemblyAttribute Include="System.Runtime.Versioning.SupportedOSPlatform">
         <_Parameter1>windows</_Parameter1>
     </AssemblyAttribute>
@@ -156,12 +156,10 @@
 
   </Target>
 
-  <!-- Removes specified assembly level attributes. https://github.com/dotnet/runtime/issues/44257-->
-  <Target Name="RemoveSupportedPlatformAssemblyLevelAttribute"
-          AfterTargets="GetAssemblyAttributes">
+  <!-- Removes assembly level attributes for Browser. -->
+  <Target Name="RemoveSupportedPlatformAssemblyAttributeForBrowser" AfterTargets="GetAssemblyAttributes" Condition="'$(TargetFrameworkSuffix)' == 'Browser'">
     <ItemGroup>
       <AssemblyAttribute Remove="System.Runtime.Versioning.SupportedOSPlatformAttribute" />
-      <AssemblyAttribute Remove="System.Runtime.Versioning.TargetPlatformAttribute" />
     </ItemGroup>
   </Target>
 
diff --git a/src/libraries/System.DirectoryServices.Protocols/src/Resources/Strings.resx b/src/libraries/System.DirectoryServices.Protocols/src/Resources/Strings.resx
index d454ecca21867..c64bcb7ec3389 100644
--- a/src/libraries/System.DirectoryServices.Protocols/src/Resources/Strings.resx
+++ b/src/libraries/System.DirectoryServices.Protocols/src/Resources/Strings.resx
@@ -1,4 +1,5 @@
-<root>
+<?xml version="1.0" encoding="utf-8"?>
+<root>
   <!-- 
     Microsoft ResX Schema 
     
@@ -488,4 +489,7 @@
   <data name="DirectoryServicesProtocols_PlatformNotSupported" xml:space="preserve">
     <value>System.DirectoryServices.Protocols is not supported on this platform.</value>
   </data>
-</root>
+  <data name="QuotaControlNotSupported" xml:space="preserve">
+    <value>System.DirectoryServices.Protocols.QuotaControl is not supported on this platform.</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/src/libraries/System.DirectoryServices.Protocols/src/System.DirectoryServices.Protocols.csproj b/src/libraries/System.DirectoryServices.Protocols/src/System.DirectoryServices.Protocols.csproj
index 5d448bcccd8ba..53027e707cd92 100644
--- a/src/libraries/System.DirectoryServices.Protocols/src/System.DirectoryServices.Protocols.csproj
+++ b/src/libraries/System.DirectoryServices.Protocols/src/System.DirectoryServices.Protocols.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IncludeDllSafeSearchPathAttribute>true</IncludeDllSafeSearchPathAttribute>
@@ -41,6 +41,7 @@
   </ItemGroup>
   <ItemGroup Condition="'$(TargetsWindows)' == 'true'">
     <Compile Include="System\DirectoryServices\Protocols\common\BerConverter.Windows.cs" />
+    <Compile Include="System\DirectoryServices\Protocols\common\QuotaControl.Windows.cs" />
     <Compile Include="System\DirectoryServices\Protocols\Interop\LdapPal.Windows.cs" />
     <Compile Include="System\DirectoryServices\Protocols\Interop\BerPal.Windows.cs" />
     <Compile Include="System\DirectoryServices\Protocols\ldap\LdapConnection.Windows.cs" />
@@ -58,6 +59,7 @@
   </ItemGroup>
   <ItemGroup Condition="'$(TargetsUnix)' == 'true'">
     <Compile Include="System\DirectoryServices\Protocols\common\BerConverter.Linux.cs" />
+    <Compile Include="System\DirectoryServices\Protocols\common\QuotaControl.Linux.cs" />
     <Compile Include="System\DirectoryServices\Protocols\Interop\LdapPal.Linux.cs" />
     <Compile Include="System\DirectoryServices\Protocols\Interop\BerPal.Linux.cs" />
     <Compile Include="System\DirectoryServices\Protocols\ldap\LdapConnection.Linux.cs" />
diff --git a/src/libraries/System.DirectoryServices.Protocols/src/System/DirectoryServices/Protocols/common/DirectoryControl.cs b/src/libraries/System.DirectoryServices.Protocols/src/System/DirectoryServices/Protocols/common/DirectoryControl.cs
index ce1b60c24b117..29888434deef3 100644
--- a/src/libraries/System.DirectoryServices.Protocols/src/System/DirectoryServices/Protocols/common/DirectoryControl.cs
+++ b/src/libraries/System.DirectoryServices.Protocols/src/System/DirectoryServices/Protocols/common/DirectoryControl.cs
@@ -1022,7 +1022,7 @@ public byte[] ContextId
     }
 
     [SupportedOSPlatform("windows")]
-    public class QuotaControl : DirectoryControl
+    public partial class QuotaControl : DirectoryControl
     {
         private byte[] _sid;
 
@@ -1033,23 +1033,6 @@ public QuotaControl(SecurityIdentifier querySid) : this()
             QuerySid = querySid;
         }
 
-        public SecurityIdentifier QuerySid
-        {
-            get => _sid == null ? null : new SecurityIdentifier(_sid, 0);
-            set
-            {
-                if (value == null)
-                {
-                    _sid = null;
-                }
-                else
-                {
-                    _sid = new byte[value.BinaryLength];
-                    value.GetBinaryForm(_sid, 0);
-                }
-            }
-        }
-
         public override byte[] GetValue()
         {
             _directoryControlValue = BerConverter.Encode("{o}", new object[] { _sid });
diff --git a/src/libraries/System.DirectoryServices.Protocols/src/System/DirectoryServices/Protocols/common/QuotaControl.Linux.cs b/src/libraries/System.DirectoryServices.Protocols/src/System/DirectoryServices/Protocols/common/QuotaControl.Linux.cs
new file mode 100644
index 0000000000000..67e07d1598d24
--- /dev/null
+++ b/src/libraries/System.DirectoryServices.Protocols/src/System/DirectoryServices/Protocols/common/QuotaControl.Linux.cs
@@ -0,0 +1,26 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Security.Principal;
+
+namespace System.DirectoryServices.Protocols
+{
+    public partial class QuotaControl : DirectoryControl
+    {
+        public SecurityIdentifier QuerySid
+        {
+            get => _sid == null ? null : throw new System.PlatformNotSupportedException(SR.QuotaControlNotSupported);
+            set
+            {
+                if (value == null)
+                {
+                    _sid = null;
+                }
+                else
+                {
+                    throw new System.PlatformNotSupportedException(SR.QuotaControlNotSupported);
+                }
+            }
+        }
+    }
+}
diff --git a/src/libraries/System.DirectoryServices.Protocols/src/System/DirectoryServices/Protocols/common/QuotaControl.Windows.cs b/src/libraries/System.DirectoryServices.Protocols/src/System/DirectoryServices/Protocols/common/QuotaControl.Windows.cs
new file mode 100644
index 0000000000000..0e5d289afd43e
--- /dev/null
+++ b/src/libraries/System.DirectoryServices.Protocols/src/System/DirectoryServices/Protocols/common/QuotaControl.Windows.cs
@@ -0,0 +1,27 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Security.Principal;
+
+namespace System.DirectoryServices.Protocols
+{
+    public partial class QuotaControl : DirectoryControl
+    {
+        public SecurityIdentifier QuerySid
+        {
+            get => _sid == null ? null : new SecurityIdentifier(_sid, 0);
+            set
+            {
+                if (value == null)
+                {
+                    _sid = null;
+                }
+                else
+                {
+                    _sid = new byte[value.BinaryLength];
+                    value.GetBinaryForm(_sid, 0);
+                }
+            }
+        }
+    }
+}

From 94958ca3bdb0ead308c0213c8dafb266d39aa9ee Mon Sep 17 00:00:00 2001
From: Buyaa Namnan <bunamnan@microsoft.com>
Date: Wed, 2 Dec 2020 17:18:17 -0800
Subject: [PATCH 2/3] Exclude attributes from test projects

---
 eng/versioning.targets | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/eng/versioning.targets b/eng/versioning.targets
index 5a3a0422e63ff..2f8c20c13e457 100644
--- a/eng/versioning.targets
+++ b/eng/versioning.targets
@@ -157,9 +157,10 @@
   </Target>
 
   <!-- Removes assembly level attributes for Browser. -->
-  <Target Name="RemoveSupportedPlatformAssemblyAttributeForBrowser" AfterTargets="GetAssemblyAttributes" Condition="'$(TargetFrameworkSuffix)' == 'Browser'">
+  <Target Name="RemoveSupportedPlatformAssemblyAttributeForBrowser" AfterTargets="GetAssemblyAttributes" Condition="'$(TargetFrameworkSuffix)' == 'Browser' or '$(IsTestProject)' == 'true'">
     <ItemGroup>
       <AssemblyAttribute Remove="System.Runtime.Versioning.SupportedOSPlatformAttribute" />
+	  <AssemblyAttribute Remove="System.Runtime.Versioning.TargetPlatformAttribute" />
     </ItemGroup>
   </Target>
 

From 38701604199b685ec003b92d1a314fe79139f7e9 Mon Sep 17 00:00:00 2001
From: Buyaa Namnan <bunamnan@microsoft.com>
Date: Thu, 3 Dec 2020 17:23:48 -0800
Subject: [PATCH 3/3] Fix spacing

---
 eng/versioning.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/versioning.targets b/eng/versioning.targets
index 2f8c20c13e457..0f5711a5fbf51 100644
--- a/eng/versioning.targets
+++ b/eng/versioning.targets
@@ -160,7 +160,7 @@
   <Target Name="RemoveSupportedPlatformAssemblyAttributeForBrowser" AfterTargets="GetAssemblyAttributes" Condition="'$(TargetFrameworkSuffix)' == 'Browser' or '$(IsTestProject)' == 'true'">
     <ItemGroup>
       <AssemblyAttribute Remove="System.Runtime.Versioning.SupportedOSPlatformAttribute" />
-	  <AssemblyAttribute Remove="System.Runtime.Versioning.TargetPlatformAttribute" />
+      <AssemblyAttribute Remove="System.Runtime.Versioning.TargetPlatformAttribute" />
     </ItemGroup>
   </Target>