diff --git a/eng/versioning.targets b/eng/versioning.targets
index 2a2f10dbcafb9..efb7af48b76cb 100644
--- a/eng/versioning.targets
+++ b/eng/versioning.targets
@@ -29,13 +29,18 @@
     </AssemblyAttribute>
   </ItemGroup>
 
-  <!-- Adds UnsupportedOSPlatform attribute for requested libraries -->
-  <ItemGroup Condition="'$(UnsupportedOSPlatform)' != '' and '$(IsTestProject)' != 'true'">
-    <AssemblyAttribute Include="System.Runtime.Versioning.UnsupportedOSPlatform">
-        <_Parameter1>$(UnsupportedOSPlatform)</_Parameter1>
-    </AssemblyAttribute>
+  <ItemGroup>
+    <_unsupportedOSPlatforms Include="$(UnsupportedOSPlatforms)" />
   </ItemGroup>
 
+  <Target Name="AddUnsupportedOSPlatformAttribute" BeforeTargets="GenerateAssemblyInfo" AfterTargets="PrepareForBuild">
+    <ItemGroup>
+      <AssemblyAttribute Include="System.Runtime.Versioning.UnsupportedOSPlatform" Condition="'@(_unsupportedOSPlatforms)' != ''">
+        <_Parameter1>%(_unsupportedOSPlatforms.Identity)</_Parameter1>
+      </AssemblyAttribute>
+    </ItemGroup>
+  </Target>
+
   <Target Name="DecideIfWeNeedToIncludeDllSafeSearchPathAttribute"
           Condition="'$(IsDotNetFrameworkProductAssembly)' == 'true' and '$(IsTestProject)' != 'true' and '$(IsTestSupportProject)' != 'true'">
 
diff --git a/src/libraries/System.Security.Cryptography.OpenSsl/Directory.Build.props b/src/libraries/System.Security.Cryptography.OpenSsl/Directory.Build.props
index 34e5872480740..05ae3c4dc8f2c 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 @@
   <PropertyGroup>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IncludePlatformAttributes>true</IncludePlatformAttributes>
-    <UnsupportedOSPlatform>windows</UnsupportedOSPlatform>
+    <UnsupportedOSPlatforms>windows;browser</UnsupportedOSPlatforms>
   </PropertyGroup>
 </Project>
\ No newline at end of file