Skip to content

Commit ce74cf8

Browse files
committed
Rename
1 parent fe27352 commit ce74cf8

10 files changed

+40
-49
lines changed

AspNetCore.slnx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@
110110
<Project Path="src/Components/WebAssembly/DevServer/src/Microsoft.AspNetCore.Components.WebAssembly.DevServer.csproj" />
111111
</Folder>
112112
<Folder Name="/src/Components/WebAssembly/HotReload/">
113-
<Project Path="src/Components/WebAssembly/HotReload/src/Microsoft.DotNet.HotReload.WebAssembly.csproj" />
113+
<Project Path="src/Components/WebAssembly/HotReload/src/Microsoft.DotNet.HotReload.WebAssembly.Browser.csproj" />
114114
</Folder>
115115
<Folder Name="/src/Components/WebAssembly/JSInterop/">
116116
<Project Path="src/Components/WebAssembly/JSInterop/src/Microsoft.JSInterop.WebAssembly.csproj" />

eng/Baseline.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Update this list when preparing for a new patch.
4242
<Package Id="Microsoft.AspNetCore.Components.QuickGrid.EntityFrameworkAdapter" Version="9.0.0" />
4343
<Package Id="Microsoft.AspNetCore.Components.Web" Version="9.0.0" />
4444
<Package Id="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0" />
45-
<Package Id="Microsoft.DotNet.HotReload.WebAssembly" Version="9.0.0" />
45+
<Package Id="Microsoft.DotNet.HotReload.WebAssembly.Browser" Version="9.0.0" />
4646
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="9.0.0" />
4747
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.0" />
4848
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.0" />

eng/ProjectReferences.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@
154154
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Components.WebAssembly.Server" ProjectPath="$(RepoRoot)src\Components\WebAssembly\Server\src\Microsoft.AspNetCore.Components.WebAssembly.Server.csproj" />
155155
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" ProjectPath="$(RepoRoot)src\Components\WebAssembly\WebAssembly.Authentication\src\Microsoft.AspNetCore.Components.WebAssembly.Authentication.csproj" />
156156
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Components.WebAssembly" ProjectPath="$(RepoRoot)src\Components\WebAssembly\WebAssembly\src\Microsoft.AspNetCore.Components.WebAssembly.csproj" />
157-
<ProjectReferenceProvider Include="Microsoft.DotNet.HotReload.WebAssembly" ProjectPath="$(RepoRoot)src\Components\WebAssembly\HotReload\src\Microsoft.DotNet.HotReload.WebAssembly.csproj" />
157+
<ProjectReferenceProvider Include="Microsoft.DotNet.HotReload.WebAssembly.Browser" ProjectPath="$(RepoRoot)src\Components\WebAssembly\HotReload\src\Microsoft.DotNet.HotReload.WebAssembly.Browser.csproj" />
158158
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Components.WebView" ProjectPath="$(RepoRoot)src\Components\WebView\WebView\src\Microsoft.AspNetCore.Components.WebView.csproj" />
159159
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Components.Web" ProjectPath="$(RepoRoot)src\Components\Web\src\Microsoft.AspNetCore.Components.Web.csproj" />
160160
<ProjectReferenceProvider Include="Microsoft.Extensions.FileProviders.Embedded" ProjectPath="$(RepoRoot)src\FileProviders\Embedded\src\Microsoft.Extensions.FileProviders.Embedded.csproj" />

src/Components/Components.slnf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"src\\Components\\WebAssembly\\WebAssembly.Authentication\\test\\Microsoft.AspNetCore.Components.WebAssembly.Authentication.Tests.csproj",
3838
"src\\Components\\WebAssembly\\WebAssembly\\src\\Microsoft.AspNetCore.Components.WebAssembly.csproj",
3939
"src\\Components\\WebAssembly\\WebAssembly\\test\\Microsoft.AspNetCore.Components.WebAssembly.Tests.csproj",
40-
"src\\Components\\WebAssembly\\HotReload\\src\\Microsoft.DotNet.HotReload.WebAssembly.csproj",
40+
"src\\Components\\WebAssembly\\HotReload\\src\\Microsoft.DotNet.HotReload.WebAssembly.Browser.csproj",
4141
"src\\Components\\WebAssembly\\testassets\\CustomBasePathApp\\CustomBasePathApp.csproj",
4242
"src\\Components\\WebAssembly\\testassets\\HostedInAspNet.Client\\HostedInAspNet.Client.csproj",
4343
"src\\Components\\WebAssembly\\testassets\\HostedInAspNet.Server\\HostedInAspNet.Server.csproj",

src/Components/WebAssembly/HotReload/src/WebAssemblyHotReload.cs

Lines changed: 8 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
1616

17-
namespace Microsoft.DotNet.HotReload.WebAssembly;
17+
namespace Microsoft.DotNet.HotReload.WebAssembly.Browser;
1818

1919
/// <summary>
2020
/// Contains methods called by interop. Intended for framework use only, not supported for use in application
@@ -63,9 +63,11 @@ public readonly struct Delta
6363
private static bool s_initialized;
6464
private static HotReloadAgent? s_hotReloadAgent;
6565

66-
internal static async Task InitializeAsync(string baseUri)
66+
[JSExport]
67+
[SupportedOSPlatform("browser")]
68+
public static async Task InitializeAsync(string baseUri)
6769
{
68-
if (Environment.GetEnvironmentVariable("__ASPNETCORE_BROWSER_TOOLS") == "true" &&
70+
if (MetadataUpdater.IsSupported && Environment.GetEnvironmentVariable("__ASPNETCORE_BROWSER_TOOLS") == "true" &&
6971
OperatingSystem.IsBrowser())
7072
{
7173
s_initialized = true;
@@ -131,20 +133,7 @@ private static async ValueTask ApplyPreviousDeltasAsync(HotReloadAgent agent, st
131133
private static HotReloadAgent? GetAgent()
132134
=> s_hotReloadAgent ?? (s_initialized ? throw new InvalidOperationException("Hot Reload agent not initialized") : null);
133135

134-
/// <summary>
135-
/// For framework use only.
136-
/// </summary>
137-
[Obsolete("Use ApplyHotReloadDeltas instead")]
138-
public static void ApplyHotReloadDelta(string moduleIdString, byte[] metadataDelta, byte[] ilDelta, byte[] pdbBytes, int[]? updatedTypes)
139-
{
140-
GetAgent()?.ApplyDeltas(
141-
[new UpdateDelta(Guid.Parse(moduleIdString, CultureInfo.InvariantCulture), metadataDelta, ilDelta, pdbBytes, updatedTypes ?? [])]);
142-
}
143-
144-
/// <summary>
145-
/// For framework use only.
146-
/// </summary>
147-
public static LogEntry[] ApplyHotReloadDeltas(Delta[] deltas, int loggingLevel)
136+
private static LogEntry[] ApplyHotReloadDeltas(Delta[] deltas, int loggingLevel)
148137
{
149138
var agent = GetAgent();
150139

@@ -155,34 +144,13 @@ public static LogEntry[] ApplyHotReloadDeltas(Delta[] deltas, int loggingLevel)
155144
.Select(log => new LogEntry() { Message = log.message, Severity = (int)log.severity }).ToArray();
156145
}
157146

158-
/// <summary>
159-
/// For framework use only.
160-
/// </summary>
161-
public static string GetApplyUpdateCapabilities()
162-
=> GetAgent()?.Capabilities ?? "";
163-
}
164-
165-
internal static partial class Interop
166-
{
167147
private static readonly WebAssemblyHotReloadJsonSerializerContext jsonContext = new(new(JsonSerializerDefaults.Web));
168148

169-
[JSExport]
170-
[SupportedOSPlatform("browser")]
171-
public static Task InitializeAsync(string baseUri)
172-
{
173-
if (MetadataUpdater.IsSupported)
174-
{
175-
return WebAssemblyHotReload.InitializeAsync(baseUri);
176-
}
177-
178-
return Task.CompletedTask;
179-
}
180-
181149
[JSExport]
182150
[SupportedOSPlatform("browser")]
183151
public static string GetApplyUpdateCapabilities()
184152
{
185-
return WebAssemblyHotReload.GetApplyUpdateCapabilities();
153+
return GetAgent()?.Capabilities ?? "";
186154
}
187155

188156
[JSExport]
@@ -195,7 +163,7 @@ public static string ApplyHotReloadDeltas(string deltasJson, int loggingLevel)
195163
return null;
196164
}
197165

198-
var result = WebAssemblyHotReload.ApplyHotReloadDeltas(deltas, loggingLevel);
166+
var result = ApplyHotReloadDeltas(deltas, loggingLevel);
199167
return result == null ? null : JsonSerializer.Serialize(result, jsonContext.LogEntryArray);
200168
}
201169
}
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@ export async function onRuntimeConfigLoaded(config) {
44
}
55

66
export async function onRuntimeReady({ getAssemblyExports }) {
7-
const exports = await getAssemblyExports("Microsoft.DotNet.HotReload.WebAssembly");
8-
await exports.Microsoft.DotNet.HotReload.WebAssembly.Interop.InitializeAsync(document.baseURI);
7+
const exports = await getAssemblyExports("Microsoft.DotNet.HotReload.WebAssembly.Browser");
8+
await exports.Microsoft.DotNet.HotReload.WebAssembly.Browser.WebAssemblyHotReload.InitializeAsync(document.baseURI);
99

1010
if (!window.Blazor) {
1111
window.Blazor = {};
1212
}
1313

1414
window.Blazor._internal.applyHotReloadDeltas = (deltas, loggingLevel) => {
15-
const result = exports.Microsoft.DotNet.HotReload.WebAssembly.Interop.ApplyHotReloadDeltas(JSON.stringify(deltas), loggingLevel);
15+
const result = exports.Microsoft.DotNet.HotReload.WebAssembly.Browser.WebAssemblyHotReload.ApplyHotReloadDeltas(JSON.stringify(deltas), loggingLevel);
1616
return result ? JSON.parse(result) : [];
1717
};
1818

1919
window.Blazor._internal.getApplyUpdateCapabilities = () => {
20-
return exports.Microsoft.DotNet.HotReload.WebAssembly.Interop.GetApplyUpdateCapabilities() ?? '';
20+
return exports.Microsoft.DotNet.HotReload.WebAssembly.Browser.WebAssemblyHotReload.GetApplyUpdateCapabilities() ?? '';
2121
};
2222
}

src/Components/WebAssembly/WebAssembly/src/Microsoft.AspNetCore.Components.WebAssembly.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<Reference Include="Microsoft.Extensions.Configuration.Binder" />
2222
<Reference Include="Microsoft.Extensions.Logging" />
2323
<Reference Include="Microsoft.JSInterop.WebAssembly" />
24-
<Reference Include="Microsoft.DotNet.HotReload.WebAssembly" />
24+
<Reference Include="Microsoft.DotNet.HotReload.WebAssembly.Browser" />
2525
<Reference Include="Microsoft.DotNet.HotReload.Agent" PrivateAssets="all" />
2626
<Reference Include="Microsoft.DotNet.HotReload.Agent.Data" PrivateAssets="all" />
2727
</ItemGroup>

src/Components/WebAssembly/WebAssembly/src/PublicAPI.Shipped.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ Microsoft.AspNetCore.Components.WebAssembly.Hosting.WebAssemblyHostConfiguration
8080
Microsoft.AspNetCore.Components.WebAssembly.Hosting.WebAssemblyHostConfiguration.this[string! key].set -> void
8181
Microsoft.AspNetCore.Components.WebAssembly.Hosting.WebAssemblyHostConfiguration.WebAssemblyHostConfiguration() -> void
8282
Microsoft.AspNetCore.Components.WebAssembly.Hosting.WebAssemblyHostEnvironmentExtensions
83+
Microsoft.AspNetCore.Components.WebAssembly.HotReload.WebAssemblyHotReload
8384
Microsoft.AspNetCore.Components.WebAssembly.Http.BrowserRequestCache
8485
Microsoft.AspNetCore.Components.WebAssembly.Http.BrowserRequestCache.Default = 0 -> Microsoft.AspNetCore.Components.WebAssembly.Http.BrowserRequestCache
8586
Microsoft.AspNetCore.Components.WebAssembly.Http.BrowserRequestCache.ForceCache = 4 -> Microsoft.AspNetCore.Components.WebAssembly.Http.BrowserRequestCache
@@ -106,6 +107,8 @@ static Microsoft.AspNetCore.Components.WebAssembly.Hosting.WebAssemblyHostEnviro
106107
static Microsoft.AspNetCore.Components.WebAssembly.Hosting.WebAssemblyHostEnvironmentExtensions.IsEnvironment(this Microsoft.AspNetCore.Components.WebAssembly.Hosting.IWebAssemblyHostEnvironment! hostingEnvironment, string! environmentName) -> bool
107108
static Microsoft.AspNetCore.Components.WebAssembly.Hosting.WebAssemblyHostEnvironmentExtensions.IsProduction(this Microsoft.AspNetCore.Components.WebAssembly.Hosting.IWebAssemblyHostEnvironment! hostingEnvironment) -> bool
108109
static Microsoft.AspNetCore.Components.WebAssembly.Hosting.WebAssemblyHostEnvironmentExtensions.IsStaging(this Microsoft.AspNetCore.Components.WebAssembly.Hosting.IWebAssemblyHostEnvironment! hostingEnvironment) -> bool
110+
static Microsoft.AspNetCore.Components.WebAssembly.HotReload.WebAssemblyHotReload.ApplyHotReloadDelta(string! moduleIdString, byte[]! metadataDelta, byte[]! ilDelta, byte[]! pdbBytes, int[]? updatedTypes) -> void
111+
static Microsoft.AspNetCore.Components.WebAssembly.HotReload.WebAssemblyHotReload.GetApplyUpdateCapabilities() -> string!
109112
static Microsoft.AspNetCore.Components.WebAssembly.Http.WebAssemblyHttpRequestMessageExtensions.SetBrowserRequestCache(this System.Net.Http.HttpRequestMessage! requestMessage, Microsoft.AspNetCore.Components.WebAssembly.Http.BrowserRequestCache requestCache) -> System.Net.Http.HttpRequestMessage!
110113
static Microsoft.AspNetCore.Components.WebAssembly.Http.WebAssemblyHttpRequestMessageExtensions.SetBrowserRequestCredentials(this System.Net.Http.HttpRequestMessage! requestMessage, Microsoft.AspNetCore.Components.WebAssembly.Http.BrowserRequestCredentials requestCredentials) -> System.Net.Http.HttpRequestMessage!
111114
static Microsoft.AspNetCore.Components.WebAssembly.Http.WebAssemblyHttpRequestMessageExtensions.SetBrowserRequestIntegrity(this System.Net.Http.HttpRequestMessage! requestMessage, string! integrity) -> System.Net.Http.HttpRequestMessage!
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,24 @@
1+
#nullable enable
12
Microsoft.AspNetCore.Components.WebAssembly.Hosting.WebAssemblyHostBuilder.UseServiceProviderOptions(Microsoft.Extensions.DependencyInjection.ServiceProviderOptions! options) -> Microsoft.AspNetCore.Components.WebAssembly.Hosting.WebAssemblyHostBuilder!
23
Microsoft.AspNetCore.Components.WebAssembly.Hosting.WebAssemblyHostBuilderExtensions
34
static Microsoft.AspNetCore.Components.WebAssembly.Hosting.WebAssemblyHostBuilderExtensions.UseDefaultServiceProvider(this Microsoft.AspNetCore.Components.WebAssembly.Hosting.WebAssemblyHostBuilder! builder, System.Action<Microsoft.AspNetCore.Components.WebAssembly.Hosting.IWebAssemblyHostEnvironment!, Microsoft.Extensions.DependencyInjection.ServiceProviderOptions!>! configure) -> Microsoft.AspNetCore.Components.WebAssembly.Hosting.WebAssemblyHostBuilder!
45
static Microsoft.AspNetCore.Components.WebAssembly.Hosting.WebAssemblyHostBuilderExtensions.UseDefaultServiceProvider(this Microsoft.AspNetCore.Components.WebAssembly.Hosting.WebAssemblyHostBuilder! builder, System.Action<Microsoft.Extensions.DependencyInjection.ServiceProviderOptions!>! configure) -> Microsoft.AspNetCore.Components.WebAssembly.Hosting.WebAssemblyHostBuilder!
6+
Microsoft.AspNetCore.Components.WebAssembly.HotReload.WebAssemblyHotReload.Delta
7+
Microsoft.AspNetCore.Components.WebAssembly.HotReload.WebAssemblyHotReload.Delta.Delta() -> void
8+
Microsoft.AspNetCore.Components.WebAssembly.HotReload.WebAssemblyHotReload.Delta.ILDelta.get -> byte[]!
9+
Microsoft.AspNetCore.Components.WebAssembly.HotReload.WebAssemblyHotReload.Delta.ILDelta.init -> void
10+
Microsoft.AspNetCore.Components.WebAssembly.HotReload.WebAssemblyHotReload.Delta.MetadataDelta.get -> byte[]!
11+
Microsoft.AspNetCore.Components.WebAssembly.HotReload.WebAssemblyHotReload.Delta.MetadataDelta.init -> void
12+
Microsoft.AspNetCore.Components.WebAssembly.HotReload.WebAssemblyHotReload.Delta.ModuleId.get -> string!
13+
Microsoft.AspNetCore.Components.WebAssembly.HotReload.WebAssemblyHotReload.Delta.ModuleId.init -> void
14+
Microsoft.AspNetCore.Components.WebAssembly.HotReload.WebAssemblyHotReload.Delta.PdbDelta.get -> byte[]!
15+
Microsoft.AspNetCore.Components.WebAssembly.HotReload.WebAssemblyHotReload.Delta.PdbDelta.init -> void
16+
Microsoft.AspNetCore.Components.WebAssembly.HotReload.WebAssemblyHotReload.Delta.UpdatedTypes.get -> int[]!
17+
Microsoft.AspNetCore.Components.WebAssembly.HotReload.WebAssemblyHotReload.Delta.UpdatedTypes.init -> void
18+
Microsoft.AspNetCore.Components.WebAssembly.HotReload.WebAssemblyHotReload.LogEntry
19+
Microsoft.AspNetCore.Components.WebAssembly.HotReload.WebAssemblyHotReload.LogEntry.LogEntry() -> void
20+
Microsoft.AspNetCore.Components.WebAssembly.HotReload.WebAssemblyHotReload.LogEntry.Message.get -> string!
21+
Microsoft.AspNetCore.Components.WebAssembly.HotReload.WebAssemblyHotReload.LogEntry.Message.init -> void
22+
Microsoft.AspNetCore.Components.WebAssembly.HotReload.WebAssemblyHotReload.LogEntry.Severity.get -> int
23+
Microsoft.AspNetCore.Components.WebAssembly.HotReload.WebAssemblyHotReload.LogEntry.Severity.init -> void
24+
static Microsoft.AspNetCore.Components.WebAssembly.HotReload.WebAssemblyHotReload.ApplyHotReloadDeltas(Microsoft.AspNetCore.Components.WebAssembly.HotReload.WebAssemblyHotReload.Delta[]! deltas, int loggingLevel) -> Microsoft.AspNetCore.Components.WebAssembly.HotReload.WebAssemblyHotReload.LogEntry[]!

0 commit comments

Comments
 (0)