From aaac00a34341ac62949a53a7ff78cba2e04ba3c7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 2 Aug 2021 20:20:22 +0200 Subject: [PATCH] [main] Update dependencies from dotnet/arcade (#6711) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update dependencies from https://github.com/dotnet/arcade build 20210720.12 Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.21365.11 -> To Version 6.0.0-beta.21370.12 * Update dependencies from https://github.com/dotnet/arcade build 20210723.11 Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.21370.12 -> To Version 6.0.0-beta.21373.11 * Update dependencies from https://github.com/dotnet/arcade build 20210726.4 Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.21365.11 -> To Version 6.0.0-beta.21376.4 * Remove SNKP and disable CA1416 The former isn't supported anymore, and the latter is wrong (at least in the running code—I didn't check the tests). * Update dependencies from https://github.com/dotnet/arcade build 20210727.2 Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.21369.3 -> To Version 6.0.0-beta.21377.2 * Update dependencies from https://github.com/dotnet/arcade build 20210728.2 Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.21369.3 -> To Version 6.0.0-beta.21378.2 * Update dependencies from https://github.com/dotnet/arcade build 20210729.2 Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.21369.3 -> To Version 6.0.0-beta.21379.2 * Add comment Co-authored-by: dotnet-maestro[bot] Co-authored-by: Nathan Mytelka Co-authored-by: Roman Konecny --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- eng/common/internal/Tools.csproj | 2 +- eng/common/templates/steps/source-build.yml | 6 ++++++ global.json | 4 ++-- src/Build.UnitTests/BackEnd/BinaryTranslator_Tests.cs | 1 - src/Shared/AssemblyNameExtension.cs | 5 +---- src/Shared/NativeMethodsShared.cs | 4 ++++ .../ResolveAssemblyReferenceTestFixture.cs | 2 ++ 9 files changed, 21 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 686a1ec5c2a..913016f5165 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,9 +5,9 @@ https://github.com/dotnet/roslyn-analyzers - + https://github.com/dotnet/arcade - e97027cf100d2b532adce387e5cb93a373de93c9 + 62a8aafffd4c68ef887680f6837abdff906a662c @@ -18,9 +18,9 @@ https://github.com/dotnet/roslyn 5f124755232afa7b9903d6bdfcaeb47f39c8838e - + https://github.com/dotnet/arcade - e97027cf100d2b532adce387e5cb93a373de93c9 + 62a8aafffd4c68ef887680f6837abdff906a662c diff --git a/eng/Versions.props b/eng/Versions.props index 7bcd695ca9a..d9ffb13fe57 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -32,7 +32,7 @@ $([System.Text.RegularExpressions.Regex]::Match($([System.IO.File]::ReadAllText('$(MSBuildThisFileDirectory)..\global.json')), '"dotnet": "([^"]*)"').Groups.get_Item(1)) - 6.0.0-beta.21369.3 + 6.0.0-beta.21379.2 3.3.2 6.0.0-preview.2.21154.6 4.0.0-3.21373.8 diff --git a/eng/common/internal/Tools.csproj b/eng/common/internal/Tools.csproj index f46d5efe2e3..2067b8df8d9 100644 --- a/eng/common/internal/Tools.csproj +++ b/eng/common/internal/Tools.csproj @@ -1,5 +1,5 @@ + - net472 diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml index e20637ed6a1..705b7a1c847 100644 --- a/eng/common/templates/steps/source-build.yml +++ b/eng/common/templates/steps/source-build.yml @@ -29,6 +29,11 @@ steps: officialBuildArgs='/p:DotNetPublishUsingPipelines=true /p:OfficialBuildId=$(BUILD.BUILDNUMBER)' fi + internalRuntimeDownloadArgs= + if [ '$(dotnetclimsrc-read-sas-token-base64)' != '$''(dotnetclimsrc-read-sas-token-base64)' ]; then + internalRuntimeDownloadArgs='--runtimesourcefeed https://dotnetclimsrc.blob.core.windows.net/dotnet --runtimesourcefeedkey $(dotnetclimsrc-read-sas-token-base64)' + fi + targetRidArgs= if [ '${{ parameters.platform.targetRID }}' != '' ]; then targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}' @@ -43,6 +48,7 @@ steps: --configuration $buildConfig \ --restore --build --pack $publishArgs -bl \ $officialBuildArgs \ + $internalRuntimeDownloadArgs \ $targetRidArgs \ /p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \ /p:ArcadeBuildFromSource=true diff --git a/global.json b/global.json index 023d2b2e6d4..3dc6a657bbb 100644 --- a/global.json +++ b/global.json @@ -3,7 +3,7 @@ "allowPrerelease": true }, "tools": { - "dotnet": "6.0.100-preview.4.21255.9", + "dotnet": "6.0.100-preview.6.21355.2", "runtimes": { "dotnet/x64": [ "2.1.7" @@ -15,6 +15,6 @@ }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21369.3" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21379.2" } } diff --git a/src/Build.UnitTests/BackEnd/BinaryTranslator_Tests.cs b/src/Build.UnitTests/BackEnd/BinaryTranslator_Tests.cs index def0ed804d5..32e5a1a9ce1 100644 --- a/src/Build.UnitTests/BackEnd/BinaryTranslator_Tests.cs +++ b/src/Build.UnitTests/BackEnd/BinaryTranslator_Tests.cs @@ -545,7 +545,6 @@ public void AssemblyNameWithAllFields() HashAlgorithm = System.Configuration.Assemblies.AssemblyHashAlgorithm.SHA256, VersionCompatibility = AssemblyVersionCompatibility.SameMachine, CodeBase = "C:\\src", - KeyPair = new StrongNameKeyPair(new byte[] { 4, 3, 2, 1 }), ContentType = AssemblyContentType.WindowsRuntime, CultureName = "zh-HK", }; diff --git a/src/Shared/AssemblyNameExtension.cs b/src/Shared/AssemblyNameExtension.cs index 8c62a178e05..99db41274e3 100644 --- a/src/Shared/AssemblyNameExtension.cs +++ b/src/Shared/AssemblyNameExtension.cs @@ -148,7 +148,6 @@ private AssemblyNameExtension(SerializationInfo info, StreamingContext context) var hashAlgorithm = (System.Configuration.Assemblies.AssemblyHashAlgorithm) info.GetInt32("hashAlg"); var versionCompatibility = (AssemblyVersionCompatibility) info.GetInt32("verCompat"); var codeBase = info.GetString("codebase"); - var keyPair = (StrongNameKeyPair) info.GetValue("keypair", typeof(StrongNameKeyPair)); asAssemblyName = new AssemblyName { @@ -160,7 +159,6 @@ private AssemblyNameExtension(SerializationInfo info, StreamingContext context) HashAlgorithm = hashAlgorithm, VersionCompatibility = versionCompatibility, CodeBase = codeBase, - KeyPair = keyPair }; asAssemblyName.SetPublicKey(publicKey); @@ -635,7 +633,7 @@ private static int CompareBaseNamesStringWise(string asString1, string asString2 /// internal AssemblyNameExtension Clone() { - AssemblyNameExtension newExtension = new AssemblyNameExtension(); + AssemblyNameExtension newExtension = new(); if (asAssemblyName != null) { @@ -1001,7 +999,6 @@ public void GetObjectData(SerializationInfo info, StreamingContext context) info.AddValue("hashAlg", asAssemblyName.HashAlgorithm); info.AddValue("verCompat", asAssemblyName.VersionCompatibility); info.AddValue("codebase", asAssemblyName.CodeBase); - info.AddValue("keypair", asAssemblyName.KeyPair); } info.AddValue("asStr", asString); diff --git a/src/Shared/NativeMethodsShared.cs b/src/Shared/NativeMethodsShared.cs index 4e23aae1096..09314174d36 100644 --- a/src/Shared/NativeMethodsShared.cs +++ b/src/Shared/NativeMethodsShared.cs @@ -632,6 +632,9 @@ internal static bool IsMaxPathLegacyWindows() } } + // CA1416 warns about code that can only run on Windows, but we verified we're running on Windows before this. + // This is the most reasonable way to resolve this part because other ways would require ifdef'ing on NET472. +#pragma warning disable CA1416 private static bool IsLongPathsEnabledRegistry() { using (RegistryKey fileSystemKey = Registry.LocalMachine.OpenSubKey(WINDOWS_FILE_SYSTEM_REGISTRY_KEY)) @@ -640,6 +643,7 @@ private static bool IsLongPathsEnabledRegistry() return fileSystemKey != null && Convert.ToInt32(longPathsEnabledValue) == 1; } } +#pragma warning restore CA1416 /// /// Cached value for IsUnixLike (this method is called frequently during evaluation). diff --git a/src/Tasks.UnitTests/AssemblyDependency/ResolveAssemblyReferenceTestFixture.cs b/src/Tasks.UnitTests/AssemblyDependency/ResolveAssemblyReferenceTestFixture.cs index 373805aa30f..e932aba587b 100644 --- a/src/Tasks.UnitTests/AssemblyDependency/ResolveAssemblyReferenceTestFixture.cs +++ b/src/Tasks.UnitTests/AssemblyDependency/ResolveAssemblyReferenceTestFixture.cs @@ -2493,6 +2493,7 @@ internal static AssemblyNameExtension[] GetDependencies(string path) }; } +#pragma warning disable CA1416 /// /// Registry access delegate. Given a hive and a view, return the registry base key. /// @@ -2901,6 +2902,7 @@ private static string GetRegistrySubKeyDefaultValue(RegistryKey baseKey, string Assert.True(false, $"New GetRegistrySubKeyDefaultValue parameters encountered, need to add unittesting support for subKey={subKey}"); return null; } +#pragma warning restore CA1416 /// /// Delegate for System.IO.File.GetLastWriteTime