From ea032fa0132bfc639371c7b0e67d9e680c0fd323 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 23 Jul 2021 22:21:47 +0000 Subject: [PATCH 1/4] Update dependencies from https://github.com/dotnet/arcade build 20210722.16 Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.GenFacades , Microsoft.DotNet.GenAPI , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SharedFramework.Sdk From Version 6.0.0-beta.21364.3 -> To Version 6.0.0-beta.21372.16 --- eng/Version.Details.xml | 72 ++++++++++----------- eng/Versions.props | 28 ++++---- eng/common/templates/steps/source-build.yml | 6 ++ global.json | 12 ++-- 4 files changed, 62 insertions(+), 56 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6dd7101ab3fbad..8ebe3b0ab4d923 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,73 +14,73 @@ - + https://github.com/dotnet/arcade - 6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1 + 6224d1b573b73caaa84176bd83dabe75f202cdc7 - + https://github.com/dotnet/arcade - 6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1 + 6224d1b573b73caaa84176bd83dabe75f202cdc7 - + https://github.com/dotnet/arcade - 6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1 + 6224d1b573b73caaa84176bd83dabe75f202cdc7 - + https://github.com/dotnet/arcade - 6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1 + 6224d1b573b73caaa84176bd83dabe75f202cdc7 - + https://github.com/dotnet/arcade - 6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1 + 6224d1b573b73caaa84176bd83dabe75f202cdc7 - + https://github.com/dotnet/arcade - 6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1 + 6224d1b573b73caaa84176bd83dabe75f202cdc7 - + https://github.com/dotnet/arcade - 6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1 + 6224d1b573b73caaa84176bd83dabe75f202cdc7 - + https://github.com/dotnet/arcade - 6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1 + 6224d1b573b73caaa84176bd83dabe75f202cdc7 - + https://github.com/dotnet/arcade - 6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1 + 6224d1b573b73caaa84176bd83dabe75f202cdc7 - + https://github.com/dotnet/arcade - 6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1 + 6224d1b573b73caaa84176bd83dabe75f202cdc7 - + https://github.com/dotnet/arcade - 6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1 + 6224d1b573b73caaa84176bd83dabe75f202cdc7 - + https://github.com/dotnet/arcade - e97027cf100d2b532adce387e5cb93a373de93c9 + 6224d1b573b73caaa84176bd83dabe75f202cdc7 - + https://github.com/dotnet/arcade - 6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1 + 6224d1b573b73caaa84176bd83dabe75f202cdc7 - + https://github.com/dotnet/arcade - 6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1 + 6224d1b573b73caaa84176bd83dabe75f202cdc7 - + https://github.com/dotnet/arcade - 6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1 + 6224d1b573b73caaa84176bd83dabe75f202cdc7 - + https://github.com/dotnet/arcade - 6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1 + 6224d1b573b73caaa84176bd83dabe75f202cdc7 - + https://github.com/dotnet/arcade - 6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1 + 6224d1b573b73caaa84176bd83dabe75f202cdc7 https://github.com/microsoft/vstest @@ -198,9 +198,9 @@ https://github.com/dotnet/xharness e5511489deb44b13418fe622775bd7035e21c5ae - + https://github.com/dotnet/arcade - 6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1 + 6224d1b573b73caaa84176bd83dabe75f202cdc7 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index d928ac87ece65d..e4f60d6dd5cd00 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,20 +52,20 @@ 3.10.0 6.0.0-rc1.21362.2 - 6.0.0-beta.21364.3 - 6.0.0-beta.21364.3 - 6.0.0-beta.21364.3 - 6.0.0-beta.21364.3 - 6.0.0-beta.21364.3 - 6.0.0-beta.21364.3 - 2.5.1-beta.21364.3 - 6.0.0-beta.21364.3 - 6.0.0-beta.21364.3 - 6.0.0-beta.21369.3 - 6.0.0-beta.21369.3 - 6.0.0-beta.21364.3 - 6.0.0-beta.21364.3 - 6.0.0-beta.21364.3 + 6.0.0-beta.21372.16 + 6.0.0-beta.21372.16 + 6.0.0-beta.21372.16 + 6.0.0-beta.21372.16 + 6.0.0-beta.21372.16 + 6.0.0-beta.21372.16 + 2.5.1-beta.21372.16 + 6.0.0-beta.21372.16 + 6.0.0-beta.21372.16 + 6.0.0-beta.21372.16 + 6.0.0-beta.21372.16 + 6.0.0-beta.21372.16 + 6.0.0-beta.21372.16 + 6.0.0-beta.21372.16 6.0.0-preview.1.102 diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml index e20637ed6a177d..705b7a1c847b99 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 379263436c7601..8c18acbc861ddb 100644 --- a/global.json +++ b/global.json @@ -1,22 +1,22 @@ { "sdk": { - "version": "6.0.100-preview.4.21255.9", + "version": "6.0.100-preview.6.21355.2", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "6.0.100-preview.4.21255.9" + "dotnet": "6.0.100-preview.6.21355.2" }, "native-tools": { "cmake": "3.16.4", "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21364.3", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21372.16", "Microsoft.DotNet.PackageValidation": "1.0.0-preview.7.21352.4", - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21364.3", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21364.3", - "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21364.3", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21372.16", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21372.16", + "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21372.16", "Microsoft.Build.NoTargets": "3.0.4", "Microsoft.Build.Traversal": "3.0.23", "Microsoft.NET.Sdk.IL": "6.0.0-preview.7.21361.10" From a8473766e3c48e6042eaffa37c87763b4df8889a Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Fri, 23 Jul 2021 15:23:58 -0700 Subject: [PATCH 2/4] Revert .NET SDK version. --- global.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/global.json b/global.json index 8c18acbc861ddb..2e32f512e4b87c 100644 --- a/global.json +++ b/global.json @@ -1,11 +1,11 @@ { "sdk": { - "version": "6.0.100-preview.6.21355.2", + "version": "6.0.100-preview.4.21255.9", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "6.0.100-preview.6.21355.2" + "dotnet": "6.0.100-preview.4.21255.9" }, "native-tools": { "cmake": "3.16.4", From accafed18e47bc09eac82bf31b8a37c9735fe0d0 Mon Sep 17 00:00:00 2001 From: Eric StJohn Date: Tue, 20 Jul 2021 10:36:08 -0700 Subject: [PATCH 3/4] Prepare for arcade changes that enable testing of meta-packages (#55976) --- .../workaroundDowngrade.targets | 6 ++++++ src/libraries/pkg/test/testPackages.proj | 2 ++ 2 files changed, 8 insertions(+) create mode 100644 src/libraries/pkg/test/packageSettings/Microsoft.Windows.Compatibility/workaroundDowngrade.targets diff --git a/src/libraries/pkg/test/packageSettings/Microsoft.Windows.Compatibility/workaroundDowngrade.targets b/src/libraries/pkg/test/packageSettings/Microsoft.Windows.Compatibility/workaroundDowngrade.targets new file mode 100644 index 00000000000000..eed2ad859c39b3 --- /dev/null +++ b/src/libraries/pkg/test/packageSettings/Microsoft.Windows.Compatibility/workaroundDowngrade.targets @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/libraries/pkg/test/testPackages.proj b/src/libraries/pkg/test/testPackages.proj index 83ad6233b64328..e4080b6116eb20 100644 --- a/src/libraries/pkg/test/testPackages.proj +++ b/src/libraries/pkg/test/testPackages.proj @@ -33,6 +33,8 @@ + + From 8ebb92e483002b73a20c77fe51e4d30c02cad861 Mon Sep 17 00:00:00 2001 From: Eric StJohn Date: Wed, 21 Jul 2021 15:54:29 -0700 Subject: [PATCH 4/4] Fix package testing --- .../pkg/test/build/packageTest.targets | 14 ++------------ .../netstandard2.1/settings.targets | 17 +++++++++++++++++ .../settings.targets | 5 +++++ 3 files changed, 24 insertions(+), 12 deletions(-) create mode 100644 src/libraries/pkg/test/packageSettings/Microsoft.Windows.Compatibility/netstandard2.1/settings.targets create mode 100644 src/libraries/pkg/test/packageSettings/System.Runtime.Experimental/settings.targets diff --git a/src/libraries/pkg/test/build/packageTest.targets b/src/libraries/pkg/test/build/packageTest.targets index 28f5cc0240a7c2..8bffafc8e918d2 100644 --- a/src/libraries/pkg/test/build/packageTest.targets +++ b/src/libraries/pkg/test/build/packageTest.targets @@ -74,16 +74,6 @@ - - - - - @@ -104,7 +94,7 @@ Inputs="%(RuntimeLibToTest.RuntimeIdentifier)" Outputs="unused" DependsOnTargets="PrepareForRuntimeTesting" - Condition="'$(ShouldVerifyClosure)' == 'true' and '$(SkipVerifyClosureForRuntime)' != 'true'"> + Condition="'$(ShouldVerifyClosure)' == 'true' and '$(SkipVerifyClosureForRuntime)' != 'true' and '$(SkipVerifyRuntime)' != 'true'"> <_runClosureFileNames Include="@(RuntimeLibToTestDependency->'%(FileName)');@(RuntimeLibToTest->'%(FileName)')"> @@ -123,7 +113,7 @@ Inputs="%(RuntimeLibToTest.RuntimeIdentifier)" Outputs="unused" DependsOnTargets="PrepareForRuntimeTesting" - Condition="'$(ShouldVerifyTypes)' == 'true'"> + Condition="'$(ShouldVerifyTypes)' == 'true' and '$(SkipVerifyRuntime)' != 'true'"> <_runTypesFileNames Include="@(RuntimeLibToTestDependency->'%(FileName)');@(RuntimeLibToTest->'%(FileName)')"> diff --git a/src/libraries/pkg/test/packageSettings/Microsoft.Windows.Compatibility/netstandard2.1/settings.targets b/src/libraries/pkg/test/packageSettings/Microsoft.Windows.Compatibility/netstandard2.1/settings.targets new file mode 100644 index 00000000000000..6757b2ae2bc7c1 --- /dev/null +++ b/src/libraries/pkg/test/packageSettings/Microsoft.Windows.Compatibility/netstandard2.1/settings.targets @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/libraries/pkg/test/packageSettings/System.Runtime.Experimental/settings.targets b/src/libraries/pkg/test/packageSettings/System.Runtime.Experimental/settings.targets new file mode 100644 index 00000000000000..eaa4cdfb1bb52c --- /dev/null +++ b/src/libraries/pkg/test/packageSettings/System.Runtime.Experimental/settings.targets @@ -0,0 +1,5 @@ + + + true + + \ No newline at end of file