From f6d48648a2f58e18356e0075ba102b4424dbbd85 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 11 Jun 2024 12:57:10 +0000 Subject: [PATCH 01/94] Update dependencies from https://github.com/dotnet/roslyn build 20240611.3 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.10.0-3.24303.7 -> To Version 4.10.0-3.24311.3 --- NuGet.config | 2 +- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5ee9fe927c8a..183e42ab25f5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -23,7 +23,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d312484a1953..f3e6e718bac8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -82,34 +82,34 @@ d237e172b324021b97effa244af44d63d1a8bb7e - + https://github.com/dotnet/roslyn - bef690dda43733707d7dccea9868fe51f34eb8a0 + 2a9ce7e2e1b04988f2f5f7535623ffc3851cd260 - + https://github.com/dotnet/roslyn - bef690dda43733707d7dccea9868fe51f34eb8a0 + 2a9ce7e2e1b04988f2f5f7535623ffc3851cd260 - + https://github.com/dotnet/roslyn - bef690dda43733707d7dccea9868fe51f34eb8a0 + 2a9ce7e2e1b04988f2f5f7535623ffc3851cd260 - + https://github.com/dotnet/roslyn - bef690dda43733707d7dccea9868fe51f34eb8a0 + 2a9ce7e2e1b04988f2f5f7535623ffc3851cd260 - + https://github.com/dotnet/roslyn - bef690dda43733707d7dccea9868fe51f34eb8a0 + 2a9ce7e2e1b04988f2f5f7535623ffc3851cd260 - + https://github.com/dotnet/roslyn - bef690dda43733707d7dccea9868fe51f34eb8a0 + 2a9ce7e2e1b04988f2f5f7535623ffc3851cd260 - + https://github.com/dotnet/roslyn - bef690dda43733707d7dccea9868fe51f34eb8a0 + 2a9ce7e2e1b04988f2f5f7535623ffc3851cd260 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 99a4cf88a0d5..6e42a24f1f25 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -155,13 +155,13 @@ - 4.10.0-3.24303.7 - 4.10.0-3.24303.7 - 4.10.0-3.24303.7 - 4.10.0-3.24303.7 - 4.10.0-3.24303.7 - 4.10.0-3.24303.7 - 4.10.0-3.24303.7 + 4.10.0-3.24311.3 + 4.10.0-3.24311.3 + 4.10.0-3.24311.3 + 4.10.0-3.24311.3 + 4.10.0-3.24311.3 + 4.10.0-3.24311.3 + 4.10.0-3.24311.3 $(MicrosoftNetCompilersToolsetPackageVersion) From 52248c43816c72c2a534ff0275253549ff43c4fe Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 11 Jun 2024 13:04:15 +0000 Subject: [PATCH 02/94] Update dependencies from https://github.com/dotnet/arcade build 20240610.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.24270.4 -> To Version 8.0.0-beta.24310.5 --- NuGet.config | 2 +- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- .../job/source-index-stage1.yml | 16 +++++++--------- eng/common/templates/job/source-index-stage1.yml | 11 ++++------- global.json | 4 ++-- 6 files changed, 24 insertions(+), 29 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5ee9fe927c8a..183e42ab25f5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -23,7 +23,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d312484a1953..bf8303b2ba5b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -483,22 +483,22 @@ - + https://github.com/dotnet/arcade - f2b2071632d5d4c46d0f904f2b0d917b1752551b + 9f6799fdc16ae19b3e9478c55b997a6aab839d09 - + https://github.com/dotnet/arcade - f2b2071632d5d4c46d0f904f2b0d917b1752551b + 9f6799fdc16ae19b3e9478c55b997a6aab839d09 - + https://github.com/dotnet/arcade - f2b2071632d5d4c46d0f904f2b0d917b1752551b + 9f6799fdc16ae19b3e9478c55b997a6aab839d09 - + https://github.com/dotnet/arcade - f2b2071632d5d4c46d0f904f2b0d917b1752551b + 9f6799fdc16ae19b3e9478c55b997a6aab839d09 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 99a4cf88a0d5..a8a25f5c05db 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -35,7 +35,7 @@ 7.0.0 4.0.0 7.0.0 - 8.0.0-beta.24270.4 + 8.0.0-beta.24310.5 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -210,7 +210,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.24270.4 + 8.0.0-beta.24310.5 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/eng/common/templates-official/job/source-index-stage1.yml b/eng/common/templates-official/job/source-index-stage1.yml index 43ee0c202fc7..60dfb6b2d1c0 100644 --- a/eng/common/templates-official/job/source-index-stage1.yml +++ b/eng/common/templates-official/job/source-index-stage1.yml @@ -23,7 +23,7 @@ jobs: value: ${{ parameters.sourceIndexPackageSource }} - name: BinlogPath value: ${{ parameters.binlogPath }} - - template: /eng/common/templates/variables/pool-providers.yml + - template: /eng/common/templates-official/variables/pool-providers.yml ${{ if ne(parameters.pool, '') }}: pool: ${{ parameters.pool }} @@ -34,7 +34,8 @@ jobs: demands: ImageOverride -equals windows.vs2019.amd64.open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals windows.vs2019.amd64 + image: windows.vs2022.amd64 + os: windows steps: - ${{ each preStep in parameters.preSteps }}: @@ -70,16 +71,13 @@ jobs: scriptType: 'ps' scriptLocation: 'inlineScript' inlineScript: | - echo "##vso[task.setvariable variable=ARM_CLIENT_ID]$env:servicePrincipalId" - echo "##vso[task.setvariable variable=ARM_ID_TOKEN]$env:idToken" - echo "##vso[task.setvariable variable=ARM_TENANT_ID]$env:tenantId" + echo "##vso[task.setvariable variable=ARM_CLIENT_ID;issecret=true]$env:servicePrincipalId" + echo "##vso[task.setvariable variable=ARM_ID_TOKEN;issecret=true]$env:idToken" + echo "##vso[task.setvariable variable=ARM_TENANT_ID;issecret=true]$env:tenantId" - script: | - echo "Client ID: $(ARM_CLIENT_ID)" - echo "ID Token: $(ARM_ID_TOKEN)" - echo "Tenant ID: $(ARM_TENANT_ID)" az login --service-principal -u $(ARM_CLIENT_ID) --tenant $(ARM_TENANT_ID) --allow-no-subscriptions --federated-token $(ARM_ID_TOKEN) displayName: "Login to Azure" - script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) -s netsourceindexstage1 -b stage1 - displayName: Upload stage1 artifacts to source index \ No newline at end of file + displayName: Upload stage1 artifacts to source index diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml index 43ee0c202fc7..0b6bb89dc78a 100644 --- a/eng/common/templates/job/source-index-stage1.yml +++ b/eng/common/templates/job/source-index-stage1.yml @@ -70,16 +70,13 @@ jobs: scriptType: 'ps' scriptLocation: 'inlineScript' inlineScript: | - echo "##vso[task.setvariable variable=ARM_CLIENT_ID]$env:servicePrincipalId" - echo "##vso[task.setvariable variable=ARM_ID_TOKEN]$env:idToken" - echo "##vso[task.setvariable variable=ARM_TENANT_ID]$env:tenantId" + echo "##vso[task.setvariable variable=ARM_CLIENT_ID;issecret=true]$env:servicePrincipalId" + echo "##vso[task.setvariable variable=ARM_ID_TOKEN;issecret=true]$env:idToken" + echo "##vso[task.setvariable variable=ARM_TENANT_ID;issecret=true]$env:tenantId" - script: | - echo "Client ID: $(ARM_CLIENT_ID)" - echo "ID Token: $(ARM_ID_TOKEN)" - echo "Tenant ID: $(ARM_TENANT_ID)" az login --service-principal -u $(ARM_CLIENT_ID) --tenant $(ARM_TENANT_ID) --allow-no-subscriptions --federated-token $(ARM_ID_TOKEN) displayName: "Login to Azure" - script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) -s netsourceindexstage1 -b stage1 - displayName: Upload stage1 artifacts to source index \ No newline at end of file + displayName: Upload stage1 artifacts to source index diff --git a/global.json b/global.json index 1c7137dc526f..3c75c8136628 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24270.4", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24270.4" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24310.5", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24310.5" } } From 76c705819aaa56144116154f14c36e21ada7bffc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 12 Jun 2024 07:38:54 -0700 Subject: [PATCH 03/94] [release/8.0.3xx] Update dependencies from dotnet/templating (#41545) Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 2 +- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index 183e42ab25f5..ca1f5e248d72 100644 --- a/NuGet.config +++ b/NuGet.config @@ -23,7 +23,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 310183cf65a6..c381243925c1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,15 +3,15 @@ https://github.com/dotnet/templating - 1bddd10408f6e7cabcce51d89d2c40919914423d + 7248c3c1d6996893bc52c49520707994463aec29 - + https://github.com/dotnet/templating - 1bddd10408f6e7cabcce51d89d2c40919914423d + 7248c3c1d6996893bc52c49520707994463aec29 - + https://github.com/dotnet/templating - 1bddd10408f6e7cabcce51d89d2c40919914423d + 7248c3c1d6996893bc52c49520707994463aec29 diff --git a/eng/Versions.props b/eng/Versions.props index e607892d1b79..f1451bf76c84 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -144,7 +144,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.303-servicing.24303.2 + 8.0.303-servicing.24311.4 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From c9159553b8db392a6d8b4dd1592d30432f0a3935 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 12 Jun 2024 07:39:43 -0700 Subject: [PATCH 04/94] [release/8.0.3xx] Update dependencies from dotnet/roslyn (#41544) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c381243925c1..93464c4be96b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -82,34 +82,34 @@ d237e172b324021b97effa244af44d63d1a8bb7e - + https://github.com/dotnet/roslyn - 2a9ce7e2e1b04988f2f5f7535623ffc3851cd260 + dfc272796966cca9b6be9dd3d7d564b22a0fee6b - + https://github.com/dotnet/roslyn - 2a9ce7e2e1b04988f2f5f7535623ffc3851cd260 + dfc272796966cca9b6be9dd3d7d564b22a0fee6b - + https://github.com/dotnet/roslyn - 2a9ce7e2e1b04988f2f5f7535623ffc3851cd260 + dfc272796966cca9b6be9dd3d7d564b22a0fee6b - + https://github.com/dotnet/roslyn - 2a9ce7e2e1b04988f2f5f7535623ffc3851cd260 + dfc272796966cca9b6be9dd3d7d564b22a0fee6b - + https://github.com/dotnet/roslyn - 2a9ce7e2e1b04988f2f5f7535623ffc3851cd260 + dfc272796966cca9b6be9dd3d7d564b22a0fee6b - + https://github.com/dotnet/roslyn - 2a9ce7e2e1b04988f2f5f7535623ffc3851cd260 + dfc272796966cca9b6be9dd3d7d564b22a0fee6b - + https://github.com/dotnet/roslyn - 2a9ce7e2e1b04988f2f5f7535623ffc3851cd260 + dfc272796966cca9b6be9dd3d7d564b22a0fee6b https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index f1451bf76c84..44346b47fb5c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -155,13 +155,13 @@ - 4.10.0-3.24311.3 - 4.10.0-3.24311.3 - 4.10.0-3.24311.3 - 4.10.0-3.24311.3 - 4.10.0-3.24311.3 - 4.10.0-3.24311.3 - 4.10.0-3.24311.3 + 4.10.0-3.24311.11 + 4.10.0-3.24311.11 + 4.10.0-3.24311.11 + 4.10.0-3.24311.11 + 4.10.0-3.24311.11 + 4.10.0-3.24311.11 + 4.10.0-3.24311.11 $(MicrosoftNetCompilersToolsetPackageVersion) From 52357b20287f96bf5617733603705c9e194b4068 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 12 Jun 2024 07:39:55 -0700 Subject: [PATCH 05/94] [release/8.0.3xx] Update dependencies from dotnet/razor (#41543) Co-authored-by: dotnet-maestro[bot] --- 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 93464c4be96b..d20c27d7e90a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -285,18 +285,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 - + https://github.com/dotnet/razor - 69799ac98a8df65cb6bacfe66293d4cbca54a15e + c0bfb39f2018d2c077798ac992c799929df1453f - + https://github.com/dotnet/razor - 69799ac98a8df65cb6bacfe66293d4cbca54a15e + c0bfb39f2018d2c077798ac992c799929df1453f - + https://github.com/dotnet/razor - 69799ac98a8df65cb6bacfe66293d4cbca54a15e + c0bfb39f2018d2c077798ac992c799929df1453f https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 44346b47fb5c..fb349d2d199c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -176,9 +176,9 @@ - 7.0.0-preview.24273.1 - 7.0.0-preview.24273.1 - 7.0.0-preview.24273.1 + 7.0.0-preview.24312.2 + 7.0.0-preview.24312.2 + 7.0.0-preview.24312.2 From 2789db6afc92346fabf0d280a6f75dd7b6af744a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 13 Jun 2024 07:34:47 -0700 Subject: [PATCH 06/94] [release/8.0.3xx] Update dependencies from dotnet/roslyn (#41573) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d20c27d7e90a..c07a4e673ab3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -82,34 +82,34 @@ d237e172b324021b97effa244af44d63d1a8bb7e - + https://github.com/dotnet/roslyn - dfc272796966cca9b6be9dd3d7d564b22a0fee6b + 771f269b3abcbbd991f05becf8fe5e991d24b0c1 - + https://github.com/dotnet/roslyn - dfc272796966cca9b6be9dd3d7d564b22a0fee6b + 771f269b3abcbbd991f05becf8fe5e991d24b0c1 - + https://github.com/dotnet/roslyn - dfc272796966cca9b6be9dd3d7d564b22a0fee6b + 771f269b3abcbbd991f05becf8fe5e991d24b0c1 - + https://github.com/dotnet/roslyn - dfc272796966cca9b6be9dd3d7d564b22a0fee6b + 771f269b3abcbbd991f05becf8fe5e991d24b0c1 - + https://github.com/dotnet/roslyn - dfc272796966cca9b6be9dd3d7d564b22a0fee6b + 771f269b3abcbbd991f05becf8fe5e991d24b0c1 - + https://github.com/dotnet/roslyn - dfc272796966cca9b6be9dd3d7d564b22a0fee6b + 771f269b3abcbbd991f05becf8fe5e991d24b0c1 - + https://github.com/dotnet/roslyn - dfc272796966cca9b6be9dd3d7d564b22a0fee6b + 771f269b3abcbbd991f05becf8fe5e991d24b0c1 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index fb349d2d199c..fb59b41f7954 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -155,13 +155,13 @@ - 4.10.0-3.24311.11 - 4.10.0-3.24311.11 - 4.10.0-3.24311.11 - 4.10.0-3.24311.11 - 4.10.0-3.24311.11 - 4.10.0-3.24311.11 - 4.10.0-3.24311.11 + 4.10.0-3.24312.19 + 4.10.0-3.24312.19 + 4.10.0-3.24312.19 + 4.10.0-3.24312.19 + 4.10.0-3.24312.19 + 4.10.0-3.24312.19 + 4.10.0-3.24312.19 $(MicrosoftNetCompilersToolsetPackageVersion) From b45960467602a84b28d263c8bd3ca283b9e569ef Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 14 Jun 2024 12:52:44 +0000 Subject: [PATCH 07/94] Update dependencies from https://github.com/dotnet/arcade build 20240611.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.24310.5 -> To Version 8.0.0-beta.24311.3 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- global.json | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c07a4e673ab3..206c729e37e1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -483,22 +483,22 @@ - + https://github.com/dotnet/arcade - 9f6799fdc16ae19b3e9478c55b997a6aab839d09 + c214b6ad17aedca4fa48294d80f6c52ef2463081 - + https://github.com/dotnet/arcade - 9f6799fdc16ae19b3e9478c55b997a6aab839d09 + c214b6ad17aedca4fa48294d80f6c52ef2463081 - + https://github.com/dotnet/arcade - 9f6799fdc16ae19b3e9478c55b997a6aab839d09 + c214b6ad17aedca4fa48294d80f6c52ef2463081 - + https://github.com/dotnet/arcade - 9f6799fdc16ae19b3e9478c55b997a6aab839d09 + c214b6ad17aedca4fa48294d80f6c52ef2463081 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index fb59b41f7954..734ba59756cd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -35,7 +35,7 @@ 7.0.0 4.0.0 7.0.0 - 8.0.0-beta.24310.5 + 8.0.0-beta.24311.3 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -210,7 +210,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.24310.5 + 8.0.0-beta.24311.3 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/global.json b/global.json index 3c75c8136628..d2af4d682074 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24310.5", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24310.5" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24311.3", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24311.3" } } From 06f3f379d05c734015d78076762f3d83386774fc Mon Sep 17 00:00:00 2001 From: Damon Tivel Date: Wed, 12 Jun 2024 15:56:03 -0700 Subject: [PATCH 08/94] 2024-06 CTL --- .../redist/trustedroots/codesignctl.pem | 48 +++++++++++++++++++ .../redist/trustedroots/timestampctl.pem | 48 +++++++++++++++++++ .../GivenCodeSigningCtlFile.cs | 2 + .../GivenTimestampingCtlFile.cs | 2 +- 4 files changed, 99 insertions(+), 1 deletion(-) diff --git a/src/Layout/redist/trustedroots/codesignctl.pem b/src/Layout/redist/trustedroots/codesignctl.pem index 11978a9a649f..021bd8997f77 100644 --- a/src/Layout/redist/trustedroots/codesignctl.pem +++ b/src/Layout/redist/trustedroots/codesignctl.pem @@ -8620,3 +8620,51 @@ e0G4FBVWdtOW4xWFZAIwJOT2+L0Tbjq3P9y/zXjfJoBXEq9oZ0//8iuxoqGZtMOT G456y3y/FI7r6rj+4QNf -----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIFeDCCA2CgAwIBAgIQSyw7AQGLrSq8jHtbPu2QVzANBgkqhkiG9w0BAQwFADBW +MQswCQYDVQQGEwJHQjEYMBYGA1UEChMPU2VjdGlnbyBMaW1pdGVkMS0wKwYDVQQD +EyRTZWN0aWdvIFB1YmxpYyBDb2RlIFNpZ25pbmcgUm9vdCBSNDYwHhcNMjEwMzIy +MDAwMDAwWhcNNDYwMzIxMjM1OTU5WjBWMQswCQYDVQQGEwJHQjEYMBYGA1UEChMP +U2VjdGlnbyBMaW1pdGVkMS0wKwYDVQQDEyRTZWN0aWdvIFB1YmxpYyBDb2RlIFNp +Z25pbmcgUm9vdCBSNDYwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCN +55QSIgQkdC7/FiMCkoq2rjaFrEfUI5ErPtx94jGgUW+shJHjUoq14pbe0IdjJImK +/+8Skzt9u7aKvb0Ffyeba2XTpQxpsbxJOZrxbW6q5KCDJ9qaDStQ6Utbs7hkNqR+ +Sj2pcaths3OzPAsM79szV+W+NDfjlxtd/R8SPYIDdub7P2bSlDFp+m2zNKzBenjc +klDyZMeqLQSrw2rq4C+np9xu1+j/2iGrQL+57g2extmeme/G3h+pDHazJyCh1rr9 +gOcB0u/rgimVcI3/uxXP/tEPNqIuTzKQdEZrRzUTdwUzT2MuuC3hv2WnBGsY2HH6 +zAjybYmZELGt2z4s5KoYsMYHAXVn3m3pY2MeNn9pib6qRT5uWl+PoVvLnTCGMOgD +s0DGDQ84zWeoU4j6uDBl+m/H5x2xg3RpPqzEaDux5mczmrYI4IAFSEDu9oJkRqj1 +c7AGlfJsZZ+/VVscnFcax3hGfHCqlBuCF6yH6bbJDoEcQNYWFyn8XJwYK+pF9e+9 +1WdPKF4F7pBMeufG9ND8+s0+MkYTIDaKBOq3qgdGnA2TOglmmVhcKaO5DKYwODzQ +RjY1fJy67sPV+Qp2+n4FG0DKkjXp1XrRtX8ArqmQqsV/AZwQsRb8zG4Y3G9i/qZQ +p7h7uJ0VP/4gDHXIIloTlRmQAOka1cKG8eOO7F/05QIDAQABo0IwQDAdBgNVHQ4E +FgQUMuuSmv81lkgvKEBCcCA2kVwXheYwDgYDVR0PAQH/BAQDAgGGMA8GA1UdEwEB +/wQFMAMBAf8wDQYJKoZIhvcNAQEMBQADggIBAHZlwuPXIkrXHYle/2lexhQCTXOm +zc0oyrA36r+nySGqql/av/aDbNCA0QpcAKTL88w5D55BcYjVPOiKe4wXI/fKNHSR +bAauUD8AWbImPDwXg1cDPi3RGj3UzwdUskMLUnKoiPXEF/Jv0Vil0WjkPZgIGO42 +9EhImvpUcPCI1HAWMEJJ0Nk/dUtFcdiuorthDoiFUFe5uhErNikfjyBynlyeidGC +2kWNapnahHFrM6UQu3nwl/Z0gaA/V8eGjDCMDjiVrgHGHqvcqB9vL9f/dh6uF3Nt +5bl1s2EGqJUzwk5vsjfylb6FVBK5yL1iQnb3Kvz1NzEDJlf+0ebb8BYCcoOMCLOE +rKnkB/ihiMQTWlBHVEKm7dBBNCyYsT6iNKEMXb2s9395p79tDFYyhRtLl7jhrOSk +PHHxo+FOY9b0Rrr1CwjhYzztolkvCtQsayOinqFN7tESzRgzUO1Bbst/PUFgC2ML +ePV170MVtzYLEK/cXBipmNk22R3YhLMGioLjexskp0LO7g8+VlwyfexL3lYrOzu6 ++XpY0FG2bNb2WKJSJHpEhqEcYD9J0/z6+YQcBcI0v+Lm8RkqmS9WVzWctfUHw0Yv +3jg9GQ37o/HfE57nqXJYMa+96trX1m13MzOO9Kz9wb9Jh9JwBWd0Bqb2eEAtFgSR +Dx/TFsS4ehcNJMmy +-----END CERTIFICATE----- + +-----BEGIN CERTIFICATE----- +MIICKDCCAa+gAwIBAgIQUCSbou+Opr9sLB8aY4XUwzAKBggqhkjOPQQDAzBWMQsw +CQYDVQQGEwJHQjEYMBYGA1UEChMPU2VjdGlnbyBMaW1pdGVkMS0wKwYDVQQDEyRT +ZWN0aWdvIFB1YmxpYyBDb2RlIFNpZ25pbmcgUm9vdCBFNDYwHhcNMjEwMzIyMDAw +MDAwWhcNNDYwMzIxMjM1OTU5WjBWMQswCQYDVQQGEwJHQjEYMBYGA1UEChMPU2Vj +dGlnbyBMaW1pdGVkMS0wKwYDVQQDEyRTZWN0aWdvIFB1YmxpYyBDb2RlIFNpZ25p +bmcgUm9vdCBFNDYwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQIMoEDH487om+BR4zl +e7m6wWmyW0nAKLkUWG8kM85Qm3PZO8FoOZx6Yc5c0iJHRKuAhanllayqrmZYhlan +uIODzLTRDqlR+EtnOX+MubY5aDSPGUq6jiHrQrisVp0J3AejQjBAMB0GA1UdDgQW +BBTPfSygkHqYHd22XoXC4NoVcdLlXjAOBgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/ +BAUwAwEB/zAKBggqhkjOPQQDAwNnADBkAjACd++zAerlV83j8HflRwwwlLmgchbs +aGX/4g44dv/oG8KfzCVTRg6sZHMobtK0IqYCMGk5W6+oBFyZMtOebrSwXs8lGjll +/zHz43Zy8DMXO+iiqzSEwWGneZ6KupkGGqfVKw== +-----END CERTIFICATE----- + diff --git a/src/Layout/redist/trustedroots/timestampctl.pem b/src/Layout/redist/trustedroots/timestampctl.pem index 592079fa33ae..e11dc73a8817 100644 --- a/src/Layout/redist/trustedroots/timestampctl.pem +++ b/src/Layout/redist/trustedroots/timestampctl.pem @@ -9257,3 +9257,51 @@ sEn9loiN7TPb5cHvtvLTRX9Dvr82zadlqpFiHzd/7Uvv7nMXbi8LgNW1asp98aib oTM3VxKKcl+Yqg== -----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIICNjCCAb2gAwIBAgIUNdzqqPFud6Xd/BatNpw0vRVFzikwCgYIKoZIzj0EAwMw +WzELMAkGA1UEBhMCTkwxIDAeBgNVBAoMF1F1b1ZhZGlzIFRydXN0bGluayBCLlYu +MSowKAYDVQQDDCFRdW9WYWRpcyBTaWduaW5nIEVDQyBQMzg0IFJvb3QgRzQwHhcN +MjMwMzE2MTUzNjAyWhcNNDgwMzA5MTUzNjAxWjBbMQswCQYDVQQGEwJOTDEgMB4G +A1UECgwXUXVvVmFkaXMgVHJ1c3RsaW5rIEIuVi4xKjAoBgNVBAMMIVF1b1ZhZGlz +IFNpZ25pbmcgRUNDIFAzODQgUm9vdCBHNDB2MBAGByqGSM49AgEGBSuBBAAiA2IA +BFI7CA12eXWd/JJ/J6R9xlocD5E82+Q5+IKq2PzmYohXxrVz2z72REWsGaRBYykL +liyHxKYC012KoqjnXjbs38WhRVVKDFRRkBCcHpoM+PM0sJSy54NIx1jKetHHJGgF +LKNCMEAwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUWRZsDiAtkUp02ppPs/4p +UbnpynwwDgYDVR0PAQH/BAQDAgGGMAoGCCqGSM49BAMDA2cAMGQCMBZ8eADXpJ2W +4XVLDPFJMoABShYkMQVq5PHCRA1/t5l5Lgkw15p6O0DmoSYM500L/QIwRmBoIwwu +shW7GPd4iqd4bGvn1U+4UL+binQ0f4vyuAw62hoABxh7IH+mdNN+g6gT +-----END CERTIFICATE----- + +-----BEGIN CERTIFICATE----- +MIIFhjCCA26gAwIBAgIUDx0XQGkARJQ7rWtetIcEV1mwgI0wDQYJKoZIhvcNAQEM +BQAwWzELMAkGA1UEBhMCTkwxIDAeBgNVBAoMF1F1b1ZhZGlzIFRydXN0bGluayBC +LlYuMSowKAYDVQQDDCFRdW9WYWRpcyBTaWduaW5nIFJTQSA0MDk2IFJvb3QgRzQw +HhcNMjMwMzE2MTUzMjQ4WhcNNDgwMzA5MTUzMjQ3WjBbMQswCQYDVQQGEwJOTDEg +MB4GA1UECgwXUXVvVmFkaXMgVHJ1c3RsaW5rIEIuVi4xKjAoBgNVBAMMIVF1b1Zh +ZGlzIFNpZ25pbmcgUlNBIDQwOTYgUm9vdCBHNDCCAiIwDQYJKoZIhvcNAQEBBQAD +ggIPADCCAgoCggIBANCMA/gAIDZZWuEcZP0bo8ss5R5zIRDr5DYOLLh2vyg6HsEK +lEXzWuk7wBrF/Od8OMzpHCy3eWGse+BO9i63oTIVG5Usix1Q9qWzsBtj8kbCw1ah +ydO8E87y24Yapmjr/e+jY6++44IZ/dcSBK5vmJsUr6j353+z1npzUQNo5JeB01o8 +M73Gwf3kfkkc4xQNj8FluJcrYVr88zQ27Gcpe9JMkCrSpkKpxsgByVy/XDcx/gZZ +V+5urRyeovFq3IjllYTV1h4BnVAW4y9xraGRIKayq/4IKAI2L0OYjDucphkEmrWx +fP6wDX+kMCPCbw8jAWv/2fOFgq0Fq2xAp4FQbQF/xgTcDsm5zq9p8QOsw8wV4B7q ++2N+NGtSU/CYTPydg13Dik8/k71zWkWhuQ9S8LChI4MKh+lsKaLEN574U5UABwyo +OSDDRurBPRQZrEtzebgE7lwMo3WWWrVuAp5e8rtyLNrxaSVcIDjqRydWbNLF+BB2 +3iKUaZ3tV6RspDUpmsp9Gl9VRErEVJ+/O5kS0M1oMyK9LB3GGTOkW4SGhEMJQiW5 +4pcs8ZQHrF6QjAEib6Ur9DcEB6vI10xQh/I+Qb8mKiyjZpHO/h5i5sbppaG+mMPv +5GbN/dvvii+WTHuuM/g6zvyF+GOvyfLA/bRmez3zYyO9W29RPWnDQFTw1q43AgMB +AAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFFNw9E+5WtshFimqEnp6 +WQvW/EXtMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQwFAAOCAgEABdc9SCeg +Xz5mkfFh+wZoILbKSVY9qoP3Hp4WLAFpeQZiLSOoxvNLVIX4ENWYrM+wzVb+S32X +VA9kvl3QK/QJirECmvyyfMprJvKkzYF0ZjNUo0fWUGwJzja4lQjeExGte0dcsQYL +vCkqRRnt0v019E5kVDVkXgNBUipl06AULYmUAjJ9xAukbzZcIfr7XuGtpWRZzIGP +XA/R55Bn/KkJtWW7ALvB74auDpnnPT6PkJXTdgIlUOqJvtISRy0bLjv3r01ZkZvZ +aAEzmMswZpCSiFJCX0evKp4BvOBrc/e63FZC4WfU7pqtAS43PzA9h/gdcWug6I9g +R0tl50viFBfXmgYbyLcxeEJKDmHnfnWDwMENqAmsvLNroHNwdALkSdipcyA/pnYA +aR/8fXg5dYPlpuVy4F6mQhyQ4R4aASXG6NxsR7O+1Y6Q4FL4oE2IHV5kkwkUXJad +UHqicmqUZTynAe2cj+d28fmV4066TjbYiSfTRH/Ji6gJnpG9ySiYRCCHtMecjsfZ +Y+wj87Hgonlo4ek+S05aqdOPaUX5v1K6KrchPNN2GE6Tdz5OO2v2ACWyinbBn12X +dnnmQphmiOAQhu+wodWXUMTpoURWz+57cSnrKAvNbTz6DPvb1mU5UwNTfSQn09h4 +h31GcJwT1UuEv1xp188BqF4OvBPFXkjrhyE= +-----END CERTIFICATE----- + diff --git a/src/Tests/trustedroots.Tests/GivenCodeSigningCtlFile.cs b/src/Tests/trustedroots.Tests/GivenCodeSigningCtlFile.cs index 8304576ffa48..41483b5c8e9c 100644 --- a/src/Tests/trustedroots.Tests/GivenCodeSigningCtlFile.cs +++ b/src/Tests/trustedroots.Tests/GivenCodeSigningCtlFile.cs @@ -23,11 +23,13 @@ public GivenCodeSigningCtlFile() [InlineData("45140b3247eb9cc8c5b4f0d7b53091f73292089e6e5a63e2749dd3aca9198eda")] // CN=Go Daddy Root Certificate Authority - G2, O="GoDaddy.com, Inc.", L=Scottsdale, S=Arizona, C=US [InlineData("4b03f45807ad70f21bfc2cae71c9fde4604c064cf5ffb686bae5dbaad7fdd34c")] // CN=thawte Primary Root CA - G3, OU="(c) 2008 thawte, Inc. - For authorized use only", OU=Certification Services Division, O="thawte, Inc.", C=US [InlineData("52f0e1c4e58ec629291b60317f074671b85d7ea80d5b07273463534b32b40234")] // CN=COMODO RSA Certification Authority, O=COMODO CA Limited, L=Salford, S=Greater Manchester, C=GB + [InlineData("5367f20c7ade0e2bca790915056d086b720c33c1fa2a2661acf787e3292e1270")] // CN=Microsoft Identity Verification Root Certificate Authority 2020, O=Microsoft Corporation, C=US [InlineData("552f7bdcf1a7af9e6ce672017f4f12abf77240c78e761ac203d1d9d20ac89988")] // CN=DigiCert Trusted Root G4, OU=www.digicert.com, O=DigiCert Inc, C=US [InlineData("5c58468d55f58e497e743982d2b50010b6d165374acf83a7d4a32db768c4408e")] // CN=Certum Trusted Network CA, OU=Certum Certification Authority, O=Unizeto Technologies S.A., C=PL [InlineData("7353b6d6c2d6da4247773f3f07d075decb5134212bead0928ef1f46115260941")] // CN=DigiCert CS RSA4096 Root G5, O="DigiCert, Inc.", C=US [InlineData("7431e5f4c3c1ce4690774f0b61e05440883ba9a01ed00ba6abd7806ed3b118cf")] // CN=DigiCert High Assurance EV Root CA, OU=www.digicert.com, O=DigiCert Inc, C=US [InlineData("7b9d553e1c92cb6e8803e137f4f287d4363757f5d44b37d52f9fca22fb97df86")] // CN=GlobalSign Code Signing Root R45, O=GlobalSign nv-sa, C=BE + [InlineData("7e76260ae69a55d3f060b0fd18b2a8c01443c87b60791030c9fa0b0585101a38")] // CN=Sectigo Public Code Signing Root R46, O=Sectigo Limited, C=GB [InlineData("85666a562ee0be5ce925c1d8890a6f76a87ec16d4d7d5f29ea7419cf20123b69")] // CN=SSL.com Root Certification Authority RSA, O=SSL Corporation, L=Houston, S=Texas, C=US [InlineData("85a0dd7dd720adb7ff05f83d542b209dc7ff4528f7d677b18389fea5e5c49e86")] // CN=QuoVadis Root CA 2, O=QuoVadis Limited, C=BM [InlineData("8d722f81a9c113c0791df136a2966db26c950a971db46b4199f4ea54b78bfb9f")] // CN=thawte Primary Root CA, OU="(c) 2006 thawte, Inc. - For authorized use only", OU=Certification Services Division, O="thawte, Inc.", C=US diff --git a/src/Tests/trustedroots.Tests/GivenTimestampingCtlFile.cs b/src/Tests/trustedroots.Tests/GivenTimestampingCtlFile.cs index 8096fe3a1d9e..7d2f255c9479 100644 --- a/src/Tests/trustedroots.Tests/GivenTimestampingCtlFile.cs +++ b/src/Tests/trustedroots.Tests/GivenTimestampingCtlFile.cs @@ -25,10 +25,10 @@ public GivenTimestampingCtlFile() [InlineData("5c58468d55f58e497e743982d2b50010b6d165374acf83a7d4a32db768c4408e")] // CN=Certum Trusted Network CA, OU=Certum Certification Authority, O=Unizeto Technologies S.A., C=PL [InlineData("6dc47172e01cbcb0bf62580d895fe2b8ac9ad4f873801e0c10b9c837d21eb177")] // CN=Entrust.net Certification Authority (2048), OU=(c) 1999 Entrust.net Limited, OU=www.entrust.net/CPS_2048 incorp. by ref. (limits liab.), O=Entrust.net [InlineData("6fff78e400a70c11011cd85977c459fb5af96a3df0540820d0f4b8607875e58f")] // CN=UTN-USERFirst-Object, OU=http://www.usertrust.com, O=The USERTRUST Network, L=Salt Lake City, S=UT, C=US + [InlineData("85666a562ee0be5ce925c1d8890a6f76a87ec16d4d7d5f29ea7419cf20123b69")] // CN=SSL.com Root Certification Authority RSA, O=SSL Corporation, L=Houston, S=Texas, C=US [InlineData("8a866fd1b276b57e578e921c65828a2bed58e9f2f288054134b7f1f4bfc9cc74")] // CN=QuoVadis Root CA 1 G3, O=QuoVadis Limited, C=BM [InlineData("a45ede3bbbf09c8ae15c72efc07268d693a21c996fd51e67ca079460fd6d8873")] // CN=QuoVadis Root Certification Authority, OU=Root Certification Authority, O=QuoVadis Limited, C=BM [InlineData("cbb522d7b7f127ad6a0113865bdf1cd4102e7d0759af635a7cf4720dc963c53b")] // CN=GlobalSign, O=GlobalSign, OU=GlobalSign Root CA - R3 - [InlineData("d7a7a0fb5d7e2731d771e9484ebcdef71d5f0c3e0a2948782bc83ee0ea699ef4")] // CN=AAA Certificate Services, O=Comodo CA Limited, L=Salford, S=Greater Manchester, C=GB [InlineData("e793c9b02fd8aa13e21c31228accb08119643b749c898964b1746d46c3d4cbd2")] // CN=USERTrust RSA Certification Authority, O=The USERTRUST Network, L=Jersey City, S=New Jersey, C=US public void File_contains_certificates_used_in_NuGet_org_package_signatures(string expectedFingerprint) { From 308b9ad64cfc8cba1fc59370991e597454209c2a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 15 Jun 2024 12:44:47 +0000 Subject: [PATCH 09/94] Update dependencies from https://github.com/dotnet/razor build 20240614.2 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.24312.2 -> To Version 7.0.0-preview.24314.2 --- 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 c07a4e673ab3..3c471d786369 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -285,18 +285,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 - + https://github.com/dotnet/razor - c0bfb39f2018d2c077798ac992c799929df1453f + fc9b28705adcd7c5dbd6f5104ee1d992e857a9fb - + https://github.com/dotnet/razor - c0bfb39f2018d2c077798ac992c799929df1453f + fc9b28705adcd7c5dbd6f5104ee1d992e857a9fb - + https://github.com/dotnet/razor - c0bfb39f2018d2c077798ac992c799929df1453f + fc9b28705adcd7c5dbd6f5104ee1d992e857a9fb https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index fb59b41f7954..6f0d5fae6045 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -176,9 +176,9 @@ - 7.0.0-preview.24312.2 - 7.0.0-preview.24312.2 - 7.0.0-preview.24312.2 + 7.0.0-preview.24314.2 + 7.0.0-preview.24314.2 + 7.0.0-preview.24314.2 From d73873c48128d7d6a973a6ad64e2610bdf7272dc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 15 Jun 2024 12:45:15 +0000 Subject: [PATCH 10/94] Update dependencies from https://github.com/dotnet/templating build 20240614.2 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.303-servicing.24311.4 -> To Version 8.0.303-servicing.24314.2 --- NuGet.config | 2 +- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index ca1f5e248d72..6baf4d7d0dc9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -23,7 +23,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c07a4e673ab3..fa1750142752 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,15 +3,15 @@ https://github.com/dotnet/templating - 7248c3c1d6996893bc52c49520707994463aec29 + 2c8137bda50484d21e263aaac51dad537ba57cc8 - + https://github.com/dotnet/templating - 7248c3c1d6996893bc52c49520707994463aec29 + 2c8137bda50484d21e263aaac51dad537ba57cc8 - + https://github.com/dotnet/templating - 7248c3c1d6996893bc52c49520707994463aec29 + 2c8137bda50484d21e263aaac51dad537ba57cc8 diff --git a/eng/Versions.props b/eng/Versions.props index fb59b41f7954..096cfc32e562 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -144,7 +144,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.303-servicing.24311.4 + 8.0.303-servicing.24314.2 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 0bd63554c1b286bb91632dcaf2e4eef4ec67e5c7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 15 Jun 2024 12:47:19 +0000 Subject: [PATCH 11/94] Update dependencies from https://github.com/dotnet/arcade build 20240611.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.24310.5 -> To Version 8.0.0-beta.24311.3 From bc938c63d65e94be8297aa86ebb9d1671f61bdb9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 16 Jun 2024 12:38:00 +0000 Subject: [PATCH 12/94] Update dependencies from https://github.com/dotnet/razor build 20240614.2 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.24312.2 -> To Version 7.0.0-preview.24314.2 From 66ca80c5aca56fc89c28d5a8e1d734c5ffa99563 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 16 Jun 2024 12:38:31 +0000 Subject: [PATCH 13/94] Update dependencies from https://github.com/dotnet/templating build 20240614.2 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.303-servicing.24311.4 -> To Version 8.0.303-servicing.24314.2 From 4b168dc968c29c1bdb6790b0fed5e40d5e10dff6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 16 Jun 2024 12:40:33 +0000 Subject: [PATCH 14/94] Update dependencies from https://github.com/dotnet/arcade build 20240611.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.24310.5 -> To Version 8.0.0-beta.24311.3 From 3a8dccce312dc59939766a28afd91d85655f3975 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 17 Jun 2024 12:31:15 +0000 Subject: [PATCH 15/94] Update dependencies from https://github.com/microsoft/vstest build 20240617.2 Microsoft.NET.Test.Sdk , Microsoft.TestPlatform.Build , Microsoft.TestPlatform.CLI From Version 17.10.0-release-24272-11 -> To Version 17.10.0-release-24317-02 --- 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 c07a4e673ab3..eec9b4d3cd20 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -187,18 +187,18 @@ https://github.com/nuget/nuget.client fb50d1a45ed10b39b5f335bc3a4bdcaea9b951cf - + https://github.com/microsoft/vstest - 83d73f783bf54c336d1eab04a53d554f8a6c0b19 + c4d80397805bec06b354d20aeb1773e243c6add0 - + https://github.com/microsoft/vstest - 83d73f783bf54c336d1eab04a53d554f8a6c0b19 + c4d80397805bec06b354d20aeb1773e243c6add0 - + https://github.com/microsoft/vstest - 83d73f783bf54c336d1eab04a53d554f8a6c0b19 + c4d80397805bec06b354d20aeb1773e243c6add0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index fb59b41f7954..080b1362d391 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -100,9 +100,9 @@ - 17.10.0-release-24272-11 - 17.10.0-release-24272-11 - 17.10.0-release-24272-11 + 17.10.0-release-24317-02 + 17.10.0-release-24317-02 + 17.10.0-release-24317-02 From c12e91a116c4cd08819177c9cb20c66d108569bd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 17 Jun 2024 12:31:52 +0000 Subject: [PATCH 16/94] Update dependencies from https://github.com/dotnet/razor build 20240614.2 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.24312.2 -> To Version 7.0.0-preview.24314.2 From ebbd5cecddd08e409bc20b5e04c3e81cc95131b8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 17 Jun 2024 12:32:24 +0000 Subject: [PATCH 17/94] Update dependencies from https://github.com/dotnet/templating build 20240614.2 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.303-servicing.24311.4 -> To Version 8.0.303-servicing.24314.2 From 0aad89a92e541e92f18746c96d0834a8efdfe279 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 17 Jun 2024 12:34:27 +0000 Subject: [PATCH 18/94] Update dependencies from https://github.com/dotnet/arcade build 20240611.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.24310.5 -> To Version 8.0.0-beta.24311.3 From 37302cb1eddcd55e9f3c00a3c72e387f7d9af38b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 18 Jun 2024 12:45:36 +0000 Subject: [PATCH 19/94] Update dependencies from https://github.com/microsoft/vstest build 20240617.2 Microsoft.NET.Test.Sdk , Microsoft.TestPlatform.Build , Microsoft.TestPlatform.CLI From Version 17.10.0-release-24272-11 -> To Version 17.10.0-release-24317-02 --- NuGet.config | 1 + 1 file changed, 1 insertion(+) diff --git a/NuGet.config b/NuGet.config index ca1f5e248d72..2fe66c7b93ed 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,6 +24,7 @@ + From 3c4fad0bd5e4ff655f85f834b7e8eaad52043955 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 18 Jun 2024 12:46:16 +0000 Subject: [PATCH 20/94] Update dependencies from https://github.com/dotnet/razor build 20240614.2 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.24312.2 -> To Version 7.0.0-preview.24314.2 --- NuGet.config | 1 + 1 file changed, 1 insertion(+) diff --git a/NuGet.config b/NuGet.config index ca1f5e248d72..2fe66c7b93ed 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,6 +24,7 @@ + From 9f444483393ce9a5e32a440e2d8728febc546c5d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 18 Jun 2024 12:46:46 +0000 Subject: [PATCH 21/94] Update dependencies from https://github.com/dotnet/roslyn build 20240618.3 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.10.0-3.24312.19 -> To Version 4.10.0-3.24318.3 --- NuGet.config | 1 + eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 3 files changed, 22 insertions(+), 21 deletions(-) diff --git a/NuGet.config b/NuGet.config index ca1f5e248d72..2fe66c7b93ed 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,6 +24,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 206c729e37e1..88ab4fec9d77 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -82,34 +82,34 @@ d237e172b324021b97effa244af44d63d1a8bb7e - + https://github.com/dotnet/roslyn - 771f269b3abcbbd991f05becf8fe5e991d24b0c1 + 10c1f374ce445ebbcc17fe8b52564539591628a8 - + https://github.com/dotnet/roslyn - 771f269b3abcbbd991f05becf8fe5e991d24b0c1 + 10c1f374ce445ebbcc17fe8b52564539591628a8 - + https://github.com/dotnet/roslyn - 771f269b3abcbbd991f05becf8fe5e991d24b0c1 + 10c1f374ce445ebbcc17fe8b52564539591628a8 - + https://github.com/dotnet/roslyn - 771f269b3abcbbd991f05becf8fe5e991d24b0c1 + 10c1f374ce445ebbcc17fe8b52564539591628a8 - + https://github.com/dotnet/roslyn - 771f269b3abcbbd991f05becf8fe5e991d24b0c1 + 10c1f374ce445ebbcc17fe8b52564539591628a8 - + https://github.com/dotnet/roslyn - 771f269b3abcbbd991f05becf8fe5e991d24b0c1 + 10c1f374ce445ebbcc17fe8b52564539591628a8 - + https://github.com/dotnet/roslyn - 771f269b3abcbbd991f05becf8fe5e991d24b0c1 + 10c1f374ce445ebbcc17fe8b52564539591628a8 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 734ba59756cd..a3a2bc3d943b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -155,13 +155,13 @@ - 4.10.0-3.24312.19 - 4.10.0-3.24312.19 - 4.10.0-3.24312.19 - 4.10.0-3.24312.19 - 4.10.0-3.24312.19 - 4.10.0-3.24312.19 - 4.10.0-3.24312.19 + 4.10.0-3.24318.3 + 4.10.0-3.24318.3 + 4.10.0-3.24318.3 + 4.10.0-3.24318.3 + 4.10.0-3.24318.3 + 4.10.0-3.24318.3 + 4.10.0-3.24318.3 $(MicrosoftNetCompilersToolsetPackageVersion) From 5a91dac0100f40f92416154eebd82a6ac7096e5a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 18 Jun 2024 12:47:18 +0000 Subject: [PATCH 22/94] Update dependencies from https://github.com/dotnet/templating build 20240614.2 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.303-servicing.24311.4 -> To Version 8.0.303-servicing.24314.2 From e6e6a12e6780f7ba17cb5bb9c6b698fb1023eeba Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 19 Jun 2024 12:31:10 +0000 Subject: [PATCH 23/94] Update dependencies from https://github.com/microsoft/vstest build 20240617.2 Microsoft.NET.Test.Sdk , Microsoft.TestPlatform.Build , Microsoft.TestPlatform.CLI From Version 17.10.0-release-24272-11 -> To Version 17.10.0-release-24317-02 From 11a21c43435993a77826e7df5e97eb7999eea712 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 19 Jun 2024 12:31:47 +0000 Subject: [PATCH 24/94] Update dependencies from https://github.com/dotnet/razor build 20240614.2 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.24312.2 -> To Version 7.0.0-preview.24314.2 From 85ed2b09a8662b7fc9ad4425aed778994c8d13d0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 19 Jun 2024 12:32:21 +0000 Subject: [PATCH 25/94] Update dependencies from https://github.com/dotnet/roslyn build 20240618.3 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.10.0-3.24312.19 -> To Version 4.10.0-3.24318.3 From e9c90bfb45a401fe9d0ac77414769db621059b4b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 19 Jun 2024 12:32:55 +0000 Subject: [PATCH 26/94] Update dependencies from https://github.com/dotnet/templating build 20240614.2 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.303-servicing.24311.4 -> To Version 8.0.303-servicing.24314.2 From aacfaf5ee70fa08a96025001c6712e4bd87b3a59 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 20 Jun 2024 12:28:12 +0000 Subject: [PATCH 27/94] Update dependencies from https://github.com/microsoft/vstest build 20240617.2 Microsoft.NET.Test.Sdk , Microsoft.TestPlatform.Build , Microsoft.TestPlatform.CLI From Version 17.10.0-release-24272-11 -> To Version 17.10.0-release-24317-02 From 1c48ffd3fd667fe90fe9d2f620daec0147290c52 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 20 Jun 2024 12:28:40 +0000 Subject: [PATCH 28/94] Update dependencies from https://github.com/dotnet/razor build 20240614.2 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.24312.2 -> To Version 7.0.0-preview.24314.2 From 09b59b883917ce52e445ce65db6a09017173f902 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 20 Jun 2024 12:29:12 +0000 Subject: [PATCH 29/94] Update dependencies from https://github.com/dotnet/roslyn build 20240618.3 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.10.0-3.24312.19 -> To Version 4.10.0-3.24318.3 From da527ecd5a40c64bba146001a57aee3a0b0ab50d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 20 Jun 2024 12:29:48 +0000 Subject: [PATCH 30/94] Update dependencies from https://github.com/dotnet/templating build 20240614.2 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.303-servicing.24311.4 -> To Version 8.0.303-servicing.24314.2 From 94f324e4d9bdf9fd58147d63dddf6618f1e07e63 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 21 Jun 2024 12:46:18 +0000 Subject: [PATCH 31/94] Update dependencies from https://github.com/microsoft/vstest build 20240617.2 Microsoft.NET.Test.Sdk , Microsoft.TestPlatform.Build , Microsoft.TestPlatform.CLI From Version 17.10.0-release-24272-11 -> To Version 17.10.0-release-24317-02 From 4282bf938ea687abf9f801c154ee1f697e810896 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 21 Jun 2024 12:46:49 +0000 Subject: [PATCH 32/94] Update dependencies from https://github.com/dotnet/razor build 20240614.2 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.24312.2 -> To Version 7.0.0-preview.24314.2 From 6369cad0d94cb07ff2ae30c4b1af4d68ede922a1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 21 Jun 2024 12:47:20 +0000 Subject: [PATCH 33/94] Update dependencies from https://github.com/dotnet/roslyn build 20240618.3 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.10.0-3.24312.19 -> To Version 4.10.0-3.24318.3 From 14f0b2c11b77aa9c2407a1e578c1a189c0fc3d79 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 21 Jun 2024 12:47:55 +0000 Subject: [PATCH 34/94] Update dependencies from https://github.com/dotnet/templating build 20240614.2 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.303-servicing.24311.4 -> To Version 8.0.303-servicing.24314.2 From 1e4f3371326a00fd9e5073f6aeb5b032db45ecec Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 22 Jun 2024 12:51:51 +0000 Subject: [PATCH 35/94] Update dependencies from https://github.com/microsoft/vstest build 20240617.2 Microsoft.NET.Test.Sdk , Microsoft.TestPlatform.Build , Microsoft.TestPlatform.CLI From Version 17.10.0-release-24272-11 -> To Version 17.10.0-release-24317-02 From daed755b2c36a2f58e947a6b2258f5a301d35533 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 22 Jun 2024 12:52:22 +0000 Subject: [PATCH 36/94] Update dependencies from https://github.com/dotnet/razor build 20240614.2 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.24312.2 -> To Version 7.0.0-preview.24314.2 From 3c9cbea78dcdbd2863311ee0f41bfd386edf8040 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 22 Jun 2024 12:54:04 +0000 Subject: [PATCH 37/94] Update dependencies from https://github.com/dotnet/roslyn build 20240618.3 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.10.0-3.24312.19 -> To Version 4.10.0-3.24318.3 From 128de5bd6a0ad974e9e52549f26f727f449ded4e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 22 Jun 2024 12:54:39 +0000 Subject: [PATCH 38/94] Update dependencies from https://github.com/dotnet/templating build 20240614.2 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.303-servicing.24311.4 -> To Version 8.0.303-servicing.24314.2 From d27f0a5597bbad652028f587311deecd17f765d7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 22 Jun 2024 12:58:31 +0000 Subject: [PATCH 39/94] Update dependencies from https://github.com/dotnet/arcade build 20240621.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.24311.3 -> To Version 8.0.0-beta.24321.3 --- NuGet.config | 1 + eng/Version.Details.xml | 16 +++---- eng/Versions.props | 4 +- .../templates-official/job/source-build.yml | 8 ++++ .../templates-official/jobs/source-build.yml | 8 ++++ .../steps/enable-internal-runtimes.yml | 28 ++++++++++++ .../steps/get-delegation-sas.yml | 43 +++++++++++++++++++ .../steps/get-federated-access-token.yml | 28 ++++++++++++ eng/common/templates/job/source-build.yml | 8 ++++ eng/common/templates/jobs/source-build.yml | 8 ++++ .../steps/enable-internal-runtimes.yml | 28 ++++++++++++ .../templates/steps/get-delegation-sas.yml | 43 +++++++++++++++++++ .../steps/get-federated-access-token.yml | 28 ++++++++++++ global.json | 4 +- 14 files changed, 243 insertions(+), 12 deletions(-) create mode 100644 eng/common/templates-official/steps/enable-internal-runtimes.yml create mode 100644 eng/common/templates-official/steps/get-delegation-sas.yml create mode 100644 eng/common/templates-official/steps/get-federated-access-token.yml create mode 100644 eng/common/templates/steps/enable-internal-runtimes.yml create mode 100644 eng/common/templates/steps/get-delegation-sas.yml create mode 100644 eng/common/templates/steps/get-federated-access-token.yml diff --git a/NuGet.config b/NuGet.config index ca1f5e248d72..2fe66c7b93ed 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,6 +24,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 206c729e37e1..c5d071ecc34c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -483,22 +483,22 @@ - + https://github.com/dotnet/arcade - c214b6ad17aedca4fa48294d80f6c52ef2463081 + a95bcc256e9bdf47394e4dab04872811c16daaea - + https://github.com/dotnet/arcade - c214b6ad17aedca4fa48294d80f6c52ef2463081 + a95bcc256e9bdf47394e4dab04872811c16daaea - + https://github.com/dotnet/arcade - c214b6ad17aedca4fa48294d80f6c52ef2463081 + a95bcc256e9bdf47394e4dab04872811c16daaea - + https://github.com/dotnet/arcade - c214b6ad17aedca4fa48294d80f6c52ef2463081 + a95bcc256e9bdf47394e4dab04872811c16daaea https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 734ba59756cd..e20ee169fdfc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -35,7 +35,7 @@ 7.0.0 4.0.0 7.0.0 - 8.0.0-beta.24311.3 + 8.0.0-beta.24321.3 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -210,7 +210,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.24311.3 + 8.0.0-beta.24321.3 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/eng/common/templates-official/job/source-build.yml b/eng/common/templates-official/job/source-build.yml index f193dfbe2366..f983033bb028 100644 --- a/eng/common/templates-official/job/source-build.yml +++ b/eng/common/templates-official/job/source-build.yml @@ -31,6 +31,12 @@ parameters: # container and pool. platform: {} + # If set to true and running on a non-public project, + # Internal blob storage locations will be enabled. + # This is not enabled by default because many repositories do not need internal sources + # and do not need to have the required service connections approved in the pipeline. + enableInternalSources: false + jobs: - job: ${{ parameters.jobNamePrefix }}_${{ parameters.platform.name }} displayName: Source-Build (${{ parameters.platform.name }}) @@ -62,6 +68,8 @@ jobs: clean: all steps: + - ${{ if eq(parameters.enableInternalSources, true) }}: + - template: /eng/common/templates-official/steps/enable-internal-runtimes.yml - template: /eng/common/templates-official/steps/source-build.yml parameters: platform: ${{ parameters.platform }} diff --git a/eng/common/templates-official/jobs/source-build.yml b/eng/common/templates-official/jobs/source-build.yml index 08e5db9bb116..5cf6a269c0b6 100644 --- a/eng/common/templates-official/jobs/source-build.yml +++ b/eng/common/templates-official/jobs/source-build.yml @@ -21,6 +21,12 @@ parameters: # one job runs on 'defaultManagedPlatform'. platforms: [] + # If set to true and running on a non-public project, + # Internal nuget and blob storage locations will be enabled. + # This is not enabled by default because many repositories do not need internal sources + # and do not need to have the required service connections approved in the pipeline. + enableInternalSources: false + jobs: - ${{ if ne(parameters.allCompletedJobId, '') }}: @@ -38,9 +44,11 @@ jobs: parameters: jobNamePrefix: ${{ parameters.jobNamePrefix }} platform: ${{ platform }} + enableInternalSources: ${{ parameters.enableInternalSources }} - ${{ if eq(length(parameters.platforms), 0) }}: - template: /eng/common/templates-official/job/source-build.yml parameters: jobNamePrefix: ${{ parameters.jobNamePrefix }} platform: ${{ parameters.defaultManagedPlatform }} + enableInternalSources: ${{ parameters.enableInternalSources }} diff --git a/eng/common/templates-official/steps/enable-internal-runtimes.yml b/eng/common/templates-official/steps/enable-internal-runtimes.yml new file mode 100644 index 000000000000..93a8394a666b --- /dev/null +++ b/eng/common/templates-official/steps/enable-internal-runtimes.yml @@ -0,0 +1,28 @@ +# Obtains internal runtime download credentials and populates the 'dotnetbuilds-internal-container-read-token-base64' +# variable with the base64-encoded SAS token, by default + +parameters: +- name: federatedServiceConnection + type: string + default: 'dotnetbuilds-internal-read' +- name: outputVariableName + type: string + default: 'dotnetbuilds-internal-container-read-token-base64' +- name: expiryInHours + type: number + default: 1 +- name: base64Encode + type: boolean + default: true + +steps: +- ${{ if ne(variables['System.TeamProject'], 'public') }}: + - template: /eng/common/templates-official/steps/get-delegation-sas.yml + parameters: + federatedServiceConnection: ${{ parameters.federatedServiceConnection }} + outputVariableName: ${{ parameters.outputVariableName }} + expiryInHours: ${{ parameters.expiryInHours }} + base64Encode: ${{ parameters.base64Encode }} + storageAccount: dotnetbuilds + container: internal + permissions: rl diff --git a/eng/common/templates-official/steps/get-delegation-sas.yml b/eng/common/templates-official/steps/get-delegation-sas.yml new file mode 100644 index 000000000000..c0e8f91317f0 --- /dev/null +++ b/eng/common/templates-official/steps/get-delegation-sas.yml @@ -0,0 +1,43 @@ +parameters: +- name: federatedServiceConnection + type: string +- name: outputVariableName + type: string +- name: expiryInHours + type: number + default: 1 +- name: base64Encode + type: boolean + default: false +- name: storageAccount + type: string +- name: container + type: string +- name: permissions + type: string + default: 'rl' + +steps: +- task: AzureCLI@2 + displayName: 'Generate delegation SAS Token for ${{ parameters.storageAccount }}/${{ parameters.container }}' + inputs: + azureSubscription: ${{ parameters.federatedServiceConnection }} + scriptType: 'pscore' + scriptLocation: 'inlineScript' + inlineScript: | + # Calculate the expiration of the SAS token and convert to UTC + $expiry = (Get-Date).AddHours(${{ parameters.expiryInHours }}).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ") + + $sas = az storage container generate-sas --account-name ${{ parameters.storageAccount }} --name ${{ parameters.container }} --permissions ${{ parameters.permissions }} --expiry $expiry --auth-mode login --as-user -o tsv + + if ($LASTEXITCODE -ne 0) { + Write-Error "Failed to generate SAS token." + exit 1 + } + + if ('${{ parameters.base64Encode }}' -eq 'true') { + $sas = [Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes($sas)) + } + + Write-Host "Setting '${{ parameters.outputVariableName }}' with the access token value" + Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true]$sas" diff --git a/eng/common/templates-official/steps/get-federated-access-token.yml b/eng/common/templates-official/steps/get-federated-access-token.yml new file mode 100644 index 000000000000..e3786cef6dfd --- /dev/null +++ b/eng/common/templates-official/steps/get-federated-access-token.yml @@ -0,0 +1,28 @@ +parameters: +- name: federatedServiceConnection + type: string +- name: outputVariableName + type: string +# Resource to get a token for. Common values include: +# - '499b84ac-1321-427f-aa17-267ca6975798' for Azure DevOps +# - 'https://storage.azure.com/' for storage +# Defaults to Azure DevOps +- name: resource + type: string + default: '499b84ac-1321-427f-aa17-267ca6975798' + +steps: +- task: AzureCLI@2 + displayName: 'Getting federated access token for feeds' + inputs: + azureSubscription: ${{ parameters.federatedServiceConnection }} + scriptType: 'pscore' + scriptLocation: 'inlineScript' + inlineScript: | + $accessToken = az account get-access-token --query accessToken --resource ${{ parameters.resource }} --output tsv + if ($LASTEXITCODE -ne 0) { + Write-Error "Failed to get access token for resource '${{ parameters.resource }}'" + exit 1 + } + Write-Host "Setting '${{ parameters.outputVariableName }}' with the access token value" + Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true]$accessToken" diff --git a/eng/common/templates/job/source-build.yml b/eng/common/templates/job/source-build.yml index 8a3deef2b727..c0ff472b697b 100644 --- a/eng/common/templates/job/source-build.yml +++ b/eng/common/templates/job/source-build.yml @@ -31,6 +31,12 @@ parameters: # container and pool. platform: {} + # If set to true and running on a non-public project, + # Internal blob storage locations will be enabled. + # This is not enabled by default because many repositories do not need internal sources + # and do not need to have the required service connections approved in the pipeline. + enableInternalSources: false + jobs: - job: ${{ parameters.jobNamePrefix }}_${{ parameters.platform.name }} displayName: Source-Build (${{ parameters.platform.name }}) @@ -61,6 +67,8 @@ jobs: clean: all steps: + - ${{ if eq(parameters.enableInternalSources, true) }}: + - template: /eng/common/templates/steps/enable-internal-runtimes.yml - template: /eng/common/templates/steps/source-build.yml parameters: platform: ${{ parameters.platform }} diff --git a/eng/common/templates/jobs/source-build.yml b/eng/common/templates/jobs/source-build.yml index a15b07eb51d9..5f46bfa895c1 100644 --- a/eng/common/templates/jobs/source-build.yml +++ b/eng/common/templates/jobs/source-build.yml @@ -21,6 +21,12 @@ parameters: # one job runs on 'defaultManagedPlatform'. platforms: [] + # If set to true and running on a non-public project, + # Internal nuget and blob storage locations will be enabled. + # This is not enabled by default because many repositories do not need internal sources + # and do not need to have the required service connections approved in the pipeline. + enableInternalSources: false + jobs: - ${{ if ne(parameters.allCompletedJobId, '') }}: @@ -38,9 +44,11 @@ jobs: parameters: jobNamePrefix: ${{ parameters.jobNamePrefix }} platform: ${{ platform }} + enableInternalSources: ${{ parameters.enableInternalSources }} - ${{ if eq(length(parameters.platforms), 0) }}: - template: /eng/common/templates/job/source-build.yml parameters: jobNamePrefix: ${{ parameters.jobNamePrefix }} platform: ${{ parameters.defaultManagedPlatform }} + enableInternalSources: ${{ parameters.enableInternalSources }} diff --git a/eng/common/templates/steps/enable-internal-runtimes.yml b/eng/common/templates/steps/enable-internal-runtimes.yml new file mode 100644 index 000000000000..54dc9416c519 --- /dev/null +++ b/eng/common/templates/steps/enable-internal-runtimes.yml @@ -0,0 +1,28 @@ +# Obtains internal runtime download credentials and populates the 'dotnetbuilds-internal-container-read-token-base64' +# variable with the base64-encoded SAS token, by default + +parameters: +- name: federatedServiceConnection + type: string + default: 'dotnetbuilds-internal-read' +- name: outputVariableName + type: string + default: 'dotnetbuilds-internal-container-read-token-base64' +- name: expiryInHours + type: number + default: 1 +- name: base64Encode + type: boolean + default: true + +steps: +- ${{ if ne(variables['System.TeamProject'], 'public') }}: + - template: /eng/common/templates/steps/get-delegation-sas.yml + parameters: + federatedServiceConnection: ${{ parameters.federatedServiceConnection }} + outputVariableName: ${{ parameters.outputVariableName }} + expiryInHours: ${{ parameters.expiryInHours }} + base64Encode: ${{ parameters.base64Encode }} + storageAccount: dotnetbuilds + container: internal + permissions: rl diff --git a/eng/common/templates/steps/get-delegation-sas.yml b/eng/common/templates/steps/get-delegation-sas.yml new file mode 100644 index 000000000000..c0e8f91317f0 --- /dev/null +++ b/eng/common/templates/steps/get-delegation-sas.yml @@ -0,0 +1,43 @@ +parameters: +- name: federatedServiceConnection + type: string +- name: outputVariableName + type: string +- name: expiryInHours + type: number + default: 1 +- name: base64Encode + type: boolean + default: false +- name: storageAccount + type: string +- name: container + type: string +- name: permissions + type: string + default: 'rl' + +steps: +- task: AzureCLI@2 + displayName: 'Generate delegation SAS Token for ${{ parameters.storageAccount }}/${{ parameters.container }}' + inputs: + azureSubscription: ${{ parameters.federatedServiceConnection }} + scriptType: 'pscore' + scriptLocation: 'inlineScript' + inlineScript: | + # Calculate the expiration of the SAS token and convert to UTC + $expiry = (Get-Date).AddHours(${{ parameters.expiryInHours }}).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ") + + $sas = az storage container generate-sas --account-name ${{ parameters.storageAccount }} --name ${{ parameters.container }} --permissions ${{ parameters.permissions }} --expiry $expiry --auth-mode login --as-user -o tsv + + if ($LASTEXITCODE -ne 0) { + Write-Error "Failed to generate SAS token." + exit 1 + } + + if ('${{ parameters.base64Encode }}' -eq 'true') { + $sas = [Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes($sas)) + } + + Write-Host "Setting '${{ parameters.outputVariableName }}' with the access token value" + Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true]$sas" diff --git a/eng/common/templates/steps/get-federated-access-token.yml b/eng/common/templates/steps/get-federated-access-token.yml new file mode 100644 index 000000000000..c8c49cc0e8f0 --- /dev/null +++ b/eng/common/templates/steps/get-federated-access-token.yml @@ -0,0 +1,28 @@ +parameters: +- name: federatedServiceConnection + type: string +- name: outputVariableName + type: string +# Resource to get a token for. Common values include: +# - '499b84ac-1321-427f-aa17-267ca6975798' for Azure DevOps +# - 'https://storage.azure.com/' for storage +# Defaults to Azure DevOps +- name: resource + type: string + default: '499b84ac-1321-427f-aa17-267ca6975798' + +steps: +- task: AzureCLI@2 + displayName: 'Getting federated access token for feeds' + inputs: + azureSubscription: ${{ parameters.federatedServiceConnection }} + scriptType: 'pscore' + scriptLocation: 'inlineScript' + inlineScript: | + $accessToken = az account get-access-token --query accessToken --resource ${{ parameters.resource }} --output tsv + if ($LASTEXITCODE -ne 0) { + Write-Error "Failed to get access token for resource '${{ parameters.resource }}'" + exit 1 + } + Write-Host "Setting '${{ parameters.outputVariableName }}' with the access token value" + Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true]$accessToken" \ No newline at end of file diff --git a/global.json b/global.json index d2af4d682074..2d6984391166 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24311.3", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24311.3" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24321.3", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24321.3" } } From c4c1d28e1981124157ad9e315a8c4d93c4ab9fd1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 23 Jun 2024 12:43:37 +0000 Subject: [PATCH 40/94] Update dependencies from https://github.com/microsoft/vstest build 20240617.2 Microsoft.NET.Test.Sdk , Microsoft.TestPlatform.Build , Microsoft.TestPlatform.CLI From Version 17.10.0-release-24272-11 -> To Version 17.10.0-release-24317-02 From 13f8609c462a2b2111dc0f9d0d1e07644803e080 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 23 Jun 2024 12:44:08 +0000 Subject: [PATCH 41/94] Update dependencies from https://github.com/dotnet/razor build 20240614.2 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.24312.2 -> To Version 7.0.0-preview.24314.2 From a49b31b29ffb370d7fef0d6cf76e55419a24405f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 23 Jun 2024 12:45:51 +0000 Subject: [PATCH 42/94] Update dependencies from https://github.com/dotnet/roslyn build 20240618.3 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.10.0-3.24312.19 -> To Version 4.10.0-3.24318.3 From cf83392073ed1437b2c006846cc26974f8d9f32a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 23 Jun 2024 12:46:29 +0000 Subject: [PATCH 43/94] Update dependencies from https://github.com/dotnet/templating build 20240614.2 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.303-servicing.24311.4 -> To Version 8.0.303-servicing.24314.2 From cc0c678d19bff28ae2001f235dba912bbaa51009 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 23 Jun 2024 12:50:16 +0000 Subject: [PATCH 44/94] Update dependencies from https://github.com/dotnet/arcade build 20240621.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.24311.3 -> To Version 8.0.0-beta.24321.3 From 38ebdd4a8f4a680ddec2585244b29b1f8fa0f36b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 24 Jun 2024 12:35:49 +0000 Subject: [PATCH 45/94] Update dependencies from https://github.com/microsoft/vstest build 20240617.2 Microsoft.NET.Test.Sdk , Microsoft.TestPlatform.Build , Microsoft.TestPlatform.CLI From Version 17.10.0-release-24272-11 -> To Version 17.10.0-release-24317-02 From a01e3c59a793bf6136b17d314e5f8df0317e1b6a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 24 Jun 2024 12:36:24 +0000 Subject: [PATCH 46/94] Update dependencies from https://github.com/dotnet/razor build 20240614.2 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.24312.2 -> To Version 7.0.0-preview.24314.2 From 42d830b8f232c6db62169ac2cbd01614e1333c9a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 24 Jun 2024 12:38:18 +0000 Subject: [PATCH 47/94] Update dependencies from https://github.com/dotnet/roslyn build 20240624.2 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.10.0-3.24312.19 -> To Version 4.10.0-3.24324.2 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 88ab4fec9d77..69bf7a361001 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -82,34 +82,34 @@ d237e172b324021b97effa244af44d63d1a8bb7e - + https://github.com/dotnet/roslyn - 10c1f374ce445ebbcc17fe8b52564539591628a8 + f62997be6231928d10cfeeb061de003a4723930b - + https://github.com/dotnet/roslyn - 10c1f374ce445ebbcc17fe8b52564539591628a8 + f62997be6231928d10cfeeb061de003a4723930b - + https://github.com/dotnet/roslyn - 10c1f374ce445ebbcc17fe8b52564539591628a8 + f62997be6231928d10cfeeb061de003a4723930b - + https://github.com/dotnet/roslyn - 10c1f374ce445ebbcc17fe8b52564539591628a8 + f62997be6231928d10cfeeb061de003a4723930b - + https://github.com/dotnet/roslyn - 10c1f374ce445ebbcc17fe8b52564539591628a8 + f62997be6231928d10cfeeb061de003a4723930b - + https://github.com/dotnet/roslyn - 10c1f374ce445ebbcc17fe8b52564539591628a8 + f62997be6231928d10cfeeb061de003a4723930b - + https://github.com/dotnet/roslyn - 10c1f374ce445ebbcc17fe8b52564539591628a8 + f62997be6231928d10cfeeb061de003a4723930b https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index a3a2bc3d943b..a7361398c38d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -155,13 +155,13 @@ - 4.10.0-3.24318.3 - 4.10.0-3.24318.3 - 4.10.0-3.24318.3 - 4.10.0-3.24318.3 - 4.10.0-3.24318.3 - 4.10.0-3.24318.3 - 4.10.0-3.24318.3 + 4.10.0-3.24324.2 + 4.10.0-3.24324.2 + 4.10.0-3.24324.2 + 4.10.0-3.24324.2 + 4.10.0-3.24324.2 + 4.10.0-3.24324.2 + 4.10.0-3.24324.2 $(MicrosoftNetCompilersToolsetPackageVersion) From 678ec8acdccb090ef98efbe50005514b8181b9d4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 24 Jun 2024 12:38:51 +0000 Subject: [PATCH 48/94] Update dependencies from https://github.com/dotnet/templating build 20240614.2 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.303-servicing.24311.4 -> To Version 8.0.303-servicing.24314.2 From b48ab67e6a6f3a741e3f8270da454e00d5d7a886 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 24 Jun 2024 12:42:56 +0000 Subject: [PATCH 49/94] Update dependencies from https://github.com/dotnet/arcade build 20240624.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.24311.3 -> To Version 8.0.0-beta.24324.1 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- global.json | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c5d071ecc34c..66bc53a272a4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -483,22 +483,22 @@ - + https://github.com/dotnet/arcade - a95bcc256e9bdf47394e4dab04872811c16daaea + 748cd976bf8b0f69b809e569943635ab8be36dc8 - + https://github.com/dotnet/arcade - a95bcc256e9bdf47394e4dab04872811c16daaea + 748cd976bf8b0f69b809e569943635ab8be36dc8 - + https://github.com/dotnet/arcade - a95bcc256e9bdf47394e4dab04872811c16daaea + 748cd976bf8b0f69b809e569943635ab8be36dc8 - + https://github.com/dotnet/arcade - a95bcc256e9bdf47394e4dab04872811c16daaea + 748cd976bf8b0f69b809e569943635ab8be36dc8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index e20ee169fdfc..20d93236329c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -35,7 +35,7 @@ 7.0.0 4.0.0 7.0.0 - 8.0.0-beta.24321.3 + 8.0.0-beta.24324.1 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -210,7 +210,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.24321.3 + 8.0.0-beta.24324.1 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/global.json b/global.json index 2d6984391166..18a15064de9d 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24321.3", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24321.3" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24324.1", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24324.1" } } From 4857c491290409b17ecb088f1e1a587572bc7fd3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 25 Jun 2024 12:50:10 +0000 Subject: [PATCH 50/94] Update dependencies from https://github.com/microsoft/vstest build 20240617.2 Microsoft.NET.Test.Sdk , Microsoft.TestPlatform.Build , Microsoft.TestPlatform.CLI From Version 17.10.0-release-24272-11 -> To Version 17.10.0-release-24317-02 --- NuGet.config | 2 ++ 1 file changed, 2 insertions(+) diff --git a/NuGet.config b/NuGet.config index 2fe66c7b93ed..dc29aad8cfa6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,6 +24,8 @@ + + From dd083f765f554cba10f96fabe0dc5d667b451ce2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 25 Jun 2024 12:50:46 +0000 Subject: [PATCH 51/94] Update dependencies from https://github.com/dotnet/razor build 20240614.2 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.24312.2 -> To Version 7.0.0-preview.24314.2 --- NuGet.config | 2 ++ 1 file changed, 2 insertions(+) diff --git a/NuGet.config b/NuGet.config index 2fe66c7b93ed..dc29aad8cfa6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,6 +24,8 @@ + + From 13df731b6509eafd2bc5d65bcc17f8c8e83d49dd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 25 Jun 2024 12:52:42 +0000 Subject: [PATCH 52/94] Update dependencies from https://github.com/dotnet/roslyn build 20240624.8 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.10.0-3.24312.19 -> To Version 4.10.0-3.24324.8 --- NuGet.config | 2 ++ eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 3 files changed, 23 insertions(+), 21 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2fe66c7b93ed..dc29aad8cfa6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,6 +24,8 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 69bf7a361001..353e8a18f765 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -82,34 +82,34 @@ d237e172b324021b97effa244af44d63d1a8bb7e - + https://github.com/dotnet/roslyn - f62997be6231928d10cfeeb061de003a4723930b + 04fb39164c99c519832109f21b22630bc9246fce - + https://github.com/dotnet/roslyn - f62997be6231928d10cfeeb061de003a4723930b + 04fb39164c99c519832109f21b22630bc9246fce - + https://github.com/dotnet/roslyn - f62997be6231928d10cfeeb061de003a4723930b + 04fb39164c99c519832109f21b22630bc9246fce - + https://github.com/dotnet/roslyn - f62997be6231928d10cfeeb061de003a4723930b + 04fb39164c99c519832109f21b22630bc9246fce - + https://github.com/dotnet/roslyn - f62997be6231928d10cfeeb061de003a4723930b + 04fb39164c99c519832109f21b22630bc9246fce - + https://github.com/dotnet/roslyn - f62997be6231928d10cfeeb061de003a4723930b + 04fb39164c99c519832109f21b22630bc9246fce - + https://github.com/dotnet/roslyn - f62997be6231928d10cfeeb061de003a4723930b + 04fb39164c99c519832109f21b22630bc9246fce https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index a7361398c38d..0a2886f97bf2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -155,13 +155,13 @@ - 4.10.0-3.24324.2 - 4.10.0-3.24324.2 - 4.10.0-3.24324.2 - 4.10.0-3.24324.2 - 4.10.0-3.24324.2 - 4.10.0-3.24324.2 - 4.10.0-3.24324.2 + 4.10.0-3.24324.8 + 4.10.0-3.24324.8 + 4.10.0-3.24324.8 + 4.10.0-3.24324.8 + 4.10.0-3.24324.8 + 4.10.0-3.24324.8 + 4.10.0-3.24324.8 $(MicrosoftNetCompilersToolsetPackageVersion) From 259d494d95b68b225d1248b0453de0a582323e4a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 25 Jun 2024 12:53:14 +0000 Subject: [PATCH 53/94] Update dependencies from https://github.com/dotnet/templating build 20240614.2 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.303-servicing.24311.4 -> To Version 8.0.303-servicing.24314.2 From f024a06f8f6e88ec813418248d0c0138c057631f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 25 Jun 2024 12:57:28 +0000 Subject: [PATCH 54/94] Update dependencies from https://github.com/dotnet/arcade build 20240624.7 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.24311.3 -> To Version 8.0.0-beta.24324.7 --- NuGet.config | 2 ++ eng/Version.Details.xml | 16 +++++------ eng/Versions.props | 4 +-- eng/common/post-build/publish-using-darc.ps1 | 15 +++++----- .../job/publish-build-assets.yml | 12 ++++---- .../post-build/post-build.yml | 8 ++++-- .../templates/job/publish-build-assets.yml | 12 ++++---- .../templates/post-build/post-build.yml | 8 ++++-- .../post-build/setup-maestro-vars.yml | 28 +++++++++---------- global.json | 4 +-- 10 files changed, 59 insertions(+), 50 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2fe66c7b93ed..dc29aad8cfa6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,6 +24,8 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 66bc53a272a4..f5b905a2d433 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -483,22 +483,22 @@ - + https://github.com/dotnet/arcade - 748cd976bf8b0f69b809e569943635ab8be36dc8 + 3fe41d9e97519a4e9b48293906dbf58714ea9a0d - + https://github.com/dotnet/arcade - 748cd976bf8b0f69b809e569943635ab8be36dc8 + 3fe41d9e97519a4e9b48293906dbf58714ea9a0d - + https://github.com/dotnet/arcade - 748cd976bf8b0f69b809e569943635ab8be36dc8 + 3fe41d9e97519a4e9b48293906dbf58714ea9a0d - + https://github.com/dotnet/arcade - 748cd976bf8b0f69b809e569943635ab8be36dc8 + 3fe41d9e97519a4e9b48293906dbf58714ea9a0d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 20d93236329c..3d33c3270349 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -35,7 +35,7 @@ 7.0.0 4.0.0 7.0.0 - 8.0.0-beta.24324.1 + 8.0.0-beta.24324.7 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -210,7 +210,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.24324.1 + 8.0.0-beta.24324.7 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1 index 5a3a32ea8d75..238945cb5ab4 100644 --- a/eng/common/post-build/publish-using-darc.ps1 +++ b/eng/common/post-build/publish-using-darc.ps1 @@ -2,7 +2,6 @@ param( [Parameter(Mandatory=$true)][int] $BuildId, [Parameter(Mandatory=$true)][int] $PublishingInfraVersion, [Parameter(Mandatory=$true)][string] $AzdoToken, - [Parameter(Mandatory=$true)][string] $MaestroToken, [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net', [Parameter(Mandatory=$true)][string] $WaitPublishingFinish, [Parameter(Mandatory=$false)][string] $ArtifactsPublishingAdditionalParameters, @@ -31,13 +30,13 @@ try { } & $darc add-build-to-channel ` - --id $buildId ` - --publishing-infra-version $PublishingInfraVersion ` - --default-channels ` - --source-branch main ` - --azdev-pat $AzdoToken ` - --bar-uri $MaestroApiEndPoint ` - --password $MaestroToken ` + --id $buildId ` + --publishing-infra-version $PublishingInfraVersion ` + --default-channels ` + --source-branch main ` + --azdev-pat "$AzdoToken" ` + --bar-uri "$MaestroApiEndPoint" ` + --ci ` @optionalParams if ($LastExitCode -ne 0) { diff --git a/eng/common/templates-official/job/publish-build-assets.yml b/eng/common/templates-official/job/publish-build-assets.yml index 589ac80a18b7..d01739c12857 100644 --- a/eng/common/templates-official/job/publish-build-assets.yml +++ b/eng/common/templates-official/job/publish-build-assets.yml @@ -76,13 +76,16 @@ jobs: - task: NuGetAuthenticate@1 - - task: PowerShell@2 + - task: AzureCLI@2 displayName: Publish Build Assets inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet + azureSubscription: "Darc: Maestro Production" + scriptType: ps + scriptLocation: scriptPath + scriptPath: $(Build.SourcesDirectory)/eng/common/sdk-task.ps1 + arguments: > + -task PublishBuildAssets -restore -msbuildEngine dotnet /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests' - /p:BuildAssetRegistryToken=$(MaestroAccessToken) /p:MaestroApiEndpoint=https://maestro-prod.westus2.cloudapp.azure.com /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }} /p:OfficialBuildId=$(Build.BuildNumber) @@ -144,7 +147,6 @@ jobs: arguments: -BuildId $(BARBuildId) -PublishingInfraVersion 3 -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' - -MaestroToken '$(MaestroApiAccessToken)' -WaitPublishingFinish true -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' diff --git a/eng/common/templates-official/post-build/post-build.yml b/eng/common/templates-official/post-build/post-build.yml index da1f40958b45..0dfa387e7b78 100644 --- a/eng/common/templates-official/post-build/post-build.yml +++ b/eng/common/templates-official/post-build/post-build.yml @@ -272,14 +272,16 @@ stages: - task: NuGetAuthenticate@1 - - task: PowerShell@2 + - task: AzureCLI@2 displayName: Publish Using Darc inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 + azureSubscription: "Darc: Maestro Production" + scriptType: ps + scriptLocation: scriptPath + scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 arguments: -BuildId $(BARBuildId) -PublishingInfraVersion ${{ parameters.publishingInfraVersion }} -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' - -MaestroToken '$(MaestroApiAccessToken)' -WaitPublishingFinish true -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index 8ec0151def21..9fd69fa7c9b7 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -74,13 +74,16 @@ jobs: - task: NuGetAuthenticate@1 - - task: PowerShell@2 + - task: AzureCLI@2 displayName: Publish Build Assets inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet + azureSubscription: "Darc: Maestro Production" + scriptType: ps + scriptLocation: scriptPath + scriptPath: $(Build.SourcesDirectory)/eng/common/sdk-task.ps1 + arguments: > + -task PublishBuildAssets -restore -msbuildEngine dotnet /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests' - /p:BuildAssetRegistryToken=$(MaestroAccessToken) /p:MaestroApiEndpoint=https://maestro.dot.net /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }} /p:OfficialBuildId=$(Build.BuildNumber) @@ -140,7 +143,6 @@ jobs: arguments: -BuildId $(BARBuildId) -PublishingInfraVersion 3 -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' - -MaestroToken '$(MaestroApiAccessToken)' -WaitPublishingFinish true -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index aba44a25a338..2db4933468fd 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -268,14 +268,16 @@ stages: - task: NuGetAuthenticate@1 - - task: PowerShell@2 + - task: AzureCLI@2 displayName: Publish Using Darc inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 + azureSubscription: "Darc: Maestro Production" + scriptType: ps + scriptLocation: scriptPath + scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 arguments: -BuildId $(BARBuildId) -PublishingInfraVersion ${{ parameters.publishingInfraVersion }} -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' - -MaestroToken '$(MaestroApiAccessToken)' -WaitPublishingFinish true -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' diff --git a/eng/common/templates/post-build/setup-maestro-vars.yml b/eng/common/templates/post-build/setup-maestro-vars.yml index 0c87f149a4ad..64b9abc68504 100644 --- a/eng/common/templates/post-build/setup-maestro-vars.yml +++ b/eng/common/templates/post-build/setup-maestro-vars.yml @@ -11,13 +11,14 @@ steps: artifactName: ReleaseConfigs checkDownloadedFiles: true - - task: PowerShell@2 + - task: AzureCLI@2 name: setReleaseVars displayName: Set Release Configs Vars inputs: - targetType: inline - pwsh: true - script: | + azureSubscription: "Darc: Maestro Production" + scriptType: pscore + scriptLocation: inlineScript + inlineScript: | try { if (!$Env:PromoteToMaestroChannels -or $Env:PromoteToMaestroChannels.Trim() -eq '') { $Content = Get-Content $(Build.StagingDirectory)/ReleaseConfigs/ReleaseConfigs.txt @@ -31,15 +32,16 @@ steps: $AzureDevOpsBuildId = $Env:Build_BuildId } else { - $buildApiEndpoint = "${Env:MaestroApiEndPoint}/api/builds/${Env:BARBuildId}?api-version=${Env:MaestroApiVersion}" + . $(Build.SourcesDirectory)\eng\common\tools.ps1 + $darc = Get-Darc + $buildInfo = & $darc get-build ` + --id ${{ parameters.BARBuildId }} ` + --extended ` + --output-format json ` + --ci ` + | convertFrom-Json - $apiHeaders = New-Object 'System.Collections.Generic.Dictionary[[String],[String]]' - $apiHeaders.Add('Accept', 'application/json') - $apiHeaders.Add('Authorization',"Bearer ${Env:MAESTRO_API_TOKEN}") - - $buildInfo = try { Invoke-WebRequest -Method Get -Uri $buildApiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" } - - $BarId = $Env:BARBuildId + $BarId = ${{ parameters.BARBuildId }} $Channels = $Env:PromoteToMaestroChannels -split "," $Channels = $Channels -join "][" $Channels = "[$Channels]" @@ -65,6 +67,4 @@ steps: exit 1 } env: - MAESTRO_API_TOKEN: $(MaestroApiAccessToken) - BARBuildId: ${{ parameters.BARBuildId }} PromoteToMaestroChannels: ${{ parameters.PromoteToChannelIds }} diff --git a/global.json b/global.json index 18a15064de9d..3299cf13efbd 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24324.1", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24324.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24324.7", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24324.7" } } From 7c0ad0f892b9fc1444981dd850bb6df826c8d97f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 26 Jun 2024 12:50:10 +0000 Subject: [PATCH 55/94] Update dependencies from https://github.com/microsoft/vstest build 20240617.2 Microsoft.NET.Test.Sdk , Microsoft.TestPlatform.Build , Microsoft.TestPlatform.CLI From Version 17.10.0-release-24272-11 -> To Version 17.10.0-release-24317-02 From 52e63f699ecf8c274f9275a214dc187e250e6d21 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 26 Jun 2024 12:50:41 +0000 Subject: [PATCH 56/94] Update dependencies from https://github.com/dotnet/razor build 20240626.2 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.24312.2 -> To Version 7.0.0-preview.24326.2 --- 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 3c471d786369..6dd27570b097 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -285,18 +285,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 - + https://github.com/dotnet/razor - fc9b28705adcd7c5dbd6f5104ee1d992e857a9fb + 6f2caf542643b6c72369e41172572015d8f48311 - + https://github.com/dotnet/razor - fc9b28705adcd7c5dbd6f5104ee1d992e857a9fb + 6f2caf542643b6c72369e41172572015d8f48311 - + https://github.com/dotnet/razor - fc9b28705adcd7c5dbd6f5104ee1d992e857a9fb + 6f2caf542643b6c72369e41172572015d8f48311 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 6f0d5fae6045..c45bdc83d7db 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -176,9 +176,9 @@ - 7.0.0-preview.24314.2 - 7.0.0-preview.24314.2 - 7.0.0-preview.24314.2 + 7.0.0-preview.24326.2 + 7.0.0-preview.24326.2 + 7.0.0-preview.24326.2 From a36a442644a3ed5767f2acc2f4dbad5d074372f9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 26 Jun 2024 12:52:36 +0000 Subject: [PATCH 57/94] Update dependencies from https://github.com/dotnet/roslyn build 20240624.8 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.10.0-3.24312.19 -> To Version 4.10.0-3.24324.8 From c929df68d52ce8dd969eae4accbb83d630b56913 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 26 Jun 2024 12:53:13 +0000 Subject: [PATCH 58/94] Update dependencies from https://github.com/dotnet/templating build 20240614.2 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.303-servicing.24311.4 -> To Version 8.0.303-servicing.24314.2 From e12c6f06f82c0ff1c7175dac07c17a9229668812 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 26 Jun 2024 12:55:07 +0000 Subject: [PATCH 59/94] Update dependencies from https://github.com/dotnet/arcade build 20240624.7 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.24311.3 -> To Version 8.0.0-beta.24324.7 From 175eccfbed839c30403cc172cb8392069ab9e705 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 27 Jun 2024 12:59:28 +0000 Subject: [PATCH 60/94] Update dependencies from https://github.com/microsoft/vstest build 20240617.2 Microsoft.NET.Test.Sdk , Microsoft.TestPlatform.Build , Microsoft.TestPlatform.CLI From Version 17.10.0-release-24272-11 -> To Version 17.10.0-release-24317-02 --- NuGet.config | 1 + 1 file changed, 1 insertion(+) diff --git a/NuGet.config b/NuGet.config index dc29aad8cfa6..600ebd405c65 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,6 +24,7 @@ + From 3a476a43469c16270f7193129ecf80d64e43986a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 27 Jun 2024 13:00:01 +0000 Subject: [PATCH 61/94] Update dependencies from https://github.com/dotnet/razor build 20240626.2 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.24312.2 -> To Version 7.0.0-preview.24326.2 --- NuGet.config | 1 + 1 file changed, 1 insertion(+) diff --git a/NuGet.config b/NuGet.config index dc29aad8cfa6..600ebd405c65 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,6 +24,7 @@ + From ec137df7c1732a396e947ec405ddf1345f184c5d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 27 Jun 2024 13:02:02 +0000 Subject: [PATCH 62/94] Update dependencies from https://github.com/dotnet/roslyn build 20240624.8 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.10.0-3.24312.19 -> To Version 4.10.0-3.24324.8 --- NuGet.config | 1 + 1 file changed, 1 insertion(+) diff --git a/NuGet.config b/NuGet.config index dc29aad8cfa6..600ebd405c65 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,6 +24,7 @@ + From f032397b4b03920a624ce4be102a5fc296e58f79 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 27 Jun 2024 13:02:37 +0000 Subject: [PATCH 63/94] Update dependencies from https://github.com/dotnet/templating build 20240614.2 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.303-servicing.24311.4 -> To Version 8.0.303-servicing.24314.2 From 9a16d862433533c1011ad81ccf52d6dc49041141 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 27 Jun 2024 13:04:18 +0000 Subject: [PATCH 64/94] Update dependencies from https://github.com/dotnet/arcade build 20240624.7 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.24311.3 -> To Version 8.0.0-beta.24324.7 --- NuGet.config | 1 + 1 file changed, 1 insertion(+) diff --git a/NuGet.config b/NuGet.config index dc29aad8cfa6..600ebd405c65 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,6 +24,7 @@ + From fae6a4e7b3d5ce20cb5a5a3e9aed98c8f44c22e9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 28 Jun 2024 12:54:26 +0000 Subject: [PATCH 65/94] Update dependencies from https://github.com/microsoft/vstest build 20240617.2 Microsoft.NET.Test.Sdk , Microsoft.TestPlatform.Build , Microsoft.TestPlatform.CLI From Version 17.10.0-release-24272-11 -> To Version 17.10.0-release-24317-02 From 29ff210a7ae29dc01f812220a70df31e12154284 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 28 Jun 2024 12:55:00 +0000 Subject: [PATCH 66/94] Update dependencies from https://github.com/dotnet/razor build 20240626.2 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.24312.2 -> To Version 7.0.0-preview.24326.2 From 472162ca199fc941d2c7e14672d8343cf7e0c855 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 28 Jun 2024 12:56:52 +0000 Subject: [PATCH 67/94] Update dependencies from https://github.com/dotnet/roslyn build 20240624.8 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.10.0-3.24312.19 -> To Version 4.10.0-3.24324.8 From 16b1a2aeafd71b7a819b4c0e8f0a318a5cfe4de9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 28 Jun 2024 12:57:26 +0000 Subject: [PATCH 68/94] Update dependencies from https://github.com/dotnet/templating build 20240614.2 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.303-servicing.24311.4 -> To Version 8.0.303-servicing.24314.2 From 149565b7f5c0b3995365222070abdcb8e9a1cf16 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 28 Jun 2024 12:59:02 +0000 Subject: [PATCH 69/94] Update dependencies from https://github.com/dotnet/arcade build 20240624.7 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.24311.3 -> To Version 8.0.0-beta.24324.7 From 66c3e36e85a151e9b0e1c203bf7265ef0cd94d42 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 29 Jun 2024 12:38:00 +0000 Subject: [PATCH 70/94] Update dependencies from https://github.com/microsoft/vstest build 20240617.2 Microsoft.NET.Test.Sdk , Microsoft.TestPlatform.Build , Microsoft.TestPlatform.CLI From Version 17.10.0-release-24272-11 -> To Version 17.10.0-release-24317-02 From 532b70213c3c07e82ca6f173b67972948a34df85 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 29 Jun 2024 12:38:32 +0000 Subject: [PATCH 71/94] Update dependencies from https://github.com/dotnet/razor build 20240626.2 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.24312.2 -> To Version 7.0.0-preview.24326.2 From 2fbec85a807da3fa8cc8ae89fbffac5b116f80e2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 29 Jun 2024 12:40:28 +0000 Subject: [PATCH 72/94] Update dependencies from https://github.com/dotnet/roslyn build 20240624.8 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.10.0-3.24312.19 -> To Version 4.10.0-3.24324.8 From 22853c35b8846544e16f60562aea0b26383cd106 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 29 Jun 2024 12:41:00 +0000 Subject: [PATCH 73/94] Update dependencies from https://github.com/dotnet/templating build 20240614.2 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.303-servicing.24311.4 -> To Version 8.0.303-servicing.24314.2 From de9b3f2b2ca96cb1b9e5df3e4f7bdf693d9fa5c4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 29 Jun 2024 12:44:23 +0000 Subject: [PATCH 74/94] Update dependencies from https://github.com/dotnet/arcade build 20240626.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.24311.3 -> To Version 8.0.0-beta.24326.4 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- global.json | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f5b905a2d433..79d8471c0d46 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -483,22 +483,22 @@ - + https://github.com/dotnet/arcade - 3fe41d9e97519a4e9b48293906dbf58714ea9a0d + bee35f3044609d08c40566f8a008baa4d0451a9e - + https://github.com/dotnet/arcade - 3fe41d9e97519a4e9b48293906dbf58714ea9a0d + bee35f3044609d08c40566f8a008baa4d0451a9e - + https://github.com/dotnet/arcade - 3fe41d9e97519a4e9b48293906dbf58714ea9a0d + bee35f3044609d08c40566f8a008baa4d0451a9e - + https://github.com/dotnet/arcade - 3fe41d9e97519a4e9b48293906dbf58714ea9a0d + bee35f3044609d08c40566f8a008baa4d0451a9e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 3d33c3270349..202caa22d817 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -35,7 +35,7 @@ 7.0.0 4.0.0 7.0.0 - 8.0.0-beta.24324.7 + 8.0.0-beta.24326.4 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -210,7 +210,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.24324.7 + 8.0.0-beta.24326.4 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/global.json b/global.json index 3299cf13efbd..9404a652c2a9 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24324.7", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24324.7" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24326.4", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24326.4" } } From 747303b757016da3f733f35fc495d5f63f285ce6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 30 Jun 2024 12:36:30 +0000 Subject: [PATCH 75/94] Update dependencies from https://github.com/microsoft/vstest build 20240617.2 Microsoft.NET.Test.Sdk , Microsoft.TestPlatform.Build , Microsoft.TestPlatform.CLI From Version 17.10.0-release-24272-11 -> To Version 17.10.0-release-24317-02 From 246f52627e31fc9e9aa19a8b0d7d5f4cbcb8b7df Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 30 Jun 2024 12:37:01 +0000 Subject: [PATCH 76/94] Update dependencies from https://github.com/dotnet/razor build 20240626.2 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.24312.2 -> To Version 7.0.0-preview.24326.2 From 9d0d5cf67878e39ba3d0cd4ede9eefa2929c8452 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 30 Jun 2024 12:38:58 +0000 Subject: [PATCH 77/94] Update dependencies from https://github.com/dotnet/roslyn build 20240624.8 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.10.0-3.24312.19 -> To Version 4.10.0-3.24324.8 From ef004e5f39e9fcd7695b542ebac6f3e84588ee0a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 30 Jun 2024 12:39:31 +0000 Subject: [PATCH 78/94] Update dependencies from https://github.com/dotnet/templating build 20240614.2 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.303-servicing.24311.4 -> To Version 8.0.303-servicing.24314.2 From d13a66c10b0c6094f7093c728cdf58b539c1ab0e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 30 Jun 2024 12:43:01 +0000 Subject: [PATCH 79/94] Update dependencies from https://github.com/dotnet/arcade build 20240626.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.24311.3 -> To Version 8.0.0-beta.24326.4 From 9c8d895d050894ec1ad125ad4035296ea2e829f9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 1 Jul 2024 12:33:30 +0000 Subject: [PATCH 80/94] Update dependencies from https://github.com/microsoft/vstest build 20240617.2 Microsoft.NET.Test.Sdk , Microsoft.TestPlatform.Build , Microsoft.TestPlatform.CLI From Version 17.10.0-release-24272-11 -> To Version 17.10.0-release-24317-02 From e48c7672f05adbdd661790c0335196d848adf04e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 1 Jul 2024 12:34:01 +0000 Subject: [PATCH 81/94] Update dependencies from https://github.com/dotnet/razor build 20240626.2 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.24312.2 -> To Version 7.0.0-preview.24326.2 From c3948a84de9d7253ab023e1736ed41dae4652268 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 1 Jul 2024 12:35:55 +0000 Subject: [PATCH 82/94] Update dependencies from https://github.com/dotnet/roslyn build 20240624.8 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.10.0-3.24312.19 -> To Version 4.10.0-3.24324.8 From b4768e391b6a53ec770aa5bb8cc0bed934a5d760 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 1 Jul 2024 12:36:31 +0000 Subject: [PATCH 83/94] Update dependencies from https://github.com/dotnet/templating build 20240614.2 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.303-servicing.24311.4 -> To Version 8.0.303-servicing.24314.2 From 16c4b79540ee7639b0d7fd9520db4db1f19af97b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 1 Jul 2024 12:40:22 +0000 Subject: [PATCH 84/94] Update dependencies from https://github.com/dotnet/arcade build 20240628.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.24311.3 -> To Version 8.0.0-beta.24328.2 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- global.json | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 79d8471c0d46..5d47569c296c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -483,22 +483,22 @@ - + https://github.com/dotnet/arcade - bee35f3044609d08c40566f8a008baa4d0451a9e + 761c516b64fee3941d8909d24205ced835eed83e - + https://github.com/dotnet/arcade - bee35f3044609d08c40566f8a008baa4d0451a9e + 761c516b64fee3941d8909d24205ced835eed83e - + https://github.com/dotnet/arcade - bee35f3044609d08c40566f8a008baa4d0451a9e + 761c516b64fee3941d8909d24205ced835eed83e - + https://github.com/dotnet/arcade - bee35f3044609d08c40566f8a008baa4d0451a9e + 761c516b64fee3941d8909d24205ced835eed83e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 202caa22d817..5d756017a838 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -35,7 +35,7 @@ 7.0.0 4.0.0 7.0.0 - 8.0.0-beta.24326.4 + 8.0.0-beta.24328.2 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -210,7 +210,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.24326.4 + 8.0.0-beta.24328.2 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/global.json b/global.json index 9404a652c2a9..74e605301f20 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24326.4", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24326.4" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24328.2", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24328.2" } } From 85ca99abb01f6f10f83b3f7f6275df35f43fd75a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 2 Jul 2024 12:52:32 +0000 Subject: [PATCH 85/94] Update dependencies from https://github.com/microsoft/vstest build 20240617.2 Microsoft.NET.Test.Sdk , Microsoft.TestPlatform.Build , Microsoft.TestPlatform.CLI From Version 17.10.0-release-24272-11 -> To Version 17.10.0-release-24317-02 From b4bf1dcab24abee1f4c73e4e31de3506e3004cb4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 2 Jul 2024 12:53:03 +0000 Subject: [PATCH 86/94] Update dependencies from https://github.com/dotnet/razor build 20240626.2 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.24312.2 -> To Version 7.0.0-preview.24326.2 From 06240d08b8ee7c8e982ec7519171938a4319c620 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 2 Jul 2024 12:54:56 +0000 Subject: [PATCH 87/94] Update dependencies from https://github.com/dotnet/roslyn build 20240624.8 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.10.0-3.24312.19 -> To Version 4.10.0-3.24324.8 From a2905724b08bf26553ac5c248e3a569b0a033544 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 2 Jul 2024 12:55:29 +0000 Subject: [PATCH 88/94] Update dependencies from https://github.com/dotnet/templating build 20240614.2 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.303-servicing.24311.4 -> To Version 8.0.303-servicing.24314.2 From 194445444f738e80ae8035f6d0e0537eb0635506 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 2 Jul 2024 12:57:20 +0000 Subject: [PATCH 89/94] Update dependencies from https://github.com/dotnet/arcade build 20240628.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.24311.3 -> To Version 8.0.0-beta.24328.2 From e8c4a32b68e9957064f95f0317d1ed2ab9c853a8 Mon Sep 17 00:00:00 2001 From: "Matt Mitchell (.NET)" Date: Tue, 2 Jul 2024 09:29:51 -0700 Subject: [PATCH 90/94] Update arcade --- NuGet.config | 4 ++ eng/Version.Details.xml | 16 +++---- eng/Versions.props | 4 +- eng/common/post-build/publish-using-darc.ps1 | 15 +++---- .../job/publish-build-assets.yml | 12 +++--- .../templates-official/job/source-build.yml | 8 ++++ .../templates-official/jobs/source-build.yml | 8 ++++ .../post-build/post-build.yml | 8 ++-- .../steps/enable-internal-runtimes.yml | 28 ++++++++++++ .../steps/get-delegation-sas.yml | 43 +++++++++++++++++++ .../steps/get-federated-access-token.yml | 28 ++++++++++++ .../templates/job/publish-build-assets.yml | 12 +++--- eng/common/templates/job/source-build.yml | 8 ++++ eng/common/templates/jobs/source-build.yml | 8 ++++ .../templates/post-build/post-build.yml | 8 ++-- .../post-build/setup-maestro-vars.yml | 28 ++++++------ .../steps/enable-internal-runtimes.yml | 28 ++++++++++++ .../templates/steps/get-delegation-sas.yml | 43 +++++++++++++++++++ .../steps/get-federated-access-token.yml | 28 ++++++++++++ global.json | 4 +- 20 files changed, 291 insertions(+), 50 deletions(-) create mode 100644 eng/common/templates-official/steps/enable-internal-runtimes.yml create mode 100644 eng/common/templates-official/steps/get-delegation-sas.yml create mode 100644 eng/common/templates-official/steps/get-federated-access-token.yml create mode 100644 eng/common/templates/steps/enable-internal-runtimes.yml create mode 100644 eng/common/templates/steps/get-delegation-sas.yml create mode 100644 eng/common/templates/steps/get-federated-access-token.yml diff --git a/NuGet.config b/NuGet.config index ca1f5e248d72..600ebd405c65 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,6 +24,10 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 206c729e37e1..236f30263401 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -483,22 +483,22 @@ - + https://github.com/dotnet/arcade - c214b6ad17aedca4fa48294d80f6c52ef2463081 + 8b879da4e449c48d99f3f642fc429379a64e8fe8 - + https://github.com/dotnet/arcade - c214b6ad17aedca4fa48294d80f6c52ef2463081 + 8b879da4e449c48d99f3f642fc429379a64e8fe8 - + https://github.com/dotnet/arcade - c214b6ad17aedca4fa48294d80f6c52ef2463081 + 8b879da4e449c48d99f3f642fc429379a64e8fe8 - + https://github.com/dotnet/arcade - c214b6ad17aedca4fa48294d80f6c52ef2463081 + 8b879da4e449c48d99f3f642fc429379a64e8fe8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 734ba59756cd..7e8c301c485f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -35,7 +35,7 @@ 7.0.0 4.0.0 7.0.0 - 8.0.0-beta.24311.3 + 8.0.0-beta.24352.1 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -210,7 +210,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.24311.3 + 8.0.0-beta.24352.1 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1 index 5a3a32ea8d75..238945cb5ab4 100644 --- a/eng/common/post-build/publish-using-darc.ps1 +++ b/eng/common/post-build/publish-using-darc.ps1 @@ -2,7 +2,6 @@ param( [Parameter(Mandatory=$true)][int] $BuildId, [Parameter(Mandatory=$true)][int] $PublishingInfraVersion, [Parameter(Mandatory=$true)][string] $AzdoToken, - [Parameter(Mandatory=$true)][string] $MaestroToken, [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net', [Parameter(Mandatory=$true)][string] $WaitPublishingFinish, [Parameter(Mandatory=$false)][string] $ArtifactsPublishingAdditionalParameters, @@ -31,13 +30,13 @@ try { } & $darc add-build-to-channel ` - --id $buildId ` - --publishing-infra-version $PublishingInfraVersion ` - --default-channels ` - --source-branch main ` - --azdev-pat $AzdoToken ` - --bar-uri $MaestroApiEndPoint ` - --password $MaestroToken ` + --id $buildId ` + --publishing-infra-version $PublishingInfraVersion ` + --default-channels ` + --source-branch main ` + --azdev-pat "$AzdoToken" ` + --bar-uri "$MaestroApiEndPoint" ` + --ci ` @optionalParams if ($LastExitCode -ne 0) { diff --git a/eng/common/templates-official/job/publish-build-assets.yml b/eng/common/templates-official/job/publish-build-assets.yml index 589ac80a18b7..d01739c12857 100644 --- a/eng/common/templates-official/job/publish-build-assets.yml +++ b/eng/common/templates-official/job/publish-build-assets.yml @@ -76,13 +76,16 @@ jobs: - task: NuGetAuthenticate@1 - - task: PowerShell@2 + - task: AzureCLI@2 displayName: Publish Build Assets inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet + azureSubscription: "Darc: Maestro Production" + scriptType: ps + scriptLocation: scriptPath + scriptPath: $(Build.SourcesDirectory)/eng/common/sdk-task.ps1 + arguments: > + -task PublishBuildAssets -restore -msbuildEngine dotnet /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests' - /p:BuildAssetRegistryToken=$(MaestroAccessToken) /p:MaestroApiEndpoint=https://maestro-prod.westus2.cloudapp.azure.com /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }} /p:OfficialBuildId=$(Build.BuildNumber) @@ -144,7 +147,6 @@ jobs: arguments: -BuildId $(BARBuildId) -PublishingInfraVersion 3 -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' - -MaestroToken '$(MaestroApiAccessToken)' -WaitPublishingFinish true -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' diff --git a/eng/common/templates-official/job/source-build.yml b/eng/common/templates-official/job/source-build.yml index f193dfbe2366..f983033bb028 100644 --- a/eng/common/templates-official/job/source-build.yml +++ b/eng/common/templates-official/job/source-build.yml @@ -31,6 +31,12 @@ parameters: # container and pool. platform: {} + # If set to true and running on a non-public project, + # Internal blob storage locations will be enabled. + # This is not enabled by default because many repositories do not need internal sources + # and do not need to have the required service connections approved in the pipeline. + enableInternalSources: false + jobs: - job: ${{ parameters.jobNamePrefix }}_${{ parameters.platform.name }} displayName: Source-Build (${{ parameters.platform.name }}) @@ -62,6 +68,8 @@ jobs: clean: all steps: + - ${{ if eq(parameters.enableInternalSources, true) }}: + - template: /eng/common/templates-official/steps/enable-internal-runtimes.yml - template: /eng/common/templates-official/steps/source-build.yml parameters: platform: ${{ parameters.platform }} diff --git a/eng/common/templates-official/jobs/source-build.yml b/eng/common/templates-official/jobs/source-build.yml index 08e5db9bb116..5cf6a269c0b6 100644 --- a/eng/common/templates-official/jobs/source-build.yml +++ b/eng/common/templates-official/jobs/source-build.yml @@ -21,6 +21,12 @@ parameters: # one job runs on 'defaultManagedPlatform'. platforms: [] + # If set to true and running on a non-public project, + # Internal nuget and blob storage locations will be enabled. + # This is not enabled by default because many repositories do not need internal sources + # and do not need to have the required service connections approved in the pipeline. + enableInternalSources: false + jobs: - ${{ if ne(parameters.allCompletedJobId, '') }}: @@ -38,9 +44,11 @@ jobs: parameters: jobNamePrefix: ${{ parameters.jobNamePrefix }} platform: ${{ platform }} + enableInternalSources: ${{ parameters.enableInternalSources }} - ${{ if eq(length(parameters.platforms), 0) }}: - template: /eng/common/templates-official/job/source-build.yml parameters: jobNamePrefix: ${{ parameters.jobNamePrefix }} platform: ${{ parameters.defaultManagedPlatform }} + enableInternalSources: ${{ parameters.enableInternalSources }} diff --git a/eng/common/templates-official/post-build/post-build.yml b/eng/common/templates-official/post-build/post-build.yml index da1f40958b45..0dfa387e7b78 100644 --- a/eng/common/templates-official/post-build/post-build.yml +++ b/eng/common/templates-official/post-build/post-build.yml @@ -272,14 +272,16 @@ stages: - task: NuGetAuthenticate@1 - - task: PowerShell@2 + - task: AzureCLI@2 displayName: Publish Using Darc inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 + azureSubscription: "Darc: Maestro Production" + scriptType: ps + scriptLocation: scriptPath + scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 arguments: -BuildId $(BARBuildId) -PublishingInfraVersion ${{ parameters.publishingInfraVersion }} -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' - -MaestroToken '$(MaestroApiAccessToken)' -WaitPublishingFinish true -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' diff --git a/eng/common/templates-official/steps/enable-internal-runtimes.yml b/eng/common/templates-official/steps/enable-internal-runtimes.yml new file mode 100644 index 000000000000..93a8394a666b --- /dev/null +++ b/eng/common/templates-official/steps/enable-internal-runtimes.yml @@ -0,0 +1,28 @@ +# Obtains internal runtime download credentials and populates the 'dotnetbuilds-internal-container-read-token-base64' +# variable with the base64-encoded SAS token, by default + +parameters: +- name: federatedServiceConnection + type: string + default: 'dotnetbuilds-internal-read' +- name: outputVariableName + type: string + default: 'dotnetbuilds-internal-container-read-token-base64' +- name: expiryInHours + type: number + default: 1 +- name: base64Encode + type: boolean + default: true + +steps: +- ${{ if ne(variables['System.TeamProject'], 'public') }}: + - template: /eng/common/templates-official/steps/get-delegation-sas.yml + parameters: + federatedServiceConnection: ${{ parameters.federatedServiceConnection }} + outputVariableName: ${{ parameters.outputVariableName }} + expiryInHours: ${{ parameters.expiryInHours }} + base64Encode: ${{ parameters.base64Encode }} + storageAccount: dotnetbuilds + container: internal + permissions: rl diff --git a/eng/common/templates-official/steps/get-delegation-sas.yml b/eng/common/templates-official/steps/get-delegation-sas.yml new file mode 100644 index 000000000000..c0e8f91317f0 --- /dev/null +++ b/eng/common/templates-official/steps/get-delegation-sas.yml @@ -0,0 +1,43 @@ +parameters: +- name: federatedServiceConnection + type: string +- name: outputVariableName + type: string +- name: expiryInHours + type: number + default: 1 +- name: base64Encode + type: boolean + default: false +- name: storageAccount + type: string +- name: container + type: string +- name: permissions + type: string + default: 'rl' + +steps: +- task: AzureCLI@2 + displayName: 'Generate delegation SAS Token for ${{ parameters.storageAccount }}/${{ parameters.container }}' + inputs: + azureSubscription: ${{ parameters.federatedServiceConnection }} + scriptType: 'pscore' + scriptLocation: 'inlineScript' + inlineScript: | + # Calculate the expiration of the SAS token and convert to UTC + $expiry = (Get-Date).AddHours(${{ parameters.expiryInHours }}).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ") + + $sas = az storage container generate-sas --account-name ${{ parameters.storageAccount }} --name ${{ parameters.container }} --permissions ${{ parameters.permissions }} --expiry $expiry --auth-mode login --as-user -o tsv + + if ($LASTEXITCODE -ne 0) { + Write-Error "Failed to generate SAS token." + exit 1 + } + + if ('${{ parameters.base64Encode }}' -eq 'true') { + $sas = [Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes($sas)) + } + + Write-Host "Setting '${{ parameters.outputVariableName }}' with the access token value" + Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true]$sas" diff --git a/eng/common/templates-official/steps/get-federated-access-token.yml b/eng/common/templates-official/steps/get-federated-access-token.yml new file mode 100644 index 000000000000..e3786cef6dfd --- /dev/null +++ b/eng/common/templates-official/steps/get-federated-access-token.yml @@ -0,0 +1,28 @@ +parameters: +- name: federatedServiceConnection + type: string +- name: outputVariableName + type: string +# Resource to get a token for. Common values include: +# - '499b84ac-1321-427f-aa17-267ca6975798' for Azure DevOps +# - 'https://storage.azure.com/' for storage +# Defaults to Azure DevOps +- name: resource + type: string + default: '499b84ac-1321-427f-aa17-267ca6975798' + +steps: +- task: AzureCLI@2 + displayName: 'Getting federated access token for feeds' + inputs: + azureSubscription: ${{ parameters.federatedServiceConnection }} + scriptType: 'pscore' + scriptLocation: 'inlineScript' + inlineScript: | + $accessToken = az account get-access-token --query accessToken --resource ${{ parameters.resource }} --output tsv + if ($LASTEXITCODE -ne 0) { + Write-Error "Failed to get access token for resource '${{ parameters.resource }}'" + exit 1 + } + Write-Host "Setting '${{ parameters.outputVariableName }}' with the access token value" + Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true]$accessToken" diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index 8ec0151def21..9fd69fa7c9b7 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -74,13 +74,16 @@ jobs: - task: NuGetAuthenticate@1 - - task: PowerShell@2 + - task: AzureCLI@2 displayName: Publish Build Assets inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet + azureSubscription: "Darc: Maestro Production" + scriptType: ps + scriptLocation: scriptPath + scriptPath: $(Build.SourcesDirectory)/eng/common/sdk-task.ps1 + arguments: > + -task PublishBuildAssets -restore -msbuildEngine dotnet /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests' - /p:BuildAssetRegistryToken=$(MaestroAccessToken) /p:MaestroApiEndpoint=https://maestro.dot.net /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }} /p:OfficialBuildId=$(Build.BuildNumber) @@ -140,7 +143,6 @@ jobs: arguments: -BuildId $(BARBuildId) -PublishingInfraVersion 3 -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' - -MaestroToken '$(MaestroApiAccessToken)' -WaitPublishingFinish true -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' diff --git a/eng/common/templates/job/source-build.yml b/eng/common/templates/job/source-build.yml index 8a3deef2b727..c0ff472b697b 100644 --- a/eng/common/templates/job/source-build.yml +++ b/eng/common/templates/job/source-build.yml @@ -31,6 +31,12 @@ parameters: # container and pool. platform: {} + # If set to true and running on a non-public project, + # Internal blob storage locations will be enabled. + # This is not enabled by default because many repositories do not need internal sources + # and do not need to have the required service connections approved in the pipeline. + enableInternalSources: false + jobs: - job: ${{ parameters.jobNamePrefix }}_${{ parameters.platform.name }} displayName: Source-Build (${{ parameters.platform.name }}) @@ -61,6 +67,8 @@ jobs: clean: all steps: + - ${{ if eq(parameters.enableInternalSources, true) }}: + - template: /eng/common/templates/steps/enable-internal-runtimes.yml - template: /eng/common/templates/steps/source-build.yml parameters: platform: ${{ parameters.platform }} diff --git a/eng/common/templates/jobs/source-build.yml b/eng/common/templates/jobs/source-build.yml index a15b07eb51d9..5f46bfa895c1 100644 --- a/eng/common/templates/jobs/source-build.yml +++ b/eng/common/templates/jobs/source-build.yml @@ -21,6 +21,12 @@ parameters: # one job runs on 'defaultManagedPlatform'. platforms: [] + # If set to true and running on a non-public project, + # Internal nuget and blob storage locations will be enabled. + # This is not enabled by default because many repositories do not need internal sources + # and do not need to have the required service connections approved in the pipeline. + enableInternalSources: false + jobs: - ${{ if ne(parameters.allCompletedJobId, '') }}: @@ -38,9 +44,11 @@ jobs: parameters: jobNamePrefix: ${{ parameters.jobNamePrefix }} platform: ${{ platform }} + enableInternalSources: ${{ parameters.enableInternalSources }} - ${{ if eq(length(parameters.platforms), 0) }}: - template: /eng/common/templates/job/source-build.yml parameters: jobNamePrefix: ${{ parameters.jobNamePrefix }} platform: ${{ parameters.defaultManagedPlatform }} + enableInternalSources: ${{ parameters.enableInternalSources }} diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index aba44a25a338..2db4933468fd 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -268,14 +268,16 @@ stages: - task: NuGetAuthenticate@1 - - task: PowerShell@2 + - task: AzureCLI@2 displayName: Publish Using Darc inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 + azureSubscription: "Darc: Maestro Production" + scriptType: ps + scriptLocation: scriptPath + scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 arguments: -BuildId $(BARBuildId) -PublishingInfraVersion ${{ parameters.publishingInfraVersion }} -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' - -MaestroToken '$(MaestroApiAccessToken)' -WaitPublishingFinish true -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' diff --git a/eng/common/templates/post-build/setup-maestro-vars.yml b/eng/common/templates/post-build/setup-maestro-vars.yml index 0c87f149a4ad..64b9abc68504 100644 --- a/eng/common/templates/post-build/setup-maestro-vars.yml +++ b/eng/common/templates/post-build/setup-maestro-vars.yml @@ -11,13 +11,14 @@ steps: artifactName: ReleaseConfigs checkDownloadedFiles: true - - task: PowerShell@2 + - task: AzureCLI@2 name: setReleaseVars displayName: Set Release Configs Vars inputs: - targetType: inline - pwsh: true - script: | + azureSubscription: "Darc: Maestro Production" + scriptType: pscore + scriptLocation: inlineScript + inlineScript: | try { if (!$Env:PromoteToMaestroChannels -or $Env:PromoteToMaestroChannels.Trim() -eq '') { $Content = Get-Content $(Build.StagingDirectory)/ReleaseConfigs/ReleaseConfigs.txt @@ -31,15 +32,16 @@ steps: $AzureDevOpsBuildId = $Env:Build_BuildId } else { - $buildApiEndpoint = "${Env:MaestroApiEndPoint}/api/builds/${Env:BARBuildId}?api-version=${Env:MaestroApiVersion}" + . $(Build.SourcesDirectory)\eng\common\tools.ps1 + $darc = Get-Darc + $buildInfo = & $darc get-build ` + --id ${{ parameters.BARBuildId }} ` + --extended ` + --output-format json ` + --ci ` + | convertFrom-Json - $apiHeaders = New-Object 'System.Collections.Generic.Dictionary[[String],[String]]' - $apiHeaders.Add('Accept', 'application/json') - $apiHeaders.Add('Authorization',"Bearer ${Env:MAESTRO_API_TOKEN}") - - $buildInfo = try { Invoke-WebRequest -Method Get -Uri $buildApiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" } - - $BarId = $Env:BARBuildId + $BarId = ${{ parameters.BARBuildId }} $Channels = $Env:PromoteToMaestroChannels -split "," $Channels = $Channels -join "][" $Channels = "[$Channels]" @@ -65,6 +67,4 @@ steps: exit 1 } env: - MAESTRO_API_TOKEN: $(MaestroApiAccessToken) - BARBuildId: ${{ parameters.BARBuildId }} PromoteToMaestroChannels: ${{ parameters.PromoteToChannelIds }} diff --git a/eng/common/templates/steps/enable-internal-runtimes.yml b/eng/common/templates/steps/enable-internal-runtimes.yml new file mode 100644 index 000000000000..54dc9416c519 --- /dev/null +++ b/eng/common/templates/steps/enable-internal-runtimes.yml @@ -0,0 +1,28 @@ +# Obtains internal runtime download credentials and populates the 'dotnetbuilds-internal-container-read-token-base64' +# variable with the base64-encoded SAS token, by default + +parameters: +- name: federatedServiceConnection + type: string + default: 'dotnetbuilds-internal-read' +- name: outputVariableName + type: string + default: 'dotnetbuilds-internal-container-read-token-base64' +- name: expiryInHours + type: number + default: 1 +- name: base64Encode + type: boolean + default: true + +steps: +- ${{ if ne(variables['System.TeamProject'], 'public') }}: + - template: /eng/common/templates/steps/get-delegation-sas.yml + parameters: + federatedServiceConnection: ${{ parameters.federatedServiceConnection }} + outputVariableName: ${{ parameters.outputVariableName }} + expiryInHours: ${{ parameters.expiryInHours }} + base64Encode: ${{ parameters.base64Encode }} + storageAccount: dotnetbuilds + container: internal + permissions: rl diff --git a/eng/common/templates/steps/get-delegation-sas.yml b/eng/common/templates/steps/get-delegation-sas.yml new file mode 100644 index 000000000000..c0e8f91317f0 --- /dev/null +++ b/eng/common/templates/steps/get-delegation-sas.yml @@ -0,0 +1,43 @@ +parameters: +- name: federatedServiceConnection + type: string +- name: outputVariableName + type: string +- name: expiryInHours + type: number + default: 1 +- name: base64Encode + type: boolean + default: false +- name: storageAccount + type: string +- name: container + type: string +- name: permissions + type: string + default: 'rl' + +steps: +- task: AzureCLI@2 + displayName: 'Generate delegation SAS Token for ${{ parameters.storageAccount }}/${{ parameters.container }}' + inputs: + azureSubscription: ${{ parameters.federatedServiceConnection }} + scriptType: 'pscore' + scriptLocation: 'inlineScript' + inlineScript: | + # Calculate the expiration of the SAS token and convert to UTC + $expiry = (Get-Date).AddHours(${{ parameters.expiryInHours }}).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ") + + $sas = az storage container generate-sas --account-name ${{ parameters.storageAccount }} --name ${{ parameters.container }} --permissions ${{ parameters.permissions }} --expiry $expiry --auth-mode login --as-user -o tsv + + if ($LASTEXITCODE -ne 0) { + Write-Error "Failed to generate SAS token." + exit 1 + } + + if ('${{ parameters.base64Encode }}' -eq 'true') { + $sas = [Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes($sas)) + } + + Write-Host "Setting '${{ parameters.outputVariableName }}' with the access token value" + Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true]$sas" diff --git a/eng/common/templates/steps/get-federated-access-token.yml b/eng/common/templates/steps/get-federated-access-token.yml new file mode 100644 index 000000000000..c8c49cc0e8f0 --- /dev/null +++ b/eng/common/templates/steps/get-federated-access-token.yml @@ -0,0 +1,28 @@ +parameters: +- name: federatedServiceConnection + type: string +- name: outputVariableName + type: string +# Resource to get a token for. Common values include: +# - '499b84ac-1321-427f-aa17-267ca6975798' for Azure DevOps +# - 'https://storage.azure.com/' for storage +# Defaults to Azure DevOps +- name: resource + type: string + default: '499b84ac-1321-427f-aa17-267ca6975798' + +steps: +- task: AzureCLI@2 + displayName: 'Getting federated access token for feeds' + inputs: + azureSubscription: ${{ parameters.federatedServiceConnection }} + scriptType: 'pscore' + scriptLocation: 'inlineScript' + inlineScript: | + $accessToken = az account get-access-token --query accessToken --resource ${{ parameters.resource }} --output tsv + if ($LASTEXITCODE -ne 0) { + Write-Error "Failed to get access token for resource '${{ parameters.resource }}'" + exit 1 + } + Write-Host "Setting '${{ parameters.outputVariableName }}' with the access token value" + Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true]$accessToken" \ No newline at end of file diff --git a/global.json b/global.json index d2af4d682074..ddd87ad0324e 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24311.3", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24311.3" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24352.1", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24352.1" } } From 00b43c9bb0db31d4e26642d71594f11050e149b9 Mon Sep 17 00:00:00 2001 From: "Matt Mitchell (.NET)" Date: Tue, 2 Jul 2024 09:25:56 -0700 Subject: [PATCH 91/94] Use delegation SAS for internal builds --- .vsts-ci-richnav.yml | 37 +++++------ .vsts-ci.yml | 6 +- .vsts-pr.yml | 18 ++---- eng/build-pr.yml | 143 ++++++++++++++++++++++--------------------- eng/build.yml | 143 ++++++++++++++++++++++--------------------- 5 files changed, 174 insertions(+), 173 deletions(-) diff --git a/.vsts-ci-richnav.yml b/.vsts-ci-richnav.yml index 2b254e9b8f72..1995db108e1d 100644 --- a/.vsts-ci-richnav.yml +++ b/.vsts-ci-richnav.yml @@ -26,7 +26,7 @@ stages: richCodeNavigationEnvironment: 'production' pool: name: $(DncEngPublicBuildPool) - demands: ImageOverride -equals windows.vs2019.amd64.open + demands: ImageOverride -equals windows.vs2019.amd64.open timeoutInMinutes: 180 strategy: matrix: @@ -45,6 +45,7 @@ stages: - _SignArgs: '' - _InternalRuntimeDownloadArgs: '' steps: + - template: /eng/common/templates/steps/enable-internal-runtimes.yml - powershell: eng\common\build.ps1 -restore -ci @@ -65,23 +66,23 @@ stages: TestFullMSBuild: 'true' SYSTEM_ACCESSTOKEN: $(System.AccessToken) - - task: CopyFiles@2 - displayName: Gather Logs - inputs: - SourceFolder: '$(Build.SourcesDirectory)/artifacts' - Contents: | - log/$(_BuildConfig)/**/* - TestResults/$(_BuildConfig)/**/* - SymStore/$(_BuildConfig)/**/* - TargetFolder: '$(Build.ArtifactStagingDirectory)' - continueOnError: true + - task: CopyFiles@2 + displayName: Gather Logs + inputs: + SourceFolder: '$(Build.SourcesDirectory)/artifacts' + Contents: | + log/$(_BuildConfig)/**/* + TestResults/$(_BuildConfig)/**/* + SymStore/$(_BuildConfig)/**/* + TargetFolder: '$(Build.ArtifactStagingDirectory)' + continueOnError: true condition: always() - - task: PublishBuildArtifacts@1 - displayName: Publish Logs to VSTS - inputs: - PathtoPublish: '$(Build.ArtifactStagingDirectory)' - ArtifactName: '$(_AgentOSName)_$(Agent.JobName)_$(Build.BuildNumber)' - publishLocation: Container - continueOnError: true + - task: PublishBuildArtifacts@1 + displayName: Publish Logs to VSTS + inputs: + PathtoPublish: '$(Build.ArtifactStagingDirectory)' + ArtifactName: '$(_AgentOSName)_$(Agent.JobName)_$(Build.BuildNumber)' + publishLocation: Container + continueOnError: true condition: always() diff --git a/.vsts-ci.yml b/.vsts-ci.yml index dae1b70901af..f6a97ff62c1e 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -36,10 +36,9 @@ variables: value: /p:OfficialBuilder=Microsoft - name: Codeql.Enabled value: true - - group: DotNetBuilds storage account read tokens - name: _InternalRuntimeDownloadArgs - value: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal - /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) + value: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal + /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - group: DotNet-CLI-SDLValidation-Params - template: /eng/common/templates-official/variables/pool-providers.yml @@ -115,6 +114,7 @@ extends: value: '' - template: /eng/common/templates-official/job/source-build.yml@self parameters: + enableInternalSources: true platform: name: 'Managed' container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8' diff --git a/.vsts-pr.yml b/.vsts-pr.yml index de5c9f6f8d18..3cc8ded3296d 100644 --- a/.vsts-pr.yml +++ b/.vsts-pr.yml @@ -18,14 +18,8 @@ pr: variables: - name: teamName value: Roslyn-Project-System - - name: _DotNetPublishToBlobFeed - value: false - name: _CIBuild value: -restore -build -sign -pack -ci - - name: _DotNetArtifactsCategory - value: .NETCore - - name: _DotNetValidationArtifactsCategory - value: .NETCore - ${{ if or(startswith(variables['Build.SourceBranch'], 'refs/heads/release/'), startswith(variables['Build.SourceBranch'], 'refs/heads/internal/release/'), eq(variables['Build.Reason'], 'Manual')) }}: - name: PostBuildSign value: false @@ -44,10 +38,9 @@ variables: value: /p:OfficialBuilder=Microsoft - name: Codeql.Enabled value: true - - group: DotNetBuilds storage account read tokens - name: _InternalRuntimeDownloadArgs - value: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal - /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) + value: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal + /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - group: DotNet-CLI-SDLValidation-Params - template: /eng/common/templates/variables/pool-providers.yml @@ -64,9 +57,9 @@ stages: name: $(DncEngInternalBuildPool) demands: ImageOverride -equals windows.vs2019.amd64 steps: - - publish: $(Build.SourcesDirectory)\eng\BuildConfiguration - artifact: BuildConfiguration - displayName: Publish Build Config + - publish: $(Build.SourcesDirectory)\eng\BuildConfiguration + artifact: BuildConfiguration + displayName: Publish Build Config - template: /eng/build-pr.yml parameters: agentOs: Windows_NT @@ -94,6 +87,7 @@ stages: _Test: '' - template: /eng/common/templates/job/source-build.yml parameters: + enableInternalSources: true platform: name: 'Managed' container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8' diff --git a/eng/build-pr.yml b/eng/build-pr.yml index 23f394e6f943..e86d00ffded0 100644 --- a/eng/build-pr.yml +++ b/eng/build-pr.yml @@ -56,7 +56,7 @@ jobs: - _OfficialBuildIdArgs: /p:OfficialBuildId=$(BUILD.BUILDNUMBER) - _SignArgs: /p:DotNetSignType=$(_SignType) /p:TeamName=$(_TeamName) - _PerfIterations: 25 - + steps: - ${{ if ne(variables['System.TeamProject'], 'public') }}: - task: PowerShell@2 @@ -66,6 +66,7 @@ jobs: arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token env: Token: $(dn-bot-dnceng-artifact-feeds-rw) + - template: /eng/common/templates/steps/enable-internal-runtimes.yml - ${{ if eq(parameters.agentOs, 'Windows_NT') }}: - powershell: eng\common\build.ps1 $(_CIBuild) @@ -98,7 +99,7 @@ jobs: SYSTEM_ACCESSTOKEN: $(System.AccessToken) HelixAccessToken: $(_HelixApiToken) RunAoTTests: 'false' - + - ${{ if eq(parameters.agentOs, 'Windows_NT_FullFramework') }}: - powershell: eng\common\build.ps1 $(_CIBuild) @@ -130,7 +131,7 @@ jobs: TestFullMSBuild: 'true' SYSTEM_ACCESSTOKEN: $(System.AccessToken) HelixAccessToken: $(_HelixApiToken) - + - ${{ if eq(parameters.agentOs, 'Windows_NT_TestAsTools') }}: - powershell: eng\common\build.ps1 $(_CIBuild) @@ -142,7 +143,7 @@ jobs: displayName: Build env: BuildConfig: $(_BuildConfig) - + - ${{ if notIn(parameters.agentOs, 'Windows_NT', 'Windows_NT_FullFramework', 'Windows_NT_TestAsTools') }}: - script: eng/common/build.sh $(_CIBuild) @@ -173,35 +174,35 @@ jobs: RunAoTTests: 'false' - task: PublishTestResults@2 - displayName: Publish Test Results - inputs: - testResultsFormat: xUnit - testResultsFiles: 'artifacts/TestResults/$(_BuildConfig)/*.xml' - testRunTitle: '$(_AgentOSName)_$(Agent.JobName)' - buildPlatform: '$(BuildPlatform)' - buildConfiguration: '$(_BuildConfig)' + displayName: Publish Test Results + inputs: + testResultsFormat: xUnit + testResultsFiles: 'artifacts/TestResults/$(_BuildConfig)/*.xml' + testRunTitle: '$(_AgentOSName)_$(Agent.JobName)' + buildPlatform: '$(BuildPlatform)' + buildConfiguration: '$(_BuildConfig)' condition: always() - - task: CopyFiles@2 - displayName: Gather Logs - inputs: - SourceFolder: '$(Build.SourcesDirectory)/artifacts' - Contents: | - log/$(_BuildConfig)/**/* - TestResults/$(_BuildConfig)/**/* + - task: CopyFiles@2 + displayName: Gather Logs + inputs: + SourceFolder: '$(Build.SourcesDirectory)/artifacts' + Contents: | + log/$(_BuildConfig)/**/* + TestResults/$(_BuildConfig)/**/* SymStore/$(_BuildConfig)/**/* tmp/$(_BuildConfig)/**/*.binlog - TargetFolder: '$(Build.ArtifactStagingDirectory)' - continueOnError: true + TargetFolder: '$(Build.ArtifactStagingDirectory)' + continueOnError: true condition: always() - - - task: PublishBuildArtifacts@1 - displayName: Publish Logs to VSTS - inputs: - PathtoPublish: '$(Build.ArtifactStagingDirectory)' - ArtifactName: '$(_AgentOSName)_$(Agent.JobName)_$(Build.BuildNumber)' - publishLocation: Container - continueOnError: true + + - task: PublishBuildArtifacts@1 + displayName: Publish Logs to VSTS + inputs: + PathtoPublish: '$(Build.ArtifactStagingDirectory)' + ArtifactName: '$(_AgentOSName)_$(Agent.JobName)_$(Build.BuildNumber)' + publishLocation: Container + continueOnError: true condition: always() # AoT Jobs @@ -247,6 +248,7 @@ jobs: arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token env: Token: $(dn-bot-dnceng-artifact-feeds-rw) + - template: /eng/common/templates/steps/enable-internal-runtimes.yml - ${{ if eq(parameters.agentOs, 'Windows_NT') }}: - powershell: eng\common\build.ps1 $(_CIBuild) @@ -314,26 +316,26 @@ jobs: RunAoTTests: 'true' - ${{ if in(parameters.agentOs, 'Windows_NT', 'Darwin') }}: - - task: CopyFiles@2 - displayName: Gather Logs - inputs: - SourceFolder: '$(Build.SourcesDirectory)/artifacts' - Contents: | - log/$(_BuildConfig)/**/* - TestResults/$(_BuildConfig)/**/* + - task: CopyFiles@2 + displayName: Gather Logs + inputs: + SourceFolder: '$(Build.SourcesDirectory)/artifacts' + Contents: | + log/$(_BuildConfig)/**/* + TestResults/$(_BuildConfig)/**/* SymStore/$(_BuildConfig)/**/* tmp/$(_BuildConfig)/**/*.binlog - TargetFolder: '$(Build.ArtifactStagingDirectory)' - continueOnError: true + TargetFolder: '$(Build.ArtifactStagingDirectory)' + continueOnError: true condition: always() - - task: PublishBuildArtifacts@1 - displayName: Publish Logs to VSTS - inputs: - PathtoPublish: '$(Build.ArtifactStagingDirectory)' - ArtifactName: '$(_AgentOSName)_$(Agent.JobName)_$(Build.BuildNumber)' - publishLocation: Container - continueOnError: true + - task: PublishBuildArtifacts@1 + displayName: Publish Logs to VSTS + inputs: + PathtoPublish: '$(Build.ArtifactStagingDirectory)' + ArtifactName: '$(_AgentOSName)_$(Agent.JobName)_$(Build.BuildNumber)' + publishLocation: Container + continueOnError: true condition: always() # TemplateEngine Jobs @@ -379,6 +381,7 @@ jobs: arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token env: Token: $(dn-bot-dnceng-artifact-feeds-rw) + - template: /eng/common/templates/steps/enable-internal-runtimes.yml - ${{ if contains(parameters.agentOs, 'Windows_NT') }}: - powershell: eng\common\build.ps1 $(_CIBuild) @@ -446,35 +449,35 @@ jobs: /bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/dotnet-new.IntegrationTests.binlog $(_InternalRuntimeDownloadArgs) displayName: Run dotnet new Integration Tests - + - task: PublishTestResults@2 - displayName: Publish Test Results - inputs: - testResultsFormat: xUnit - testResultsFiles: 'artifacts/TestResults/$(_BuildConfig)/*.xml' - testRunTitle: '$(_AgentOSName)_$(Agent.JobName)' - buildPlatform: '$(BuildPlatform)' - buildConfiguration: '$(_BuildConfig)' + displayName: Publish Test Results + inputs: + testResultsFormat: xUnit + testResultsFiles: 'artifacts/TestResults/$(_BuildConfig)/*.xml' + testRunTitle: '$(_AgentOSName)_$(Agent.JobName)' + buildPlatform: '$(BuildPlatform)' + buildConfiguration: '$(_BuildConfig)' condition: always() - - - task: CopyFiles@2 - displayName: Gather Logs - inputs: - SourceFolder: '$(Build.SourcesDirectory)/artifacts' - Contents: | - log/$(_BuildConfig)/**/* - TestResults/$(_BuildConfig)/**/* + + - task: CopyFiles@2 + displayName: Gather Logs + inputs: + SourceFolder: '$(Build.SourcesDirectory)/artifacts' + Contents: | + log/$(_BuildConfig)/**/* + TestResults/$(_BuildConfig)/**/* SymStore/$(_BuildConfig)/**/* tmp/$(_BuildConfig)/**/*.binlog - TargetFolder: '$(Build.ArtifactStagingDirectory)' - continueOnError: true + TargetFolder: '$(Build.ArtifactStagingDirectory)' + continueOnError: true condition: always() - - - task: PublishBuildArtifacts@1 - displayName: Publish Logs to VSTS - inputs: - PathtoPublish: '$(Build.ArtifactStagingDirectory)' - ArtifactName: '$(_AgentOSName)_$(Agent.JobName)_$(Build.BuildNumber)' - publishLocation: Container - continueOnError: true + + - task: PublishBuildArtifacts@1 + displayName: Publish Logs to VSTS + inputs: + PathtoPublish: '$(Build.ArtifactStagingDirectory)' + ArtifactName: '$(_AgentOSName)_$(Agent.JobName)_$(Build.BuildNumber)' + publishLocation: Container + continueOnError: true condition: always() diff --git a/eng/build.yml b/eng/build.yml index ba6ee57efb91..c65b75901aba 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -67,7 +67,7 @@ jobs: value: /p:DotNetSignType=$(_SignType) /p:TeamName=$(_TeamName) - name: _PerfIterations value: 25 - + steps: - ${{ if ne(variables['System.TeamProject'], 'public') }}: - task: PowerShell@2 @@ -77,6 +77,7 @@ jobs: arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token env: Token: $(dn-bot-dnceng-artifact-feeds-rw) + - template: /eng/common/templates-official/steps/enable-internal-runtimes.yml - ${{ if eq(parameters.agentOs, 'Windows_NT') }}: - powershell: eng\common\build.ps1 $(_CIBuild) @@ -109,7 +110,7 @@ jobs: SYSTEM_ACCESSTOKEN: $(System.AccessToken) HelixAccessToken: $(_HelixApiToken) RunAoTTests: 'false' - + - ${{ if eq(parameters.agentOs, 'Windows_NT_FullFramework') }}: - powershell: eng\common\build.ps1 $(_CIBuild) @@ -141,7 +142,7 @@ jobs: TestFullMSBuild: 'true' SYSTEM_ACCESSTOKEN: $(System.AccessToken) HelixAccessToken: $(_HelixApiToken) - + - ${{ if eq(parameters.agentOs, 'Windows_NT_TestAsTools') }}: - powershell: eng\common\build.ps1 $(_CIBuild) @@ -153,7 +154,7 @@ jobs: displayName: Build env: BuildConfig: $(_BuildConfig) - + - ${{ if notIn(parameters.agentOs, 'Windows_NT', 'Windows_NT_FullFramework', 'Windows_NT_TestAsTools') }}: - script: eng/common/build.sh $(_CIBuild) @@ -184,35 +185,35 @@ jobs: RunAoTTests: 'false' - task: PublishTestResults@2 - displayName: Publish Test Results - inputs: - testResultsFormat: xUnit - testResultsFiles: 'artifacts/TestResults/$(_BuildConfig)/*.xml' - testRunTitle: '$(_AgentOSName)_$(Agent.JobName)' - buildPlatform: '$(BuildPlatform)' - buildConfiguration: '$(_BuildConfig)' + displayName: Publish Test Results + inputs: + testResultsFormat: xUnit + testResultsFiles: 'artifacts/TestResults/$(_BuildConfig)/*.xml' + testRunTitle: '$(_AgentOSName)_$(Agent.JobName)' + buildPlatform: '$(BuildPlatform)' + buildConfiguration: '$(_BuildConfig)' condition: always() - - task: CopyFiles@2 - displayName: Gather Logs - inputs: - SourceFolder: '$(Build.SourcesDirectory)/artifacts' - Contents: | - log/$(_BuildConfig)/**/* - TestResults/$(_BuildConfig)/**/* + - task: CopyFiles@2 + displayName: Gather Logs + inputs: + SourceFolder: '$(Build.SourcesDirectory)/artifacts' + Contents: | + log/$(_BuildConfig)/**/* + TestResults/$(_BuildConfig)/**/* SymStore/$(_BuildConfig)/**/* tmp/$(_BuildConfig)/**/*.binlog - TargetFolder: '$(Build.ArtifactStagingDirectory)' - continueOnError: true + TargetFolder: '$(Build.ArtifactStagingDirectory)' + continueOnError: true condition: always() - - - task: 1ES.PublishBuildArtifacts@1 - displayName: Publish Logs to VSTS - inputs: - PathtoPublish: '$(Build.ArtifactStagingDirectory)' - ArtifactName: '$(_AgentOSName)_$(Agent.JobName)_$(Build.BuildNumber)' - publishLocation: Container - continueOnError: true + + - task: 1ES.PublishBuildArtifacts@1 + displayName: Publish Logs to VSTS + inputs: + PathtoPublish: '$(Build.ArtifactStagingDirectory)' + ArtifactName: '$(_AgentOSName)_$(Agent.JobName)_$(Build.BuildNumber)' + publishLocation: Container + continueOnError: true condition: always() # AoT Jobs @@ -271,6 +272,7 @@ jobs: arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token env: Token: $(dn-bot-dnceng-artifact-feeds-rw) + - template: /eng/common/templates-official/steps/enable-internal-runtimes.yml - ${{ if eq(parameters.agentOs, 'Windows_NT') }}: - powershell: eng\common\build.ps1 $(_CIBuild) @@ -338,26 +340,26 @@ jobs: RunAoTTests: 'true' - ${{ if in(parameters.agentOs, 'Windows_NT', 'Darwin') }}: - - task: CopyFiles@2 - displayName: Gather Logs - inputs: - SourceFolder: '$(Build.SourcesDirectory)/artifacts' - Contents: | - log/$(_BuildConfig)/**/* - TestResults/$(_BuildConfig)/**/* + - task: CopyFiles@2 + displayName: Gather Logs + inputs: + SourceFolder: '$(Build.SourcesDirectory)/artifacts' + Contents: | + log/$(_BuildConfig)/**/* + TestResults/$(_BuildConfig)/**/* SymStore/$(_BuildConfig)/**/* tmp/$(_BuildConfig)/**/*.binlog - TargetFolder: '$(Build.ArtifactStagingDirectory)' - continueOnError: true + TargetFolder: '$(Build.ArtifactStagingDirectory)' + continueOnError: true condition: always() - - task: 1ES.PublishBuildArtifacts@1 - displayName: Publish Logs to VSTS - inputs: - PathtoPublish: '$(Build.ArtifactStagingDirectory)' - ArtifactName: '$(_AgentOSName)_$(Agent.JobName)_$(Build.BuildNumber)' - publishLocation: Container - continueOnError: true + - task: 1ES.PublishBuildArtifacts@1 + displayName: Publish Logs to VSTS + inputs: + PathtoPublish: '$(Build.ArtifactStagingDirectory)' + ArtifactName: '$(_AgentOSName)_$(Agent.JobName)_$(Build.BuildNumber)' + publishLocation: Container + continueOnError: true condition: always() # TemplateEngine Jobs @@ -416,6 +418,7 @@ jobs: arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token env: Token: $(dn-bot-dnceng-artifact-feeds-rw) + - template: /eng/common/templates-official/steps/enable-internal-runtimes.yml - ${{ if contains(parameters.agentOs, 'Windows_NT') }}: - powershell: eng\common\build.ps1 $(_CIBuild) @@ -483,35 +486,35 @@ jobs: /bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/dotnet-new.IntegrationTests.binlog $(_InternalRuntimeDownloadArgs) displayName: Run dotnet new Integration Tests - + - task: PublishTestResults@2 - displayName: Publish Test Results - inputs: - testResultsFormat: xUnit - testResultsFiles: 'artifacts/TestResults/$(_BuildConfig)/*.xml' - testRunTitle: '$(_AgentOSName)_$(Agent.JobName)' - buildPlatform: '$(BuildPlatform)' - buildConfiguration: '$(_BuildConfig)' + displayName: Publish Test Results + inputs: + testResultsFormat: xUnit + testResultsFiles: 'artifacts/TestResults/$(_BuildConfig)/*.xml' + testRunTitle: '$(_AgentOSName)_$(Agent.JobName)' + buildPlatform: '$(BuildPlatform)' + buildConfiguration: '$(_BuildConfig)' condition: always() - - - task: CopyFiles@2 - displayName: Gather Logs - inputs: - SourceFolder: '$(Build.SourcesDirectory)/artifacts' - Contents: | - log/$(_BuildConfig)/**/* - TestResults/$(_BuildConfig)/**/* + + - task: CopyFiles@2 + displayName: Gather Logs + inputs: + SourceFolder: '$(Build.SourcesDirectory)/artifacts' + Contents: | + log/$(_BuildConfig)/**/* + TestResults/$(_BuildConfig)/**/* SymStore/$(_BuildConfig)/**/* tmp/$(_BuildConfig)/**/*.binlog - TargetFolder: '$(Build.ArtifactStagingDirectory)' - continueOnError: true + TargetFolder: '$(Build.ArtifactStagingDirectory)' + continueOnError: true condition: always() - - - task: 1ES.PublishBuildArtifacts@1 - displayName: Publish Logs to VSTS - inputs: - PathtoPublish: '$(Build.ArtifactStagingDirectory)' - ArtifactName: '$(_AgentOSName)_$(Agent.JobName)_$(Build.BuildNumber)' - publishLocation: Container - continueOnError: true + + - task: 1ES.PublishBuildArtifacts@1 + displayName: Publish Logs to VSTS + inputs: + PathtoPublish: '$(Build.ArtifactStagingDirectory)' + ArtifactName: '$(_AgentOSName)_$(Agent.JobName)_$(Build.BuildNumber)' + publishLocation: Container + continueOnError: true condition: always() From 6c179f9edd4eecaa6057d29f5378204b6359dac1 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 2 Jul 2024 10:45:33 -0700 Subject: [PATCH 92/94] Update branding to 8.0.304 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 734ba59756cd..e5bd247428a1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,7 +11,7 @@ - 8.0.303 + 8.0.304 8.0.300 true From 7b5d22d296c1f1af61d05546800c8bcbd3b1cce8 Mon Sep 17 00:00:00 2001 From: Farhad Alizada Date: Thu, 20 Jun 2024 17:12:55 +0200 Subject: [PATCH 93/94] Onboard new inter-branch merge flow [Workflow] --- .github/workflows/inter-branch-merge-flow.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 .github/workflows/inter-branch-merge-flow.yml diff --git a/.github/workflows/inter-branch-merge-flow.yml b/.github/workflows/inter-branch-merge-flow.yml new file mode 100644 index 000000000000..20246c14fc58 --- /dev/null +++ b/.github/workflows/inter-branch-merge-flow.yml @@ -0,0 +1,13 @@ +name: Inter-branch merge workflow +on: + push: + branches: + - release/** + +permissions: + contents: write + pull-requests: write + +jobs: + Merge: + uses: dotnet/arcade/.github/workflows/inter-branch-merge-base.yml@main \ No newline at end of file From a57fa160ddfb60852eaeecdae8843228903b8590 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 3 Jul 2024 12:53:51 +0000 Subject: [PATCH 94/94] Update dependencies from https://github.com/dotnet/templating build 20240702.15 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.303-servicing.24314.2 -> To Version 8.0.304-servicing.24352.15 --- NuGet.config | 7 +------ eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 9 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6d31162866f4..6063c455bcd8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -23,12 +23,7 @@ - - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index eb4fcf62a22b..98551aaa87b9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/templating - 2c8137bda50484d21e263aaac51dad537ba57cc8 + 350f32942e8db0ab82b6ecc1c5710de386298e55 - + https://github.com/dotnet/templating - 2c8137bda50484d21e263aaac51dad537ba57cc8 + 350f32942e8db0ab82b6ecc1c5710de386298e55 - + https://github.com/dotnet/templating - 2c8137bda50484d21e263aaac51dad537ba57cc8 + 350f32942e8db0ab82b6ecc1c5710de386298e55 diff --git a/eng/Versions.props b/eng/Versions.props index 06206dacfaba..59a9db5432be 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -138,13 +138,13 @@ - 8.0.303 + 8.0.304 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.303-servicing.24314.2 + 8.0.304-servicing.24352.15 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion)