Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/workflows/TryMudEx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@ name: Deploy TryMudEx
on:
push:
branches:
- 'main'
- '**'
workflow_dispatch:
env:
AZURE_WEBAPP_NAME: TryMudEx
AZURE_WEBAPP_PACKAGE_PATH: .\published
CONFIGURATION: Release
DOTNET_CORE_VERSION: 8.0.x
DOTNET_CORE_VERSION: 10.0.x
WORKING_DIRECTORY: TryMudEx
jobs:
build:
Expand Down
2 changes: 1 addition & 1 deletion MudBlazor.Extensions/Helper/JsImportHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ private static IJSInProcessRuntime GetJsRuntime()
return null;
}

var instanceField = defaultJsRuntimeType.GetField(instanceFieldName, BindingFlags.Static | BindingFlags.NonPublic);
var instanceField = defaultJsRuntimeType.GetField(instanceFieldName, BindingFlags.Static | BindingFlags.NonPublic | BindingFlags.Public);
if (instanceField == null)
{
return null;
Expand Down
2 changes: 1 addition & 1 deletion MudBlazor.Extensions/version.generated.props
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<MudEx_PackageVersion>8.15.0-prev-251130154</MudEx_PackageVersion>
<MudEx_PackageVersion>8.15.1-prev-2511302238</MudEx_PackageVersion>
<MudEx_MajorVersion>8</MudEx_MajorVersion>
<MudEx_MinorVersion>15</MudEx_MinorVersion>
<MudBlazor_Version>8.15.0</MudBlazor_Version>
Expand Down
6 changes: 3 additions & 3 deletions Samples/MainSample.WebAssembly/Examples/ExampleBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -79,15 +79,15 @@ public async Task<string> GetSourceCodeAsync()
return code = CleanCode(code);
}

public async Task<IDictionary<string, string>> GetAdditionalCodeFilesAsync()
public async Task<IDictionary<string, string>> GetAdditionalCodeFilesAsync(bool asMarkDown = true)
{
var client = new HttpClient();
var result = new Dictionary<string, string>();
foreach (var file in AdditionalCodeFiles)
{
var fileUrl = file.StartsWith("http") ? file : GH.Path(file);
var code = await client.GetStringAsync(fileUrl);
result[file] = MudExCodeView.CodeAsMarkup(code);
result[file] = asMarkDown ? MudExCodeView.CodeAsMarkup(code) : code;
}
return result;
}
Expand Down Expand Up @@ -138,5 +138,5 @@ public interface IExample {
public Task<string> GetSourceCodeAsync();
public IComponent[]? ComponentRefs { get; }
public bool HasAdditionalCodeFiles { get; }
public Task<IDictionary<string, string>> GetAdditionalCodeFilesAsync();
public Task<IDictionary<string, string>> GetAdditionalCodeFilesAsync(bool asMarkDown = true);
}
14 changes: 13 additions & 1 deletion Samples/MainSample.WebAssembly/Shared/MudExDemoBox.razor
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,19 @@
private async Task RunClicked()
{
await LoadCodeAsync();
await TryMudExHelper.EditCodeInTryMudexAsync(Code, JsRuntime);
if (_example?.HasAdditionalCodeFiles == true)
{
var files = new Dictionary<string, string>
{
{ "__Main.razor", Code }
};
files.AddRange(await _example.GetAdditionalCodeFilesAsync(false));
await TryMudExHelper.EditCodeInTryMudexAsync(files, JsRuntime);
}
else
{
await TryMudExHelper.EditCodeInTryMudexAsync(Code, JsRuntime);
}
}

private async Task EditInstanceClicked(IComponent component)
Expand Down
22 changes: 11 additions & 11 deletions Samples/MainSample.WebAssembly/wwwroot/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,17 @@
<meta name="twitter:description" content="MudEx is blazor component and extension library for mudblazor.">
<meta name="twitter:image" content="https://www.mudex.org/sample-data/logo.png">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
<script src="/script.js?v=8.15.0-prev-251130154"></script>
<script src="/script.js?v=8.15.1-prev-2511301834"></script>
<script src="_content/MudBlazor.Extensions/js/components/MudExAppLoader.min.js"></script>
<link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap" rel="stylesheet" />
<link href="css/app.css?v=8.15.0-prev-251130154" rel="stylesheet" />
<link href="_content/MudBlazor/MudBlazor.min.css?v=8.15.0-prev-251130154" rel="stylesheet" />
<link href="MainSample.WebAssembly.styles.css?v=8.15.0-prev-251130154" rel="stylesheet">
<link id="mudex-styles" href="_content/MudBlazor.Extensions/mudBlazorExtensions.min.css?v=8.15.0-prev-251130154" rel="stylesheet">
<link href="css/app.css?v=8.15.1-prev-2511301834" rel="stylesheet" />
<link href="_content/MudBlazor/MudBlazor.min.css?v=8.15.1-prev-2511301834" rel="stylesheet" />
<link href="MainSample.WebAssembly.styles.css?v=8.15.1-prev-2511301834" rel="stylesheet">
<link id="mudex-styles" href="_content/MudBlazor.Extensions/mudBlazorExtensions.min.css?v=8.15.1-prev-2511301834" rel="stylesheet">
<script type="text/javascript" src="https://js.live.net/v7.2/OneDrive.js"></script>
<script src="/lib/monaco-editor/min/vs/loader.js?v=8.15.0-prev-251130154"></script>
<script src="./_content/MudBlazor.Markdown/MudBlazor.Markdown.min.js?v=8.15.0-prev-251130154"></script>
<link href="./_content/MudBlazor.Markdown/MudBlazor.Markdown.min.css?v=8.15.0-prev-251130154" rel="stylesheet" />
<script src="/lib/monaco-editor/min/vs/loader.js?v=8.15.1-prev-2511301834"></script>
<script src="./_content/MudBlazor.Markdown/MudBlazor.Markdown.min.js?v=8.15.1-prev-2511301834"></script>
<link href="./_content/MudBlazor.Markdown/MudBlazor.Markdown.min.css?v=8.15.1-prev-2511301834" rel="stylesheet" />

</head>
<body>
Expand All @@ -48,7 +48,7 @@
</div>
</div>

<h1 class="app-title">MudBlazor.Extensions v8.15.0-prev-251130154</h1>
<h1 class="app-title">MudBlazor.Extensions v8.15.1-prev-2511301834</h1>
<p class="app-subtitle">for MudBlazor 8.15.0</p>

<div class="loading-spinner-container">
Expand Down Expand Up @@ -83,8 +83,8 @@ <h1 class="app-title">MudBlazor.Extensions v8.15.0-prev-251130154</h1>
</div>


<script src="_framework/blazor.webassembly.js?cb=8.15.0-prev-251130154"></script>
<script src="_content/MudBlazor/MudBlazor.min.js?cb=8.15.0-prev-251130154"></script>
<script src="_framework/blazor.webassembly.js?cb=8.15.1-prev-2511301834"></script>
<script src="_content/MudBlazor/MudBlazor.min.js?cb=8.15.1-prev-2511301834"></script>
</body>
</html>

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
</PropertyGroup>

<!--Used for the periodic table examples-->
Expand Down
12 changes: 8 additions & 4 deletions TryMudEx/Try.Core/Try.Core.csproj
Original file line number Diff line number Diff line change
@@ -1,16 +1,20 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<LangVersion>preview</LangVersion>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="FluentValidation" Version="11.11.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.19" />
<PackageReference Include="FluentValidation" Version="12.1.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="6.0.36" />
<PackageReference Include="System.Runtime.Loader" Version="4.3.0" />
<PackageReference Include="System.Net.Http.Json" Version="9.0.8" />
<PackageReference Include="System.Net.Http.Json" Version="10.0.0" />
<PackageReference Condition="'$(Configuration)' == 'Release'" Include="MudBlazor.Extensions" Version="*-*" />
<!-- WICHTIG: aktueller Roslyn-Compiler für neue C#-Features -->
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.14.0" />
<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.14.0" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion TryMudEx/Try.Tests/Try.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>

Expand Down
3 changes: 2 additions & 1 deletion TryMudEx/TryMudEx.Client/Pages/Repl.razor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,8 @@ public partial class Repl : IDisposable

[Inject] public IDialogService DialogService { get; set; }

[Inject] public IJSUnmarshalledRuntime UnmarshalledJsRuntime { get; set; }
//[Inject] public IJSUnmarshalledRuntime UnmarshalledJsRuntime { get; set; }
[Inject] public IJSRuntime UnmarshalledJsRuntime { get; set; }


[Parameter] public bool ShowHiddenFiles { get; set; }
Expand Down
4 changes: 2 additions & 2 deletions TryMudEx/TryMudEx.Client/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public static async Task Main(string[] args)
builder.RootComponents.Add<HeadOutlet>("head::after");

builder.Services.AddSingleton(serviceProvider => (IJSInProcessRuntime)serviceProvider.GetRequiredService<IJSRuntime>());
builder.Services.AddSingleton(serviceProvider => (IJSUnmarshalledRuntime)serviceProvider.GetRequiredService<IJSRuntime>());
//builder.Services.AddSingleton(serviceProvider => (IJSUnmarshalledRuntime)serviceProvider.GetRequiredService<IJSRuntime>());
builder.Services.AddScoped(_ => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
builder.Services.AddScoped<SnippetsService>();
//builder.Services.AddSingleton(new CompilationService());
Expand Down Expand Up @@ -108,7 +108,7 @@ private static IJSInProcessRuntime GetJsRuntime()
throw new MissingMemberException($"Couldn't find type '{defaultJsRuntimeTypeName}'.");
}

var instanceField = defaultJsRuntimeType.GetField(instanceFieldName, BindingFlags.Static | BindingFlags.NonPublic);
var instanceField = defaultJsRuntimeType.GetField(instanceFieldName, BindingFlags.Static | BindingFlags.NonPublic | BindingFlags.Public);
if (instanceField == null)
{
throw new MissingMemberException($"Couldn't find property '{instanceFieldName}' in '{defaultJsRuntimeTypeName}'.");
Expand Down
11 changes: 6 additions & 5 deletions TryMudEx/TryMudEx.Client/TryMudEx.Client.csproj
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<PublishTrimmed>false</PublishTrimmed>
<WasmEnableWebcil>false</WasmEnableWebcil>
<WasmFingerprintAssets>false</WasmFingerprintAssets>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Blazored.LocalStorage" Version="4.5.0" />
<PackageReference Include="FluentValidation" Version="11.11.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.19" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.19" PrivateAssets="all" />
<PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="8.0.19" />
<PackageReference Include="FluentValidation" Version="12.1.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.0" PrivateAssets="all" />
<PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="10.0.0" />
<PackageReference Include="MudBlazor.Markdown" Version="8.11.0" />
<PackageReference Condition="'$(Configuration)' == 'Release'" Include="MudBlazor.Extensions" Version="*-*" />

Expand Down
Loading
Loading