feat: make it default for to use default and static files

ignatandrei · ignatandrei · commit b2521fbbb4af · 2022-07-30T19:59:42.000+03:00
diff --git a/src/NetCore2Blockly/NetCore2BlocklyNew/Extensions.cs b/src/NetCore2Blockly/NetCore2BlocklyNew/Extensions.cs
@@ -16,7 +16,7 @@ namespace NetCore2BlocklyNew
     public static class Extensions
     {
         public static IEndpointRouteBuilder UseBlocklyAutomation(this IEndpointRouteBuilder endpoints)
-        {
+        {            
             //endpoints.MapFallbackToFile("BlocklyAutomation/{**:nonfile}", "BlocklyAutomation/index.html");
             endpoints.Map("BlocklyAutomation/{**:nonfile}", async ctx =>
             {
@@ -33,8 +33,14 @@ public static IEndpointRouteBuilder UseBlocklyAutomation(this IEndpointRouteBuil
             return endpoints;
         }
         public static IFileProvider FileProvider { get; set; }
-        public static void UseBlocklyUI(this IApplicationBuilder appBuilder, IWebHostEnvironment environment)
+        public static void UseBlocklyUI(this IApplicationBuilder appBuilder, IWebHostEnvironment environment, bool registerStaticAndDefaultFiles=true)
         {
+            if (registerStaticAndDefaultFiles)
+            {
+                appBuilder.UseDefaultFiles();
+                appBuilder.UseStaticFiles();
+            }
+
             if (FileProvider == null)
             {
                 var manifestEmbeddedProvider =
diff --git a/src/NetCore2Blockly/NetCore2BlocklyNew/NetCore2BlocklyNew.csproj b/src/NetCore2Blockly/NetCore2BlocklyNew/NetCore2BlocklyNew.csproj
@@ -49,6 +49,7 @@
 	<ItemGroup>
 		<!--<PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="5.0.0" />-->
 		<!--<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.2.0" />-->
+		<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.2.0" />
 		<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="3.0.0" />
 		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
 		<PackageReference Include="MimeTypeMapOfficial" Version="1.0.17" />

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ namespace NetCore2BlocklyNew`
`16`	`16`	`public static class Extensions`
`17`	`17`	`{`
`18`	`18`	`public static IEndpointRouteBuilder UseBlocklyAutomation(this IEndpointRouteBuilder endpoints)`
`19`		`- {`
	`19`	`+ {`
`20`	`20`	`//endpoints.MapFallbackToFile("BlocklyAutomation/{**:nonfile}", "BlocklyAutomation/index.html");`
`21`	`21`	`endpoints.Map("BlocklyAutomation/{**:nonfile}", async ctx =>`
`22`	`22`	`{`
`@@ -33,8 +33,14 @@ public static IEndpointRouteBuilder UseBlocklyAutomation(this IEndpointRouteBuil`
`33`	`33`	`return endpoints;`
`34`	`34`	`}`
`35`	`35`	`public static IFileProvider FileProvider { get; set; }`
`36`		`- public static void UseBlocklyUI(this IApplicationBuilder appBuilder, IWebHostEnvironment environment)`
	`36`	`+ public static void UseBlocklyUI(this IApplicationBuilder appBuilder, IWebHostEnvironment environment, bool registerStaticAndDefaultFiles=true)`
`37`	`37`	`{`
	`38`	`+ if (registerStaticAndDefaultFiles)`
	`39`	`+ {`
	`40`	`+ appBuilder.UseDefaultFiles();`
	`41`	`+ appBuilder.UseStaticFiles();`
	`42`	`+ }`
	`43`	`+`
`38`	`44`	`if (FileProvider == null)`
`39`	`45`	`{`
`40`	`46`	`var manifestEmbeddedProvider =`