[master] Update dependencies from mono/linker dotnet/runtime-assets d…

…otnet/icu (dotnet#39158) * 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 * Update dependencies from https://github.com/dotnet/runtime-assets build 20200710.1 System.ComponentModel.TypeConverter.TestData , System.Drawing.Common.TestData , System.IO.Compression.TestData , System.IO.Packaging.TestData , System.Net.TestData , System.Private.Runtime.UnicodeData , System.Security.Cryptography.X509Certificates.TestData , System.Windows.Extensions.TestData From Version 5.0.0-beta.20319.2 -> To Version 5.0.0-beta.20360.1 * 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 * Remove unsupported option * Bump SDK dependency to bring updated ILLink task * Update trimmer configuration property names * Keep debug symbols as they are needed for the tests * Disable trimming tests on Windows due to weird pdbs handling Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Marek Safar <marek.safar@gmail.com>
vseanreesermsft · Jul 14, 2020 · 018c8fb · 018c8fb
1 parent aa667de
commit 018c8fb
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 39 deletions.
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -86,41 +86,41 @@
       <Uri>https://github.com/microsoft/vstest</Uri>
       <Sha>b9296fc900e2f2d717d507b4ee2a4306521796d4</Sha>
     </Dependency>
-    <Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="5.0.0-beta.20319.2">
+    <Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="5.0.0-beta.20360.1">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>629993236116221fba87fe1de6d7893dd02c3722</Sha>
+      <Sha>b34a70799faa67f13c2e72852e4f3af463ff4d6c</Sha>
     </Dependency>
-    <Dependency Name="System.Drawing.Common.TestData" Version="5.0.0-beta.20319.2">
+    <Dependency Name="System.Drawing.Common.TestData" Version="5.0.0-beta.20360.1">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>629993236116221fba87fe1de6d7893dd02c3722</Sha>
+      <Sha>b34a70799faa67f13c2e72852e4f3af463ff4d6c</Sha>
     </Dependency>
-    <Dependency Name="System.IO.Compression.TestData" Version="5.0.0-beta.20319.2">
+    <Dependency Name="System.IO.Compression.TestData" Version="5.0.0-beta.20360.1">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>629993236116221fba87fe1de6d7893dd02c3722</Sha>
+      <Sha>b34a70799faa67f13c2e72852e4f3af463ff4d6c</Sha>
     </Dependency>
-    <Dependency Name="System.IO.Packaging.TestData" Version="5.0.0-beta.20319.2">
+    <Dependency Name="System.IO.Packaging.TestData" Version="5.0.0-beta.20360.1">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>629993236116221fba87fe1de6d7893dd02c3722</Sha>
+      <Sha>b34a70799faa67f13c2e72852e4f3af463ff4d6c</Sha>
     </Dependency>
-    <Dependency Name="System.Net.TestData" Version="5.0.0-beta.20319.2">
+    <Dependency Name="System.Net.TestData" Version="5.0.0-beta.20360.1">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>629993236116221fba87fe1de6d7893dd02c3722</Sha>
+      <Sha>b34a70799faa67f13c2e72852e4f3af463ff4d6c</Sha>
     </Dependency>
-    <Dependency Name="System.Private.Runtime.UnicodeData" Version="5.0.0-beta.20319.2">
+    <Dependency Name="System.Private.Runtime.UnicodeData" Version="5.0.0-beta.20360.1">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>629993236116221fba87fe1de6d7893dd02c3722</Sha>
+      <Sha>b34a70799faa67f13c2e72852e4f3af463ff4d6c</Sha>
     </Dependency>
-    <Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="5.0.0-beta.20319.2">
+    <Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="5.0.0-beta.20360.1">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>629993236116221fba87fe1de6d7893dd02c3722</Sha>
+      <Sha>b34a70799faa67f13c2e72852e4f3af463ff4d6c</Sha>
     </Dependency>
-    <Dependency Name="System.Windows.Extensions.TestData" Version="5.0.0-beta.20319.2">
+    <Dependency Name="System.Windows.Extensions.TestData" Version="5.0.0-beta.20360.1">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>629993236116221fba87fe1de6d7893dd02c3722</Sha>
+      <Sha>b34a70799faa67f13c2e72852e4f3af463ff4d6c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.Runtime.ICU.Transport" Version="5.0.0-preview.8.20359.5">
+    <Dependency Name="Microsoft.NETCore.Runtime.ICU.Transport" Version="5.0.0-preview.8.20359.7">
       <Uri>https://github.com/dotnet/icu</Uri>
-      <Sha />
+      <Sha>88c2807979f8762a121f8e4b217191672d334822</Sha>
     </Dependency>
     <Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="9.0.1-alpha.1.20356.1">
       <Uri>https://github.com/dotnet/llvm-project</Uri>
@@ -182,9 +182,9 @@
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>0375524a91a47ca4db3ee1be548f74bab7e26e76</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="5.0.0-preview.3.20360.3">
+    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="5.0.0-preview.3.20361.1">
       <Uri>https://github.com/mono/linker</Uri>
-      <Sha>095f30a37d740e5166d71ab2d2157c5bb2041efa</Sha>
+      <Sha>3b524e4aa109ce5c8d9db5d6447386a0714d0d2d</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.20352.3">
       <Uri>https://github.com/dotnet/xharness</Uri>

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -72,14 +72,14 @@
     <SystemTextJsonVersion>5.0.0-preview.4.20202.18</SystemTextJsonVersion>
     <runtimenativeSystemIOPortsVersion>5.0.0-alpha.1.19563.3</runtimenativeSystemIOPortsVersion>
     <!-- Runtime-Assets dependencies -->
-    <SystemComponentModelTypeConverterTestDataVersion>5.0.0-beta.20319.2</SystemComponentModelTypeConverterTestDataVersion>
-    <SystemDrawingCommonTestDataVersion>5.0.0-beta.20319.2</SystemDrawingCommonTestDataVersion>
-    <SystemIOCompressionTestDataVersion>5.0.0-beta.20319.2</SystemIOCompressionTestDataVersion>
-    <SystemIOPackagingTestDataVersion>5.0.0-beta.20319.2</SystemIOPackagingTestDataVersion>
-    <SystemNetTestDataVersion>5.0.0-beta.20319.2</SystemNetTestDataVersion>
-    <SystemPrivateRuntimeUnicodeDataVersion>5.0.0-beta.20319.2</SystemPrivateRuntimeUnicodeDataVersion>
-    <SystemSecurityCryptographyX509CertificatesTestDataVersion>5.0.0-beta.20319.2</SystemSecurityCryptographyX509CertificatesTestDataVersion>
-    <SystemWindowsExtensionsTestDataVersion>5.0.0-beta.20319.2</SystemWindowsExtensionsTestDataVersion>
+    <SystemComponentModelTypeConverterTestDataVersion>5.0.0-beta.20360.1</SystemComponentModelTypeConverterTestDataVersion>
+    <SystemDrawingCommonTestDataVersion>5.0.0-beta.20360.1</SystemDrawingCommonTestDataVersion>
+    <SystemIOCompressionTestDataVersion>5.0.0-beta.20360.1</SystemIOCompressionTestDataVersion>
+    <SystemIOPackagingTestDataVersion>5.0.0-beta.20360.1</SystemIOPackagingTestDataVersion>
+    <SystemNetTestDataVersion>5.0.0-beta.20360.1</SystemNetTestDataVersion>
+    <SystemPrivateRuntimeUnicodeDataVersion>5.0.0-beta.20360.1</SystemPrivateRuntimeUnicodeDataVersion>
+    <SystemSecurityCryptographyX509CertificatesTestDataVersion>5.0.0-beta.20360.1</SystemSecurityCryptographyX509CertificatesTestDataVersion>
+    <SystemWindowsExtensionsTestDataVersion>5.0.0-beta.20360.1</SystemWindowsExtensionsTestDataVersion>
     <!-- Standard dependencies -->
     <NETStandardLibraryVersion>2.2.0-prerelease.19564.1</NETStandardLibraryVersion>
     <!-- dotnet-optimization dependencies -->
@@ -116,9 +116,9 @@
     <!-- Docs -->
     <MicrosoftPrivateIntellisenseVersion>3.0.0-preview-20200602.3</MicrosoftPrivateIntellisenseVersion>
     <!-- ILLink -->
-    <MicrosoftNETILLinkTasksVersion>5.0.0-preview.3.20360.3</MicrosoftNETILLinkTasksVersion>
+    <MicrosoftNETILLinkTasksVersion>5.0.0-preview.3.20361.1</MicrosoftNETILLinkTasksVersion>
     <!-- ICU -->
-    <MicrosoftNETCoreRuntimeICUTransportVersion>5.0.0-preview.8.20359.5</MicrosoftNETCoreRuntimeICUTransportVersion>
+    <MicrosoftNETCoreRuntimeICUTransportVersion>5.0.0-preview.8.20359.7</MicrosoftNETCoreRuntimeICUTransportVersion>
     <!-- Mono LLVM -->
     <runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>9.0.1-alpha.1.20356.1</runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
     <runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>9.0.1-alpha.1.20356.1</runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
@@ -144,7 +144,6 @@
     <MicrosoftNETCoreTargetsPackage>Microsoft.NETCore.Targets</MicrosoftNETCoreTargetsPackage>
     <MicrosoftNETCoreRuntimeCoreCLRPackage>Microsoft.NETCore.Runtime.CoreCLR</MicrosoftNETCoreRuntimeCoreCLRPackage>
     <MicrosoftNETCoreRuntimeICUTransportPackage>Microsoft.NETCore.Runtime.ICU.Transport</MicrosoftNETCoreRuntimeICUTransportPackage>
-
     <!-- XmlDocFileRoot needs to be defined here since we use it in packaging.props and docs.targets.
     It also uses Arcade defined property NuGetPackageRoot, this is the only codepath shared in between
     packaging.props and docs.targets with arcade properties defined. 

diff --git a/eng/illink.targets b/eng/illink.targets
@@ -201,8 +201,6 @@
       <!-- keep type-forward assemblies (facades) -->
       <ILLinkArgs>$(ILLinkArgs) -t</ILLinkArgs>
       <ILLinkArgs Condition="'$(ILLinkRewritePDBs)' == 'true' and Exists('$(ILLinkTrimAssemblySymbols)')">$(ILLinkArgs) -b true</ILLinkArgs>
-      <!-- keep types and members required by Debugger-related attributes -->
-      <ILLinkArgs>$(ILLinkArgs) -v true</ILLinkArgs>
       <!-- don't remove the embedded root xml resource since ILLink may run again on the assembly -->
       <ILLinkArgs Condition="'$(ILLinkTrimXml)' != ''">$(ILLinkArgs) --strip-descriptors false</ILLinkArgs>
       <!-- pass the non-embedded root xml file on the command line -->

diff --git 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
@@ -1,11 +1,11 @@
 <Project>
   <PropertyGroup>
     <PublishTrimmed>true</PublishTrimmed>
-    <_TrimmerDefaultAction>link</_TrimmerDefaultAction>
-    <_TrimmerLinkSymbols>true</_TrimmerLinkSymbols>
+    <TrimMode>link</TrimMode>
+    <TrimmerRemoveSymbols>false</TrimmerRemoveSymbols>
     <SelfContained>true</SelfContained>
     <EnableTargetingPackDownload>false</EnableTargetingPackDownload>
     <PlatformManifestFile />
     <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
   </PropertyGroup>
-</Project>
+</Project>
diff --git 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",