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..2e32f512e4b87c 100644 --- a/global.json +++ b/global.json @@ -12,11 +12,11 @@ "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" 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/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/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 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 @@ + +