Skip to content

Commit 1f15d60

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[blazor-wasm] Update dependencies from dotnet/arcade aspnet/Blazor (#17307)
* Update dependencies from https://github.com/aspnet/Blazor build 20191121.2 - Microsoft.AspNetCore.Blazor.Mono - 3.1.0-preview4.19571.2 * Update dependencies from https://github.com/aspnet/Blazor build 20191126.1 - Microsoft.AspNetCore.Blazor.Mono - 3.1.0-preview4.19576.1 * Update dependencies from https://github.com/aspnet/Blazor build 20191126.2 - Microsoft.AspNetCore.Blazor.Mono - 3.1.0-preview4.19576.2 * Add missing extensions feed Seems like the feed with stable versions has been deleted in the updated. I've re-added it and that should fix the existing restore issues. * Pass an empty array to entry point Fixes #17419
1 parent 16195aa commit 1f15d60

File tree

8 files changed

+103
-28
lines changed

8 files changed

+103
-28
lines changed

‎NuGet.config

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,14 @@
33
<packageSources>
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
6-
<add key="darc-pub-dotnet-core-setup-93ee64d" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-core-setup-93ee64d4/nuget/v3/index.json" />
76
<add key="darc-pub-dotnet-core-setup-7d57652" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-core-setup-7d57652f/nuget/v3/index.json" />
87
<add key="darc-pub-dotnet-corefx-0f7f38c" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-corefx-0f7f38c4/nuget/v3/index.json" />
9-
<add key="darc-pub-aspnet-Extensions-4ebd75b" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-aspnet-Extensions-4ebd75b9/nuget/v3/index.json" />
10-
<add key="darc-pub-aspnet-EntityFrameworkCore-988a8a1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-aspnet-EntityFrameworkCore-988a8a13/nuget/v3/index.json" />
118
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
129
<add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
1310
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
1411
<add key="aspnet-blazor" value="https://dotnetfeed.blob.core.windows.net/aspnet-blazor/index.json" />
1512
<add key="aspnet-extensions" value="https://dotnetfeed.blob.core.windows.net/aspnet-extensions/index.json" />
13+
<add key="darc-pub-aspnet-Extensions-4ebd75b" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-aspnet-Extensions-4ebd75b9/nuget/v3/index.json" />
1614
<add key="aspnet-entityframeworkcore" value="https://dotnetfeed.blob.core.windows.net/aspnet-entityframeworkcore/index.json" />
1715
<add key="aspnet-aspnetcore-tooling" value="https://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore-tooling/index.json" />
1816
<add key="grpc-nuget-dev" value="https://grpc.jfrog.io/grpc/api/nuget/v3/grpc-nuget-dev" />
@@ -21,5 +19,6 @@
2119
<add key="aspnetcore-dev" value="https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json" />
2220
<add key="aspnetcore-tools" value="https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json" />
2321
<add key="roslyn-tools" value="https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json" />
22+
<add key="blazor-wasm" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-blazor/nuget/v3/index.json" />
2423
</packageSources>
2524
</configuration>

‎eng/Version.Details.xml

Lines changed: 8 additions & 8 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.19572.1">
12+
<Dependency Name="Microsoft.AspNetCore.Blazor.Mono" Version="3.1.0-preview4.19576.2">
1313
<Uri>https://github.com/aspnet/Blazor</Uri>
14-
<Sha>29e997d9e23dccbd6d53fddc95972c8da95cfe75</Sha>
14+
<Sha>062c73f28d43b3c92bd7f46fc9667d99ec5938dc</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>
@@ -412,17 +412,17 @@
412412
<Uri>https://github.com/aspnet/Extensions</Uri>
413413
<Sha>1c5c7777ea9a19d54ab67ec1521665c99460efc5</Sha>
414414
</Dependency>
415-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.19569.2">
415+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.19572.3">
416416
<Uri>https://github.com/dotnet/arcade</Uri>
417-
<Sha>e34d933e18ba1cd393bbafcb6018e0f858d3e89e</Sha>
417+
<Sha>0e0d227c57e69c03427d6e668716d62cf4ceb36e</Sha>
418418
</Dependency>
419-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19569.2">
419+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19572.3">
420420
<Uri>https://github.com/dotnet/arcade</Uri>
421-
<Sha>e34d933e18ba1cd393bbafcb6018e0f858d3e89e</Sha>
421+
<Sha>0e0d227c57e69c03427d6e668716d62cf4ceb36e</Sha>
422422
</Dependency>
423-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19569.2">
423+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19572.3">
424424
<Uri>https://github.com/dotnet/arcade</Uri>
425-
<Sha>e34d933e18ba1cd393bbafcb6018e0f858d3e89e</Sha>
425+
<Sha>0e0d227c57e69c03427d6e668716d62cf4ceb36e</Sha>
426426
</Dependency>
427427
<Dependency Name="Microsoft.AspNetCore.Testing" Version="3.1.0-rtm.19572.8" CoherentParentDependency="Microsoft.EntityFrameworkCore">
428428
<Uri>https://github.com/aspnet/Extensions</Uri>

‎eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
-->
6363
<PropertyGroup Label="Automated">
6464
<!-- Packages from dotnet/arcade -->
65-
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.19569.2</MicrosoftDotNetGenAPIPackageVersion>
65+
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.19572.3</MicrosoftDotNetGenAPIPackageVersion>
6666
<!-- Packages from dotnet/roslyn -->
6767
<MicrosoftNetCompilersToolsetPackageVersion>3.4.0-beta4-19569-03</MicrosoftNetCompilersToolsetPackageVersion>
6868
<!-- Packages from dotnet/core-setup -->
@@ -96,7 +96,7 @@
9696
<!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
9797
<MicrosoftNETCorePlatformsPackageVersion>3.1.0</MicrosoftNETCorePlatformsPackageVersion>
9898
<!-- Packages from aspnet/Blazor -->
99-
<MicrosoftAspNetCoreBlazorMonoPackageVersion>3.1.0-preview4.19572.1</MicrosoftAspNetCoreBlazorMonoPackageVersion>
99+
<MicrosoftAspNetCoreBlazorMonoPackageVersion>3.1.0-preview4.19576.2</MicrosoftAspNetCoreBlazorMonoPackageVersion>
100100
<!-- Packages from aspnet/Extensions -->
101101
<InternalAspNetCoreAnalyzersPackageVersion>3.1.0-rtm.19572.8</InternalAspNetCoreAnalyzersPackageVersion>
102102
<MicrosoftAspNetCoreAnalyzerTestingPackageVersion>3.1.0-rtm.19572.8</MicrosoftAspNetCoreAnalyzerTestingPackageVersion>

‎eng/common/templates/post-build/common-variables.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,19 @@ variables:
1313
- name: NetCore_5_Dev_Channel_Id
1414
value: 131
1515

16-
# .NET Tools - Validation
17-
- name: NetCore_Tools_Validation_Channel_Id
16+
# .NET Eng - Validation
17+
- name: Net_Eng_Validation_Channel_Id
1818
value: 9
1919

20-
# .NET Tools - Latest
21-
- name: NetCore_Tools_Latest_Channel_Id
20+
# .NET Eng - Latest
21+
- name: Net_Eng_Latest_Channel_Id
2222
value: 2
2323

24-
# .NET 3 Tools - Validation
25-
- name: NETCore_3_Tools_Validation_Channel_Id
24+
# .NET 3 Eng - Validation
25+
- name: NET_3_Eng_Validation_Channel_Id
2626
value: 390
2727

28-
# .NET 3 Tools - Latest
28+
# .NET 3 Eng
2929
- name: NetCore_3_Tools_Channel_Id
3030
value: 344
3131

‎eng/common/templates/post-build/post-build.yml

Lines changed: 76 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,8 @@ stages:
126126
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
127127
publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
128128
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
129-
stageName: 'NetCore_Tools_Latest_Publish'
130-
channelName: '.NET Tools - Latest'
129+
stageName: 'Net_Eng_Latest_Publish'
130+
channelName: '.NET Eng - Latest'
131131
channelId: 2
132132
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
133133
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
@@ -138,8 +138,8 @@ stages:
138138
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
139139
publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
140140
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
141-
stageName: 'PVR_Publish'
142-
channelName: '.NET Tools - Validation'
141+
stageName: 'Net_Eng_Validation_Publish'
142+
channelName: '.NET Eng - Validation'
143143
channelId: 9
144144
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
145145
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
@@ -264,3 +264,75 @@ stages:
264264
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
265265
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
266266
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'
267+
268+
- template: \eng\common\templates\post-build\channels\generic-public-channel.yml
269+
parameters:
270+
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
271+
publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
272+
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
273+
stageName: 'NETCore_SDK_301xx_Publishing'
274+
channelName: '.NET Core SDK 3.0.1xx'
275+
channelId: 556
276+
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-transport/nuget/v3/index.json'
277+
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3/nuget/v3/index.json'
278+
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-symbols/nuget/v3/index.json'
279+
280+
- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml
281+
parameters:
282+
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
283+
publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
284+
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
285+
stageName: 'NETCore_SDK_301xx_Internal_Publishing'
286+
channelName: '.NET Core SDK 3.0.1xx Internal'
287+
channelId: 555
288+
transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v3/index.json'
289+
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v3/index.json'
290+
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-symbols/nuget/v3/index.json'
291+
292+
- template: \eng\common\templates\post-build\channels\generic-public-channel.yml
293+
parameters:
294+
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
295+
publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
296+
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
297+
stageName: 'NETCore_SDK_311xx_Publishing'
298+
channelName: '.NET Core SDK 3.1.1xx'
299+
channelId: 560
300+
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json'
301+
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json'
302+
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json'
303+
304+
- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml
305+
parameters:
306+
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
307+
publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
308+
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
309+
stageName: 'NETCore_SDK_311xx_Internal_Publishing'
310+
channelName: '.NET Core SDK 3.1.1xx Internal'
311+
channelId: 559
312+
transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json'
313+
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v3/index.json'
314+
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-symbols/nuget/v3/index.json'
315+
316+
- template: \eng\common\templates\post-build\channels\generic-public-channel.yml
317+
parameters:
318+
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
319+
publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
320+
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
321+
stageName: 'NETCore_SDK_312xx_Publishing'
322+
channelName: '.NET Core SDK 3.1.2xx'
323+
channelId: 558
324+
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json'
325+
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json'
326+
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json'
327+
328+
- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml
329+
parameters:
330+
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
331+
publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
332+
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
333+
stageName: 'NETCore_SDK_312xx_Internal_Publishing'
334+
channelName: '.NET Core SDK 3.1.2xx Internal'
335+
channelId: 557
336+
transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json'
337+
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v3/index.json'
338+
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-symbols/nuget/v3/index.json'

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
},
2626
"msbuild-sdks": {
2727
"Yarn.MSBuild": "1.15.2",
28-
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19569.2",
29-
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19569.2"
28+
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19572.3",
29+
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19572.3"
3030
}
3131
}

‎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.

‎src/Components/Web.JS/src/Platform/Mono/MonoPlatform.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ let find_class: (assemblyHandle: number, namespace: string, className: string) =
1212
let find_method: (typeHandle: number, methodName: string, unknownArg: number) => MethodHandle;
1313
let invoke_method: (method: MethodHandle, target: System_Object, argsArrayPtr: number, exceptionFlagIntPtr: number) => System_Object;
1414
let mono_call_assembly_entry_point: (assemblyName: string, args: System_Object[]) => System_Object;
15+
let mono_obj_array_new: (length: number) => System_Object;
1516
let mono_string_get_utf8: (managedString: System_String) => Mono.Utf8Ptr;
1617
let mono_string: (jsString: string) => System_String;
1718
const appBinDirName = 'appBinDir';
@@ -41,7 +42,8 @@ export const monoPlatform: Platform = {
4142
findMethod: findMethod,
4243

4344
callEntryPoint: function callEntryPoint(assemblyName: string): System_Object {
44-
return mono_call_assembly_entry_point(assemblyName, []);
45+
const empty_array = mono_obj_array_new(0);
46+
return mono_call_assembly_entry_point(assemblyName, [empty_array]);
4547
},
4648

4749
callMethod: function callMethod(method: MethodHandle, target: System_Object, args: System_Object[]): System_Object {
@@ -262,8 +264,10 @@ function createEmscriptenModuleInstance(loadAssemblyUrls: string[], onReady: ()
262264
]);
263265

264266
mono_call_assembly_entry_point = Module.mono_call_assembly_entry_point;
267+
265268
mono_string_get_utf8 = Module.cwrap('mono_wasm_string_get_utf8', 'number', ['number']);
266269
mono_string = Module.cwrap('mono_wasm_string_from_js', 'number', ['string']);
270+
mono_obj_array_new = Module.cwrap ('mono_wasm_obj_array_new', 'number', ['number']);
267271

268272
MONO.loaded_files = [];
269273

0 commit comments

Comments
 (0)