Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[main] Update dependencies from dotnet/runtime #18292

Merged
merged 5 commits into from
Jun 17, 2021
Merged

[main] Update dependencies from dotnet/runtime #18292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1dd798d
Update dependencies from https://github.com/dotnet/runtime build 2021…
dotnet-maestro[bot] Jun 16, 2021
1120121
Fix analyzer errors
joeloff Jun 16, 2021
62b3c04
Suppress analyzer warnings
joeloff Jun 16, 2021
9cffbf9
Update dependencies from https://github.com/dotnet/runtime build 2021…
dotnet-maestro[bot] Jun 17, 2021
1c1a072
Fix test failure
joeloff Jun 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 26 additions & 26 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.7.21317.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2</Sha>
<Sha>96a4671bc52e70024da409f5f48b0abaa30cb901</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.7.21317.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2</Sha>
<Sha>96a4671bc52e70024da409f5f48b0abaa30cb901</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.7.21317.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2</Sha>
<Sha>96a4671bc52e70024da409f5f48b0abaa30cb901</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.7.21317.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2</Sha>
<Sha>96a4671bc52e70024da409f5f48b0abaa30cb901</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.7.21317.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2</Sha>
<Sha>96a4671bc52e70024da409f5f48b0abaa30cb901</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.7.21317.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2</Sha>
<Sha>96a4671bc52e70024da409f5f48b0abaa30cb901</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.7.21317.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2</Sha>
<Sha>96a4671bc52e70024da409f5f48b0abaa30cb901</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.7.21317.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2</Sha>
<Sha>96a4671bc52e70024da409f5f48b0abaa30cb901</Sha>
</Dependency>
<Dependency Name="Microsoft.Build" Version="17.0.0-preview-21311-02">
<Uri>https://github.com/dotnet/msbuild</Uri>
Expand Down Expand Up @@ -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.7.21317.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2</Sha>
<Sha>96a4671bc52e70024da409f5f48b0abaa30cb901</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.7.21317.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2</Sha>
<Sha>96a4671bc52e70024da409f5f48b0abaa30cb901</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.7.21317.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2</Sha>
<Sha>96a4671bc52e70024da409f5f48b0abaa30cb901</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.7.21317.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2</Sha>
<Sha>96a4671bc52e70024da409f5f48b0abaa30cb901</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="6.0.0-preview.6.21314.1">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
Expand Down Expand Up @@ -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.7.21317.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2</Sha>
<Sha>96a4671bc52e70024da409f5f48b0abaa30cb901</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
22 changes: 11 additions & 11 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.7.21317.1</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.7.21317.1</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.7.21317.1</MicrosoftNETCoreAppRefPackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.0-preview.7.21317.1</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>6.0.0-preview.7.21317.1</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.7.21317.1</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>6.0.0-preview.7.21317.1</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<MicrosoftNETHostModelVersion>6.0.0-preview.7.21317.1</MicrosoftNETHostModelVersion>
<MicrosoftExtensionsDependencyModelVersion>$(MicrosoftExtensionsDependencyModelPackageVersion)</MicrosoftExtensionsDependencyModelVersion>
</PropertyGroup>
<PropertyGroup>
Expand Down Expand Up @@ -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.7.21317.1</SystemCodeDomPackageVersion>
<SystemTextEncodingCodePagesPackageVersion>6.0.0-preview.7.21317.1</SystemTextEncodingCodePagesPackageVersion>
<SystemSecurityCryptographyProtectedDataPackageVersion>5.0.0-preview.7.20364.11</SystemSecurityCryptographyProtectedDataPackageVersion>
<SystemResourcesExtensionsPackageVersion>6.0.0-preview.6.21314.2</SystemResourcesExtensionsPackageVersion>
<SystemResourcesExtensionsPackageVersion>6.0.0-preview.7.21317.1</SystemResourcesExtensionsPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/roslyn-analyzers -->
Expand Down
2 changes: 2 additions & 0 deletions src/Cli/Microsoft.DotNet.Cli.Utils/DependencyProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -159,4 +160,5 @@ private IEnumerable<string> GetDependents()
return dependentsKey?.GetSubKeyNames() ?? Enumerable.Empty<string>();
}
}
#pragma warning restore CA1416
}
4 changes: 4 additions & 0 deletions src/Cli/Microsoft.DotNet.Cli.Utils/Windows.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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>
Expand Down
2 changes: 2 additions & 0 deletions src/Cli/Microsoft.DotNet.Cli.Utils/WindowsRegistryEnvironmentPathEditor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

namespace Microsoft.DotNet.Cli.Utils
{
#pragma warning disable CA1416
internal class WindowsRegistryEnvironmentPathEditor : IWindowsRegistryEnvironmentPathEditor
{
private static string Path = "PATH";
Expand Down Expand Up @@ -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
}
3 changes: 3 additions & 0 deletions ...ds/dotnet-workload/install/WorkloadInstallRecords/MsiWorkloadInstallationRecordManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -9,6 +10,7 @@

namespace Microsoft.DotNet.Workloads.Workload.Install.InstallRecord
{
#pragma warning disable CA1416
internal class MsiWorkloadInstallationRecordManager : IWorkloadInstallationRecordRepository
{
/// <summary>
Expand Down Expand Up @@ -62,4 +64,5 @@ public void WriteWorkloadInstallationRecord(WorkloadId workloadId, SdkFeatureBan
using RegistryKey wrk = _baseKey.CreateSubKey(Path.Combine(BasePath, $"{sdkFeatureBand}", $"{workloadId}"));
}
}
#pragma warning restore CA1416
}
2 changes: 2 additions & 0 deletions src/Tests/Microsoft.DotNet.Cli.Utils.Tests/DependencyProviderTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

namespace Microsoft.DotNet.Cli.Utils.Tests
{
#pragma warning disable CA1416
public class DependencyProviderTests
{
[WindowsOnlyTheory]
Expand Down Expand Up @@ -96,4 +97,5 @@ public void ItWillNotRemoveTheProviderIfOtherDependentsExist()
}
}
}
#pragma warning restore CA1416
}
2 changes: 1 addition & 1 deletion src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToCollectExceptionTelemetry.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}
}
Expand Down
2 changes: 2 additions & 0 deletions src/Tests/dotnet-workload-list.Tests/GivenAnMsiInstallation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

namespace Microsoft.DotNet.Cli.Workload.List.Tests
{
#pragma warning disable CA1416
[Collection("MsiWorkloadRecords")]
public class GivenAnMsiInstallation : IDisposable
{
Expand Down Expand Up @@ -71,4 +72,5 @@ private void CreateWorkloadRecord(string sdkFeatureBand, string workloadId)
RecordManager.WriteWorkloadInstallationRecord(new WorkloadId(workloadId), new SdkFeatureBand(sdkFeatureBand));
}
}
#pragma warning restore CA1416
}