diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 99f996ba5..9af81c6f3 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24252.4", + "version": "1.1.0-beta.24253.7", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0cf9a70a0..ab1dd7c27 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,41 +4,41 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - + https://github.com/dotnet/windowsdesktop - 41df5bac43211a04f80af1f8c61af99892b89956 + c88182f5ee0306d72a17b20a334bc90b558823f1 - + https://github.com/dotnet/windowsdesktop - 41df5bac43211a04f80af1f8c61af99892b89956 + c88182f5ee0306d72a17b20a334bc90b558823f1 - + https://github.com/dotnet/windowsdesktop - 41df5bac43211a04f80af1f8c61af99892b89956 + c88182f5ee0306d72a17b20a334bc90b558823f1 - + https://github.com/dotnet/windowsdesktop - 41df5bac43211a04f80af1f8c61af99892b89956 + c88182f5ee0306d72a17b20a334bc90b558823f1 - + https://github.com/dotnet/runtime - 15e98e58e6023be3121dcb0ed2e701d1d5cd098e + 84b33395057737db3ea342a5151feb6b90c1b6f6 - + https://github.com/dotnet/runtime - 15e98e58e6023be3121dcb0ed2e701d1d5cd098e + 84b33395057737db3ea342a5151feb6b90c1b6f6 - + https://github.com/dotnet/runtime - 15e98e58e6023be3121dcb0ed2e701d1d5cd098e + 84b33395057737db3ea342a5151feb6b90c1b6f6 - + https://github.com/dotnet/runtime - 15e98e58e6023be3121dcb0ed2e701d1d5cd098e + 84b33395057737db3ea342a5151feb6b90c1b6f6 - + https://github.com/dotnet/runtime - 15e98e58e6023be3121dcb0ed2e701d1d5cd098e + 84b33395057737db3ea342a5151feb6b90c1b6f6 @@ -46,70 +46,70 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 15e98e58e6023be3121dcb0ed2e701d1d5cd098e + 84b33395057737db3ea342a5151feb6b90c1b6f6 - + https://github.com/dotnet/runtime - 15e98e58e6023be3121dcb0ed2e701d1d5cd098e + 84b33395057737db3ea342a5151feb6b90c1b6f6 - + https://github.com/dotnet/aspnetcore - ed90662610b5770c9b0952d9c2db740388171bf3 + da3aa27233a2cec2f6780884f71934b2f5e686ce - + https://github.com/dotnet/aspnetcore - ed90662610b5770c9b0952d9c2db740388171bf3 + da3aa27233a2cec2f6780884f71934b2f5e686ce - + https://github.com/dotnet/aspnetcore - ed90662610b5770c9b0952d9c2db740388171bf3 + da3aa27233a2cec2f6780884f71934b2f5e686ce - + https://github.com/dotnet/aspnetcore - ed90662610b5770c9b0952d9c2db740388171bf3 + da3aa27233a2cec2f6780884f71934b2f5e686ce - + https://github.com/dotnet/aspnetcore - ed90662610b5770c9b0952d9c2db740388171bf3 + da3aa27233a2cec2f6780884f71934b2f5e686ce - + https://github.com/dotnet/aspnetcore - ed90662610b5770c9b0952d9c2db740388171bf3 + da3aa27233a2cec2f6780884f71934b2f5e686ce - + https://github.com/dotnet/aspnetcore - ed90662610b5770c9b0952d9c2db740388171bf3 + da3aa27233a2cec2f6780884f71934b2f5e686ce - + https://github.com/dotnet/aspnetcore - ed90662610b5770c9b0952d9c2db740388171bf3 + da3aa27233a2cec2f6780884f71934b2f5e686ce - + https://github.com/dotnet/sdk - 02da786118e1aa9b4abf2172d4873869cce3c63d + d7906efca66c3b5e58d5cd3baaf1f92e9fa17294 - + https://github.com/dotnet/sdk - 02da786118e1aa9b4abf2172d4873869cce3c63d + d7906efca66c3b5e58d5cd3baaf1f92e9fa17294 - + https://github.com/dotnet/sdk - 02da786118e1aa9b4abf2172d4873869cce3c63d + d7906efca66c3b5e58d5cd3baaf1f92e9fa17294 - + https://github.com/dotnet/sdk - 02da786118e1aa9b4abf2172d4873869cce3c63d + d7906efca66c3b5e58d5cd3baaf1f92e9fa17294 - + https://github.com/dotnet/sdk - 02da786118e1aa9b4abf2172d4873869cce3c63d + d7906efca66c3b5e58d5cd3baaf1f92e9fa17294 @@ -143,13 +143,13 @@ - + https://github.com/dotnet/winforms - 92b471d52558be26fcdffd5e18fb7d2b5c89e749 + c926856b3313d34df58e82c73675b4cf30b6e604 - + https://github.com/dotnet/wpf - 9cdf5e5d2de7ed379f3ae3fb6afc60761fac90c3 + 5a8619ac9bda541fcf0f6639f7efe6e234cc99eb https://github.com/dotnet/fsharp @@ -161,38 +161,38 @@ 3ef1cb25ffb292b5c87f9604d1a09b032277bf76 - + https://github.com/microsoft/vstest - bbdb1989acc0bda7bf1406393e6046cafcb5f810 + b521aa2c9c981f53b85af7c923175a850986173a - + https://github.com/microsoft/vstest - bbdb1989acc0bda7bf1406393e6046cafcb5f810 + b521aa2c9c981f53b85af7c923175a850986173a - + https://github.com/dotnet/runtime - 15e98e58e6023be3121dcb0ed2e701d1d5cd098e + 84b33395057737db3ea342a5151feb6b90c1b6f6 - + https://github.com/dotnet/roslyn - 26cb20e4b805e98f389f190409ed05c2980b3a0b + 062ad3db597a8096b5da2b188dbbbcc7f6137275 - + https://github.com/dotnet/roslyn - 26cb20e4b805e98f389f190409ed05c2980b3a0b + 062ad3db597a8096b5da2b188dbbbcc7f6137275 - + https://github.com/dotnet/msbuild - f25414599dcb07202a9f8bfd8125d04a6e5c14be + 66dcc32c3344eb76a422917dcb8c9e8f621e18fd - + https://github.com/dotnet/msbuild - f25414599dcb07202a9f8bfd8125d04a6e5c14be + 66dcc32c3344eb76a422917dcb8c9e8f621e18fd @@ -250,13 +250,13 @@ https://github.com/dotnet/arcade 020255bcf7d0b8beed7de05338d97396982ae527 - + https://github.com/dotnet/arcade-services - 26d74b389f60eb2fa6b3b53e33724419baf1752a + 05bd6da6bde53f18a8f1e8c516b778e3f86a5433 - + https://github.com/dotnet/arcade-services - 26d74b389f60eb2fa6b3b53e33724419baf1752a + 05bd6da6bde53f18a8f1e8c516b778e3f86a5433 https://github.com/dotnet/arcade @@ -272,9 +272,9 @@ https://github.com/dotnet/runtime ab1a8224cdf115b65e0db5dc88d11f205068f444 - + https://github.com/dotnet/source-build-reference-packages - c0b5d69a1a1513528c77fffff708c7502d57c35c + 9c1cc994f8123ec2a923c5179c238c13da1b4ab7 diff --git a/eng/Versions.props b/eng/Versions.props index 96202927b..edca74683 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,15 +43,15 @@ - 1.1.0-beta.24252.4 + 1.1.0-beta.24253.7 - 9.0.0-preview.5.24252.1 + 9.0.0-preview.5.24253.4 - 9.0.0-preview.5.24252.1 + 9.0.0-preview.5.24253.4 @@ -67,49 +67,49 @@ - 9.0.0-preview.5.24252.23 - 9.0.0-preview.5.24252.23 - 9.0.0-preview.5.24252.23 - 9.0.0-preview.5.24252.23 - 9.0.0-preview.5.24252.23 - 9.0.0-preview.5.24252.23 - 9.0.0-preview.5.24252.23 + 9.0.0-preview.5.24256.2 + 9.0.0-preview.5.24256.2 + 9.0.0-preview.5.24256.2 + 9.0.0-preview.5.24256.2 + 9.0.0-preview.5.24256.2 + 9.0.0-preview.5.24256.2 + 9.0.0-preview.5.24256.2 0.2.0 - 9.0.100-preview.5.24253.7 - 9.0.100-preview.5.24253.7 - 9.0.100-preview.5.24253.7 + 9.0.100-preview.5.24256.7 + 9.0.100-preview.5.24256.7 + 9.0.100-preview.5.24256.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.11.0-2.24253.1 + 4.11.0-2.24255.2 - 9.0.0-preview.5.24253.3 + 9.0.0-preview.5.24256.1 - 9.0.0-preview.5.24253.3 - 9.0.0-preview.5.24253.3 - 9.0.0-preview.5.24253.3 - 9.0.0-preview.5.24253.3 - 9.0.0-preview.5.24253.3 + 9.0.0-preview.5.24256.1 + 9.0.0-preview.5.24256.1 + 9.0.0-preview.5.24256.1 + 9.0.0-preview.5.24256.1 + 9.0.0-preview.5.24256.1 2.1.0 - 9.0.0-preview.5.24253.3 - 9.0.0-preview.5.24253.3 - 9.0.0-preview.5.24253.3 - 9.0.0-preview.5.24253.3 + 9.0.0-preview.5.24254.1 + 9.0.0-preview.5.24254.1 + 9.0.0-preview.5.24254.1 + 9.0.0-preview.5.24254.1 @@ -209,7 +209,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.11.0-preview-24253-01 + 17.11.0-preview-24253-02 9.0.0-alpha.1.24058.10 9.0.0-preview.24222.1 diff --git a/eng/pipelines/templates/jobs/vmr-build.yml b/eng/pipelines/templates/jobs/vmr-build.yml index c4783027c..f3b0e2a25 100644 --- a/eng/pipelines/templates/jobs/vmr-build.yml +++ b/eng/pipelines/templates/jobs/vmr-build.yml @@ -366,7 +366,7 @@ jobs: # Only run tests if enabled # TODO: Remove the PullRequest condition after the next re-bootstrap: https://github.com/dotnet/source-build/issues/4362 - - ${{ if and(eq(parameters.runTests, 'True'), eq(variables['Build.Reason'], 'PullRequest')) }}: + - ${{ if eq(parameters.runTests, 'True') }}: - script: | set -ex