Skip to content

Commit 84886a6

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Update dependencies from dotnet/runtime (#18292)
[main] Update dependencies from dotnet/runtime - Fix analyzer errors - Suppress analyzer warnings - Fix test failure
1 parent 8b79a31 commit 84886a6

File tree

9 files changed

+53
-38
lines changed

9 files changed

+53
-38
lines changed

‎eng/Version.Details.xml‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -25,37 +25,37 @@
2525
<Uri>https://github.com/dotnet/templating</Uri>
2626
<Sha>39028686e8e33a9045a959f29e9e545bfb21e655</Sha>
2727
</Dependency>
28-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-preview.6.21314.2">
28+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-preview.7.21317.1">
2929
<Uri>https://github.com/dotnet/runtime</Uri>
30-
<Sha>bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2</Sha>
30+
<Sha>96a4671bc52e70024da409f5f48b0abaa30cb901</Sha>
3131
</Dependency>
32-
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.0-preview.6.21314.2">
32+
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.0-preview.7.21317.1">
3333
<Uri>https://github.com/dotnet/runtime</Uri>
34-
<Sha>bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2</Sha>
34+
<Sha>96a4671bc52e70024da409f5f48b0abaa30cb901</Sha>
3535
</Dependency>
36-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.0-preview.6.21314.2">
36+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.0-preview.7.21317.1">
3737
<Uri>https://github.com/dotnet/runtime</Uri>
38-
<Sha>bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2</Sha>
38+
<Sha>96a4671bc52e70024da409f5f48b0abaa30cb901</Sha>
3939
</Dependency>
40-
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="6.0.0-preview.6.21314.2">
40+
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="6.0.0-preview.7.21317.1">
4141
<Uri>https://github.com/dotnet/runtime</Uri>
42-
<Sha>bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2</Sha>
42+
<Sha>96a4671bc52e70024da409f5f48b0abaa30cb901</Sha>
4343
</Dependency>
44-
<Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.0-preview.6.21314.2">
44+
<Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.0-preview.7.21317.1">
4545
<Uri>https://github.com/dotnet/runtime</Uri>
46-
<Sha>bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2</Sha>
46+
<Sha>96a4671bc52e70024da409f5f48b0abaa30cb901</Sha>
4747
</Dependency>
48-
<Dependency Name="Microsoft.NET.HostModel" Version="6.0.0-preview.6.21314.2">
48+
<Dependency Name="Microsoft.NET.HostModel" Version="6.0.0-preview.7.21317.1">
4949
<Uri>https://github.com/dotnet/runtime</Uri>
50-
<Sha>bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2</Sha>
50+
<Sha>96a4671bc52e70024da409f5f48b0abaa30cb901</Sha>
5151
</Dependency>
52-
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="6.0.0-preview.6.21314.2">
52+
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="6.0.0-preview.7.21317.1">
5353
<Uri>https://github.com/dotnet/runtime</Uri>
54-
<Sha>bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2</Sha>
54+
<Sha>96a4671bc52e70024da409f5f48b0abaa30cb901</Sha>
5555
</Dependency>
56-
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="6.0.0-preview.6.21314.2">
56+
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="6.0.0-preview.7.21317.1">
5757
<Uri>https://github.com/dotnet/runtime</Uri>
58-
<Sha>bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2</Sha>
58+
<Sha>96a4671bc52e70024da409f5f48b0abaa30cb901</Sha>
5959
</Dependency>
6060
<Dependency Name="Microsoft.Build" Version="17.0.0-preview-21317-11">
6161
<Uri>https://github.com/dotnet/msbuild</Uri>
@@ -109,21 +109,21 @@
109109
<Uri>https://github.com/mono/linker</Uri>
110110
<Sha>bee7f73564e495e6ab8627e7c595dacc32a4b096</Sha>
111111
</Dependency>
112-
<Dependency Name="System.CodeDom" Version="6.0.0-preview.6.21314.2">
112+
<Dependency Name="System.CodeDom" Version="6.0.0-preview.7.21317.1">
113113
<Uri>https://github.com/dotnet/runtime</Uri>
114-
<Sha>bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2</Sha>
114+
<Sha>96a4671bc52e70024da409f5f48b0abaa30cb901</Sha>
115115
</Dependency>
116-
<Dependency Name="System.Security.Cryptography.ProtectedData" Version="6.0.0-preview.6.21314.2">
116+
<Dependency Name="System.Security.Cryptography.ProtectedData" Version="6.0.0-preview.7.21317.1">
117117
<Uri>https://github.com/dotnet/runtime</Uri>
118-
<Sha>bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2</Sha>
118+
<Sha>96a4671bc52e70024da409f5f48b0abaa30cb901</Sha>
119119
</Dependency>
120-
<Dependency Name="System.Text.Encoding.CodePages" Version="6.0.0-preview.6.21314.2">
120+
<Dependency Name="System.Text.Encoding.CodePages" Version="6.0.0-preview.7.21317.1">
121121
<Uri>https://github.com/dotnet/runtime</Uri>
122-
<Sha>bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2</Sha>
122+
<Sha>96a4671bc52e70024da409f5f48b0abaa30cb901</Sha>
123123
</Dependency>
124-
<Dependency Name="System.Resources.Extensions" Version="6.0.0-preview.6.21314.2">
124+
<Dependency Name="System.Resources.Extensions" Version="6.0.0-preview.7.21317.1">
125125
<Uri>https://github.com/dotnet/runtime</Uri>
126-
<Sha>bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2</Sha>
126+
<Sha>96a4671bc52e70024da409f5f48b0abaa30cb901</Sha>
127127
</Dependency>
128128
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="6.0.0-preview.7.21316.6">
129129
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
@@ -236,9 +236,9 @@
236236
<Uri>https://github.com/dotnet/arcade</Uri>
237237
<Sha>d8967a1e57275aa682c7639ef95b4d148722ba4e</Sha>
238238
</Dependency>
239-
<Dependency Name="System.Reflection.MetadataLoadContext" Version="6.0.0-preview.6.21314.2">
239+
<Dependency Name="System.Reflection.MetadataLoadContext" Version="6.0.0-preview.7.21317.1">
240240
<Uri>https://github.com/dotnet/runtime</Uri>
241-
<Sha>bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2</Sha>
241+
<Sha>96a4671bc52e70024da409f5f48b0abaa30cb901</Sha>
242242
</Dependency>
243243
</ToolsetDependencies>
244244
</Dependencies>

‎eng/Versions.props‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,24 +31,24 @@
3131
<SystemReflectionMetadataVersion>5.0.0</SystemReflectionMetadataVersion>
3232
<MicrosoftDotNetSignToolVersion>6.0.0-beta.21316.3</MicrosoftDotNetSignToolVersion>
3333
<MicrosoftWebXdtPackageVersion>3.1.0</MicrosoftWebXdtPackageVersion>
34-
<SystemSecurityCryptographyProtectedDataPackageVersion>6.0.0-preview.6.21314.2</SystemSecurityCryptographyProtectedDataPackageVersion>
34+
<SystemSecurityCryptographyProtectedDataPackageVersion>6.0.0-preview.7.21317.1</SystemSecurityCryptographyProtectedDataPackageVersion>
3535
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
3636
<SystemXmlXmlDocumentPackageVersion>4.3.0</SystemXmlXmlDocumentPackageVersion>
3737
<WebDeploymentPackageVersion>4.0.5</WebDeploymentPackageVersion>
3838
<SystemTextJsonVersion>4.7.2</SystemTextJsonVersion>
39-
<SystemReflectionMetadataLoadContextVersion>6.0.0-preview.6.21314.2</SystemReflectionMetadataLoadContextVersion>
39+
<SystemReflectionMetadataLoadContextVersion>6.0.0-preview.7.21317.1</SystemReflectionMetadataLoadContextVersion>
4040
<DeploymentReleasesVersion>1.0.0-preview1.1.21112.1</DeploymentReleasesVersion>
4141
<SystemManagementPackageVersion>4.6.0</SystemManagementPackageVersion>
4242
</PropertyGroup>
4343
<PropertyGroup>
4444
<!-- Dependencies from https://github.com/dotnet/runtime -->
45-
<MicrosoftNETCoreAppRefPackageVersion>6.0.0-preview.6.21314.2</MicrosoftNETCoreAppRefPackageVersion>
46-
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.0-preview.6.21314.2</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
47-
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>6.0.0-preview.6.21314.2</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
45+
<MicrosoftNETCoreAppRefPackageVersion>6.0.0-preview.7.21317.1</MicrosoftNETCoreAppRefPackageVersion>
46+
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.0-preview.7.21317.1</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
47+
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>6.0.0-preview.7.21317.1</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
4848
<MicrosoftNETCoreAppRuntimePackageVersion>$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</MicrosoftNETCoreAppRuntimePackageVersion>
49-
<MicrosoftExtensionsDependencyModelPackageVersion>6.0.0-preview.6.21314.2</MicrosoftExtensionsDependencyModelPackageVersion>
50-
<MicrosoftNETCoreDotNetHostResolverPackageVersion>6.0.0-preview.6.21314.2</MicrosoftNETCoreDotNetHostResolverPackageVersion>
51-
<MicrosoftNETHostModelVersion>6.0.0-preview.6.21314.2</MicrosoftNETHostModelVersion>
49+
<MicrosoftExtensionsDependencyModelPackageVersion>6.0.0-preview.7.21317.1</MicrosoftExtensionsDependencyModelPackageVersion>
50+
<MicrosoftNETCoreDotNetHostResolverPackageVersion>6.0.0-preview.7.21317.1</MicrosoftNETCoreDotNetHostResolverPackageVersion>
51+
<MicrosoftNETHostModelVersion>6.0.0-preview.7.21317.1</MicrosoftNETHostModelVersion>
5252
<MicrosoftExtensionsDependencyModelVersion>$(MicrosoftExtensionsDependencyModelPackageVersion)</MicrosoftExtensionsDependencyModelVersion>
5353
</PropertyGroup>
5454
<PropertyGroup>
@@ -80,10 +80,10 @@
8080
</PropertyGroup>
8181
<PropertyGroup>
8282
<!-- Dependencies from https://github.com/dotnet/runtime -->
83-
<SystemCodeDomPackageVersion>6.0.0-preview.6.21314.2</SystemCodeDomPackageVersion>
84-
<SystemTextEncodingCodePagesPackageVersion>6.0.0-preview.6.21314.2</SystemTextEncodingCodePagesPackageVersion>
83+
<SystemCodeDomPackageVersion>6.0.0-preview.7.21317.1</SystemCodeDomPackageVersion>
84+
<SystemTextEncodingCodePagesPackageVersion>6.0.0-preview.7.21317.1</SystemTextEncodingCodePagesPackageVersion>
8585
<SystemSecurityCryptographyProtectedDataPackageVersion>5.0.0-preview.7.20364.11</SystemSecurityCryptographyProtectedDataPackageVersion>
86-
<SystemResourcesExtensionsPackageVersion>6.0.0-preview.6.21314.2</SystemResourcesExtensionsPackageVersion>
86+
<SystemResourcesExtensionsPackageVersion>6.0.0-preview.7.21317.1</SystemResourcesExtensionsPackageVersion>
8787
</PropertyGroup>
8888
<PropertyGroup>
8989
<!-- Dependencies from https://github.com/dotnet/roslyn-analyzers -->

‎src/Cli/Microsoft.DotNet.Cli.Utils/DependencyProvider.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ namespace Microsoft.DotNet.Cli.Utils
2424
/// dependent entry. If there are no other dependents, it can proceed to remove the MSI, otherwise it should do nothing.
2525
/// </para>
2626
/// </summary>
27+
#pragma warning disable CA1416
2728
public sealed class DependencyProvider
2829
{
2930
/// <summary>
@@ -159,4 +160,5 @@ private IEnumerable<string> GetDependents()
159160
return dependentsKey?.GetSubKeyNames() ?? Enumerable.Empty<string>();
160161
}
161162
}
163+
#pragma warning restore CA1416
162164
}

‎src/Cli/Microsoft.DotNet.Cli.Utils/Windows.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
33
//
44

5+
using System.Runtime.Versioning;
56
using System.Security.Principal;
67
using System.Threading;
78

@@ -10,6 +11,9 @@ namespace Microsoft.DotNet.Cli.Utils
1011
/// <summary>
1112
/// Utility methods, specific to Windows.
1213
/// </summary>
14+
#if NET
15+
[SupportedOSPlatform("windows")]
16+
#endif
1317
public static class Windows
1418
{
1519
/// <summary>

‎src/Cli/Microsoft.DotNet.Cli.Utils/WindowsRegistryEnvironmentPathEditor.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
namespace Microsoft.DotNet.Cli.Utils
1414
{
15+
#pragma warning disable CA1416
1516
internal class WindowsRegistryEnvironmentPathEditor : IWindowsRegistryEnvironmentPathEditor
1617
{
1718
private static string Path = "PATH";
@@ -72,4 +73,5 @@ private static RegistryKey OpenEnvironmentKeyIfExists(bool writable, SdkEnvironm
7273
private const int HWND_BROADCAST = 0xffff;
7374
private const int WM_SETTINGCHANGE = 0x001A;
7475
}
76+
#pragma warning restore CA1416
7577
}

‎src/Cli/dotnet/commands/dotnet-workload/install/WorkloadInstallRecords/MsiWorkloadInstallationRecordManager.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// Copyright (c) .NET Foundation and contributors. All rights reserved.
22
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
3+
#nullable disable
34

45
using System.Collections.Generic;
56
using System.IO;
@@ -9,6 +10,7 @@
910

1011
namespace Microsoft.DotNet.Workloads.Workload.Install.InstallRecord
1112
{
13+
#pragma warning disable CA1416
1214
internal class MsiWorkloadInstallationRecordManager : IWorkloadInstallationRecordRepository
1315
{
1416
/// <summary>
@@ -62,4 +64,5 @@ public void WriteWorkloadInstallationRecord(WorkloadId workloadId, SdkFeatureBan
6264
using RegistryKey wrk = _baseKey.CreateSubKey(Path.Combine(BasePath, $"{sdkFeatureBand}", $"{workloadId}"));
6365
}
6466
}
67+
#pragma warning restore CA1416
6568
}

‎src/Tests/Microsoft.DotNet.Cli.Utils.Tests/DependencyProviderTests.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
namespace Microsoft.DotNet.Cli.Utils.Tests
1111
{
12+
#pragma warning disable CA1416
1213
public class DependencyProviderTests
1314
{
1415
[WindowsOnlyTheory]
@@ -96,4 +97,5 @@ public void ItWillNotRemoveTheProviderIfOtherDependentsExist()
9697
}
9798
}
9899
}
100+
#pragma warning restore CA1416
99101
}

‎src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToCollectExceptionTelemetry.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public void It_collects_Exception()
3131
mSBuildCommand
3232
.Execute(telemetryTestLogger, causeTaskToFail)
3333
.StdOut.Should()
34-
.Contain("\"EventName\":\"taskBaseCatchException\",\"Properties\":{\"exceptionType\":\"System.IO.FileNotFoundException\"")
34+
.Contain("\"EventName\":\"taskBaseCatchException\",\"Properties\":{\"exceptionType\":\"System.IO.IOException\"")
3535
.And.Contain("detail");
3636
}
3737
}

‎src/Tests/dotnet-workload-list.Tests/GivenAnMsiInstallation.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
namespace Microsoft.DotNet.Cli.Workload.List.Tests
1313
{
14+
#pragma warning disable CA1416
1415
[Collection("MsiWorkloadRecords")]
1516
public class GivenAnMsiInstallation : IDisposable
1617
{
@@ -71,4 +72,5 @@ private void CreateWorkloadRecord(string sdkFeatureBand, string workloadId)
7172
RecordManager.WriteWorkloadInstallationRecord(new WorkloadId(workloadId), new SdkFeatureBand(sdkFeatureBand));
7273
}
7374
}
75+
#pragma warning restore CA1416
7476
}

0 commit comments

Comments
 (0)