From 8c476b58df6032c6713c69535d2679632abac9ba Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 9 Apr 2021 13:05:37 +0000 Subject: [PATCH 1/5] Update dependencies from https://github.com/dotnet/arcade build 20210408.2 (#10188) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- global.json | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 371179081..450b0d4bc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -136,13 +136,13 @@ - + https://github.com/dotnet/arcade - 86aee6d02b2fb8534b9466db0da25483d7c399a9 + 814754c257edd24aeff89615106e4557d07632d8 - + https://github.com/dotnet/arcade - 86aee6d02b2fb8534b9466db0da25483d7c399a9 + 814754c257edd24aeff89615106e4557d07632d8 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index be68d9a62..10eeae61a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -20,7 +20,7 @@ - 6.0.0-beta.21207.4 + 6.0.0-beta.21208.2 diff --git a/global.json b/global.json index c45f0e3c1..7e8a7fa0c 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21207.4" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21208.2" } } From f1b8e73e579f9c520ed5fa8fa5a20743e64b59e6 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Fri, 9 Apr 2021 11:34:12 -0700 Subject: [PATCH 2/5] Disable VS package push when post build sign is true (#10189) When post build signing is true, don't push VS packages. These unsigned packages will not successfully insert into Visual Studio --- eng/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/build.yml b/eng/build.yml index 738b205c6..63e5254a3 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -146,7 +146,7 @@ phases: packagesToPush: '$(Build.SourcesDirectory)/artifacts/packages/$(_BuildConfig)/NonShipping/VS.*.nupkg' nuGetFeedType: external publishFeedCredentials: 'DevDiv - VS package feed' - condition: and(succeeded(), eq(variables['_PushToVSFeed'], 'true'), eq(variables['_DotNetPublishToBlobFeed'], 'true'), or(eq(variables['_BuildArchitecture'], 'x64'), eq(variables['_BuildArchitecture'], 'x86'))) + condition: and(succeeded(), ne(variables['PostBuildSign'], true), eq(variables['_PushToVSFeed'], 'true'), eq(variables['_DotNetPublishToBlobFeed'], 'true'), or(eq(variables['_BuildArchitecture'], 'x64'), eq(variables['_BuildArchitecture'], 'x86'))) - task: PublishTestResults@2 displayName: Publish Test Results From ae55aee247b7aeb1fef48a3fb1c8b4f6112a2fb3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 10 Apr 2021 13:10:27 +0000 Subject: [PATCH 3/5] Update dependencies from https://github.com/dotnet/arcade build 20210409.17 (#10190) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- global.json | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 450b0d4bc..2347d49cc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -136,13 +136,13 @@ - + https://github.com/dotnet/arcade - 814754c257edd24aeff89615106e4557d07632d8 + 28d9452d7e2ae4e98a1df735b90b03d3cac1f4e7 - + https://github.com/dotnet/arcade - 814754c257edd24aeff89615106e4557d07632d8 + 28d9452d7e2ae4e98a1df735b90b03d3cac1f4e7 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 10eeae61a..1b9c3daea 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -20,7 +20,7 @@ - 6.0.0-beta.21208.2 + 6.0.0-beta.21209.17 diff --git a/global.json b/global.json index 7e8a7fa0c..037202ac2 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21208.2" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21209.17" } } From 90716fd1a040d408a81723e7f2169322f7f09f3d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 12 Apr 2021 13:18:13 +0000 Subject: [PATCH 4/5] Update dependencies from https://github.com/dotnet/test-templates build 20210412.1 (#10193) [main] Update dependencies from dotnet/test-templates --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2347d49cc..0860061ce 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -67,17 +67,17 @@ https://github.com/dotnet/aspnetcore a5864bb173de0f2b7902b128b9716d77d3f14630 - + https://github.com/dotnet/test-templates - a17e4bdbd6aeab998156ab8cb15b0ddc31517612 + 662d3df355d14faf209008e4af4bb446227cf4aa - + https://github.com/dotnet/test-templates - a17e4bdbd6aeab998156ab8cb15b0ddc31517612 + 662d3df355d14faf209008e4af4bb446227cf4aa - + https://github.com/dotnet/test-templates - a17e4bdbd6aeab998156ab8cb15b0ddc31517612 + 662d3df355d14faf209008e4af4bb446227cf4aa https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index 1b9c3daea..8ce8bfb18 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,8 +36,8 @@ - 1.0.2-beta4.21206.1 - 1.0.2-beta4.21206.1 + 1.0.2-beta4.21212.1 + 1.0.2-beta4.21212.1 @@ -135,7 +135,7 @@ 1.5.3 1.0.2-beta3 $(MicrosoftDotNetCommonItemTemplates21PackageVersion) - 1.0.2-beta4.21206.1 + 1.0.2-beta4.21212.1 2.1.26 From c6e6c1b622701ea76e946882375c426bc422763d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 12 Apr 2021 16:09:56 +0000 Subject: [PATCH 5/5] Update dependencies from https://github.com/dotnet/test-templates build 20210412.2 (#10194) [main] Update dependencies from dotnet/test-templates --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0860061ce..3ca5b3b18 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -67,17 +67,17 @@ https://github.com/dotnet/aspnetcore a5864bb173de0f2b7902b128b9716d77d3f14630 - + https://github.com/dotnet/test-templates - 662d3df355d14faf209008e4af4bb446227cf4aa + cb722862f3d76493dc5047a0c30e3bd5f4391170 - + https://github.com/dotnet/test-templates - 662d3df355d14faf209008e4af4bb446227cf4aa + cb722862f3d76493dc5047a0c30e3bd5f4391170 - + https://github.com/dotnet/test-templates - 662d3df355d14faf209008e4af4bb446227cf4aa + cb722862f3d76493dc5047a0c30e3bd5f4391170 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index 8ce8bfb18..c493a137f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,8 +36,8 @@ - 1.0.2-beta4.21212.1 - 1.0.2-beta4.21212.1 + 1.0.2-beta4.21212.2 + 1.0.2-beta4.21212.2 @@ -135,7 +135,7 @@ 1.5.3 1.0.2-beta3 $(MicrosoftDotNetCommonItemTemplates21PackageVersion) - 1.0.2-beta4.21212.1 + 1.0.2-beta4.21212.2 2.1.26