Some cleanup

Author: Mackinnon Buck

src/Components/WebView/WebView/src/Microsoft.AspNetCore.Components.WebView.csproj

@@ -72,9 +72,6 @@
 
   <Target Name="_AddEmbeddedBlazorWebView" BeforeTargets="_CalculateEmbeddedFilesManifestInputs" DependsOnTargets="_CheckBlazorWebViewJSPath">
     <ItemGroup>
-      <!--<EmbeddedResource Include="blazor.modules.json" LogicalName="_framework/blazor.modules.json" />-->
-      <!--<EmbeddedResource Include="$(BlazorWebViewJSFile)" LogicalName="_framework/$(BlazorWebViewJSFilename)" />
-      <EmbeddedResource Include="$(BlazorWebViewJSFile).map" LogicalName="_framework/$(BlazorWebViewJSFilename).map" Condition="Exists('$(BlazorWebViewJSFile).map')" />-->
       <Content Include="$(BlazorWebViewJSFile)" Pack="true" PackagePath="staticwebassets/$(BlazorWebViewJSFilename)" />
       <Content Include="blazor.modules.json" Pack="true" PackagePath="staticwebassets/blazor.modules.json" />
     </ItemGroup>

src/Components/WebView/WebView/src/StaticContentProvider.cs

@@ -12,8 +12,6 @@ internal sealed class StaticContentProvider
     private readonly Uri _appBaseUri;
     private readonly string _hostPageRelativePath;
     private static readonly FileExtensionContentTypeProvider ContentTypeProvider = new();
-    //private static readonly ManifestEmbeddedFileProvider _manifestProvider =
-    //    new ManifestEmbeddedFileProvider(typeof(StaticContentProvider).Assembly);
 
     public StaticContentProvider(IFileProvider fileProvider, Uri appBaseUri, string hostPageRelativePath)
     {
@@ -35,7 +33,6 @@ public bool TryGetResponseContent(string requestUri, bool allowFallbackOnHostPag
             string contentType;
             var found = TryGetFromFileProvider(relativePath, out content, out contentType)
                 || (allowFallbackOnHostPage && TryGetFromFileProvider(_hostPageRelativePath, out content, out contentType));
-                //|| TryGetFrameworkFile(relativePath, out content, out contentType);
 
             if (found)
             {
@@ -83,23 +80,6 @@ private bool TryGetFromFileProvider(string relativePath, out Stream content, out
         return false;
     }
 
-    //private static bool TryGetFrameworkFile(string relativePath, out Stream content, out string contentType)
-    //{
-    //    // We're not trying to simulate everything a real webserver does. We don't need to
-    //    // support querystring parameters, for example. It's enough to require an exact match.
-    //    var file = _manifestProvider.GetFileInfo(relativePath);
-    //    if (file.Exists)
-    //    {
-    //        content = file.CreateReadStream();
-    //        contentType = GetResponseContentTypeOrDefault(relativePath);
-    //        return true;
-    //    }
-
-    //    content = default;
-    //    contentType = default;
-    //    return false;
-    //}
-
     private static string GetResponseContentTypeOrDefault(string path)
         => ContentTypeProvider.TryGetContentType(path, out var matchedContentType)
         ? matchedContentType

src/Components/WebView/WebView/src/build/Microsoft.AspNetCore.Components.WebView.props

@@ -14,7 +14,7 @@
     <PropertyGroup>
       <_WebViewAssetsBasePath Condition="'$(_WebViewAssetsBasePath)' == ''">$(MSBuildThisFileDirectory)..\staticwebassets\</_WebViewAssetsBasePath>
       <_BlazorModulesFilePath Condition="'$(_WebViewAssetsBasePath)' == ''">$(MSBuildThisFileDirectory)..\staticwebassets\blazor.modules.json</_BlazorModulesFilePath>
-  </PropertyGroup>
+    </PropertyGroup>
     <ItemGroup>
       <_WebViewAssetCandidates Include="$(_WebViewAssetsBasePath)blazor.webview.js">
         <RelativePath>_framework/blazor.webview.js</RelativePath>