Skip to content
This repository has been archived by the owner on Feb 25, 2021. It is now read-only.

Commit

Permalink
Upgrade Mono linker binaries to e4cc70f4b50. From here on, we start t…
Browse files Browse the repository at this point in the history
…aking the linker build (monolinker.exe) supplied with the Mono wasm CI output.
  • Loading branch information
SteveSandersonMS committed Oct 31, 2019
1 parent bb70aa2 commit 1eafba7
Show file tree
Hide file tree
Showing 11 changed files with 11 additions and 17 deletions.
2 changes: 1 addition & 1 deletion eng/Signing.props
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<_MonoBinaryToExcludeFromSigning Include="I18N.Other.dll" />
<_MonoBinaryToExcludeFromSigning Include="I18N.Rare.dll" />
<_MonoBinaryToExcludeFromSigning Include="I18N.West.dll" />
<_MonoBinaryToExcludeFromSigning Include="illink.dll" />
<_MonoBinaryToExcludeFromSigning Include="monolinker.exe" />
<_MonoBinaryToExcludeFromSigning Include="Microsoft.CSharp.dll" />
<_MonoBinaryToExcludeFromSigning Include="Microsoft.Win32.Primitives.dll" />
<_MonoBinaryToExcludeFromSigning Include="Microsoft.Win32.Registry.AccessControl.dll" />
Expand Down
18 changes: 6 additions & 12 deletions src/Microsoft.AspNetCore.Blazor.Mono/HowToUpgradeMonoLinker.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,10 @@
# Upgrading Mono Linker

* Download the latest build from CI on dnceng
* Go to build pipeline on dnceng internal
* Read the build logs for the latest good build to find the URL of the last-pushed package, e.g., https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/illink.tasks/0.1.6-prerelease.19263.1/illink.tasks.0.1.6-prerelease.19263.1.nupkg and download it
* Unzip the nupkg
* Open its `tools\netcoreapp2.0` directory
* Copy the following to `(blazorroot)/mono/tools/binaries/illink`:
* `illink.dll`
* `Mono.Cecil.dll`
* `Mono.Cecil.Mdb.dll`
* `Mono.Cecil.Pdb.dll`
* First upgrade to whatever version of Mono you want to use as per `HowToUpgradeMono.md`
* In the Mono build you downloaded and extracted, find the `wasm-bcl\wasm_tools` dir. From this directory, copy the following to `(blazorroot)/src/Microsoft.AspNetCore.Blazor.Mono/tools/binaries/monolinker`:
* `monolinker.exe`
* `Mono.Cecil.dll`

Presumably you should also copy any other new dependencies it has, though it's not necessary to copy `NuGet.*.dll` or `Newtonsoft.Json.dll` or the `runtimes` subdirectory (since we execute it as a framework-dependent app).
That should be all you need. Note that the target dir also contains `monolinker.runtimeconfig.json`, which is necessary for `dotnet monolinker.exe` to work.

Note that `(blazorroot)/mono/tools/binaries/illink` also contains `illink.runtimeconfig.json`, which is necessary for `dotnet illink.dll` to work.
Now commit this with a message similar to `Upgrade Mono linker binaries to <their-commit-sha>`.
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<file src="..\..\THIRD-PARTY-NOTICES.txt" />
<file src="build\**" target="build" />
<file src="dist\**\*" target="tools\mono" />
<file src="tools\binaries\illink\**\*.*" target="tools\illink" />
<file src="tools\binaries\monolinker\**\*.*" target="tools\monolinker" />
<file src="$PackageIcon$" target="" />
</files>
</package>
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>
<PropertyGroup>
<BlazorMonoRuntimeBasePath>$(MSBuildThisFileDirectory)../../</BlazorMonoRuntimeBasePath>
<MonoLinkerPath>$(BlazorMonoRuntimeBasePath)tools/illink/illink.dll</MonoLinkerPath>
<MonoLinkerPath>$(BlazorMonoRuntimeBasePath)tools/monolinker/monolinker.exe</MonoLinkerPath>
<MonoBaseClassLibraryPath>$(BlazorMonoRuntimeBasePath)tools/mono/bcl/</MonoBaseClassLibraryPath>
<MonoBaseClassLibraryFacadesPath>$(BlazorMonoRuntimeBasePath)tools/mono/bcl/Facades/</MonoBaseClassLibraryFacadesPath>
<MonoWasmRuntimePath>$(BlazorMonoRuntimeBasePath)tools/mono/wasm/</MonoWasmRuntimePath>
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"runtimeOptions": {
"tfm": "netcoreapp2.0",
"tfm": "netcoreapp3.0",
"framework": {
"name": "Microsoft.NETCore.App",
"version": "2.0.0"
"version": "3.0.0"
},
"rollForwardOnNoCandidateFx": 2
}
Expand Down

0 comments on commit 1eafba7

Please sign in to comment.