Skip to content

Commit cfc5e1f

Browse files
committed
Merge embedded file provider; bump package version
Create a ManifestEmbeddedFileProvider for the executing assembly and, if an existing FileProvider is set, wrap both with a CompositeFileProvider; otherwise assign the manifest provider and continue checking environment/wwwroot as before. This ensures embedded resources are available alongside any configured file provider. Also bump package version to 10.2026.316.550.
1 parent 8cb5978 commit cfc5e1f

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

src/NetCore2Blockly/NetCore2BlocklyNew/Extensions.cs

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,14 @@ public static void UseBlocklyUI(this IApplicationBuilder appBuilder, IWebHostEnv
4040
appBuilder.UseDefaultFiles();
4141
appBuilder.UseStaticFiles();
4242
}
43-
44-
if (FileProvider == null)
43+
var manifestEmbeddedProvider =
44+
new ManifestEmbeddedFileProvider(Assembly.GetExecutingAssembly());
45+
if (FileProvider != null)
46+
{
47+
FileProvider = new CompositeFileProvider(FileProvider, manifestEmbeddedProvider);
48+
}
49+
else //file provder is not set, try to find from embedded resource and wwwroot if exists
4550
{
46-
var manifestEmbeddedProvider =
47-
new ManifestEmbeddedFileProvider(Assembly.GetExecutingAssembly());
4851
var service = appBuilder.ApplicationServices;
4952
FileProvider = manifestEmbeddedProvider;
5053
if (environment != null)

src/NetCore2Blockly/NetCore2BlocklyNew/NetCore2BlocklyNew.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
</ItemGroup>
1919
<PropertyGroup>
2020
<PackageId>NetCore2Blockly</PackageId>
21-
<Version>10.2026.316.437</Version>
21+
<Version>10.2026.316.550</Version>
2222
<PackageReadmeFile>README.md</PackageReadmeFile>
2323
<GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
2424
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>

0 commit comments

Comments
 (0)