diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 9a6b043f0ff5e6..a63a455be2a24e 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "1.0.0-prerelease.21214.1", + "version": "1.0.0-prerelease.21216.1", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9b83928c7a9ea0..b4147135161c77 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,74 +1,74 @@ - + https://github.com/dotnet/icu - 313017d0effca6e8ade5fefc8e580224e65d8525 + 032ffcab30edde31f2274f6e5613254b84cc7fa4 - + https://github.com/dotnet/arcade - db49d790a4bfa977a9ed7436bf2aa242cefae45e + 53fe29e220fc0db05eafd5c6bc6c8fb9ee7cec7c - + https://github.com/dotnet/arcade - db49d790a4bfa977a9ed7436bf2aa242cefae45e + 53fe29e220fc0db05eafd5c6bc6c8fb9ee7cec7c - + https://github.com/dotnet/arcade - db49d790a4bfa977a9ed7436bf2aa242cefae45e + 53fe29e220fc0db05eafd5c6bc6c8fb9ee7cec7c - + https://github.com/dotnet/arcade - db49d790a4bfa977a9ed7436bf2aa242cefae45e + 53fe29e220fc0db05eafd5c6bc6c8fb9ee7cec7c - + https://github.com/dotnet/arcade - db49d790a4bfa977a9ed7436bf2aa242cefae45e + 53fe29e220fc0db05eafd5c6bc6c8fb9ee7cec7c - + https://github.com/dotnet/arcade - db49d790a4bfa977a9ed7436bf2aa242cefae45e + 53fe29e220fc0db05eafd5c6bc6c8fb9ee7cec7c - + https://github.com/dotnet/arcade - db49d790a4bfa977a9ed7436bf2aa242cefae45e + 53fe29e220fc0db05eafd5c6bc6c8fb9ee7cec7c - + https://github.com/dotnet/arcade - db49d790a4bfa977a9ed7436bf2aa242cefae45e + 53fe29e220fc0db05eafd5c6bc6c8fb9ee7cec7c - + https://github.com/dotnet/arcade - db49d790a4bfa977a9ed7436bf2aa242cefae45e + 53fe29e220fc0db05eafd5c6bc6c8fb9ee7cec7c - + https://github.com/dotnet/arcade - db49d790a4bfa977a9ed7436bf2aa242cefae45e + 53fe29e220fc0db05eafd5c6bc6c8fb9ee7cec7c - + https://github.com/dotnet/arcade - db49d790a4bfa977a9ed7436bf2aa242cefae45e + 53fe29e220fc0db05eafd5c6bc6c8fb9ee7cec7c - + https://github.com/dotnet/arcade - db49d790a4bfa977a9ed7436bf2aa242cefae45e + 53fe29e220fc0db05eafd5c6bc6c8fb9ee7cec7c - + https://github.com/dotnet/arcade - db49d790a4bfa977a9ed7436bf2aa242cefae45e + 53fe29e220fc0db05eafd5c6bc6c8fb9ee7cec7c - + https://github.com/dotnet/arcade - db49d790a4bfa977a9ed7436bf2aa242cefae45e + 53fe29e220fc0db05eafd5c6bc6c8fb9ee7cec7c - + https://github.com/dotnet/arcade - db49d790a4bfa977a9ed7436bf2aa242cefae45e + 53fe29e220fc0db05eafd5c6bc6c8fb9ee7cec7c - + https://github.com/dotnet/arcade - db49d790a4bfa977a9ed7436bf2aa242cefae45e + 53fe29e220fc0db05eafd5c6bc6c8fb9ee7cec7c https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -94,41 +94,41 @@ https://github.com/microsoft/vstest 140434f7109d357d0158ade9e5164a4861513965 - + https://github.com/dotnet/runtime-assets - f071377c4c5db727bb65abc878877ccf89f67ac1 + f2b69543b89f14baf6117cf8410ea0d20bdcca9a - + https://github.com/dotnet/runtime-assets - f071377c4c5db727bb65abc878877ccf89f67ac1 + f2b69543b89f14baf6117cf8410ea0d20bdcca9a - + https://github.com/dotnet/runtime-assets - f071377c4c5db727bb65abc878877ccf89f67ac1 + f2b69543b89f14baf6117cf8410ea0d20bdcca9a - + https://github.com/dotnet/runtime-assets - f071377c4c5db727bb65abc878877ccf89f67ac1 + f2b69543b89f14baf6117cf8410ea0d20bdcca9a - + https://github.com/dotnet/runtime-assets - f071377c4c5db727bb65abc878877ccf89f67ac1 + f2b69543b89f14baf6117cf8410ea0d20bdcca9a - + https://github.com/dotnet/runtime-assets - f071377c4c5db727bb65abc878877ccf89f67ac1 + f2b69543b89f14baf6117cf8410ea0d20bdcca9a - + https://github.com/dotnet/runtime-assets - f071377c4c5db727bb65abc878877ccf89f67ac1 + f2b69543b89f14baf6117cf8410ea0d20bdcca9a - + https://github.com/dotnet/runtime-assets - f071377c4c5db727bb65abc878877ccf89f67ac1 + f2b69543b89f14baf6117cf8410ea0d20bdcca9a - + https://github.com/dotnet/runtime-assets - f071377c4c5db727bb65abc878877ccf89f67ac1 + f2b69543b89f14baf6117cf8410ea0d20bdcca9a https://github.com/dotnet/llvm-project @@ -198,17 +198,17 @@ https://github.com/mono/linker 0e2e95e9db92cd41f620f96dda84171cbf34fa6c - + https://github.com/dotnet/xharness - 83721524941aff6b628b0b943a8c193e1829985d + 21d923ff91ab416edd01ab35981f48c390ffe67d - + https://github.com/dotnet/xharness - 83721524941aff6b628b0b943a8c193e1829985d + 21d923ff91ab416edd01ab35981f48c390ffe67d - + https://github.com/dotnet/arcade - db49d790a4bfa977a9ed7436bf2aa242cefae45e + 53fe29e220fc0db05eafd5c6bc6c8fb9ee7cec7c diff --git a/eng/Versions.props b/eng/Versions.props index 6761527e4aa673..b23a6f1d9017df 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,19 +54,19 @@ 3.9.0-5.final 3.9.0-5.final - 6.0.0-beta.21212.6 - 6.0.0-beta.21212.6 - 6.0.0-beta.21212.6 - 6.0.0-beta.21212.6 - 6.0.0-beta.21212.6 - 6.0.0-beta.21212.6 - 2.5.1-beta.21212.6 - 6.0.0-beta.21212.6 - 6.0.0-beta.21212.6 - 6.0.0-beta.21212.6 - 6.0.0-beta.21212.6 - 6.0.0-beta.21212.6 - 6.0.0-beta.21212.6 + 6.0.0-beta.21216.2 + 6.0.0-beta.21216.2 + 6.0.0-beta.21216.2 + 6.0.0-beta.21216.2 + 6.0.0-beta.21216.2 + 6.0.0-beta.21216.2 + 2.5.1-beta.21216.2 + 6.0.0-beta.21216.2 + 6.0.0-beta.21216.2 + 6.0.0-beta.21216.2 + 6.0.0-beta.21216.2 + 6.0.0-beta.21216.2 + 6.0.0-beta.21216.2 5.9.0-preview.2 @@ -112,15 +112,15 @@ 4.3.0 6.0.0-preview.4.21211.7 - 6.0.0-beta.21212.1 - 6.0.0-beta.21212.1 - 6.0.0-beta.21212.1 - 6.0.0-beta.21212.1 - 6.0.0-beta.21212.1 - 6.0.0-beta.21212.1 - 6.0.0-beta.21212.1 - 6.0.0-beta.21212.1 - 6.0.0-beta.21212.1 + 6.0.0-beta.21216.1 + 6.0.0-beta.21216.1 + 6.0.0-beta.21216.1 + 6.0.0-beta.21216.1 + 6.0.0-beta.21216.1 + 6.0.0-beta.21216.1 + 6.0.0-beta.21216.1 + 6.0.0-beta.21216.1 + 6.0.0-beta.21216.1 99.99.99-master-20210415.12 99.99.99-master-20210415.12 @@ -153,8 +153,8 @@ 1.0.1-prerelease-00006 16.9.0-preview-20201201-01 - 1.0.0-prerelease.21214.1 - 1.0.0-prerelease.21214.1 + 1.0.0-prerelease.21216.1 + 1.0.0-prerelease.21216.1 2.4.1 2.4.2 1.3.0 @@ -167,7 +167,7 @@ 6.0.100-preview.2.21217.1 - 6.0.0-preview.4.21212.2 + 6.0.0-preview.5.21216.2 9.0.1-alpha.1.21212.1 9.0.1-alpha.1.21212.1 diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml index 928a70cda2c5a8..d2b271ec1ac137 100644 --- a/eng/common/templates/job/onelocbuild.yml +++ b/eng/common/templates/job/onelocbuild.yml @@ -11,6 +11,7 @@ parameters: SourcesDirectory: $(Build.SourcesDirectory) CreatePr: true + AutoCompletePr: false UseCheckedInLocProjectJson: false LanguageSet: VS_Main_Languages LclSource: lclFilesInRepo @@ -54,6 +55,8 @@ jobs: lclSource: ${{ parameters.LclSource }} lclPackageId: ${{ parameters.LclPackageId }} isCreatePrSelected: ${{ parameters.CreatePr }} + ${{ if eq(parameters.CreatePr, true) }}: + isAutoCompletePrSelected: ${{ parameters.AutoCompletePr }} packageSourceAuth: patAuth patVariable: ${{ parameters.CeapexPat }} ${{ if eq(parameters.RepoType, 'gitHub') }}: diff --git a/global.json b/global.json index acf9cd11ff85d9..172ca430183701 100644 --- a/global.json +++ b/global.json @@ -12,10 +12,10 @@ "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21212.6", - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21212.6", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21212.6", - "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21212.6", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21216.2", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21216.2", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21216.2", + "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21216.2", "Microsoft.Build.NoTargets": "2.0.17", "Microsoft.Build.Traversal": "2.1.1", "Microsoft.NET.Sdk.IL": "6.0.0-preview.4.21211.7"