diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 85fd3e4cf6c5cd..b96d58bf366d16 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "1.0.0-prerelease.21364.1", + "version": "1.0.0-prerelease.21370.1", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2ba88ba501a960..2f2190618a1115 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,113 +14,113 @@ - + https://github.com/dotnet/arcade - e97027cf100d2b532adce387e5cb93a373de93c9 + 89806f0b9e93ad2bbe32c654412835c0801a2032 - + https://github.com/dotnet/arcade - e97027cf100d2b532adce387e5cb93a373de93c9 + 89806f0b9e93ad2bbe32c654412835c0801a2032 - + https://github.com/dotnet/arcade - e97027cf100d2b532adce387e5cb93a373de93c9 + 89806f0b9e93ad2bbe32c654412835c0801a2032 - + https://github.com/dotnet/arcade - e97027cf100d2b532adce387e5cb93a373de93c9 + 89806f0b9e93ad2bbe32c654412835c0801a2032 - + https://github.com/dotnet/arcade - e97027cf100d2b532adce387e5cb93a373de93c9 + 89806f0b9e93ad2bbe32c654412835c0801a2032 - + https://github.com/dotnet/arcade - e97027cf100d2b532adce387e5cb93a373de93c9 + 89806f0b9e93ad2bbe32c654412835c0801a2032 - + https://github.com/dotnet/arcade - e97027cf100d2b532adce387e5cb93a373de93c9 + 89806f0b9e93ad2bbe32c654412835c0801a2032 - + https://github.com/dotnet/arcade - e97027cf100d2b532adce387e5cb93a373de93c9 + 89806f0b9e93ad2bbe32c654412835c0801a2032 - + https://github.com/dotnet/arcade - e97027cf100d2b532adce387e5cb93a373de93c9 + 89806f0b9e93ad2bbe32c654412835c0801a2032 - + https://github.com/dotnet/arcade - e97027cf100d2b532adce387e5cb93a373de93c9 + 89806f0b9e93ad2bbe32c654412835c0801a2032 - + https://github.com/dotnet/arcade - e97027cf100d2b532adce387e5cb93a373de93c9 + 89806f0b9e93ad2bbe32c654412835c0801a2032 - + https://github.com/dotnet/arcade - e97027cf100d2b532adce387e5cb93a373de93c9 + 89806f0b9e93ad2bbe32c654412835c0801a2032 - + https://github.com/dotnet/arcade - e97027cf100d2b532adce387e5cb93a373de93c9 + 89806f0b9e93ad2bbe32c654412835c0801a2032 - + https://github.com/dotnet/arcade - e97027cf100d2b532adce387e5cb93a373de93c9 + 89806f0b9e93ad2bbe32c654412835c0801a2032 - + https://github.com/dotnet/arcade - e97027cf100d2b532adce387e5cb93a373de93c9 + 89806f0b9e93ad2bbe32c654412835c0801a2032 - + https://github.com/dotnet/arcade - e97027cf100d2b532adce387e5cb93a373de93c9 + 89806f0b9e93ad2bbe32c654412835c0801a2032 - + https://github.com/dotnet/arcade - e97027cf100d2b532adce387e5cb93a373de93c9 + 89806f0b9e93ad2bbe32c654412835c0801a2032 https://github.com/microsoft/vstest 140434f7109d357d0158ade9e5164a4861513965 - + https://github.com/dotnet/runtime-assets - 8693e5f9d69ddf21543072fca8e4314b9f5e0682 + bcfd1993de3767c54c6d8a522bf63770fba3c98d - + https://github.com/dotnet/runtime-assets - 8693e5f9d69ddf21543072fca8e4314b9f5e0682 + bcfd1993de3767c54c6d8a522bf63770fba3c98d - + https://github.com/dotnet/runtime-assets - 8693e5f9d69ddf21543072fca8e4314b9f5e0682 + bcfd1993de3767c54c6d8a522bf63770fba3c98d - + https://github.com/dotnet/runtime-assets - 8693e5f9d69ddf21543072fca8e4314b9f5e0682 + bcfd1993de3767c54c6d8a522bf63770fba3c98d - + https://github.com/dotnet/runtime-assets - 8693e5f9d69ddf21543072fca8e4314b9f5e0682 + bcfd1993de3767c54c6d8a522bf63770fba3c98d - + https://github.com/dotnet/runtime-assets - 8693e5f9d69ddf21543072fca8e4314b9f5e0682 + bcfd1993de3767c54c6d8a522bf63770fba3c98d - + https://github.com/dotnet/runtime-assets - 8693e5f9d69ddf21543072fca8e4314b9f5e0682 + bcfd1993de3767c54c6d8a522bf63770fba3c98d - + https://github.com/dotnet/runtime-assets - 8693e5f9d69ddf21543072fca8e4314b9f5e0682 + bcfd1993de3767c54c6d8a522bf63770fba3c98d - + https://github.com/dotnet/runtime-assets - 8693e5f9d69ddf21543072fca8e4314b9f5e0682 + bcfd1993de3767c54c6d8a522bf63770fba3c98d https://github.com/dotnet/llvm-project @@ -190,41 +190,41 @@ https://github.com/mono/linker 6eae01980dc694107bdee0bc723d75a0dd601f0e - + https://github.com/dotnet/xharness - e5511489deb44b13418fe622775bd7035e21c5ae + aa0da55569eaa42c2c735dd89abd2843fba4fe01 - + https://github.com/dotnet/xharness - e5511489deb44b13418fe622775bd7035e21c5ae + aa0da55569eaa42c2c735dd89abd2843fba4fe01 - + https://github.com/dotnet/arcade - e97027cf100d2b532adce387e5cb93a373de93c9 + 89806f0b9e93ad2bbe32c654412835c0801a2032 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - d77585ed642412eb5e2c36bec4c626aef387060e + 2e172488a9ee56619a08c8303a708e69dc82503e - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - d77585ed642412eb5e2c36bec4c626aef387060e + 2e172488a9ee56619a08c8303a708e69dc82503e - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - d77585ed642412eb5e2c36bec4c626aef387060e + 2e172488a9ee56619a08c8303a708e69dc82503e - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - d77585ed642412eb5e2c36bec4c626aef387060e + 2e172488a9ee56619a08c8303a708e69dc82503e https://github.com/dotnet/hotreload-utils 589840a79ed6335a310a011ee9e244e660798cf5 - + https://github.com/dotnet/runtime-assets - 8693e5f9d69ddf21543072fca8e4314b9f5e0682 + bcfd1993de3767c54c6d8a522bf63770fba3c98d https://github.com/dotnet/roslyn-analyzers diff --git a/eng/Versions.props b/eng/Versions.props index eac0a300b1d879..ecd7f036d099fc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,22 +52,20 @@ 3.10.0 6.0.0-rc1.21366.2 - 6.0.0-beta.21369.3 - 6.0.0-beta.21369.3 - 6.0.0-beta.21369.3 - 6.0.0-beta.21369.3 - 6.0.0-beta.21369.3 - 6.0.0-beta.21369.3 - 2.5.1-beta.21369.3 - 6.0.0-beta.21369.3 - 6.0.0-beta.21369.3 - 6.0.0-beta.21369.3 - 6.0.0-beta.21369.3 - 6.0.0-beta.21369.3 - 6.0.0-beta.21369.3 - 6.0.0-beta.21369.3 - 6.0.0-beta.21369.3 - 6.0.0-beta.21369.3 + 6.0.0-beta.21370.12 + 6.0.0-beta.21370.12 + 6.0.0-beta.21370.12 + 6.0.0-beta.21370.12 + 6.0.0-beta.21370.12 + 6.0.0-beta.21370.12 + 2.5.1-beta.21370.12 + 6.0.0-beta.21370.12 + 6.0.0-beta.21370.12 + 6.0.0-beta.21370.12 + 6.0.0-beta.21370.12 + 6.0.0-beta.21370.12 + 6.0.0-beta.21370.12 + 6.0.0-beta.21370.12 6.0.0-preview.1.102 @@ -116,21 +114,21 @@ 4.5.0 6.0.0-rc.1.21369.2 - 6.0.0-beta.21369.1 - 6.0.0-beta.21369.1 - 6.0.0-beta.21369.1 - 6.0.0-beta.21369.1 - 6.0.0-beta.21369.1 - 6.0.0-beta.21369.1 - 6.0.0-beta.21369.1 - 6.0.0-beta.21369.1 - 6.0.0-beta.21369.1 - 6.0.0-beta.21369.1 + 6.0.0-beta.21371.1 + 6.0.0-beta.21371.1 + 6.0.0-beta.21371.1 + 6.0.0-beta.21371.1 + 6.0.0-beta.21371.1 + 6.0.0-beta.21371.1 + 6.0.0-beta.21371.1 + 6.0.0-beta.21371.1 + 6.0.0-beta.21371.1 + 6.0.0-beta.21371.1 - 1.0.0-prerelease.21367.5 - 1.0.0-prerelease.21367.5 - 1.0.0-prerelease.21367.5 - 1.0.0-prerelease.21367.5 + 1.0.0-prerelease.21371.3 + 1.0.0-prerelease.21371.3 + 1.0.0-prerelease.21371.3 + 1.0.0-prerelease.21371.3 16.9.0-beta1.21055.5 2.0.0-beta1.20253.1 @@ -154,8 +152,8 @@ 1.0.1-prerelease-00006 16.9.0-preview-20201201-01 - 1.0.0-prerelease.21364.1 - 1.0.0-prerelease.21364.1 + 1.0.0-prerelease.21370.1 + 1.0.0-prerelease.21370.1 1.0.1-alpha.0.21369.1 2.4.1 2.4.2 diff --git a/global.json b/global.json index 863e9ef68eb4be..64d00112833c92 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.21369.3", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21370.12", "Microsoft.DotNet.PackageValidation": "1.0.0-preview.7.21352.4", - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21369.3", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21369.3", - "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21369.3", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21370.12", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21370.12", + "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21370.12", "Microsoft.Build.NoTargets": "3.0.4", "Microsoft.Build.Traversal": "3.0.23", "Microsoft.NET.Sdk.IL": "6.0.0-rc.1.21369.2" 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