diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 788a59fffd48..02fa1560b148 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,98 +6,98 @@ This file should be imported by eng/Versions.props - 11.0.0-preview.4.26215.121 - 11.0.0-preview.4.26215.121 - 11.0.0-preview.4.26215.121 - 11.0.0-beta.26215.121 - 11.0.0-beta.26215.121 - 11.0.0-beta.26215.121 - 11.0.0-beta.26215.121 - 11.0.0-beta.26215.121 - 11.0.0-beta.26215.121 - 11.0.0-beta.26215.121 - 11.0.0-preview.4.26215.121 - 11.0.0-preview.4.26215.121 - 11.0.0-preview.4.26215.121 - 11.0.0-preview.4.26215.121 - 11.0.0-preview.4.26215.121 - 11.0.0-preview.4.26215.121 - 11.0.0-preview.4.26215.121 - 11.0.0-preview.4.26215.121 - 11.0.0-preview.4.26215.121 - 11.0.0-preview.4.26215.121 - 11.0.0-preview.4.26215.121 - 11.0.0-preview.4.26215.121 - 11.0.0-preview.4.26215.121 - 11.0.0-preview.4.26215.121 - 11.0.0-preview.4.26215.121 - 11.0.0-preview.4.26215.121 - 11.0.0-preview.4.26215.121 - 11.0.0-preview.4.26215.121 - 11.0.0-preview.4.26215.121 - 11.0.0-preview.4.26215.121 - 11.0.0-preview.4.26215.121 - 11.0.0-preview.4.26215.121 - 11.0.0-preview.4.26215.121 - 11.0.0-preview.4.26215.121 - 11.0.0-preview.4.26215.121 - 11.0.0-preview.4.26215.121 - 11.0.0-preview.4.26215.121 - 11.0.0-preview.4.26215.121 - 11.0.0-preview.4.26215.121 - 11.0.0-preview.4.26215.121 - 11.0.0-preview.4.26215.121 - 11.0.0-preview.4.26215.121 - 11.0.0-preview.4.26215.121 - 11.0.0-preview.4.26215.121 - 11.0.0-preview.4.26215.121 - 11.0.0-preview.4.26215.121 - 11.0.0-preview.4.26215.121 - 11.0.0-preview.4.26215.121 - 11.0.0-preview.4.26215.121 - 11.0.0-preview.4.26215.121 - 11.0.0-preview.4.26215.121 - 11.0.0-preview.4.26215.121 - 11.0.0-preview.4.26215.121 - 11.0.0-preview.4.26215.121 - 11.0.0-preview.4.26215.121 - 11.0.0-preview.4.26215.121 - 11.0.0-preview.4.26215.121 - 11.0.0-preview.4.26215.121 - 11.0.0-preview.4.26215.121 - 11.0.0-preview.4.26215.121 - 3.3.0-preview.4.26215.121 - 7.7.0-rc.21621 - 7.7.0-rc.21621 - 7.7.0-rc.21621 - 11.0.0-preview.4.26215.121 - 11.0.0-preview.4.26215.121 - 11.0.0-preview.4.26215.121 - 11.0.0-preview.4.26215.121 - 11.0.0-preview.4.26215.121 - 11.0.0-preview.4.26215.121 - 11.0.0-preview.4.26215.121 - 11.0.0-preview.4.26215.121 - 11.0.0-preview.4.26215.121 - 11.0.0-preview.4.26215.121 - 11.0.0-preview.4.26215.121 - 11.0.0-preview.4.26215.121 - 11.0.0-preview.4.26215.121 - 11.0.0-preview.4.26215.121 - 11.0.0-preview.4.26215.121 - 11.0.0-preview.4.26215.121 - 11.0.0-preview.4.26215.121 - 11.0.0-preview.4.26215.121 - 11.0.0-preview.4.26215.121 - 11.0.0-preview.4.26215.121 - 11.0.0-preview.4.26215.121 - 11.0.0-preview.4.26215.121 - 11.0.0-preview.4.26215.121 - 11.0.0-preview.4.26215.121 - 11.0.0-preview.4.26215.121 - 11.0.0-preview.4.26215.121 - 11.0.0-preview.4.26215.121 - 11.0.0-preview.4.26215.121 + 11.0.0-preview.4.26224.104 + 11.0.0-preview.4.26224.104 + 11.0.0-preview.4.26224.104 + 11.0.0-beta.26224.104 + 11.0.0-beta.26224.104 + 11.0.0-beta.26224.104 + 11.0.0-beta.26224.104 + 11.0.0-beta.26224.104 + 11.0.0-beta.26224.104 + 11.0.0-beta.26224.104 + 11.0.0-preview.4.26224.104 + 11.0.0-preview.4.26224.104 + 11.0.0-preview.4.26224.104 + 11.0.0-preview.4.26224.104 + 11.0.0-preview.4.26224.104 + 11.0.0-preview.4.26224.104 + 11.0.0-preview.4.26224.104 + 11.0.0-preview.4.26224.104 + 11.0.0-preview.4.26224.104 + 11.0.0-preview.4.26224.104 + 11.0.0-preview.4.26224.104 + 11.0.0-preview.4.26224.104 + 11.0.0-preview.4.26224.104 + 11.0.0-preview.4.26224.104 + 11.0.0-preview.4.26224.104 + 11.0.0-preview.4.26224.104 + 11.0.0-preview.4.26224.104 + 11.0.0-preview.4.26224.104 + 11.0.0-preview.4.26224.104 + 11.0.0-preview.4.26224.104 + 11.0.0-preview.4.26224.104 + 11.0.0-preview.4.26224.104 + 11.0.0-preview.4.26224.104 + 11.0.0-preview.4.26224.104 + 11.0.0-preview.4.26224.104 + 11.0.0-preview.4.26224.104 + 11.0.0-preview.4.26224.104 + 11.0.0-preview.4.26224.104 + 11.0.0-preview.4.26224.104 + 11.0.0-preview.4.26224.104 + 11.0.0-preview.4.26224.104 + 11.0.0-preview.4.26224.104 + 11.0.0-preview.4.26224.104 + 11.0.0-preview.4.26224.104 + 11.0.0-preview.4.26224.104 + 11.0.0-preview.4.26224.104 + 11.0.0-preview.4.26224.104 + 11.0.0-preview.4.26224.104 + 11.0.0-preview.4.26224.104 + 11.0.0-preview.4.26224.104 + 11.0.0-preview.4.26224.104 + 11.0.0-preview.4.26224.104 + 11.0.0-preview.4.26224.104 + 11.0.0-preview.4.26224.104 + 11.0.0-preview.4.26224.104 + 11.0.0-preview.4.26224.104 + 11.0.0-preview.4.26224.104 + 11.0.0-preview.4.26224.104 + 11.0.0-preview.4.26224.104 + 11.0.0-preview.4.26224.104 + 3.3.0-preview.4.26224.104 + 7.7.0-rc.22504 + 7.7.0-rc.22504 + 7.7.0-rc.22504 + 11.0.0-preview.4.26224.104 + 11.0.0-preview.4.26224.104 + 11.0.0-preview.4.26224.104 + 11.0.0-preview.4.26224.104 + 11.0.0-preview.4.26224.104 + 11.0.0-preview.4.26224.104 + 11.0.0-preview.4.26224.104 + 11.0.0-preview.4.26224.104 + 11.0.0-preview.4.26224.104 + 11.0.0-preview.4.26224.104 + 11.0.0-preview.4.26224.104 + 11.0.0-preview.4.26224.104 + 11.0.0-preview.4.26224.104 + 11.0.0-preview.4.26224.104 + 11.0.0-preview.4.26224.104 + 11.0.0-preview.4.26224.104 + 11.0.0-preview.4.26224.104 + 11.0.0-preview.4.26224.104 + 11.0.0-preview.4.26224.104 + 11.0.0-preview.4.26224.104 + 11.0.0-preview.4.26224.104 + 11.0.0-preview.4.26224.104 + 11.0.0-preview.4.26224.104 + 11.0.0-preview.4.26224.104 + 11.0.0-preview.4.26224.104 + 11.0.0-preview.4.26224.104 + 11.0.0-preview.4.26224.104 + 11.0.0-preview.4.26224.104 10.6.0-preview.1.26215.2 10.6.0-preview.1.26215.2 @@ -219,9 +219,9 @@ This file should be imported by eng/Versions.props $(MicrosoftExtensionsCachingHybridPackageVersion) $(MicrosoftExtensionsDiagnosticsTestingPackageVersion) - $(MicrosoftExtensionsTimeProviderTestingPackageVersion) $(MicrosoftExtensionsServiceDiscoveryPackageVersion) $(MicrosoftExtensionsServiceDiscoveryYarpPackageVersion) + $(MicrosoftExtensionsTimeProviderTestingPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildFrameworkPackageVersion) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 00ce9d44155b..7d3ed33cd10d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -8,333 +8,333 @@ See https://github.com/dotnet/arcade/blob/master/Documentation/Darc.md for instructions on using darc. --> - + - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 @@ -358,37 +358,37 @@ - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 https://github.com/dotnet/extensions @@ -448,17 +448,17 @@ https://github.com/dotnet/msbuild d1cce8d7cc03c23a4f1bad8e9240714fd9d199a3 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 - + https://github.com/dotnet/dotnet - ab01524bbb2ef1eea0ffaef161b3ef5686e8f256 + c04bdfe301317064b6ebc9738c274e28f98377a6 diff --git a/eng/Versions.props b/eng/Versions.props index 0aac744e93b8..3fd7fdf1fb7b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -194,7 +194,6 @@ 1.58.0 2.3.0 - $(MicrosoftExtensionsServiceDiscoveryVersion) 7.0.0 1.0.0 3.3.1 diff --git a/eng/common/core-templates/post-build/post-build.yml b/eng/common/core-templates/post-build/post-build.yml index fcf40d1d2e69..8aa86e304919 100644 --- a/eng/common/core-templates/post-build/post-build.yml +++ b/eng/common/core-templates/post-build/post-build.yml @@ -225,7 +225,7 @@ stages: displayName: Validate inputs: filePath: eng\common\sdk-task.ps1 - arguments: -task SigningValidation -restore + arguments: -task SigningValidation -restore -msbuildEngine dotnet /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts' /p:SignCheckExclusionsFile='$(System.DefaultWorkingDirectory)/eng/SignCheckExclusionsFile.txt' ${{ parameters.signingValidationAdditionalParameters }} diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index d1ca56d84575..65adefc7f268 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -185,7 +185,11 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) { if ((-not $globalJsonHasRuntimes) -and (-not [string]::IsNullOrEmpty($env:DOTNET_INSTALL_DIR)) -and (Test-Path(Join-Path $env:DOTNET_INSTALL_DIR "sdk\$dotnetSdkVersion"))) { $dotnetRoot = $env:DOTNET_INSTALL_DIR } else { - $dotnetRoot = Join-Path $RepoRoot '.dotnet' + if (-not [string]::IsNullOrEmpty($env:DOTNET_GLOBAL_INSTALL_DIR)) { + $dotnetRoot = $env:DOTNET_GLOBAL_INSTALL_DIR + } else { + $dotnetRoot = Join-Path $RepoRoot '.dotnet' + } if (-not (Test-Path(Join-Path $dotnetRoot "sdk\$dotnetSdkVersion"))) { if ($install) { @@ -677,9 +681,19 @@ function InitializeToolset() { } $downloadArgs = @("package", "download", "Microsoft.DotNet.Arcade.Sdk@$toolsetVersion", "--verbosity", "minimal", "--prerelease", "--output", "$nugetCache") - if ($env:NUGET_CONFIG) { + $nugetConfig = $env:NUGET_CONFIG + if (-not $nugetConfig) { + # Search for any variation of nuget.config in the RepoRoot + $configFile = Get-ChildItem -Path $RepoRoot -File | Where-Object { $_.Name -ieq "nuget.config" } | Select-Object -First 1 + + if ($configFile) { + $nugetConfig = $configFile.FullName + } + } + + if ($nugetConfig) { $downloadArgs += "--configfile" - $downloadArgs += $env:NUGET_CONFIG + $downloadArgs += $nugetConfig } DotNet @downloadArgs diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 22341be2cc6c..95c55ce9b4d9 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -148,7 +148,11 @@ function InitializeDotNetCli { if [[ $global_json_has_runtimes == false && -n "${DOTNET_INSTALL_DIR:-}" && -d "$DOTNET_INSTALL_DIR/sdk/$dotnet_sdk_version" ]]; then dotnet_root="$DOTNET_INSTALL_DIR" else - dotnet_root="${repo_root}.dotnet" + if [[ -n "${DOTNET_GLOBAL_INSTALL_DIR:-}" ]]; then + dotnet_root="$DOTNET_GLOBAL_INSTALL_DIR" + else + dotnet_root="${repo_root}.dotnet" + fi export DOTNET_INSTALL_DIR="$dotnet_root" @@ -427,8 +431,19 @@ function InitializeToolset { fi local download_args=("package" "download" "Microsoft.DotNet.Arcade.Sdk@$toolset_version" "--verbosity" "minimal" "--prerelease" "--output" "$_GetNuGetPackageCachePath") - if [[ -n "${NUGET_CONFIG:-}" ]]; then - download_args+=("--configfile" "$NUGET_CONFIG") + local nuget_config="${NUGET_CONFIG:-}" + if [[ -z "$nuget_config" ]]; then + # Search for any variation of nuget.config in the RepoRoot + local found_config + found_config=$(find "$repo_root" -maxdepth 1 -type f -iname "nuget.config" -print -quit) + + if [[ -n "$found_config" ]]; then + nuget_config="$found_config" + fi + fi + + if [[ -n "$nuget_config" ]]; then + download_args+=("--configfile" "$nuget_config") fi DotNet "${download_args[@]}" diff --git a/global.json b/global.json index e4b1e0acbb96..53d49c69cd40 100644 --- a/global.json +++ b/global.json @@ -22,9 +22,9 @@ "jdk": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26215.121", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26215.121", - "Microsoft.DotNet.SharedFramework.Sdk": "11.0.0-beta.26215.121", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26224.104", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26224.104", + "Microsoft.DotNet.SharedFramework.Sdk": "11.0.0-beta.26224.104", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.WixToolset.Sdk": "6.0.3-dotnet.4" diff --git a/src/Components/Testing/src/Microsoft.AspNetCore.Components.Testing.csproj b/src/Components/Testing/src/Microsoft.AspNetCore.Components.Testing.csproj index 2f3356435c08..54c766267423 100644 --- a/src/Components/Testing/src/Microsoft.AspNetCore.Components.Testing.csproj +++ b/src/Components/Testing/src/Microsoft.AspNetCore.Components.Testing.csproj @@ -30,9 +30,7 @@ - -