diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 46f4d5a99b09e4..04fe174b6adb68 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -86,41 +86,41 @@ https://github.com/microsoft/vstest b9296fc900e2f2d717d507b4ee2a4306521796d4 - + https://github.com/dotnet/runtime-assets - 629993236116221fba87fe1de6d7893dd02c3722 + b34a70799faa67f13c2e72852e4f3af463ff4d6c - + https://github.com/dotnet/runtime-assets - 629993236116221fba87fe1de6d7893dd02c3722 + b34a70799faa67f13c2e72852e4f3af463ff4d6c - + https://github.com/dotnet/runtime-assets - 629993236116221fba87fe1de6d7893dd02c3722 + b34a70799faa67f13c2e72852e4f3af463ff4d6c - + https://github.com/dotnet/runtime-assets - 629993236116221fba87fe1de6d7893dd02c3722 + b34a70799faa67f13c2e72852e4f3af463ff4d6c - + https://github.com/dotnet/runtime-assets - 629993236116221fba87fe1de6d7893dd02c3722 + b34a70799faa67f13c2e72852e4f3af463ff4d6c - + https://github.com/dotnet/runtime-assets - 629993236116221fba87fe1de6d7893dd02c3722 + b34a70799faa67f13c2e72852e4f3af463ff4d6c - + https://github.com/dotnet/runtime-assets - 629993236116221fba87fe1de6d7893dd02c3722 + b34a70799faa67f13c2e72852e4f3af463ff4d6c - + https://github.com/dotnet/runtime-assets - 629993236116221fba87fe1de6d7893dd02c3722 + b34a70799faa67f13c2e72852e4f3af463ff4d6c - + https://github.com/dotnet/icu - + 88c2807979f8762a121f8e4b217191672d334822 https://github.com/dotnet/llvm-project @@ -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..96a3e59d8710ec 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -72,14 +72,14 @@ 5.0.0-preview.4.20202.18 5.0.0-alpha.1.19563.3 - 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 @@ -116,9 +116,9 @@ 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 + 5.0.0-preview.8.20359.7 9.0.1-alpha.1.20356.1 9.0.1-alpha.1.20356.1 @@ -144,7 +144,6 @@ Microsoft.NETCore.Targets Microsoft.NETCore.Runtime.CoreCLR Microsoft.NETCore.Runtime.ICU.Transport - $(ILLinkArgs) -t $(ILLinkArgs) -b true - - $(ILLinkArgs) -v true $(ILLinkArgs) --strip-descriptors false 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: diff --git a/eng/testing/linker/SupportFiles/Directory.Build.props b/eng/testing/linker/SupportFiles/Directory.Build.props index 3bec2264d6fd98..4f2c8b61a1e1a8 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 + false true false true - \ No newline at end of file + 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",