Skip to content

Commit 1f61fc6

Browse files
wtgodbewtgodbe
authored
Update dependencies from dotnet/blazor (#18424)
* Update dependencies from dotnet/blazor * Update version of blazor package used * Removed obsolete WipedMethod invocation test * react to mono.wasm to dotnet.wasm rename * Leftover code cleanup
1 parent e64b8a9 commit 1f61fc6

File tree

12 files changed

+35
-63
lines changed

12 files changed

+35
-63
lines changed

‎eng/Version.Details.xml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
-->
1010
<Dependencies>
1111
<ProductDependencies>
12-
<Dependency Name="Microsoft.AspNetCore.Blazor.Mono" Version="3.1.0-preview4.19578.1">
12+
<Dependency Name="Microsoft.AspNetCore.Blazor.Mono" Version="3.2.0-preview1.20067.1">
1313
<Uri>https://github.com/aspnet/Blazor</Uri>
14-
<Sha>9ff01af4257317a90b64959fe1c87aef3da4a36f</Sha>
14+
<Sha>dd7fb4d3931d556458f62642c2edfc59f6295bfb</Sha>
1515
</Dependency>
1616
<Dependency Name="Microsoft.AspNetCore.Razor.Language" Version="3.1.0-rtm.19573.1">
1717
<Uri>https://github.com/aspnet/AspNetCore-Tooling</Uri>
@@ -281,10 +281,6 @@
281281
<Uri>https://github.com/aspnet/Extensions</Uri>
282282
<Sha>1c5c7777ea9a19d54ab67ec1521665c99460efc5</Sha>
283283
</Dependency>
284-
<Dependency Name="Microsoft.Internal.Extensions.Refs" Version="3.1.0-rtm.19572.8" CoherentParentDependency="Microsoft.EntityFrameworkCore">
285-
<Uri>https://github.com/aspnet/Extensions</Uri>
286-
<Sha>1c5c7777ea9a19d54ab67ec1521665c99460efc5</Sha>
287-
</Dependency>
288284
<Dependency Name="Microsoft.JSInterop" Version="3.1.0" CoherentParentDependency="Microsoft.EntityFrameworkCore" Pinned="true">
289285
<Uri>https://github.com/aspnet/Extensions</Uri>
290286
<Sha>1c5c7777ea9a19d54ab67ec1521665c99460efc5</Sha>

‎eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
<!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
9898
<MicrosoftNETCorePlatformsPackageVersion>3.1.0</MicrosoftNETCorePlatformsPackageVersion>
9999
<!-- Packages from aspnet/Blazor -->
100-
<MicrosoftAspNetCoreBlazorMonoPackageVersion>3.1.0-preview4.19578.1</MicrosoftAspNetCoreBlazorMonoPackageVersion>
100+
<MicrosoftAspNetCoreBlazorMonoPackageVersion>3.2.0-preview1.20067.1</MicrosoftAspNetCoreBlazorMonoPackageVersion>
101101
<!-- Packages from aspnet/Extensions -->
102102
<InternalAspNetCoreAnalyzersPackageVersion>3.1.0-rtm.19575.5</InternalAspNetCoreAnalyzersPackageVersion>
103103
<MicrosoftAspNetCoreAnalyzerTestingPackageVersion>3.1.0-rtm.19575.5</MicrosoftAspNetCoreAnalyzerTestingPackageVersion>

‎src/Components/Blazor/Build/src/targets/Blazor.MonoRuntime.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<PropertyGroup Label="Blazor build outputs">
88
<MonoLinkerI18NAssemblies>none</MonoLinkerI18NAssemblies> <!-- See Mono linker docs - allows comma-separated values from: none,all,cjk,mideast,other,rare,west -->
9-
<AdditionalMonoLinkerOptions>--disable-opt unreachablebodies --verbose --strip-security true --exclude-feature com --exclude-feature sre -v false -c link -u link -b true</AdditionalMonoLinkerOptions>
9+
<AdditionalMonoLinkerOptions>--disable-opt unreachablebodies --verbose --strip-security true --exclude-feature com -v false -c link -u link -b true</AdditionalMonoLinkerOptions>
1010
<BaseBlazorDistPath>dist\</BaseBlazorDistPath>
1111
<BaseBlazorPackageContentOutputPath>$(BaseBlazorDistPath)_content\</BaseBlazorPackageContentOutputPath>
1212
<BaseBlazorRuntimeOutputPath>$(BaseBlazorDistPath)_framework\</BaseBlazorRuntimeOutputPath>

‎src/Components/Blazor/Build/test/BuildIntegrationTests/BuildIntegrationTest.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ public async Task Build_WithDefaultSettings_Works()
2222

2323
Assert.FileExists(result, buildOutputDirectory, "dist", "_framework", "blazor.boot.json");
2424
Assert.FileExists(result, buildOutputDirectory, "dist", "_framework", "blazor.webassembly.js");
25-
Assert.FileExists(result, buildOutputDirectory, "dist", "_framework", "wasm", "mono.wasm");
26-
Assert.FileExists(result, buildOutputDirectory, "dist", "_framework", "wasm", "mono.js");
25+
Assert.FileExists(result, buildOutputDirectory, "dist", "_framework", "wasm", "dotnet.wasm");
26+
Assert.FileExists(result, buildOutputDirectory, "dist", "_framework", "wasm", "dotnet.js");
2727
Assert.FileExists(result, buildOutputDirectory, "dist", "_framework", "_bin", "standalone.dll");
2828
Assert.FileExists(result, buildOutputDirectory, "dist", "_framework", "_bin", "Microsoft.Extensions.Logging.Abstractions.dll"); // Verify dependencies are part of the output.
2929
}
@@ -65,8 +65,8 @@ public async Task Build_WithLinkOnBuildDisabled_Works()
6565

6666
Assert.FileExists(result, buildOutputDirectory, "dist", "_framework", "blazor.boot.json");
6767
Assert.FileExists(result, buildOutputDirectory, "dist", "_framework", "blazor.webassembly.js");
68-
Assert.FileExists(result, buildOutputDirectory, "dist", "_framework", "wasm", "mono.wasm");
69-
Assert.FileExists(result, buildOutputDirectory, "dist", "_framework", "wasm", "mono.js");
68+
Assert.FileExists(result, buildOutputDirectory, "dist", "_framework", "wasm", "dotnet.wasm");
69+
Assert.FileExists(result, buildOutputDirectory, "dist", "_framework", "wasm", "dotnet.js");
7070
Assert.FileExists(result, buildOutputDirectory, "dist", "_framework", "_bin", "standalone.dll");
7171
Assert.FileExists(result, buildOutputDirectory, "dist", "_framework", "_bin", "Microsoft.Extensions.Logging.Abstractions.dll"); // Verify dependencies are part of the output.
7272
}

‎src/Components/Blazor/Build/test/BuildIntegrationTests/PublishIntegrationTest.cs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ public async Task Publish_WithDefaultSettings_Works()
2323

2424
Assert.FileExists(result, blazorPublishDirectory, "dist", "_framework", "blazor.boot.json");
2525
Assert.FileExists(result, blazorPublishDirectory, "dist", "_framework", "blazor.webassembly.js");
26-
Assert.FileExists(result, blazorPublishDirectory, "dist", "_framework", "wasm", "mono.wasm");
27-
Assert.FileExists(result, blazorPublishDirectory, "dist", "_framework", "wasm", "mono.js");
26+
Assert.FileExists(result, blazorPublishDirectory, "dist", "_framework", "wasm", "dotnet.wasm");
27+
Assert.FileExists(result, blazorPublishDirectory, "dist", "_framework", "wasm", "dotnet.js");
2828
Assert.FileExists(result, blazorPublishDirectory, "dist", "_framework", "_bin", "standalone.dll");
2929
Assert.FileExists(result, blazorPublishDirectory, "dist", "_framework", "_bin", "Microsoft.Extensions.Logging.Abstractions.dll"); // Verify dependencies are part of the output.
3030

@@ -57,8 +57,8 @@ public async Task Publish_WithNoBuild_Works()
5757

5858
Assert.FileExists(result, blazorPublishDirectory, "dist", "_framework", "blazor.boot.json");
5959
Assert.FileExists(result, blazorPublishDirectory, "dist", "_framework", "blazor.webassembly.js");
60-
Assert.FileExists(result, blazorPublishDirectory, "dist", "_framework", "wasm", "mono.wasm");
61-
Assert.FileExists(result, blazorPublishDirectory, "dist", "_framework", "wasm", "mono.js");
60+
Assert.FileExists(result, blazorPublishDirectory, "dist", "_framework", "wasm", "dotnet.wasm");
61+
Assert.FileExists(result, blazorPublishDirectory, "dist", "_framework", "wasm", "dotnet.js");
6262
Assert.FileExists(result, blazorPublishDirectory, "dist", "_framework", "_bin", "standalone.dll");
6363
Assert.FileExists(result, blazorPublishDirectory, "dist", "_framework", "_bin", "Microsoft.Extensions.Logging.Abstractions.dll"); // Verify dependencies are part of the output.
6464

@@ -96,8 +96,8 @@ public async Task Publish_WithLinkOnBuildDisabled_Works()
9696

9797
Assert.FileExists(result, blazorPublishDirectory, "dist", "_framework", "blazor.boot.json");
9898
Assert.FileExists(result, blazorPublishDirectory, "dist", "_framework", "blazor.webassembly.js");
99-
Assert.FileExists(result, blazorPublishDirectory, "dist", "_framework", "wasm", "mono.wasm");
100-
Assert.FileExists(result, blazorPublishDirectory, "dist", "_framework", "wasm", "mono.js");
99+
Assert.FileExists(result, blazorPublishDirectory, "dist", "_framework", "wasm", "dotnet.wasm");
100+
Assert.FileExists(result, blazorPublishDirectory, "dist", "_framework", "wasm", "dotnet.js");
101101
Assert.FileExists(result, blazorPublishDirectory, "dist", "_framework", "_bin", "standalone.dll");
102102
Assert.FileExists(result, blazorPublishDirectory, "dist", "_framework", "_bin", "Microsoft.Extensions.Logging.Abstractions.dll"); // Verify dependencies are part of the output.
103103

@@ -158,8 +158,8 @@ public async Task Publish_HostedApp_Works()
158158
var blazorPublishDirectory = Path.Combine(publishDirectory, "standalone");
159159
Assert.FileExists(result, blazorPublishDirectory, "dist", "_framework", "blazor.boot.json");
160160
Assert.FileExists(result, blazorPublishDirectory, "dist", "_framework", "blazor.webassembly.js");
161-
Assert.FileExists(result, blazorPublishDirectory, "dist", "_framework", "wasm", "mono.wasm");
162-
Assert.FileExists(result, blazorPublishDirectory, "dist", "_framework", "wasm", "mono.js");
161+
Assert.FileExists(result, blazorPublishDirectory, "dist", "_framework", "wasm", "dotnet.wasm");
162+
Assert.FileExists(result, blazorPublishDirectory, "dist", "_framework", "wasm", "dotnet.js");
163163
Assert.FileExists(result, blazorPublishDirectory, "dist", "_framework", "_bin", "standalone.dll");
164164
Assert.FileExists(result, blazorPublishDirectory, "dist", "_framework", "_bin", "Microsoft.Extensions.Logging.Abstractions.dll"); // Verify dependencies are part of the output.
165165

@@ -201,8 +201,8 @@ public async Task Publish_HostedApp_WithNoBuild_Works()
201201
var blazorPublishDirectory = Path.Combine(publishDirectory, "standalone");
202202
Assert.FileExists(result, blazorPublishDirectory, "dist", "_framework", "blazor.boot.json");
203203
Assert.FileExists(result, blazorPublishDirectory, "dist", "_framework", "blazor.webassembly.js");
204-
Assert.FileExists(result, blazorPublishDirectory, "dist", "_framework", "wasm", "mono.wasm");
205-
Assert.FileExists(result, blazorPublishDirectory, "dist", "_framework", "wasm", "mono.js");
204+
Assert.FileExists(result, blazorPublishDirectory, "dist", "_framework", "wasm", "dotnet.wasm");
205+
Assert.FileExists(result, blazorPublishDirectory, "dist", "_framework", "wasm", "dotnet.js");
206206
Assert.FileExists(result, blazorPublishDirectory, "dist", "_framework", "_bin", "standalone.dll");
207207
Assert.FileExists(result, blazorPublishDirectory, "dist", "_framework", "_bin", "Microsoft.Extensions.Logging.Abstractions.dll"); // Verify dependencies are part of the output.
208208

‎src/Components/Blazor/testassets/MonoSanity/wwwroot/index.html

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,6 @@
3636
</form>
3737
</fieldset>
3838

39-
<fieldset>
40-
<legend>Invoke wiped method</legend>
41-
<form id="invokeWipedMethod">
42-
<button type="submit" disabled>Go</button>
43-
<div><textarea rows="5" cols="80" readonly id="invokeWipedMethodStackTrace"></textarea></div>
44-
</form>
45-
</fieldset>
46-
4739
<fieldset>
4840
<legend>Call JS from .NET</legend>
4941
<form id="callJs">
@@ -111,16 +103,6 @@
111103
}
112104
};
113105

114-
el('invokeWipedMethod').onsubmit = function (evt) {
115-
evt.preventDefault();
116-
try {
117-
invokeMonoMethod('MonoSanityClient', 'MonoSanityClient', 'Examples', 'InvokeWipedMethod', []);
118-
el('invokeWipedMethodStackTrace').value = 'WARNING: No exception occurred';
119-
} catch (ex) {
120-
el('invokeWipedMethodStackTrace').value = ex.toString();
121-
}
122-
};
123-
124106
el('callJs').onsubmit = function (evt) {
125107
evt.preventDefault();
126108
var expression = el('callJsEvalExpression').value;

‎src/Components/Blazor/testassets/MonoSanity/wwwroot/loader.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
window.initMono = function initMono(loadAssemblyUrls, onReadyCallback) {
1313
window.Module = {
1414
locateFile: function (fileName) {
15-
return fileName === 'mono.wasm' ? '/_framework/wasm/mono.wasm' : fileName;
15+
return fileName === 'dotnet.wasm' ? '/_framework/wasm/dotnet.wasm' : fileName;
1616
},
1717
onRuntimeInitialized: function () {
1818
var allAssemblyUrls = loadAssemblyUrls.concat([
@@ -117,7 +117,7 @@
117117
}
118118

119119
var scriptElem = document.createElement('script');
120-
scriptElem.src = '/_framework/wasm/mono.js';
120+
scriptElem.src = '/_framework/wasm/dotnet.js';
121121
document.body.appendChild(scriptElem);
122122
}
123123

‎src/Components/Blazor/testassets/MonoSanityClient/Examples.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,6 @@ public static void TriggerException(string message)
3131
throw new InvalidOperationException(message);
3232
}
3333

34-
public static void InvokeWipedMethod()
35-
{
36-
new HttpClientHandler().Dispose();
37-
}
38-
3934
public static string EvaluateJavaScript(string expression)
4035
{
4136
var result = InternalCalls.InvokeJSUnmarshalled<string, string, object, object>(out var exceptionMessage, "evaluateJsExpression", expression, null, null);

‎src/Components/Web.JS/dist/Release/blazor.server.js

Lines changed: 10 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Components/Web.JS/dist/Release/blazor.webassembly.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)