[release/6.0.1xx-preview6] Update dependencies from dotnet/runtime (#…

…18291) [release/6.0.1xx-preview6] Update dependencies from dotnet/runtime - Cherry pick from 84886a6 to fix build errors
dotnet · Jun 17, 2021 · da060e3 · da060e3
1 parent e35c19c
commit da060e3
Show file tree

Hide file tree

Showing 9 changed files with 53 additions and 38 deletions.
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -25,37 +25,37 @@
       <Uri>https://github.com/dotnet/templating</Uri>
       <Sha>d2bbca27dbe1b65b0a14102c6c8078a525f7b39f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-preview.6.21314.2">
+    <Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-preview.6.21316.6">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2</Sha>
+      <Sha>3ef9d071b8a668a26d8746fb8c7b827d13e8273c</Sha>
     </Dependency>
-    <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.0-preview.6.21314.2">
+    <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.0-preview.6.21316.6">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2</Sha>
+      <Sha>3ef9d071b8a668a26d8746fb8c7b827d13e8273c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.0-preview.6.21314.2">
+    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.0-preview.6.21316.6">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2</Sha>
+      <Sha>3ef9d071b8a668a26d8746fb8c7b827d13e8273c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="6.0.0-preview.6.21314.2">
+    <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="6.0.0-preview.6.21316.6">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2</Sha>
+      <Sha>3ef9d071b8a668a26d8746fb8c7b827d13e8273c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.0-preview.6.21314.2">
+    <Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.0-preview.6.21316.6">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2</Sha>
+      <Sha>3ef9d071b8a668a26d8746fb8c7b827d13e8273c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.HostModel" Version="6.0.0-preview.6.21314.2">
+    <Dependency Name="Microsoft.NET.HostModel" Version="6.0.0-preview.6.21316.6">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2</Sha>
+      <Sha>3ef9d071b8a668a26d8746fb8c7b827d13e8273c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.DependencyModel" Version="6.0.0-preview.6.21314.2">
+    <Dependency Name="Microsoft.Extensions.DependencyModel" Version="6.0.0-preview.6.21316.6">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2</Sha>
+      <Sha>3ef9d071b8a668a26d8746fb8c7b827d13e8273c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="6.0.0-preview.6.21314.2">
+    <Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="6.0.0-preview.6.21316.6">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2</Sha>
+      <Sha>3ef9d071b8a668a26d8746fb8c7b827d13e8273c</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Build" Version="17.0.0-preview-21317-02">
       <Uri>https://github.com/dotnet/msbuild</Uri>
@@ -109,21 +109,21 @@
       <Uri>https://github.com/mono/linker</Uri>
       <Sha>f90f5c929054d4b4b69da0a21db4f69aa64d63af</Sha>
     </Dependency>
-    <Dependency Name="System.CodeDom" Version="6.0.0-preview.6.21314.2">
+    <Dependency Name="System.CodeDom" Version="6.0.0-preview.6.21316.6">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2</Sha>
+      <Sha>3ef9d071b8a668a26d8746fb8c7b827d13e8273c</Sha>
     </Dependency>
-    <Dependency Name="System.Security.Cryptography.ProtectedData" Version="6.0.0-preview.6.21314.2">
+    <Dependency Name="System.Security.Cryptography.ProtectedData" Version="6.0.0-preview.6.21316.6">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2</Sha>
+      <Sha>3ef9d071b8a668a26d8746fb8c7b827d13e8273c</Sha>
     </Dependency>
-    <Dependency Name="System.Text.Encoding.CodePages" Version="6.0.0-preview.6.21314.2">
+    <Dependency Name="System.Text.Encoding.CodePages" Version="6.0.0-preview.6.21316.6">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2</Sha>
+      <Sha>3ef9d071b8a668a26d8746fb8c7b827d13e8273c</Sha>
     </Dependency>
-    <Dependency Name="System.Resources.Extensions" Version="6.0.0-preview.6.21314.2">
+    <Dependency Name="System.Resources.Extensions" Version="6.0.0-preview.6.21316.6">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2</Sha>
+      <Sha>3ef9d071b8a668a26d8746fb8c7b827d13e8273c</Sha>
     </Dependency>
     <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="6.0.0-preview.6.21316.1">
       <Uri>https://github.com/dotnet/windowsdesktop</Uri>
@@ -236,9 +236,9 @@
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>fc067a0928f1c8ca4ab3471e9f8edb592e96dec4</Sha>
     </Dependency>
-    <Dependency Name="System.Reflection.MetadataLoadContext" Version="6.0.0-preview.6.21314.2">
+    <Dependency Name="System.Reflection.MetadataLoadContext" Version="6.0.0-preview.6.21316.6">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2</Sha>
+      <Sha>3ef9d071b8a668a26d8746fb8c7b827d13e8273c</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -31,24 +31,24 @@
     <SystemReflectionMetadataVersion>5.0.0</SystemReflectionMetadataVersion>
     <MicrosoftDotNetSignToolVersion>6.0.0-beta.21314.1</MicrosoftDotNetSignToolVersion>
     <MicrosoftWebXdtPackageVersion>3.1.0</MicrosoftWebXdtPackageVersion>
-    <SystemSecurityCryptographyProtectedDataPackageVersion>6.0.0-preview.6.21314.2</SystemSecurityCryptographyProtectedDataPackageVersion>
+    <SystemSecurityCryptographyProtectedDataPackageVersion>6.0.0-preview.6.21316.6</SystemSecurityCryptographyProtectedDataPackageVersion>
     <SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
     <SystemXmlXmlDocumentPackageVersion>4.3.0</SystemXmlXmlDocumentPackageVersion>
     <WebDeploymentPackageVersion>4.0.5</WebDeploymentPackageVersion>
     <SystemTextJsonVersion>4.7.2</SystemTextJsonVersion>
-    <SystemReflectionMetadataLoadContextVersion>6.0.0-preview.6.21314.2</SystemReflectionMetadataLoadContextVersion>
+    <SystemReflectionMetadataLoadContextVersion>6.0.0-preview.6.21316.6</SystemReflectionMetadataLoadContextVersion>
     <DeploymentReleasesVersion>1.0.0-preview1.1.21112.1</DeploymentReleasesVersion>
     <SystemManagementPackageVersion>4.6.0</SystemManagementPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/runtime -->
-    <MicrosoftNETCoreAppRefPackageVersion>6.0.0-preview.6.21314.2</MicrosoftNETCoreAppRefPackageVersion>
-    <VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.0-preview.6.21314.2</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
-    <MicrosoftNETCoreAppRuntimewinx64PackageVersion>6.0.0-preview.6.21314.2</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
+    <MicrosoftNETCoreAppRefPackageVersion>6.0.0-preview.6.21316.6</MicrosoftNETCoreAppRefPackageVersion>
+    <VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.0-preview.6.21316.6</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
+    <MicrosoftNETCoreAppRuntimewinx64PackageVersion>6.0.0-preview.6.21316.6</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
     <MicrosoftNETCoreAppRuntimePackageVersion>$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</MicrosoftNETCoreAppRuntimePackageVersion>
-    <MicrosoftExtensionsDependencyModelPackageVersion>6.0.0-preview.6.21314.2</MicrosoftExtensionsDependencyModelPackageVersion>
-    <MicrosoftNETCoreDotNetHostResolverPackageVersion>6.0.0-preview.6.21314.2</MicrosoftNETCoreDotNetHostResolverPackageVersion>
-    <MicrosoftNETHostModelVersion>6.0.0-preview.6.21314.2</MicrosoftNETHostModelVersion>
+    <MicrosoftExtensionsDependencyModelPackageVersion>6.0.0-preview.6.21316.6</MicrosoftExtensionsDependencyModelPackageVersion>
+    <MicrosoftNETCoreDotNetHostResolverPackageVersion>6.0.0-preview.6.21316.6</MicrosoftNETCoreDotNetHostResolverPackageVersion>
+    <MicrosoftNETHostModelVersion>6.0.0-preview.6.21316.6</MicrosoftNETHostModelVersion>
     <MicrosoftExtensionsDependencyModelVersion>$(MicrosoftExtensionsDependencyModelPackageVersion)</MicrosoftExtensionsDependencyModelVersion>
   </PropertyGroup>
   <PropertyGroup>
@@ -80,10 +80,10 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/runtime -->
-    <SystemCodeDomPackageVersion>6.0.0-preview.6.21314.2</SystemCodeDomPackageVersion>
-    <SystemTextEncodingCodePagesPackageVersion>6.0.0-preview.6.21314.2</SystemTextEncodingCodePagesPackageVersion>
+    <SystemCodeDomPackageVersion>6.0.0-preview.6.21316.6</SystemCodeDomPackageVersion>
+    <SystemTextEncodingCodePagesPackageVersion>6.0.0-preview.6.21316.6</SystemTextEncodingCodePagesPackageVersion>
     <SystemSecurityCryptographyProtectedDataPackageVersion>5.0.0-preview.7.20364.11</SystemSecurityCryptographyProtectedDataPackageVersion>
-    <SystemResourcesExtensionsPackageVersion>6.0.0-preview.6.21314.2</SystemResourcesExtensionsPackageVersion>
+    <SystemResourcesExtensionsPackageVersion>6.0.0-preview.6.21316.6</SystemResourcesExtensionsPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/roslyn-analyzers -->

diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/DependencyProvider.cs b/src/Cli/Microsoft.DotNet.Cli.Utils/DependencyProvider.cs
@@ -24,6 +24,7 @@ namespace Microsoft.DotNet.Cli.Utils
     /// dependent entry. If there are no other dependents, it can proceed to remove the MSI, otherwise it should do nothing.
     /// </para>
     /// </summary>
+#pragma warning disable CA1416
     public sealed class DependencyProvider
     {
         /// <summary>
@@ -159,4 +160,5 @@ private IEnumerable<string> GetDependents()
             return dependentsKey?.GetSubKeyNames() ?? Enumerable.Empty<string>();
         }
     }
+#pragma warning restore CA1416
 }
diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/Windows.cs b/src/Cli/Microsoft.DotNet.Cli.Utils/Windows.cs
@@ -2,6 +2,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
+using System.Runtime.Versioning;
 using System.Security.Principal;
 using System.Threading;
 
@@ -10,6 +11,9 @@ namespace Microsoft.DotNet.Cli.Utils
     /// <summary>
     /// Utility methods, specific to Windows.
     /// </summary>
+#if NET
+    [SupportedOSPlatform("windows")]
+#endif
     public static class Windows
     {
         /// <summary>

diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/WindowsRegistryEnvironmentPathEditor.cs b/src/Cli/Microsoft.DotNet.Cli.Utils/WindowsRegistryEnvironmentPathEditor.cs
@@ -12,6 +12,7 @@
 
 namespace Microsoft.DotNet.Cli.Utils
 {
+#pragma warning disable CA1416
     internal class WindowsRegistryEnvironmentPathEditor : IWindowsRegistryEnvironmentPathEditor
     {
         private static string Path = "PATH";
@@ -72,4 +73,5 @@ private static RegistryKey OpenEnvironmentKeyIfExists(bool writable, SdkEnvironm
         private const int HWND_BROADCAST = 0xffff;
         private const int WM_SETTINGCHANGE = 0x001A;
     }
+#pragma warning restore CA1416
 }
diff --git a/...ds/dotnet-workload/install/WorkloadInstallRecords/MsiWorkloadInstallationRecordManager.cs b/...ds/dotnet-workload/install/WorkloadInstallRecords/MsiWorkloadInstallationRecordManager.cs
@@ -1,5 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
+#nullable disable
 
 using System.Collections.Generic;
 using System.IO;
@@ -9,6 +10,7 @@
 
 namespace Microsoft.DotNet.Workloads.Workload.Install.InstallRecord
 {
+#pragma warning disable CA1416
     internal class MsiWorkloadInstallationRecordManager : IWorkloadInstallationRecordRepository
     {
         /// <summary>
@@ -62,4 +64,5 @@ public void WriteWorkloadInstallationRecord(WorkloadId workloadId, SdkFeatureBan
             using RegistryKey wrk = _baseKey.CreateSubKey(Path.Combine(BasePath, $"{sdkFeatureBand}", $"{workloadId}"));
         }
     }
+#pragma warning restore CA1416
 }
diff --git a/src/Tests/Microsoft.DotNet.Cli.Utils.Tests/DependencyProviderTests.cs b/src/Tests/Microsoft.DotNet.Cli.Utils.Tests/DependencyProviderTests.cs
@@ -9,6 +9,7 @@
 
 namespace Microsoft.DotNet.Cli.Utils.Tests
 {
+#pragma warning disable CA1416
     public class DependencyProviderTests
     {
         [WindowsOnlyTheory]
@@ -96,4 +97,5 @@ public void ItWillNotRemoveTheProviderIfOtherDependentsExist()
             }
         }
     }
+#pragma warning restore CA1416
 }
diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToCollectExceptionTelemetry.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToCollectExceptionTelemetry.cs
@@ -31,7 +31,7 @@ public void It_collects_Exception()
             mSBuildCommand
                 .Execute(telemetryTestLogger, causeTaskToFail)
                 .StdOut.Should()
-                .Contain("\"EventName\":\"taskBaseCatchException\",\"Properties\":{\"exceptionType\":\"System.IO.FileNotFoundException\"")
+                .Contain("\"EventName\":\"taskBaseCatchException\",\"Properties\":{\"exceptionType\":\"System.IO.IOException\"")
                 .And.Contain("detail");
         }
     }

diff --git a/src/Tests/dotnet-workload-list.Tests/GivenAnMsiInstallation.cs b/src/Tests/dotnet-workload-list.Tests/GivenAnMsiInstallation.cs
@@ -11,6 +11,7 @@
 
 namespace Microsoft.DotNet.Cli.Workload.List.Tests
 {
+#pragma warning disable CA1416
     [Collection("MsiWorkloadRecords")]
     public class GivenAnMsiInstallation : IDisposable
     {
@@ -71,4 +72,5 @@ private void CreateWorkloadRecord(string sdkFeatureBand, string workloadId)
             RecordManager.WriteWorkloadInstallationRecord(new WorkloadId(workloadId), new SdkFeatureBand(sdkFeatureBand));
         }
     }
+#pragma warning restore CA1416
 }