diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ccbab9facd1c..3763547026e0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -25,37 +25,37 @@ https://github.com/dotnet/templating d2bbca27dbe1b65b0a14102c6c8078a525f7b39f - + https://github.com/dotnet/runtime - bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2 + 96a4671bc52e70024da409f5f48b0abaa30cb901 - + https://github.com/dotnet/runtime - bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2 + 96a4671bc52e70024da409f5f48b0abaa30cb901 - + https://github.com/dotnet/runtime - bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2 + 96a4671bc52e70024da409f5f48b0abaa30cb901 - + https://github.com/dotnet/runtime - bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2 + 96a4671bc52e70024da409f5f48b0abaa30cb901 - + https://github.com/dotnet/runtime - bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2 + 96a4671bc52e70024da409f5f48b0abaa30cb901 - + https://github.com/dotnet/runtime - bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2 + 96a4671bc52e70024da409f5f48b0abaa30cb901 - + https://github.com/dotnet/runtime - bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2 + 96a4671bc52e70024da409f5f48b0abaa30cb901 - + https://github.com/dotnet/runtime - bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2 + 96a4671bc52e70024da409f5f48b0abaa30cb901 https://github.com/dotnet/msbuild @@ -109,21 +109,21 @@ https://github.com/mono/linker f90f5c929054d4b4b69da0a21db4f69aa64d63af - + https://github.com/dotnet/runtime - bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2 + 96a4671bc52e70024da409f5f48b0abaa30cb901 - + https://github.com/dotnet/runtime - bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2 + 96a4671bc52e70024da409f5f48b0abaa30cb901 - + https://github.com/dotnet/runtime - bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2 + 96a4671bc52e70024da409f5f48b0abaa30cb901 - + https://github.com/dotnet/runtime - bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2 + 96a4671bc52e70024da409f5f48b0abaa30cb901 https://github.com/dotnet/windowsdesktop @@ -236,9 +236,9 @@ https://github.com/dotnet/arcade fc067a0928f1c8ca4ab3471e9f8edb592e96dec4 - + https://github.com/dotnet/runtime - bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2 + 96a4671bc52e70024da409f5f48b0abaa30cb901 diff --git a/eng/Versions.props b/eng/Versions.props index 2978e4930c6b..b39477f6122e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,24 +31,24 @@ 5.0.0 6.0.0-beta.21314.1 3.1.0 - 6.0.0-preview.6.21314.2 + 6.0.0-preview.7.21317.1 4.3.0 4.3.0 4.0.5 4.7.2 - 6.0.0-preview.6.21314.2 + 6.0.0-preview.7.21317.1 1.0.0-preview1.1.21112.1 4.6.0 - 6.0.0-preview.6.21314.2 - 6.0.0-preview.6.21314.2 - 6.0.0-preview.6.21314.2 + 6.0.0-preview.7.21317.1 + 6.0.0-preview.7.21317.1 + 6.0.0-preview.7.21317.1 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 6.0.0-preview.6.21314.2 - 6.0.0-preview.6.21314.2 - 6.0.0-preview.6.21314.2 + 6.0.0-preview.7.21317.1 + 6.0.0-preview.7.21317.1 + 6.0.0-preview.7.21317.1 $(MicrosoftExtensionsDependencyModelPackageVersion) @@ -80,10 +80,10 @@ - 6.0.0-preview.6.21314.2 - 6.0.0-preview.6.21314.2 + 6.0.0-preview.7.21317.1 + 6.0.0-preview.7.21317.1 5.0.0-preview.7.20364.11 - 6.0.0-preview.6.21314.2 + 6.0.0-preview.7.21317.1 diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/DependencyProvider.cs b/src/Cli/Microsoft.DotNet.Cli.Utils/DependencyProvider.cs index fe9953168335..d4b3fbf8be3f 100644 --- 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. /// /// +#pragma warning disable CA1416 public sealed class DependencyProvider { /// @@ -159,4 +160,5 @@ private IEnumerable GetDependents() return dependentsKey?.GetSubKeyNames() ?? Enumerable.Empty(); } } +#pragma warning restore CA1416 } diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/Windows.cs b/src/Cli/Microsoft.DotNet.Cli.Utils/Windows.cs index 3ca0caf5ec14..4a27c217ab45 100644 --- 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 /// /// Utility methods, specific to Windows. /// +#if NET + [SupportedOSPlatform("windows")] +#endif public static class Windows { /// diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/WindowsRegistryEnvironmentPathEditor.cs b/src/Cli/Microsoft.DotNet.Cli.Utils/WindowsRegistryEnvironmentPathEditor.cs index 484a03fea0f3..c423cb4b0b2b 100644 --- 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/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadInstallRecords/MsiWorkloadInstallationRecordManager.cs b/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadInstallRecords/MsiWorkloadInstallationRecordManager.cs index a750dc0d8de4..aaeca81e91c1 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadInstallRecords/MsiWorkloadInstallationRecordManager.cs +++ b/src/Cli/dotnet/commands/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 { /// @@ -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 index 99ba98f7866c..d57ec0f2b5e8 100644 --- 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 index 9d7398114733..02dd254129ac 100644 --- 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 index 2f08df63fbf0..d83f99168622 100644 --- 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 }