From f01eccbc546ad0f2feb971b8e8d3c89ff61262b2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 12 Jul 2020 12:06:36 +0000 Subject: [PATCH 1/8] Update dependencies from https://github.com/mono/linker build 20200711.1 Microsoft.NET.ILLink.Tasks From Version 5.0.0-preview.3.20360.3 -> To Version 5.0.0-preview.3.20361.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 46f4d5a99b09e4..e5530cd5af794a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -182,9 +182,9 @@ https://github.com/dotnet/runtime 0375524a91a47ca4db3ee1be548f74bab7e26e76 - + https://github.com/mono/linker - 095f30a37d740e5166d71ab2d2157c5bb2041efa + 3b524e4aa109ce5c8d9db5d6447386a0714d0d2d https://github.com/dotnet/xharness diff --git a/eng/Versions.props b/eng/Versions.props index d3ae88f4bf1542..8408f784250ce3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -116,7 +116,7 @@ 3.0.0-preview-20200602.3 - 5.0.0-preview.3.20360.3 + 5.0.0-preview.3.20361.1 5.0.0-preview.8.20359.5 @@ -144,7 +144,6 @@ Microsoft.NETCore.Targets Microsoft.NETCore.Runtime.CoreCLR Microsoft.NETCore.Runtime.ICU.Transport - - 5.0.0-beta.20319.2 - 5.0.0-beta.20319.2 - 5.0.0-beta.20319.2 - 5.0.0-beta.20319.2 - 5.0.0-beta.20319.2 - 5.0.0-beta.20319.2 - 5.0.0-beta.20319.2 - 5.0.0-beta.20319.2 + 5.0.0-beta.20360.1 + 5.0.0-beta.20360.1 + 5.0.0-beta.20360.1 + 5.0.0-beta.20360.1 + 5.0.0-beta.20360.1 + 5.0.0-beta.20360.1 + 5.0.0-beta.20360.1 + 5.0.0-beta.20360.1 2.2.0-prerelease.19564.1 From 43f85534fc5dfa32393bb9a02e0aecbf9ae45d5c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 12 Jul 2020 12:22:26 +0000 Subject: [PATCH 3/8] Update dependencies from https://github.com/dotnet/icu build 20200709.7 Microsoft.NETCore.Runtime.ICU.Transport From Version 5.0.0-preview.8.20359.5 -> To Version 5.0.0-preview.8.20359.7 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 93038d31994833..04fe174b6adb68 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -118,9 +118,9 @@ https://github.com/dotnet/runtime-assets b34a70799faa67f13c2e72852e4f3af463ff4d6c - + https://github.com/dotnet/icu - + 88c2807979f8762a121f8e4b217191672d334822 https://github.com/dotnet/llvm-project diff --git a/eng/Versions.props b/eng/Versions.props index ead5137af21e90..96a3e59d8710ec 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -118,7 +118,7 @@ 5.0.0-preview.3.20361.1 - 5.0.0-preview.8.20359.5 + 5.0.0-preview.8.20359.7 9.0.1-alpha.1.20356.1 9.0.1-alpha.1.20356.1 From b03eba55360bc88fa7336df490b6ef1bb03539f1 Mon Sep 17 00:00:00 2001 From: Marek Safar Date: Mon, 13 Jul 2020 11:42:07 +0200 Subject: [PATCH 4/8] Remove unsupported option --- eng/illink.targets | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/eng/illink.targets b/eng/illink.targets index fc38a10979f854..8a554d2084d35c 100644 --- a/eng/illink.targets +++ b/eng/illink.targets @@ -51,9 +51,9 @@ - + --> $(ArtifactsBinDir)ILLinkTrimAssembly/$(BuildSettings)/trimmed @@ -111,11 +111,11 @@ - + - @@ -152,7 +152,7 @@ - @@ -178,8 +178,6 @@ $(ILLinkArgs) -t $(ILLinkArgs) -b true - - $(ILLinkArgs) -v true $(ILLinkArgs) --strip-descriptors false @@ -235,7 +233,7 @@ <_DotNetHostFileName>dotnet <_DotNetHostFileName Condition=" '$(OS)' == 'Windows_NT' ">dotnet.exe - + - - - From 01f68c7b700e26871a0fd617af2a9d732639d206 Mon Sep 17 00:00:00 2001 From: Marek Safar Date: Mon, 13 Jul 2020 12:57:06 +0200 Subject: [PATCH 5/8] Bump SDK dependency to bring updated ILLink task --- global.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/global.json b/global.json index 2cbc796534d7f7..460a18ef3ad8b6 100644 --- a/global.json +++ b/global.json @@ -1,11 +1,11 @@ { "sdk": { - "version": "5.0.100-preview.6.20310.4", + "version": "5.0.100-preview.8.20362.3", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "5.0.100-preview.6.20310.4" + "dotnet": "5.0.100-preview.8.20362.3" }, "native-tools": { "cmake": "3.14.5", From 08f7d9159a0e163c7605adbbaf30273c67ca9a91 Mon Sep 17 00:00:00 2001 From: Marek Safar Date: Mon, 13 Jul 2020 18:57:18 +0200 Subject: [PATCH 6/8] Update trimmer configuration property names --- eng/testing/linker/SupportFiles/Directory.Build.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/testing/linker/SupportFiles/Directory.Build.props b/eng/testing/linker/SupportFiles/Directory.Build.props index 3bec2264d6fd98..f9e1bf0e26b751 100644 --- a/eng/testing/linker/SupportFiles/Directory.Build.props +++ b/eng/testing/linker/SupportFiles/Directory.Build.props @@ -1,11 +1,11 @@ true - <_TrimmerDefaultAction>link - <_TrimmerLinkSymbols>true + link + true true false true - \ No newline at end of file + From ab93a299da15c5607c7c91260b6c18ec161e1232 Mon Sep 17 00:00:00 2001 From: Marek Safar Date: Tue, 14 Jul 2020 10:50:59 +0200 Subject: [PATCH 7/8] Keep debug symbols as they are needed for the tests --- eng/testing/linker/SupportFiles/Directory.Build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/testing/linker/SupportFiles/Directory.Build.props b/eng/testing/linker/SupportFiles/Directory.Build.props index f9e1bf0e26b751..4f2c8b61a1e1a8 100644 --- a/eng/testing/linker/SupportFiles/Directory.Build.props +++ b/eng/testing/linker/SupportFiles/Directory.Build.props @@ -2,7 +2,7 @@ true link - true + false true false From 5a1a1d51e53f1f1028c5e91a7b74a0992fd1cb43 Mon Sep 17 00:00:00 2001 From: Marek Safar Date: Tue, 14 Jul 2020 14:47:57 +0200 Subject: [PATCH 8/8] Disable trimming tests on Windows due to weird pdbs handling --- eng/pipelines/runtime-linker-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/runtime-linker-tests.yml b/eng/pipelines/runtime-linker-tests.yml index ceffb1e237e76c..a14af99374f919 100644 --- a/eng/pipelines/runtime-linker-tests.yml +++ b/eng/pipelines/runtime-linker-tests.yml @@ -59,7 +59,7 @@ jobs: jobTemplate: /eng/pipelines/common/global-build-job.yml buildConfig: release platforms: - - Windows_NT_x64 +# - Windows_NT_x64 - OSX_x64 - Linux_x64 jobParameters: