From 1f5b814ce728be7611a60289f91dd2077d7d8208 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 10 Oct 2024 12:44:39 +0000 Subject: [PATCH 1/6] Update dependencies from https://dev.azure.com/devdiv/DevDiv/_git/vs-code-coverage build 20241010.2 Microsoft.Testing.Extensions.CodeCoverage From Version 17.13.0-preview.24508.1 -> To Version 17.13.0-preview.24510.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f55041421a..6a4faebe3c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,9 +13,9 @@ https://github.com/dotnet/arcade f209a925b15bc66ecb9a8825bd9595937bbe3aa1 - + https://dev.azure.com/devdiv/DevDiv/_git/vs-code-coverage - 163daeac091af87cd9d7b516c01d1cdb1abdbd33 + f45dff0041bdc975106a8e1205beb79ba276abec https://github.com/microsoft/testanywhere diff --git a/eng/Versions.props b/eng/Versions.props index b74137692d..d49840044a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 10.0.0-beta.24504.4 - 17.13.0-preview.24508.1 + 17.13.0-preview.24510.2 1.5.0-preview.24509.1 1.0.0-alpha.24473.2 From 4a19149ac690a9c91800618f0c58a5833e43ddde Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 10 Oct 2024 17:31:39 +0000 Subject: [PATCH 2/6] Update dependencies from https://github.com/dotnet/arcade build 20241010.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.XliffTasks From Version 10.0.0-beta.24504.4 -> To Version 10.0.0-beta.24510.1 --- eng/Version.Details.xml | 12 ++--- eng/Versions.props | 2 +- eng/common/core-templates/job/job.yml | 54 ++++--------------- .../steps/cleanup-microbuild.yml | 28 ++++++++++ .../steps/install-microbuild.yml | 43 +++++++++++++++ global.json | 6 +-- 6 files changed, 90 insertions(+), 55 deletions(-) create mode 100644 eng/common/core-templates/steps/cleanup-microbuild.yml create mode 100644 eng/common/core-templates/steps/install-microbuild.yml diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6a4faebe3c..2a25a476c9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/arcade - f209a925b15bc66ecb9a8825bd9595937bbe3aa1 + 380002a14775d7f68f098c7e6b7d1c3638bd4c5d - + https://github.com/dotnet/arcade - f209a925b15bc66ecb9a8825bd9595937bbe3aa1 + 380002a14775d7f68f098c7e6b7d1c3638bd4c5d - + https://github.com/dotnet/arcade - f209a925b15bc66ecb9a8825bd9595937bbe3aa1 + 380002a14775d7f68f098c7e6b7d1c3638bd4c5d https://dev.azure.com/devdiv/DevDiv/_git/vs-code-coverage diff --git a/eng/Versions.props b/eng/Versions.props index d49840044a..94427ec2f6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -7,7 +7,7 @@ preview - 10.0.0-beta.24504.4 + 10.0.0-beta.24510.1 17.13.0-preview.24510.2 1.5.0-preview.24509.1 diff --git a/eng/common/core-templates/job/job.yml b/eng/common/core-templates/job/job.yml index c37d16634d..295c9a2317 100644 --- a/eng/common/core-templates/job/job.yml +++ b/eng/common/core-templates/job/job.yml @@ -128,33 +128,11 @@ jobs: - ${{ preStep }} - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - ${{ if eq(parameters.enableMicrobuild, 'true') }}: - - task: MicroBuildSigningPlugin@4 - displayName: Install MicroBuild plugin - inputs: - signType: $(_SignType) - zipSources: false - feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json - ${{ if and(eq(parameters.enableMicrobuildForMacAndLinux, 'true'), ne(variables['Agent.Os'], 'Windows_NT')) }}: - azureSubscription: 'MicroBuild Signing Task (DevDiv)' - env: - TeamName: $(_TeamName) - MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)' - SYSTEM_ACCESSTOKEN: $(System.AccessToken) + - template: /eng/common/core-templates/steps/install-microbuild.yml + parameters: + enableMicrobuild: ${{ parameters.enableMicrobuild }} + enableMicrobuildForMacAndLinux: ${{ parameters.enableMicrobuildForMacAndLinux }} continueOnError: ${{ parameters.continueOnError }} - condition: and( - succeeded(), - or( - and( - eq(variables['Agent.Os'], 'Windows_NT'), - in(variables['_SignType'], 'real', 'test') - ), - and( - ${{ eq(parameters.enableMicrobuildForMacAndLinux, true) }}, - ne(variables['Agent.Os'], 'Windows_NT'), - eq(variables['_SignType'], 'real') - ) - )) - ${{ if and(eq(parameters.runAsPublic, 'false'), eq(variables['System.TeamProject'], 'internal')) }}: - task: NuGetAuthenticate@1 @@ -183,26 +161,12 @@ jobs: - ${{ each step in parameters.componentGovernanceSteps }}: - ${{ step }} - - ${{ if eq(parameters.enableMicrobuild, 'true') }}: - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - task: MicroBuildCleanup@1 - displayName: Execute Microbuild cleanup tasks - condition: and( - always(), - or( - and( - eq(variables['Agent.Os'], 'Windows_NT'), - in(variables['_SignType'], 'real', 'test') - ), - and( - ${{ eq(parameters.enableMicrobuildForMacAndLinux, true) }}, - ne(variables['Agent.Os'], 'Windows_NT'), - eq(variables['_SignType'], 'real') - ) - )) + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - template: /eng/common/core-templates/steps/cleanup-microbuild.yml + parameters: + enableMicrobuild: ${{ parameters.enableMicrobuild }} + enableMicrobuildForMacAndLinux: ${{ parameters.enableMicrobuildForMacAndLinux }} continueOnError: ${{ parameters.continueOnError }} - env: - TeamName: $(_TeamName) # Publish test results - ${{ if or(and(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, '')), eq(parameters.testResultsFormat, 'xunit')) }}: diff --git a/eng/common/core-templates/steps/cleanup-microbuild.yml b/eng/common/core-templates/steps/cleanup-microbuild.yml new file mode 100644 index 0000000000..c0fdcd3379 --- /dev/null +++ b/eng/common/core-templates/steps/cleanup-microbuild.yml @@ -0,0 +1,28 @@ +parameters: + # Enable cleanup tasks for MicroBuild + enableMicrobuild: false + # Enable cleanup tasks for MicroBuild on Mac and Linux + # Will be ignored if 'enableMicrobuild' is false or 'Agent.Os' is 'Windows_NT' + enableMicrobuildForMacAndLinux: false + continueOnError: false + +steps: + - ${{ if eq(parameters.enableMicrobuild, 'true') }}: + - task: MicroBuildCleanup@1 + displayName: Execute Microbuild cleanup tasks + condition: and( + always(), + or( + and( + eq(variables['Agent.Os'], 'Windows_NT'), + in(variables['_SignType'], 'real', 'test') + ), + and( + ${{ eq(parameters.enableMicrobuildForMacAndLinux, true) }}, + ne(variables['Agent.Os'], 'Windows_NT'), + eq(variables['_SignType'], 'real') + ) + )) + continueOnError: ${{ parameters.continueOnError }} + env: + TeamName: $(_TeamName) diff --git a/eng/common/core-templates/steps/install-microbuild.yml b/eng/common/core-templates/steps/install-microbuild.yml new file mode 100644 index 0000000000..9abe726e54 --- /dev/null +++ b/eng/common/core-templates/steps/install-microbuild.yml @@ -0,0 +1,43 @@ +parameters: + # Enable cleanup tasks for MicroBuild + enableMicrobuild: false + # Enable cleanup tasks for MicroBuild on Mac and Linux + # Will be ignored if 'enableMicrobuild' is false or 'Agent.Os' is 'Windows_NT' + enableMicrobuildForMacAndLinux: false + continueOnError: false + +steps: + - ${{ if eq(parameters.enableMicrobuild, 'true') }}: + # Remove Python downgrade with https://github.com/dotnet/arcade/issues/15151 + - ${{ if and(eq(parameters.enableMicrobuildForMacAndLinux, 'true'), ne(variables['Agent.Os'], 'Windows_NT')) }}: + - task: UsePythonVersion@0 + displayName: 'Use Python 3.11.x' + inputs: + versionSpec: '3.11.x' + + - task: MicroBuildSigningPlugin@4 + displayName: Install MicroBuild plugin + inputs: + signType: $(_SignType) + zipSources: false + feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json + ${{ if and(eq(parameters.enableMicrobuildForMacAndLinux, 'true'), ne(variables['Agent.Os'], 'Windows_NT')) }}: + azureSubscription: 'MicroBuild Signing Task (DevDiv)' + env: + TeamName: $(_TeamName) + MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)' + SYSTEM_ACCESSTOKEN: $(System.AccessToken) + continueOnError: ${{ parameters.continueOnError }} + condition: and( + succeeded(), + or( + and( + eq(variables['Agent.Os'], 'Windows_NT'), + in(variables['_SignType'], 'real', 'test') + ), + and( + ${{ eq(parameters.enableMicrobuildForMacAndLinux, true) }}, + ne(variables['Agent.Os'], 'Windows_NT'), + eq(variables['_SignType'], 'real') + ) + )) diff --git a/global.json b/global.json index 8b900a6bef..903cf8f3a6 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "9.0.100-rc.1.24452.12", + "dotnet": "9.0.100-rc.2.24474.11", "runtimes": { "dotnet": [ "3.1.32", @@ -20,12 +20,12 @@ } }, "sdk": { - "version": "9.0.100-rc.1.24452.12", + "version": "9.0.100-rc.2.24474.11", "allowPrerelease": true, "rollForward": "latestFeature" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24504.4", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24510.1", "MSBuild.Sdk.Extras": "3.0.44" } } From f30d9b3105acb82ee2d3cc0c268032cddb252833 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 11 Oct 2024 12:30:03 +0000 Subject: [PATCH 3/6] Update dependencies from https://github.com/dotnet/arcade build 20241010.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.XliffTasks From Version 10.0.0-beta.24510.1 -> To Version 10.0.0-beta.24510.3 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/build.sh | 1 - eng/common/core-templates/steps/source-build.yml | 1 - global.json | 2 +- 5 files changed, 8 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2a25a476c9..647f1c999a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/arcade - 380002a14775d7f68f098c7e6b7d1c3638bd4c5d + f044058aaef59331bfc565f098d81a4e2e9092e3 - + https://github.com/dotnet/arcade - 380002a14775d7f68f098c7e6b7d1c3638bd4c5d + f044058aaef59331bfc565f098d81a4e2e9092e3 - + https://github.com/dotnet/arcade - 380002a14775d7f68f098c7e6b7d1c3638bd4c5d + f044058aaef59331bfc565f098d81a4e2e9092e3 https://dev.azure.com/devdiv/DevDiv/_git/vs-code-coverage diff --git a/eng/Versions.props b/eng/Versions.props index 94427ec2f6..52608d73dd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -7,7 +7,7 @@ preview - 10.0.0-beta.24510.1 + 10.0.0-beta.24510.3 17.13.0-preview.24510.2 1.5.0-preview.24509.1 diff --git a/eng/common/build.sh b/eng/common/build.sh index ac1ee8620c..483647daf1 100755 --- a/eng/common/build.sh +++ b/eng/common/build.sh @@ -231,7 +231,6 @@ function Build { /p:Restore=$restore \ /p:Build=$build \ /p:DotNetBuildRepo=$product_build \ - /p:ArcadeBuildFromSource=$source_build \ /p:DotNetBuildSourceOnly=$source_build \ /p:Rebuild=$rebuild \ /p:Test=$test \ diff --git a/eng/common/core-templates/steps/source-build.yml b/eng/common/core-templates/steps/source-build.yml index 2915d29bb7..c9271c0115 100644 --- a/eng/common/core-templates/steps/source-build.yml +++ b/eng/common/core-templates/steps/source-build.yml @@ -86,7 +86,6 @@ steps: $runtimeOsArgs \ $baseOsArgs \ /p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \ - /p:ArcadeBuildFromSource=true \ /p:DotNetBuildSourceOnly=true \ /p:DotNetBuildRepo=true \ /p:AssetManifestFileName=$assetManifestFileName diff --git a/global.json b/global.json index 903cf8f3a6..4c7d0c9209 100644 --- a/global.json +++ b/global.json @@ -25,7 +25,7 @@ "rollForward": "latestFeature" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24510.1", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24510.3", "MSBuild.Sdk.Extras": "3.0.44" } } From 566d1f5834644da86a250b3d434d23941dc1f970 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 12 Oct 2024 12:27:44 +0000 Subject: [PATCH 4/6] Update dependencies from https://github.com/dotnet/arcade build 20241011.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.XliffTasks From Version 10.0.0-beta.24510.3 -> To Version 10.0.0-beta.24511.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 647f1c999a..d45ad8910e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/arcade - f044058aaef59331bfc565f098d81a4e2e9092e3 + 712dea25b14a59fe642f2d28e8a3f3c931c03759 - + https://github.com/dotnet/arcade - f044058aaef59331bfc565f098d81a4e2e9092e3 + 712dea25b14a59fe642f2d28e8a3f3c931c03759 - + https://github.com/dotnet/arcade - f044058aaef59331bfc565f098d81a4e2e9092e3 + 712dea25b14a59fe642f2d28e8a3f3c931c03759 https://dev.azure.com/devdiv/DevDiv/_git/vs-code-coverage diff --git a/eng/Versions.props b/eng/Versions.props index 52608d73dd..8015c8b99b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -7,7 +7,7 @@ preview - 10.0.0-beta.24510.3 + 10.0.0-beta.24511.1 17.13.0-preview.24510.2 1.5.0-preview.24509.1 diff --git a/global.json b/global.json index 4c7d0c9209..19a1238786 100644 --- a/global.json +++ b/global.json @@ -25,7 +25,7 @@ "rollForward": "latestFeature" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24510.3", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24511.1", "MSBuild.Sdk.Extras": "3.0.44" } } From 1ee780da6884fa4cdaac5deace31c8c56311485b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 12 Oct 2024 12:53:52 +0000 Subject: [PATCH 5/6] Update dependencies from https://dev.azure.com/devdiv/DevDiv/_git/vs-code-coverage build 20241011.2 Microsoft.Testing.Extensions.CodeCoverage From Version 17.13.0-preview.24510.2 -> To Version 17.13.0-preview.24511.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d45ad8910e..c5c62a8abd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,9 +13,9 @@ https://github.com/dotnet/arcade 712dea25b14a59fe642f2d28e8a3f3c931c03759 - + https://dev.azure.com/devdiv/DevDiv/_git/vs-code-coverage - f45dff0041bdc975106a8e1205beb79ba276abec + 840c991e45000e96cbd1139582a8948ff388ed22 https://github.com/microsoft/testanywhere diff --git a/eng/Versions.props b/eng/Versions.props index 8015c8b99b..36340a1def 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 10.0.0-beta.24511.1 - 17.13.0-preview.24510.2 + 17.13.0-preview.24511.2 1.5.0-preview.24509.1 1.0.0-alpha.24473.2 From fed5d3368154aba97c8be3be9daaba333b634db8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 14 Oct 2024 12:02:40 +0000 Subject: [PATCH 6/6] Update dependencies from https://dev.azure.com/devdiv/DevDiv/_git/vs-code-coverage build 20241013.1 Microsoft.Testing.Extensions.CodeCoverage From Version 17.13.0-preview.24511.2 -> To Version 17.13.0-preview.24513.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c5c62a8abd..e4d8b71e42 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,9 +13,9 @@ https://github.com/dotnet/arcade 712dea25b14a59fe642f2d28e8a3f3c931c03759 - + https://dev.azure.com/devdiv/DevDiv/_git/vs-code-coverage - 840c991e45000e96cbd1139582a8948ff388ed22 + 16a7c15ea661cd431732189bc3bffa79644dc0cb https://github.com/microsoft/testanywhere diff --git a/eng/Versions.props b/eng/Versions.props index 36340a1def..13f1799635 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 10.0.0-beta.24511.1 - 17.13.0-preview.24511.2 + 17.13.0-preview.24513.1 1.5.0-preview.24509.1 1.0.0-alpha.24473.2