From a600783b5008c9f91bbf81e368bef77c7bf6de83 Mon Sep 17 00:00:00 2001
From: David Cantu <dacantu@microsoft.com>
Date: Thu, 22 Jul 2021 15:31:36 -0700
Subject: [PATCH 1/2] Make Extensions.FileProviders supported in browser and
 only unsupport FSW usage

---
 .../Directory.Build.props                     |  4 +-
 ...t.Extensions.FileProviders.Physical.csproj |  9 +---
 .../src/PhysicalFileProvider.cs               |  8 ++-
 .../src/PhysicalFilesWatcher.cs               | 10 ++++
 .../src/Resources/Strings.resx                | 54 +++++++++----------
 .../src/HostBuilder.cs                        |  2 -
 6 files changed, 48 insertions(+), 39 deletions(-)

diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Physical/Directory.Build.props b/src/libraries/Microsoft.Extensions.FileProviders.Physical/Directory.Build.props
index 8ec207de7d8b3f..1ade7c7070766b 100644
--- a/src/libraries/Microsoft.Extensions.FileProviders.Physical/Directory.Build.props
+++ b/src/libraries/Microsoft.Extensions.FileProviders.Physical/Directory.Build.props
@@ -2,6 +2,6 @@
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <IsAspNetCoreApp>true</IsAspNetCoreApp>
-    <UnsupportedOSPlatforms>browser</UnsupportedOSPlatforms>
+    <IncludePlatformAttributes>true</IncludePlatformAttributes>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Physical/src/Microsoft.Extensions.FileProviders.Physical.csproj b/src/libraries/Microsoft.Extensions.FileProviders.Physical/src/Microsoft.Extensions.FileProviders.Physical.csproj
index 534a08b11ff87a..242f042fb3262a 100644
--- a/src/libraries/Microsoft.Extensions.FileProviders.Physical/src/Microsoft.Extensions.FileProviders.Physical.csproj
+++ b/src/libraries/Microsoft.Extensions.FileProviders.Physical/src/Microsoft.Extensions.FileProviders.Physical.csproj
@@ -1,17 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <RootNamespace>Microsoft.Extensions.FileProviders</RootNamespace>
-    <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppCurrent)-Browser;netstandard2.0;net461</TargetFrameworks>
+    <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;net461</TargetFrameworks>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <EnableDefaultItems>true</EnableDefaultItems>
     <PackageDescription>File provider for physical files for Microsoft.Extensions.FileProviders.</PackageDescription>
   </PropertyGroup>
-  
-  <PropertyGroup Condition="'$(TargetsBrowser)' == 'true'">
-    <EnableDefaultItems>false</EnableDefaultItems>
-    <GeneratePlatformNotSupportedAssemblyMessage>SR.FileProvidersPhysical_PlatformNotSupported</GeneratePlatformNotSupportedAssemblyMessage>
-  </PropertyGroup>
 
   <ItemGroup>
     <Compile Include="$(CommonPath)Extensions\EmptyDisposable.cs"
diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Physical/src/PhysicalFileProvider.cs b/src/libraries/Microsoft.Extensions.FileProviders.Physical/src/PhysicalFileProvider.cs
index 4238fff652eb7a..290d33aaa21294 100644
--- a/src/libraries/Microsoft.Extensions.FileProviders.Physical/src/PhysicalFileProvider.cs
+++ b/src/libraries/Microsoft.Extensions.FileProviders.Physical/src/PhysicalFileProvider.cs
@@ -161,7 +161,13 @@ internal PhysicalFilesWatcher CreateFileWatcher()
             string root = PathUtils.EnsureTrailingSlash(Path.GetFullPath(Root));
 
             // When both UsePollingFileWatcher & UseActivePolling are set, we won't use a FileSystemWatcher.
-            FileSystemWatcher watcher = UsePollingFileWatcher && UseActivePolling ? null : new FileSystemWatcher(root);
+            FileSystemWatcher watcher = UsePollingFileWatcher && UseActivePolling ? null :
+#if NETCOREAPP
+                OperatingSystem.IsBrowser() ? throw new PlatformNotSupportedException(SR.Format(SR.FileSystemWatcher_PlatformNotSupported, typeof(FileSystemWatcher))) : new FileSystemWatcher(root);
+#else
+                new FileSystemWatcher(root);
+#endif
+
             return new PhysicalFilesWatcher(root, watcher, UsePollingFileWatcher, _filters)
             {
                 UseActivePolling = UseActivePolling,
diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Physical/src/PhysicalFilesWatcher.cs b/src/libraries/Microsoft.Extensions.FileProviders.Physical/src/PhysicalFilesWatcher.cs
index f9f122313535cc..b72aa885fe809e 100644
--- a/src/libraries/Microsoft.Extensions.FileProviders.Physical/src/PhysicalFilesWatcher.cs
+++ b/src/libraries/Microsoft.Extensions.FileProviders.Physical/src/PhysicalFilesWatcher.cs
@@ -88,6 +88,13 @@ public PhysicalFilesWatcher(
 
             if (fileSystemWatcher != null)
             {
+#if NETCOREAPP
+                if (OperatingSystem.IsBrowser())
+                {
+                    throw new PlatformNotSupportedException(SR.Format(SR.FileSystemWatcher_PlatformNotSupported, typeof(FileSystemWatcher)));
+                }
+#endif
+
                 _fileWatcher = fileSystemWatcher;
                 _fileWatcher.IncludeSubdirectories = true;
                 _fileWatcher.Created += OnChanged;
@@ -264,6 +271,8 @@ protected virtual void Dispose(bool disposing)
             }
         }
 
+// We made sure that browser never uses FileSystemWatcher.
+#pragma warning disable CA1416 // Validate platform compatibility
         private void OnRenamed(object sender, RenamedEventArgs e)
         {
             // For a file name change or a directory's name change notify registered tokens.
@@ -400,6 +409,7 @@ private void TryEnableFileSystemWatcher()
                 }
             }
         }
+#pragma warning restore CA1416 // Validate platform compatibility
 
         private static string NormalizePath(string filter) => filter = filter.Replace('\\', '/');
 
diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Physical/src/Resources/Strings.resx b/src/libraries/Microsoft.Extensions.FileProviders.Physical/src/Resources/Strings.resx
index 2ff2106bca01fe..1eb0026a4f2a76 100644
--- a/src/libraries/Microsoft.Extensions.FileProviders.Physical/src/Resources/Strings.resx
+++ b/src/libraries/Microsoft.Extensions.FileProviders.Physical/src/Resources/Strings.resx
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
-    Microsoft ResX Schema
-
+    Microsoft ResX Schema 
+    
     Version 2.0
-
-    The primary goals of this format is to allow a simple XML format
-    that is mostly human readable. The generation and parsing of the
-    various data types are done through the TypeConverter classes
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
     associated with the data types.
-
+    
     Example:
-
+    
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
@@ -26,36 +26,36 @@
         <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
         <comment>This is a comment</comment>
     </data>
-
-    There are any number of "resheader" rows that contain simple
+                
+    There are any number of "resheader" rows that contain simple 
     name/value pairs.
-
-    Each data row contains a name, and value. The row also contains a
-    type or mimetype. Type corresponds to a .NET class that support
-    text/value conversion through the TypeConverter architecture.
-    Classes that don't support this are serialized and stored with the
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
     mimetype set.
-
-    The mimetype is used for serialized objects, and tells the
-    ResXResourceReader how to depersist the object. This is currently not
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
     extensible. For a given mimetype the value must be set accordingly:
-
-    Note - application/x-microsoft.net.object.binary.base64 is the format
-    that the ResXResourceWriter will generate, however the reader can
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
     read any of the formats listed below.
-
+    
     mimetype: application/x-microsoft.net.object.binary.base64
     value   : The object must be serialized with 
             : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
-
+    
     mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with
+    value   : The object must be serialized with 
             : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
             : and then encoded with base64 encoding.
 
     mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array
+    value   : The object must be serialized into a byte array 
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
@@ -129,7 +129,7 @@
   <data name="UnexpectedFileSystemInfo" xml:space="preserve">
     <value>Unexpected type of FileSystemInfo</value>
   </data>
-  <data name="FileProvidersPhysical_PlatformNotSupported" xml:space="preserve">
-    <value>Microsoft.Extensions.FileProviders.Physical is not supported on this platform.</value>
+  <data name="FileSystemWatcher_PlatformNotSupported" xml:space="preserve">
+    <value>The type {0} is not supported on this platform, use polling instead.</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/src/libraries/Microsoft.Extensions.Hosting/src/HostBuilder.cs b/src/libraries/Microsoft.Extensions.Hosting/src/HostBuilder.cs
index 927a287da77e17..3827761382a135 100644
--- a/src/libraries/Microsoft.Extensions.Hosting/src/HostBuilder.cs
+++ b/src/libraries/Microsoft.Extensions.Hosting/src/HostBuilder.cs
@@ -192,9 +192,7 @@ private void CreateHostingEnvironment()
                 _hostingEnvironment.ApplicationName = Assembly.GetEntryAssembly()?.GetName().Name;
             }
 
-#pragma warning disable CA1416 // 'PhysicalFileProvider' is unsupported on: 'browser' https://github.com/dotnet/runtime/issues/56178
             _hostingEnvironment.ContentRootFileProvider = _defaultProvider = new PhysicalFileProvider(_hostingEnvironment.ContentRootPath);
-#pragma warning restore CA1416 // 'PhysicalFileProvider' is unsupported on: 'browser'
         }
 
         private string ResolveContentRootPath(string contentRootPath, string basePath)

From fd54a5156f6ea0cf6bf89601aa0aef3d1a2abd3e Mon Sep 17 00:00:00 2001
From: David Cantu <dacantu@microsoft.com>
Date: Thu, 22 Jul 2021 16:26:23 -0700
Subject: [PATCH 2/2] Disable CA1416 only for TryEnableFileSystemWatcher

---
 .../src/PhysicalFilesWatcher.cs                    | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Physical/src/PhysicalFilesWatcher.cs b/src/libraries/Microsoft.Extensions.FileProviders.Physical/src/PhysicalFilesWatcher.cs
index b72aa885fe809e..81df7c51532bf3 100644
--- a/src/libraries/Microsoft.Extensions.FileProviders.Physical/src/PhysicalFilesWatcher.cs
+++ b/src/libraries/Microsoft.Extensions.FileProviders.Physical/src/PhysicalFilesWatcher.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Concurrent;
 using System.IO;
+using System.Runtime.Versioning;
 using System.Security;
 using System.Threading;
 using System.Threading.Tasks;
@@ -147,7 +148,10 @@ public IChangeToken CreateFileChangeToken(string filter)
             }
 
             IChangeToken changeToken = GetOrAddChangeToken(filter);
+// We made sure that browser never uses FileSystemWatcher.
+#pragma warning disable CA1416 // Validate platform compatibility
             TryEnableFileSystemWatcher();
+#pragma warning restore CA1416 // Validate platform compatibility
 
             return changeToken;
         }
@@ -271,8 +275,7 @@ protected virtual void Dispose(bool disposing)
             }
         }
 
-// We made sure that browser never uses FileSystemWatcher.
-#pragma warning disable CA1416 // Validate platform compatibility
+        [UnsupportedOSPlatform("browser")]
         private void OnRenamed(object sender, RenamedEventArgs e)
         {
             // For a file name change or a directory's name change notify registered tokens.
@@ -305,11 +308,13 @@ ex is DirectoryNotFoundException ||
             }
         }
 
+        [UnsupportedOSPlatform("browser")]
         private void OnChanged(object sender, FileSystemEventArgs e)
         {
             OnFileSystemEntryChange(e.FullPath);
         }
 
+        [UnsupportedOSPlatform("browser")]
         private void OnError(object sender, ErrorEventArgs e)
         {
             // Notify all cache entries on error.
@@ -319,6 +324,7 @@ private void OnError(object sender, ErrorEventArgs e)
             }
         }
 
+        [UnsupportedOSPlatform("browser")]
         private void OnFileSystemEntryChange(string fullPath)
         {
             try
@@ -341,6 +347,7 @@ ex is SecurityException ||
             }
         }
 
+        [UnsupportedOSPlatform("browser")]
         private void ReportChangeForMatchedEntries(string path)
         {
             if (string.IsNullOrEmpty(path))
@@ -377,6 +384,7 @@ private void ReportChangeForMatchedEntries(string path)
             }
         }
 
+        [UnsupportedOSPlatform("browser")]
         private void TryDisableFileSystemWatcher()
         {
             if (_fileWatcher != null)
@@ -394,6 +402,7 @@ private void TryDisableFileSystemWatcher()
             }
         }
 
+        [UnsupportedOSPlatform("browser")]
         private void TryEnableFileSystemWatcher()
         {
             if (_fileWatcher != null)
@@ -409,7 +418,6 @@ private void TryEnableFileSystemWatcher()
                 }
             }
         }
-#pragma warning restore CA1416 // Validate platform compatibility
 
         private static string NormalizePath(string filter) => filter = filter.Replace('\\', '/');