From 98a268209d1f3f7907a554c87f23364115cf8db8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 15 Apr 2021 12:18:07 +0000 Subject: [PATCH 01/12] Update dependencies from https://github.com/dotnet/arcade build 20210414.5 Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.GenAPI , Microsoft.DotNet.Helix.Sdk From Version 6.0.0-beta.21212.6 -> To Version 6.0.0-beta.21214.5 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- eng/common/templates/job/onelocbuild.yml | 3 +++ global.json | 8 ++++---- 4 files changed, 20 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index aa1ae2c4b5c..ff5ff84399f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -99,25 +99,25 @@ - + https://github.com/dotnet/arcade - db49d790a4bfa977a9ed7436bf2aa242cefae45e + 93a6389f406e5e900da46ab643c608578f143851 - + https://github.com/dotnet/arcade - db49d790a4bfa977a9ed7436bf2aa242cefae45e + 93a6389f406e5e900da46ab643c608578f143851 - + https://github.com/dotnet/arcade - db49d790a4bfa977a9ed7436bf2aa242cefae45e + 93a6389f406e5e900da46ab643c608578f143851 - + https://github.com/dotnet/arcade - db49d790a4bfa977a9ed7436bf2aa242cefae45e + 93a6389f406e5e900da46ab643c608578f143851 - + https://github.com/dotnet/arcade - db49d790a4bfa977a9ed7436bf2aa242cefae45e + 93a6389f406e5e900da46ab643c608578f143851 diff --git a/eng/Versions.props b/eng/Versions.props index c8a295eb21c..da487bc806b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,9 +43,9 @@ - 6.0.0-beta.21212.6 - 6.0.0-beta.21212.6 - 6.0.0-beta.21212.6 + 6.0.0-beta.21214.5 + 6.0.0-beta.21214.5 + 6.0.0-beta.21214.5 diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml index 928a70cda2c..d2b271ec1ac 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 2654e127b6b..767090dbdb7 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.100-preview.1.21103.13", + "dotnet": "6.0.100-preview.2.21155.3", "runtimes": { "dotnet": [ "2.1.7", @@ -12,11 +12,11 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21212.6", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21212.6" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21214.5", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21214.5" }, "sdk": { - "version": "6.0.100-preview.1.21103.13" + "version": "6.0.100-preview.2.21155.3" }, "native-tools": { "strawberry-perl": "5.28.1.1-1", From 767ebe899d1789ee9aeb1f542edfa528a13c4642 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 16 Apr 2021 12:19:55 +0000 Subject: [PATCH 02/12] Update dependencies from https://github.com/dotnet/arcade build 20210415.5 Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.GenAPI , Microsoft.DotNet.Helix.Sdk From Version 6.0.0-beta.21212.6 -> To Version 6.0.0-beta.21215.5 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ff5ff84399f..6c20a2a6a17 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -99,25 +99,25 @@ - + https://github.com/dotnet/arcade - 93a6389f406e5e900da46ab643c608578f143851 + e76fe48d5eb894e58fe7841f3a2c0bcfa654ee80 - + https://github.com/dotnet/arcade - 93a6389f406e5e900da46ab643c608578f143851 + e76fe48d5eb894e58fe7841f3a2c0bcfa654ee80 - + https://github.com/dotnet/arcade - 93a6389f406e5e900da46ab643c608578f143851 + e76fe48d5eb894e58fe7841f3a2c0bcfa654ee80 - + https://github.com/dotnet/arcade - 93a6389f406e5e900da46ab643c608578f143851 + e76fe48d5eb894e58fe7841f3a2c0bcfa654ee80 - + https://github.com/dotnet/arcade - 93a6389f406e5e900da46ab643c608578f143851 + e76fe48d5eb894e58fe7841f3a2c0bcfa654ee80 diff --git a/eng/Versions.props b/eng/Versions.props index da487bc806b..9f36f09047b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,9 +43,9 @@ - 6.0.0-beta.21214.5 - 6.0.0-beta.21214.5 - 6.0.0-beta.21214.5 + 6.0.0-beta.21215.5 + 6.0.0-beta.21215.5 + 6.0.0-beta.21215.5 diff --git a/global.json b/global.json index 767090dbdb7..e7cd24bff57 100644 --- a/global.json +++ b/global.json @@ -12,8 +12,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21214.5", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21214.5" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21215.5", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21215.5" }, "sdk": { "version": "6.0.100-preview.2.21155.3" From 86092e1601384dbef9a93bace49858e3fa2d2918 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 17 Apr 2021 12:17:50 +0000 Subject: [PATCH 03/12] Update dependencies from https://github.com/dotnet/arcade build 20210416.2 Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.GenAPI , Microsoft.DotNet.Helix.Sdk From Version 6.0.0-beta.21212.6 -> To Version 6.0.0-beta.21216.2 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6c20a2a6a17..94cdf62fbce 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -99,25 +99,25 @@ - + https://github.com/dotnet/arcade - e76fe48d5eb894e58fe7841f3a2c0bcfa654ee80 + 53fe29e220fc0db05eafd5c6bc6c8fb9ee7cec7c - + https://github.com/dotnet/arcade - e76fe48d5eb894e58fe7841f3a2c0bcfa654ee80 + 53fe29e220fc0db05eafd5c6bc6c8fb9ee7cec7c - + https://github.com/dotnet/arcade - e76fe48d5eb894e58fe7841f3a2c0bcfa654ee80 + 53fe29e220fc0db05eafd5c6bc6c8fb9ee7cec7c - + https://github.com/dotnet/arcade - e76fe48d5eb894e58fe7841f3a2c0bcfa654ee80 + 53fe29e220fc0db05eafd5c6bc6c8fb9ee7cec7c - + https://github.com/dotnet/arcade - e76fe48d5eb894e58fe7841f3a2c0bcfa654ee80 + 53fe29e220fc0db05eafd5c6bc6c8fb9ee7cec7c diff --git a/eng/Versions.props b/eng/Versions.props index 9f36f09047b..5bf912a7e45 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,9 +43,9 @@ - 6.0.0-beta.21215.5 - 6.0.0-beta.21215.5 - 6.0.0-beta.21215.5 + 6.0.0-beta.21216.2 + 6.0.0-beta.21216.2 + 6.0.0-beta.21216.2 diff --git a/global.json b/global.json index e7cd24bff57..3031247fb46 100644 --- a/global.json +++ b/global.json @@ -12,8 +12,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21215.5", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21215.5" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21216.2", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21216.2" }, "sdk": { "version": "6.0.100-preview.2.21155.3" From 93de9dba485236a08b215fa8581de69245a63652 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 20 Apr 2021 12:18:33 +0000 Subject: [PATCH 04/12] Update dependencies from https://github.com/dotnet/arcade build 20210419.2 Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.GenAPI , Microsoft.DotNet.Helix.Sdk From Version 6.0.0-beta.21212.6 -> To Version 6.0.0-beta.21219.2 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- eng/common/generate-locproject.ps1 | 17 +++++++++++++---- global.json | 4 ++-- 4 files changed, 28 insertions(+), 19 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 94cdf62fbce..047b3c73bf8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -99,25 +99,25 @@ - + https://github.com/dotnet/arcade - 53fe29e220fc0db05eafd5c6bc6c8fb9ee7cec7c + 1d951297eb7bdd29a31dff3149606152717ed6b4 - + https://github.com/dotnet/arcade - 53fe29e220fc0db05eafd5c6bc6c8fb9ee7cec7c + 1d951297eb7bdd29a31dff3149606152717ed6b4 - + https://github.com/dotnet/arcade - 53fe29e220fc0db05eafd5c6bc6c8fb9ee7cec7c + 1d951297eb7bdd29a31dff3149606152717ed6b4 - + https://github.com/dotnet/arcade - 53fe29e220fc0db05eafd5c6bc6c8fb9ee7cec7c + 1d951297eb7bdd29a31dff3149606152717ed6b4 - + https://github.com/dotnet/arcade - 53fe29e220fc0db05eafd5c6bc6c8fb9ee7cec7c + 1d951297eb7bdd29a31dff3149606152717ed6b4 diff --git a/eng/Versions.props b/eng/Versions.props index 5bf912a7e45..07f10154042 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,9 +43,9 @@ - 6.0.0-beta.21216.2 - 6.0.0-beta.21216.2 - 6.0.0-beta.21216.2 + 6.0.0-beta.21219.2 + 6.0.0-beta.21219.2 + 6.0.0-beta.21219.2 diff --git a/eng/common/generate-locproject.ps1 b/eng/common/generate-locproject.ps1 index 7225ddc6669..24c00b5be98 100644 --- a/eng/common/generate-locproject.ps1 +++ b/eng/common/generate-locproject.ps1 @@ -66,10 +66,19 @@ $locJson = @{ } if ($continue) { - return @{ - SourceFile = $sourceFile - CopyOption = "LangIDOnName" - OutputPath = $outputPath + if ($_.Directory.Name -eq 'en' -and $_.Extension -eq '.json') { + return @{ + SourceFile = $sourceFile + CopyOption = "LangIDOnPath" + OutputPath = "$($_.Directory.Parent.FullName | Resolve-Path -Relative)\" + } + } + else { + return @{ + SourceFile = $sourceFile + CopyOption = "LangIDOnName" + OutputPath = $outputPath + } } } } diff --git a/global.json b/global.json index 3031247fb46..42f9bd79485 100644 --- a/global.json +++ b/global.json @@ -12,8 +12,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21216.2", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21216.2" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21219.2", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21219.2" }, "sdk": { "version": "6.0.100-preview.2.21155.3" From 6dd2598f8c1642e42c1870aa1961773a473c2330 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 21 Apr 2021 12:17:44 +0000 Subject: [PATCH 05/12] Update dependencies from https://github.com/dotnet/arcade build 20210420.2 Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.GenAPI , Microsoft.DotNet.Helix.Sdk From Version 6.0.0-beta.21212.6 -> To Version 6.0.0-beta.21220.2 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 047b3c73bf8..40229ad6330 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -99,25 +99,25 @@ - + https://github.com/dotnet/arcade - 1d951297eb7bdd29a31dff3149606152717ed6b4 + 2803c841d5e5f5cdc3d3ea42d532d51ec96fcadb - + https://github.com/dotnet/arcade - 1d951297eb7bdd29a31dff3149606152717ed6b4 + 2803c841d5e5f5cdc3d3ea42d532d51ec96fcadb - + https://github.com/dotnet/arcade - 1d951297eb7bdd29a31dff3149606152717ed6b4 + 2803c841d5e5f5cdc3d3ea42d532d51ec96fcadb - + https://github.com/dotnet/arcade - 1d951297eb7bdd29a31dff3149606152717ed6b4 + 2803c841d5e5f5cdc3d3ea42d532d51ec96fcadb - + https://github.com/dotnet/arcade - 1d951297eb7bdd29a31dff3149606152717ed6b4 + 2803c841d5e5f5cdc3d3ea42d532d51ec96fcadb diff --git a/eng/Versions.props b/eng/Versions.props index 07f10154042..1e9f915371b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,9 +43,9 @@ - 6.0.0-beta.21219.2 - 6.0.0-beta.21219.2 - 6.0.0-beta.21219.2 + 6.0.0-beta.21220.2 + 6.0.0-beta.21220.2 + 6.0.0-beta.21220.2 diff --git a/global.json b/global.json index 42f9bd79485..46b3ad74770 100644 --- a/global.json +++ b/global.json @@ -12,8 +12,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21219.2", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21219.2" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21220.2", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21220.2" }, "sdk": { "version": "6.0.100-preview.2.21155.3" From 1a34b1ef5282cf1054c16139cfeb3f019958ed9c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 22 Apr 2021 12:18:46 +0000 Subject: [PATCH 06/12] Update dependencies from https://github.com/dotnet/arcade build 20210421.1 Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.GenAPI , Microsoft.DotNet.Helix.Sdk From Version 6.0.0-beta.21212.6 -> To Version 6.0.0-beta.21221.1 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 40229ad6330..2b8270fb6d8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -99,25 +99,25 @@ - + https://github.com/dotnet/arcade - 2803c841d5e5f5cdc3d3ea42d532d51ec96fcadb + f7e58cfb0f6c93980cbb664cc9e62d9ef2df0c2f - + https://github.com/dotnet/arcade - 2803c841d5e5f5cdc3d3ea42d532d51ec96fcadb + f7e58cfb0f6c93980cbb664cc9e62d9ef2df0c2f - + https://github.com/dotnet/arcade - 2803c841d5e5f5cdc3d3ea42d532d51ec96fcadb + f7e58cfb0f6c93980cbb664cc9e62d9ef2df0c2f - + https://github.com/dotnet/arcade - 2803c841d5e5f5cdc3d3ea42d532d51ec96fcadb + f7e58cfb0f6c93980cbb664cc9e62d9ef2df0c2f - + https://github.com/dotnet/arcade - 2803c841d5e5f5cdc3d3ea42d532d51ec96fcadb + f7e58cfb0f6c93980cbb664cc9e62d9ef2df0c2f diff --git a/eng/Versions.props b/eng/Versions.props index 1e9f915371b..a1d7ca6c3c9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,9 +43,9 @@ - 6.0.0-beta.21220.2 - 6.0.0-beta.21220.2 - 6.0.0-beta.21220.2 + 6.0.0-beta.21221.1 + 6.0.0-beta.21221.1 + 6.0.0-beta.21221.1 diff --git a/global.json b/global.json index 46b3ad74770..826bb2bae3a 100644 --- a/global.json +++ b/global.json @@ -12,8 +12,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21220.2", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21220.2" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21221.1", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21221.1" }, "sdk": { "version": "6.0.100-preview.2.21155.3" From 67acd241b830db47a60a2ee6f32ec85b1af38cfd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 24 Apr 2021 12:19:31 +0000 Subject: [PATCH 07/12] Update dependencies from https://github.com/dotnet/arcade build 20210422.1 Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.GenAPI , Microsoft.DotNet.Helix.Sdk From Version 6.0.0-beta.21212.6 -> To Version 6.0.0-beta.21222.1 --- eng/Version.Details.xml | 20 +++++++++---------- eng/Versions.props | 6 +++--- .../templates/job/source-index-stage1.yml | 2 +- global.json | 4 ++-- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2b8270fb6d8..0ef5213ac3f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -99,25 +99,25 @@ - + https://github.com/dotnet/arcade - f7e58cfb0f6c93980cbb664cc9e62d9ef2df0c2f + b7279bb45342c948ab46fea2d08ec17ae2f2a1bf - + https://github.com/dotnet/arcade - f7e58cfb0f6c93980cbb664cc9e62d9ef2df0c2f + b7279bb45342c948ab46fea2d08ec17ae2f2a1bf - + https://github.com/dotnet/arcade - f7e58cfb0f6c93980cbb664cc9e62d9ef2df0c2f + b7279bb45342c948ab46fea2d08ec17ae2f2a1bf - + https://github.com/dotnet/arcade - f7e58cfb0f6c93980cbb664cc9e62d9ef2df0c2f + b7279bb45342c948ab46fea2d08ec17ae2f2a1bf - + https://github.com/dotnet/arcade - f7e58cfb0f6c93980cbb664cc9e62d9ef2df0c2f + b7279bb45342c948ab46fea2d08ec17ae2f2a1bf diff --git a/eng/Versions.props b/eng/Versions.props index a1d7ca6c3c9..154659695ce 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,9 +43,9 @@ - 6.0.0-beta.21221.1 - 6.0.0-beta.21221.1 - 6.0.0-beta.21221.1 + 6.0.0-beta.21222.1 + 6.0.0-beta.21222.1 + 6.0.0-beta.21222.1 diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml index c002a2b1b0a..a649d2b5990 100644 --- a/eng/common/templates/job/source-index-stage1.yml +++ b/eng/common/templates/job/source-index-stage1.yml @@ -1,6 +1,6 @@ parameters: runAsPublic: false - sourceIndexPackageVersion: 1.0.1-20210225.1 + sourceIndexPackageVersion: 1.0.1-20210421.1 sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci" preSteps: [] diff --git a/global.json b/global.json index 826bb2bae3a..185abefe30f 100644 --- a/global.json +++ b/global.json @@ -12,8 +12,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21221.1", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21221.1" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21222.1", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21222.1" }, "sdk": { "version": "6.0.100-preview.2.21155.3" From 3b43fd24a96f163cdfe1949af970a4e9bdd15848 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 29 Apr 2021 12:22:36 +0000 Subject: [PATCH 08/12] Update dependencies from https://github.com/dotnet/arcade build 20210428.3 Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.GenAPI , Microsoft.DotNet.Helix.Sdk From Version 6.0.0-beta.21212.6 -> To Version 6.0.0-beta.21228.3 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- eng/common/templates/job/onelocbuild.yml | 8 +++++--- global.json | 8 ++++---- 4 files changed, 22 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0ef5213ac3f..8949dd24c42 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -99,25 +99,25 @@ - + https://github.com/dotnet/arcade - b7279bb45342c948ab46fea2d08ec17ae2f2a1bf + e1044f09e18638a98a9f0448086a7295f3d16834 - + https://github.com/dotnet/arcade - b7279bb45342c948ab46fea2d08ec17ae2f2a1bf + e1044f09e18638a98a9f0448086a7295f3d16834 - + https://github.com/dotnet/arcade - b7279bb45342c948ab46fea2d08ec17ae2f2a1bf + e1044f09e18638a98a9f0448086a7295f3d16834 - + https://github.com/dotnet/arcade - b7279bb45342c948ab46fea2d08ec17ae2f2a1bf + e1044f09e18638a98a9f0448086a7295f3d16834 - + https://github.com/dotnet/arcade - b7279bb45342c948ab46fea2d08ec17ae2f2a1bf + e1044f09e18638a98a9f0448086a7295f3d16834 diff --git a/eng/Versions.props b/eng/Versions.props index 154659695ce..997f35591b9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,9 +43,9 @@ - 6.0.0-beta.21222.1 - 6.0.0-beta.21222.1 - 6.0.0-beta.21222.1 + 6.0.0-beta.21228.3 + 6.0.0-beta.21228.3 + 6.0.0-beta.21228.3 diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml index d2b271ec1ac..b27d6faf303 100644 --- a/eng/common/templates/job/onelocbuild.yml +++ b/eng/common/templates/job/onelocbuild.yml @@ -17,6 +17,7 @@ parameters: LclSource: lclFilesInRepo LclPackageId: '' RepoType: gitHub + condition: '' jobs: - job: OneLocBuild @@ -44,6 +45,7 @@ jobs: filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1 arguments: $(_GenerateLocProjectArguments) displayName: Generate LocProject.json + condition: ${{ parameters.condition }} - task: OneLocBuild@2 displayName: OneLocBuild @@ -62,7 +64,7 @@ jobs: ${{ if eq(parameters.RepoType, 'gitHub') }}: repoType: ${{ parameters.RepoType }} gitHubPatVariable: "${{ parameters.GithubPat }}" - condition: always() + condition: ${{ parameters.condition }} - task: PublishBuildArtifacts@1 displayName: Publish Localization Files @@ -70,7 +72,7 @@ jobs: PathtoPublish: '$(Build.ArtifactStagingDirectory)/loc' PublishLocation: Container ArtifactName: Loc - condition: always() + condition: ${{ parameters.condition }} - task: PublishBuildArtifacts@1 displayName: Publish LocProject.json @@ -78,4 +80,4 @@ jobs: PathtoPublish: '$(Build.SourcesDirectory)/Localize/' PublishLocation: Container ArtifactName: Loc - condition: always() \ No newline at end of file + condition: ${{ parameters.condition }} \ No newline at end of file diff --git a/global.json b/global.json index 185abefe30f..4c4911fe50c 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.100-preview.2.21155.3", + "dotnet": "6.0.100-preview.3.21202.5", "runtimes": { "dotnet": [ "2.1.7", @@ -12,11 +12,11 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21222.1", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21222.1" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21228.3", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21228.3" }, "sdk": { - "version": "6.0.100-preview.2.21155.3" + "version": "6.0.100-preview.3.21202.5" }, "native-tools": { "strawberry-perl": "5.28.1.1-1", From 7010f0a092bc7b8a29ffc3f6d3541ceeb5dfe5a5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 30 Apr 2021 12:19:06 +0000 Subject: [PATCH 09/12] Update dependencies from https://github.com/dotnet/arcade build 20210429.1 Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.GenAPI , Microsoft.DotNet.Helix.Sdk From Version 6.0.0-beta.21212.6 -> To Version 6.0.0-beta.21229.1 --- eng/Version.Details.xml | 20 ++--- eng/Versions.props | 6 +- eng/common/post-build/symbols-validation.ps1 | 94 +++++++++++--------- global.json | 4 +- 4 files changed, 66 insertions(+), 58 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8949dd24c42..f4e536fcf9d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -99,25 +99,25 @@ - + https://github.com/dotnet/arcade - e1044f09e18638a98a9f0448086a7295f3d16834 + 67f4230b38092d53d8f8d3a37301feb997adf26c - + https://github.com/dotnet/arcade - e1044f09e18638a98a9f0448086a7295f3d16834 + 67f4230b38092d53d8f8d3a37301feb997adf26c - + https://github.com/dotnet/arcade - e1044f09e18638a98a9f0448086a7295f3d16834 + 67f4230b38092d53d8f8d3a37301feb997adf26c - + https://github.com/dotnet/arcade - e1044f09e18638a98a9f0448086a7295f3d16834 + 67f4230b38092d53d8f8d3a37301feb997adf26c - + https://github.com/dotnet/arcade - e1044f09e18638a98a9f0448086a7295f3d16834 + 67f4230b38092d53d8f8d3a37301feb997adf26c diff --git a/eng/Versions.props b/eng/Versions.props index 997f35591b9..51de104ed71 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,9 +43,9 @@ - 6.0.0-beta.21228.3 - 6.0.0-beta.21228.3 - 6.0.0-beta.21228.3 + 6.0.0-beta.21229.1 + 6.0.0-beta.21229.1 + 6.0.0-beta.21229.1 diff --git a/eng/common/post-build/symbols-validation.ps1 b/eng/common/post-build/symbols-validation.ps1 index 99bf28cd5c1..e6d5d2fd054 100644 --- a/eng/common/post-build/symbols-validation.ps1 +++ b/eng/common/post-build/symbols-validation.ps1 @@ -1,9 +1,10 @@ param( - [Parameter(Mandatory=$true)][string] $InputPath, # Full path to directory where NuGet packages to be checked are stored - [Parameter(Mandatory=$true)][string] $ExtractPath, # Full path to directory where the packages will be extracted during validation - [Parameter(Mandatory=$true)][string] $DotnetSymbolVersion, # Version of dotnet symbol to use - [Parameter(Mandatory=$false)][switch] $ContinueOnError, # If we should keep checking symbols after an error - [Parameter(Mandatory=$false)][switch] $Clean # Clean extracted symbols directory after checking symbols + [Parameter(Mandatory = $true)][string] $InputPath, # Full path to directory where NuGet packages to be checked are stored + [Parameter(Mandatory = $true)][string] $ExtractPath, # Full path to directory where the packages will be extracted during validation + [Parameter(Mandatory = $true)][string] $DotnetSymbolVersion, # Version of dotnet symbol to use + [Parameter(Mandatory = $false)][switch] $CheckForWindowsPdbs, # If we should check for the existence of windows pdbs in addition to portable PDBs + [Parameter(Mandatory = $false)][switch] $ContinueOnError, # If we should keep checking symbols after an error + [Parameter(Mandatory = $false)][switch] $Clean # Clean extracted symbols directory after checking symbols ) # Maximum number of jobs to run in parallel @@ -19,9 +20,15 @@ $SecondsBetweenLoadChecks = 10 Set-Variable -Name "ERROR_BADEXTRACT" -Option Constant -Value -1 Set-Variable -Name "ERROR_FILEDOESNOTEXIST" -Option Constant -Value -2 +$WindowsPdbVerificationParam = "" +if ($CheckForWindowsPdbs) { + $WindowsPdbVerificationParam = "--windows-pdbs" +} + $CountMissingSymbols = { param( - [string] $PackagePath # Path to a NuGet package + [string] $PackagePath, # Path to a NuGet package + [string] $WindowsPdbVerificationParam # If we should check for the existence of windows pdbs in addition to portable PDBs ) . $using:PSScriptRoot\..\tools.ps1 @@ -34,7 +41,7 @@ $CountMissingSymbols = { if (!(Test-Path $PackagePath)) { Write-PipelineTaskError "Input file does not exist: $PackagePath" return [pscustomobject]@{ - result = $using:ERROR_FILEDOESNOTEXIST + result = $using:ERROR_FILEDOESNOTEXIST packagePath = $PackagePath } } @@ -57,24 +64,25 @@ $CountMissingSymbols = { Write-Host "Something went wrong extracting $PackagePath" Write-Host $_ return [pscustomobject]@{ - result = $using:ERROR_BADEXTRACT + result = $using:ERROR_BADEXTRACT packagePath = $PackagePath } } Get-ChildItem -Recurse $ExtractPath | - Where-Object {$RelevantExtensions -contains $_.Extension} | - ForEach-Object { - $FileName = $_.FullName - if ($FileName -Match '\\ref\\') { - Write-Host "`t Ignoring reference assembly file " $FileName - return - } + Where-Object { $RelevantExtensions -contains $_.Extension } | + ForEach-Object { + $FileName = $_.FullName + if ($FileName -Match '\\ref\\') { + Write-Host "`t Ignoring reference assembly file " $FileName + return + } - $FirstMatchingSymbolDescriptionOrDefault = { + $FirstMatchingSymbolDescriptionOrDefault = { param( - [string] $FullPath, # Full path to the module that has to be checked - [string] $TargetServerParam, # Parameter to pass to `Symbol Tool` indicating the server to lookup for symbols + [string] $FullPath, # Full path to the module that has to be checked + [string] $TargetServerParam, # Parameter to pass to `Symbol Tool` indicating the server to lookup for symbols + [string] $WindowsPdbVerificationParam, # Parameter to pass to potential check for windows-pdbs. [string] $SymbolsPath ) @@ -99,7 +107,7 @@ $CountMissingSymbols = { # DWARF file for a .dylib $DylibDwarf = $SymbolPath.Replace($Extension, '.dylib.dwarf') - + $dotnetSymbolExe = "$env:USERPROFILE\.dotnet\tools" $dotnetSymbolExe = Resolve-Path "$dotnetSymbolExe\dotnet-symbol.exe" @@ -107,7 +115,7 @@ $CountMissingSymbols = { while ($totalRetries -lt $using:MaxRetry) { # Save the output and get diagnostic output - $output = & $dotnetSymbolExe --symbols --modules --windows-pdbs $TargetServerParam $FullPath -o $SymbolsPath --diagnostics | Out-String + $output = & $dotnetSymbolExe --symbols --modules $WindowsPdbVerificationParam $TargetServerParam $FullPath -o $SymbolsPath --diagnostics | Out-String if (Test-Path $PdbPath) { return 'PDB' @@ -136,30 +144,30 @@ $CountMissingSymbols = { return $null } - $SymbolsOnMSDL = & $FirstMatchingSymbolDescriptionOrDefault $FileName '--microsoft-symbol-server' $SymbolsPath - $SymbolsOnSymWeb = & $FirstMatchingSymbolDescriptionOrDefault $FileName '--internal-server' $SymbolsPath + $SymbolsOnMSDL = & $FirstMatchingSymbolDescriptionOrDefault $FileName '--microsoft-symbol-server' $SymbolsPath $WindowsPdbVerificationParam + $SymbolsOnSymWeb = & $FirstMatchingSymbolDescriptionOrDefault $FileName '--internal-server' $SymbolsPath $WindowsPdbVerificationParam - Write-Host -NoNewLine "`t Checking file " $FileName "... " + Write-Host -NoNewLine "`t Checking file " $FileName "... " - if ($SymbolsOnMSDL -ne $null -and $SymbolsOnSymWeb -ne $null) { - Write-Host "Symbols found on MSDL ($SymbolsOnMSDL) and SymWeb ($SymbolsOnSymWeb)" + if ($SymbolsOnMSDL -ne $null -and $SymbolsOnSymWeb -ne $null) { + Write-Host "Symbols found on MSDL ($SymbolsOnMSDL) and SymWeb ($SymbolsOnSymWeb)" + } + else { + $MissingSymbols++ + + if ($SymbolsOnMSDL -eq $null -and $SymbolsOnSymWeb -eq $null) { + Write-Host 'No symbols found on MSDL or SymWeb!' } else { - $MissingSymbols++ - - if ($SymbolsOnMSDL -eq $null -and $SymbolsOnSymWeb -eq $null) { - Write-Host 'No symbols found on MSDL or SymWeb!' + if ($SymbolsOnMSDL -eq $null) { + Write-Host 'No symbols found on MSDL!' } else { - if ($SymbolsOnMSDL -eq $null) { - Write-Host 'No symbols found on MSDL!' - } - else { - Write-Host 'No symbols found on SymWeb!' - } + Write-Host 'No symbols found on SymWeb!' } } } + } if ($using:Clean) { Remove-Item $ExtractPath -Recurse -Force @@ -168,16 +176,16 @@ $CountMissingSymbols = { Pop-Location return [pscustomobject]@{ - result = $MissingSymbols - packagePath = $PackagePath - } + result = $MissingSymbols + packagePath = $PackagePath + } } function CheckJobResult( - $result, - $packagePath, - [ref]$DupedSymbols, - [ref]$TotalFailures) { + $result, + $packagePath, + [ref]$DupedSymbols, + [ref]$TotalFailures) { if ($result -eq $ERROR_BADEXTRACT) { Write-PipelineTelemetryError -Category 'CheckSymbols' -Message "$packagePath has duplicated symbol files" $DupedSymbols.Value++ @@ -222,7 +230,7 @@ function CheckSymbolsAvailable { return } - Start-Job -ScriptBlock $CountMissingSymbols -ArgumentList $FullName | Out-Null + Start-Job -ScriptBlock $CountMissingSymbols -ArgumentList @($FullName,$WindowsPdbVerificationParam) | Out-Null $NumJobs = @(Get-Job -State 'Running').Count diff --git a/global.json b/global.json index 4c4911fe50c..ed6cd6abb0b 100644 --- a/global.json +++ b/global.json @@ -12,8 +12,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21228.3", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21228.3" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21229.1", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21229.1" }, "sdk": { "version": "6.0.100-preview.3.21202.5" From a56ea122f5c38ca54da8e02b119d4dbea7b995bb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 1 May 2021 12:18:30 +0000 Subject: [PATCH 10/12] Update dependencies from https://github.com/dotnet/arcade build 20210430.2 Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.GenAPI , Microsoft.DotNet.Helix.Sdk From Version 6.0.0-beta.21212.6 -> To Version 6.0.0-beta.21230.2 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f4e536fcf9d..033f5a034b6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -99,25 +99,25 @@ - + https://github.com/dotnet/arcade - 67f4230b38092d53d8f8d3a37301feb997adf26c + 46ad27d3cc557f2b84ce30b2c4e27438526dc91d - + https://github.com/dotnet/arcade - 67f4230b38092d53d8f8d3a37301feb997adf26c + 46ad27d3cc557f2b84ce30b2c4e27438526dc91d - + https://github.com/dotnet/arcade - 67f4230b38092d53d8f8d3a37301feb997adf26c + 46ad27d3cc557f2b84ce30b2c4e27438526dc91d - + https://github.com/dotnet/arcade - 67f4230b38092d53d8f8d3a37301feb997adf26c + 46ad27d3cc557f2b84ce30b2c4e27438526dc91d - + https://github.com/dotnet/arcade - 67f4230b38092d53d8f8d3a37301feb997adf26c + 46ad27d3cc557f2b84ce30b2c4e27438526dc91d diff --git a/eng/Versions.props b/eng/Versions.props index 51de104ed71..dea5d718a42 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,9 +43,9 @@ - 6.0.0-beta.21229.1 - 6.0.0-beta.21229.1 - 6.0.0-beta.21229.1 + 6.0.0-beta.21230.2 + 6.0.0-beta.21230.2 + 6.0.0-beta.21230.2 diff --git a/global.json b/global.json index ed6cd6abb0b..e77eb3dd4eb 100644 --- a/global.json +++ b/global.json @@ -12,8 +12,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21229.1", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21229.1" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21230.2", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21230.2" }, "sdk": { "version": "6.0.100-preview.3.21202.5" From d0c9cb33a827877b2a64c4ba89b5f14c910d2f80 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 4 May 2021 12:19:12 +0000 Subject: [PATCH 11/12] Update dependencies from https://github.com/dotnet/arcade build 20210503.2 Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.GenAPI , Microsoft.DotNet.Helix.Sdk From Version 6.0.0-beta.21212.6 -> To Version 6.0.0-beta.21253.2 --- eng/Version.Details.xml | 20 +++++++++---------- eng/Versions.props | 6 +++--- .../post-build/sourcelink-validation.ps1 | 2 +- eng/common/post-build/symbols-validation.ps1 | 2 +- global.json | 4 ++-- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 033f5a034b6..4751bbb8432 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -99,25 +99,25 @@ - + https://github.com/dotnet/arcade - 46ad27d3cc557f2b84ce30b2c4e27438526dc91d + e9fd640e1ec1890489ea66ad0f59e733448056da - + https://github.com/dotnet/arcade - 46ad27d3cc557f2b84ce30b2c4e27438526dc91d + e9fd640e1ec1890489ea66ad0f59e733448056da - + https://github.com/dotnet/arcade - 46ad27d3cc557f2b84ce30b2c4e27438526dc91d + e9fd640e1ec1890489ea66ad0f59e733448056da - + https://github.com/dotnet/arcade - 46ad27d3cc557f2b84ce30b2c4e27438526dc91d + e9fd640e1ec1890489ea66ad0f59e733448056da - + https://github.com/dotnet/arcade - 46ad27d3cc557f2b84ce30b2c4e27438526dc91d + e9fd640e1ec1890489ea66ad0f59e733448056da diff --git a/eng/Versions.props b/eng/Versions.props index dea5d718a42..17c4b491534 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,9 +43,9 @@ - 6.0.0-beta.21230.2 - 6.0.0-beta.21230.2 - 6.0.0-beta.21230.2 + 6.0.0-beta.21253.2 + 6.0.0-beta.21253.2 + 6.0.0-beta.21253.2 diff --git a/eng/common/post-build/sourcelink-validation.ps1 b/eng/common/post-build/sourcelink-validation.ps1 index 1c46f7b6341..8c554729b61 100644 --- a/eng/common/post-build/sourcelink-validation.ps1 +++ b/eng/common/post-build/sourcelink-validation.ps1 @@ -14,7 +14,7 @@ param( $global:RepoFiles = @{} # Maximum number of jobs to run in parallel -$MaxParallelJobs = 6 +$MaxParallelJobs = 16 # Wait time between check for system load $SecondsBetweenLoadChecks = 10 diff --git a/eng/common/post-build/symbols-validation.ps1 b/eng/common/post-build/symbols-validation.ps1 index e6d5d2fd054..788321d773d 100644 --- a/eng/common/post-build/symbols-validation.ps1 +++ b/eng/common/post-build/symbols-validation.ps1 @@ -8,7 +8,7 @@ param( ) # Maximum number of jobs to run in parallel -$MaxParallelJobs = 6 +$MaxParallelJobs = 16 # Max number of retries $MaxRetry = 5 diff --git a/global.json b/global.json index e77eb3dd4eb..c6db4b44143 100644 --- a/global.json +++ b/global.json @@ -12,8 +12,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21230.2", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21230.2" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21253.2", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21253.2" }, "sdk": { "version": "6.0.100-preview.3.21202.5" From d8384a2e6ba05b0eaa1efe0d5305d242332a0bf2 Mon Sep 17 00:00:00 2001 From: Ryland <41491307+ryalanms@users.noreply.github.com> Date: Tue, 4 May 2021 14:32:05 -0700 Subject: [PATCH 12/12] Continue using Preview 1 for now. --- global.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/global.json b/global.json index c6db4b44143..789e885cb1d 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.100-preview.3.21202.5", + "dotnet": "6.0.100-preview.1.21103.13", "runtimes": { "dotnet": [ "2.1.7", @@ -16,7 +16,7 @@ "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21253.2" }, "sdk": { - "version": "6.0.100-preview.3.21202.5" + "version": "6.0.100-preview.1.21103.13" }, "native-tools": { "strawberry-perl": "5.28.1.1-1",