diff --git a/eng/Signing.props b/eng/Signing.props index 351890622..54e95c16a 100644 --- a/eng/Signing.props +++ b/eng/Signing.props @@ -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" /> diff --git a/src/Microsoft.AspNetCore.Blazor.Mono/HowToUpgradeMonoLinker.md b/src/Microsoft.AspNetCore.Blazor.Mono/HowToUpgradeMonoLinker.md index eb509563c..ed8d9cca2 100644 --- a/src/Microsoft.AspNetCore.Blazor.Mono/HowToUpgradeMonoLinker.md +++ b/src/Microsoft.AspNetCore.Blazor.Mono/HowToUpgradeMonoLinker.md @@ -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 `. \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Blazor.Mono/Microsoft.AspNetCore.Blazor.Mono.nuspec b/src/Microsoft.AspNetCore.Blazor.Mono/Microsoft.AspNetCore.Blazor.Mono.nuspec index 1a6ea54e2..ea66a6040 100644 --- a/src/Microsoft.AspNetCore.Blazor.Mono/Microsoft.AspNetCore.Blazor.Mono.nuspec +++ b/src/Microsoft.AspNetCore.Blazor.Mono/Microsoft.AspNetCore.Blazor.Mono.nuspec @@ -8,7 +8,7 @@ - + diff --git a/src/Microsoft.AspNetCore.Blazor.Mono/build/netstandard1.0/Microsoft.AspNetCore.Blazor.Mono.props b/src/Microsoft.AspNetCore.Blazor.Mono/build/netstandard1.0/Microsoft.AspNetCore.Blazor.Mono.props index ba1cf9315..47264ba78 100644 --- a/src/Microsoft.AspNetCore.Blazor.Mono/build/netstandard1.0/Microsoft.AspNetCore.Blazor.Mono.props +++ b/src/Microsoft.AspNetCore.Blazor.Mono/build/netstandard1.0/Microsoft.AspNetCore.Blazor.Mono.props @@ -1,7 +1,7 @@  $(MSBuildThisFileDirectory)../../ - $(BlazorMonoRuntimeBasePath)tools/illink/illink.dll + $(BlazorMonoRuntimeBasePath)tools/monolinker/monolinker.exe $(BlazorMonoRuntimeBasePath)tools/mono/bcl/ $(BlazorMonoRuntimeBasePath)tools/mono/bcl/Facades/ $(BlazorMonoRuntimeBasePath)tools/mono/wasm/ diff --git a/src/Microsoft.AspNetCore.Blazor.Mono/tools/binaries/illink/Mono.Cecil.Mdb.dll b/src/Microsoft.AspNetCore.Blazor.Mono/tools/binaries/illink/Mono.Cecil.Mdb.dll deleted file mode 100644 index 0717ce110..000000000 Binary files a/src/Microsoft.AspNetCore.Blazor.Mono/tools/binaries/illink/Mono.Cecil.Mdb.dll and /dev/null differ diff --git a/src/Microsoft.AspNetCore.Blazor.Mono/tools/binaries/illink/Mono.Cecil.Pdb.dll b/src/Microsoft.AspNetCore.Blazor.Mono/tools/binaries/illink/Mono.Cecil.Pdb.dll deleted file mode 100644 index b3dc940f2..000000000 Binary files a/src/Microsoft.AspNetCore.Blazor.Mono/tools/binaries/illink/Mono.Cecil.Pdb.dll and /dev/null differ diff --git a/src/Microsoft.AspNetCore.Blazor.Mono/tools/binaries/illink/Mono.Cecil.dll b/src/Microsoft.AspNetCore.Blazor.Mono/tools/binaries/illink/Mono.Cecil.dll deleted file mode 100644 index 6edf9e430..000000000 Binary files a/src/Microsoft.AspNetCore.Blazor.Mono/tools/binaries/illink/Mono.Cecil.dll and /dev/null differ diff --git a/src/Microsoft.AspNetCore.Blazor.Mono/tools/binaries/illink/illink.dll b/src/Microsoft.AspNetCore.Blazor.Mono/tools/binaries/illink/illink.dll deleted file mode 100644 index d09828e71..000000000 Binary files a/src/Microsoft.AspNetCore.Blazor.Mono/tools/binaries/illink/illink.dll and /dev/null differ diff --git a/src/Microsoft.AspNetCore.Blazor.Mono/tools/binaries/monolinker/Mono.Cecil.dll b/src/Microsoft.AspNetCore.Blazor.Mono/tools/binaries/monolinker/Mono.Cecil.dll new file mode 100644 index 000000000..ae63f0570 Binary files /dev/null and b/src/Microsoft.AspNetCore.Blazor.Mono/tools/binaries/monolinker/Mono.Cecil.dll differ diff --git a/src/Microsoft.AspNetCore.Blazor.Mono/tools/binaries/monolinker/monolinker.exe b/src/Microsoft.AspNetCore.Blazor.Mono/tools/binaries/monolinker/monolinker.exe new file mode 100644 index 000000000..054d3f4a4 Binary files /dev/null and b/src/Microsoft.AspNetCore.Blazor.Mono/tools/binaries/monolinker/monolinker.exe differ diff --git a/src/Microsoft.AspNetCore.Blazor.Mono/tools/binaries/illink/illink.runtimeconfig.json b/src/Microsoft.AspNetCore.Blazor.Mono/tools/binaries/monolinker/monolinker.runtimeconfig.json similarity index 71% rename from src/Microsoft.AspNetCore.Blazor.Mono/tools/binaries/illink/illink.runtimeconfig.json rename to src/Microsoft.AspNetCore.Blazor.Mono/tools/binaries/monolinker/monolinker.runtimeconfig.json index 69bfe205e..617ab5057 100644 --- a/src/Microsoft.AspNetCore.Blazor.Mono/tools/binaries/illink/illink.runtimeconfig.json +++ b/src/Microsoft.AspNetCore.Blazor.Mono/tools/binaries/monolinker/monolinker.runtimeconfig.json @@ -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 }