diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 892fd8c7b..b5bd872d0 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -73,10 +73,6 @@ extends: name: $(DncEngInternalBuildPool) image: 1es-windows-2022 os: windows - # Temporary to workaround MicroBuild issues. - credscan: - enabled: false - justificationForDisabling: 'CredScan is failing on the MicroBuild signing plugin. "MicroBuild/Plugins/nuget.config" has changing content and thus cannot be baselined.' stages: - stage: Build jobs: diff --git a/NuGet.config b/NuGet.config index c8bd4d7c7..c3e750405 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,19 +6,31 @@ - - + + + + + + + + + + + + + - + + + + - - @@ -32,19 +44,26 @@ - + + + + + + + + + - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c7bf8f808..b0659e89c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 8486d31e24f30e3fa1809a95699a0adc16f448d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 88e8f6129d6e8bb551a121f7969a5e0f33eb6881 + ceea22879533370683ed8d17de5a17e8e6df1d68 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 88e8f6129d6e8bb551a121f7969a5e0f33eb6881 + ceea22879533370683ed8d17de5a17e8e6df1d68 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 88e8f6129d6e8bb551a121f7969a5e0f33eb6881 + ceea22879533370683ed8d17de5a17e8e6df1d68 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 88e8f6129d6e8bb551a121f7969a5e0f33eb6881 + ceea22879533370683ed8d17de5a17e8e6df1d68 https://github.com/dotnet/test-templates @@ -110,18 +110,18 @@ https://github.com/dotnet/test-templates 1e5f3603af2277910aad946736ee23283e7f3e16 - + https://github.com/dotnet/test-templates - 1e5f3603af2277910aad946736ee23283e7f3e16 + 81349c13c2b8e8babf1cdd4e7ab350fbb1b193a4 - + https://github.com/dotnet/test-templates - 1e5f3603af2277910aad946736ee23283e7f3e16 + 81349c13c2b8e8babf1cdd4e7ab350fbb1b193a4 - + https://github.com/dotnet/test-templates - 1e5f3603af2277910aad946736ee23283e7f3e16 + 81349c13c2b8e8babf1cdd4e7ab350fbb1b193a4 @@ -132,36 +132,36 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf ebbf01f54996755566db36e2e962ba6364da2ecc - + https://github.com/dotnet/fsharp - fc5e9eda234e2b69aa479f4f83faddc31fdd4da7 + b64141459e78b327e39bf59bd5f57737ce0a6a44 - + https://github.com/dotnet/fsharp - fc5e9eda234e2b69aa479f4f83faddc31fdd4da7 + b64141459e78b327e39bf59bd5f57737ce0a6a44 - + https://github.com/microsoft/vstest - aa59400b11e1aeee2e8af48928dbd48748a8bef9 + a77b8d5b4aa89504bbff10e2880c27fd55adc55b https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 2d7eea252964e69be94cb9c847b371b23e4dd470 - + https://github.com/dotnet/roslyn - 263571123fc3dc4a638e071234ac9fbf91913962 + 9934fb9e3527e1c0c51314e57d4aab30f97e8f9e - + https://github.com/dotnet/msbuild - b5265ef370a651f8c3458110b804e5cbf869eeb5 + b34f75857bacf5ecd5531f7ff763a5739d3ae435 - + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted - 550277e0616e549446f03fda35d3e23dff75dc01 + 623fde83a3cd73cb479ec7fa03866c6116894dbf @@ -172,16 +172,16 @@ https://github.com/dotnet/emsdk 08a90ca2c88b17f1b5d081318354a41db0882cff - - https://dev.azure.com/dnceng/internal/_git/dotnet-aspire - 48e42f59d64d84b404e904996a9ed61f2a17a569 - - https://github.com/dotnet/emsdk 08a90ca2c88b17f1b5d081318354a41db0882cff + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspire + 48e42f59d64d84b404e904996a9ed61f2a17a569 + + https://github.com/dotnet/deployment-tools 5957c5c5f85f17c145e7fab4ece37ad6aafcded9 @@ -193,9 +193,9 @@ 5957c5c5f85f17c145e7fab4ece37ad6aafcded9 - + https://github.com/dotnet/source-build-externals - 908177a58a41532b3302c17f1e1a8cf1c1234545 + ed17956dbc31097b7ba6a66be086f4a70a97d84f @@ -239,9 +239,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - 79827eed138fd2575a8b24820b4f385ee4ffb6e6 + 7b55da982fc6e71c1776c4de89111aee0eecb45a diff --git a/eng/Versions.props b/eng/Versions.props index d77955771..239b4349d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -7,7 +7,7 @@ 8 0 - 1 + 2 05 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) $(VersionMajor).$(VersionMinor) @@ -16,7 +16,7 @@ true release - rtm + preview rtm servicing @@ -56,9 +56,9 @@ - 1.1.0-rc.23410.2 - 1.1.0-rc.23410.2 - 1.1.0-rc.23410.2 + 1.1.0-rc.24068.2 + 1.1.0-rc.24068.2 + 1.1.0-rc.24068.2 @@ -79,16 +79,16 @@ - 8.0.104 - 8.0.104-servicing.24170.24 - 8.0.104-servicing.24170.24 + 8.0.204 + 8.0.204-servicing.24170.23 + 8.0.204-servicing.24170.23 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.8.0-7.24067.24 + 4.9.2-3.24129.6 @@ -121,7 +121,7 @@ - 6.8.1-rc.2 + 6.9.1-rc.3 @@ -147,8 +147,8 @@ true $([MSBuild]::Subtract($(VersionFeature60), 1)) $([MSBuild]::Subtract($(VersionFeature70), 1)) - $(VersionFeature60) - $(VersionFeature70) + $(VersionFeature60) + $(VersionFeature70) $([MSBuild]::Subtract($(AspNetCoreTemplateFeature60), 1)) $([MSBuild]::Subtract($(AspNetCoreTemplateFeature70), 1)) @@ -198,7 +198,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.8.0-release-23615-02 + 17.9.0-release-24072-02 8.0.0-alpha.1.22557.12 diff --git a/eng/pipelines/templates/jobs/vmr-build.yml b/eng/pipelines/templates/jobs/vmr-build.yml index bc986e9f4..9c5e58dbe 100644 --- a/eng/pipelines/templates/jobs/vmr-build.yml +++ b/eng/pipelines/templates/jobs/vmr-build.yml @@ -67,10 +67,7 @@ jobs: condition: succeededOrFailed() dependsOn: ${{ parameters.reuseBuildArtifactsFrom }}_${{ parameters.architecture }} variables: - - ${{ if eq(variables['System.TeamProject'], 'public') }}: - - template: /eng/common/templates/variables/pool-providers.yml - - ${{ else }}: - - template: /eng/common/templates-official/variables/pool-providers.yml + - template: /eng/common/templates/variables/pool-providers.yml - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - group: AzureDevOps-Artifact-Feeds-Pats - ${{ if and(not(parameters.isBuiltFromVmr), eq(variables['System.TeamProject'], 'internal'), not(startswith(parameters.vmrBranch, 'internal/release/')), not(eq(variables['Build.Reason'], 'PullRequest'))) }}: @@ -90,21 +87,8 @@ jobs: - name: sourcesPath value: ${{ parameters.vmrPath }} - templateContext: - outputs: - - output: pipelineArtifact - displayName: 'Publish BuildLogs' - condition: succeededOrFailed() - targetPath: '$(Build.StagingDirectory)/BuildLogs' - artifactName: $(Agent.JobName)_BuildLogs_Attempt$(System.JobAttempt) - - output: pipelineArtifact - displayName: 'Publish Artifacts' - condition: succeededOrFailed() - targetPath: '${{ variables.sourcesPath }}/artifacts/${{ parameters.architecture }}/Release/' - artifactName: $(Agent.JobName)_Artifacts - steps: - - template: ../steps/vmr-prepare.yml@self + - template: ../steps/vmr-prepare.yml parameters: ${{ if eq(variables['Build.Reason'], 'PullRequest') }}: vmrBranch: $(System.PullRequest.TargetBranch) @@ -115,7 +99,7 @@ jobs: # Synchronize new content in the VMR during PRs (we expect this to come - ${{ if and(not(parameters.isBuiltFromVmr), eq(variables['Build.Reason'], 'PullRequest')) }}: - - template: ../steps/vmr-pull-updates.yml@self + - template: ../steps/vmr-pull-updates.yml parameters: vmrPath: ${{ parameters.vmrPath }} vmrBranch: ${{ parameters.vmrBranch }} @@ -266,6 +250,13 @@ jobs: displayName: Prepare BuildLogs staging directory continueOnError: true condition: succeededOrFailed() + + - publish: '$(Build.StagingDirectory)/BuildLogs' + artifact: $(Agent.JobName)_BuildLogs_Attempt$(System.JobAttempt) + displayName: Publish BuildLogs + continueOnError: true + condition: succeededOrFailed() + - task: PublishTestResults@2 displayName: Publish Test Results condition: succeededOrFailed() @@ -277,3 +268,9 @@ jobs: mergeTestResults: true publishRunAttachments: true testRunTitle: SourceBuild_SmokeTests_$(Agent.JobName) + + - publish: '${{ variables.sourcesPath }}/artifacts/${{ parameters.architecture }}/Release/' + artifact: $(Agent.JobName)_Artifacts + displayName: Publish Artifacts + condition: succeededOrFailed() + continueOnError: true diff --git a/eng/pipelines/templates/jobs/vmr-synchronization.yml b/eng/pipelines/templates/jobs/vmr-synchronization.yml index e3f20ce7b..713deea20 100644 --- a/eng/pipelines/templates/jobs/vmr-synchronization.yml +++ b/eng/pipelines/templates/jobs/vmr-synchronization.yml @@ -19,13 +19,10 @@ parameters: jobs: - job: Synchronize_VMR - displayName: Synchronize VMR's ${{ parameters.vmrBranch }} + displayName: Synchronize dotnet/dotnet timeoutInMinutes: 120 variables: - - ${{ if eq(variables['System.TeamProject'], 'public') }}: - - template: /eng/common/templates/variables/pool-providers.yml - - ${{ else }}: - - template: /eng/common/templates-official/variables/pool-providers.yml + - template: /eng/common/templates/variables/pool-providers.yml - name: vmrPath value: $(Agent.BuildDirectory)/vmr - ${{ if not(parameters.noPush) }}: @@ -39,16 +36,14 @@ jobs: - group: DotNetBot-AzDO-PAT - name: vmrInternalUrl value: https://dnceng@dev.azure.com/dnceng/internal/_git/dotnet-dotnet - + pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: $(DncEngPublicBuildPool) - image: 1es-ubuntu-2004-open - os: linux - ${{ else }}: + demands: ImageOverride -equals Build.Ubuntu.2004.Amd64.Open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals 1es-ubuntu-2004 - os: linux + demands: ImageOverride -equals Build.Ubuntu.2004.Amd64 steps: - template: ../steps/vmr-prepare.yml @@ -62,6 +57,7 @@ jobs: vmrBranch: ${{ parameters.vmrBranch }} targetRef: ${{ parameters.targetRef }} + - ${{ if and(not(parameters.noPush), not(in(variables['Build.Reason'], 'PullRequest')), eq(variables['System.TeamProject'], 'internal')) }}: # Push main and release branches to the public VMR - ${{ if or(eq(parameters.vmrBranch, 'main'), startsWith(parameters.vmrBranch, 'release/')) }}: @@ -87,4 +83,4 @@ jobs: --azdev-pat '$(dn-bot-dnceng-build-rw-code-rw)' --verbose displayName: Push changes to dotnet-dotnet (internal) - workingDirectory: $(Agent.BuildDirectory)/installer + workingDirectory: $(Agent.BuildDirectory)/installer \ No newline at end of file diff --git a/eng/pipelines/templates/stages/vmr-build.yml b/eng/pipelines/templates/stages/vmr-build.yml index fdf3180c9..51597c437 100644 --- a/eng/pipelines/templates/stages/vmr-build.yml +++ b/eng/pipelines/templates/stages/vmr-build.yml @@ -2,61 +2,38 @@ ### If run in a PR, new changes are applied to a local copy of the VMR, then it is source-built and tested parameters: -- name: dependsOn - type: object - default: [] -- name: condition - type: string - default: always() + dependsOn: [] + condition: always() # Branch of the VMR to use (to push to for internal builds) -- name: vmrBranch - type: string - default: $(Build.SourceBranch) + vmrBranch: $(Build.SourceBranch) # True when build is running from dotnet/dotnet directly -- name: isBuiltFromVmr - type: boolean - default: false + isBuiltFromVmr: # The following parameters aren't expected to be passed in rather they are used for encapsulation # ----------------------------------------------------------------------------------------------- -- name: alpine319Container - type: string - default: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19 -- name: centOSStream8Container - type: string - default: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8 -- name: centOSStream9Container - type: string - default: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9 -- name: fedora38Container - type: string - default: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-38 -- name: ubuntu2204Container - type: string - default: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04 -- name: ubuntu2204ArmContainer - type: string - default: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-arm64 + alpine319Container: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19 + centOSStream8Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8 + centOSStream9Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9 + fedora38Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-38 + ubuntu2204Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04 + ubuntu2204ArmContainer: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-arm64 -# These are not expected to be passed it but rather just object variables reused below -- name: pool_Linux - type: object - default: - name: $(defaultPoolName) - image: $(poolImage_Linux) - demands: ImageOverride -equals $(poolImage_Linux) - os: linux + # Internal builds + poolInternalAmd64: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + poolInternalAmd64PR: + name: NetCore1ESPool-Internal-XL + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + poolInternalArm64: + name: Docker-Linux-Arm-Internal -- name: pool_LinuxArm64 - type: object - default: - name: $(poolName_LinuxArm64) - image: $(poolImage_LinuxArm64) - demands: ImageOverride -equals $(poolImage_LinuxArm64) - hostArchitecture: Arm64 - os: linux + # Public builds / PRs + poolPublicAmd64: + name: NetCore-Public-XL + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open stages: - stage: VMR_Source_Build @@ -64,7 +41,23 @@ stages: dependsOn: ${{ parameters.dependsOn }} condition: ${{ parameters.condition }} variables: - - template: ../variables/vmr-build.yml@self + - ${{ if eq(variables['System.TeamProject'], 'public') }}: + - name: defaultPoolName + value: ${{ parameters.poolPublicAmd64.name }} + - name: defaultPoolDemands + value: ${{ parameters.poolPublicAmd64.demands }} + - ${{ if eq(variables['System.TeamProject'], 'internal') }}: + - ${{ if in(variables['Build.Reason'], 'PullRequest') }}: + - name: defaultPoolName + value: ${{ parameters.poolInternalAmd64PR.name }} + - name: defaultPoolDemands + value: ${{ parameters.poolInternalAmd64PR.demands }} + - ${{ else }}: + - name: defaultPoolName + value: ${{ parameters.poolInternalAmd64.name }} + - name: defaultPoolDemands + value: ${{ parameters.poolInternalAmd64.demands }} + - ${{ if ne(parameters.vmrBranch, '') }}: - name: VmrBranch value: ${{ parameters.vmrBranch }} @@ -76,14 +69,16 @@ stages: # PR and CI legs ------------------------------------ - - template: ../jobs/vmr-build.yml@self + - template: ../jobs/vmr-build.yml parameters: # Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline buildName: CentOSStream8_Online_MsftSdk isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} vmrBranch: ${{ variables.VmrBranch }} architecture: x64 - pool: ${{ parameters.pool_Linux }} + pool: + name: ${{ variables.defaultPoolName }} + demands: ${{ variables.defaultPoolDemands }} container: ${{ parameters.centOSStream8Container }} buildFromArchive: false # 🚫 enablePoison: false # 🚫 @@ -92,14 +87,16 @@ stages: useMonoRuntime: false # 🚫 withPreviousSDK: false # 🚫 - - template: ../jobs/vmr-build.yml@self + - template: ../jobs/vmr-build.yml parameters: # Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline buildName: CentOSStream8_Offline_MsftSdk isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} vmrBranch: ${{ variables.VmrBranch }} architecture: x64 - pool: ${{ parameters.pool_Linux }} + pool: + name: ${{ variables.defaultPoolName }} + demands: ${{ variables.defaultPoolDemands }} container: ${{ parameters.centOSStream8Container }} buildFromArchive: true # βœ… enablePoison: false # 🚫 @@ -112,14 +109,16 @@ stages: # CI - Stage 1 x64 legs ------------------------------------ - - template: ../jobs/vmr-build.yml@self + - template: ../jobs/vmr-build.yml parameters: # Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline buildName: Alpine319_Offline_MsftSdk isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} vmrBranch: ${{ variables.VmrBranch }} architecture: x64 - pool: ${{ parameters.pool_Linux }} + pool: + name: ${{ variables.defaultPoolName }} + demands: ${{ variables.defaultPoolDemands }} container: ${{ parameters.alpine319Container }} buildFromArchive: false # βœ… enablePoison: false # 🚫 @@ -128,14 +127,16 @@ stages: useMonoRuntime: false # 🚫 withPreviousSDK: false # 🚫 - - template: ../jobs/vmr-build.yml@self + - template: ../jobs/vmr-build.yml parameters: # Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline buildName: CentOSStream8_Online_PreviousSourceBuiltSdk isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} vmrBranch: ${{ variables.VmrBranch }} architecture: x64 - pool: ${{ parameters.pool_Linux }} + pool: + name: ${{ variables.defaultPoolName }} + demands: ${{ variables.defaultPoolDemands }} container: ${{ parameters.centOSStream8Container }} buildFromArchive: false # 🚫 enablePoison: false # 🚫 @@ -144,14 +145,16 @@ stages: useMonoRuntime: false # 🚫 withPreviousSDK: true # βœ… - - template: ../jobs/vmr-build.yml@self + - template: ../jobs/vmr-build.yml parameters: # Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline buildName: CentOSStream8_Offline_PreviousSourceBuiltSdk isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} vmrBranch: ${{ variables.VmrBranch }} architecture: x64 - pool: ${{ parameters.pool_Linux }} + pool: + name: ${{ variables.defaultPoolName }} + demands: ${{ variables.defaultPoolDemands }} container: ${{ parameters.centOSStream8Container }} buildFromArchive: false # 🚫 enablePoison: false # 🚫 @@ -160,14 +163,16 @@ stages: useMonoRuntime: false # 🚫 withPreviousSDK: true # βœ… - - template: ../jobs/vmr-build.yml@self + - template: ../jobs/vmr-build.yml parameters: # Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline buildName: CentOSStream8_Mono_Offline_MsftSdk isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} vmrBranch: ${{ variables.VmrBranch }} architecture: x64 - pool: ${{ parameters.pool_Linux }} + pool: + name: ${{ variables.defaultPoolName }} + demands: ${{ variables.defaultPoolDemands }} container: ${{ parameters.centOSStream8Container }} buildFromArchive: true # βœ… enablePoison: false # 🚫 @@ -176,14 +181,16 @@ stages: useMonoRuntime: true # βœ… withPreviousSDK: false # 🚫 - - template: ../jobs/vmr-build.yml@self + - template: ../jobs/vmr-build.yml parameters: # Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline buildName: CentOSStream9_Offline_MsftSdk isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} vmrBranch: ${{ variables.VmrBranch }} architecture: x64 - pool: ${{ parameters.pool_Linux }} + pool: + name: ${{ variables.defaultPoolName }} + demands: ${{ variables.defaultPoolDemands }} container: ${{ parameters.centOSStream9Container }} buildFromArchive: true # βœ… enablePoison: false # 🚫 @@ -192,14 +199,16 @@ stages: useMonoRuntime: false # 🚫 withPreviousSDK: false # 🚫 - - template: ../jobs/vmr-build.yml@self + - template: ../jobs/vmr-build.yml parameters: # Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline buildName: Fedora38_Offline_MsftSdk isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} vmrBranch: ${{ variables.VmrBranch }} architecture: x64 - pool: ${{ parameters.pool_Linux }} + pool: + name: ${{ variables.defaultPoolName }} + demands: ${{ variables.defaultPoolDemands }} container: ${{ parameters.fedora38Container }} buildFromArchive: true # βœ… enablePoison: true # βœ… @@ -208,14 +217,16 @@ stages: useMonoRuntime: false # 🚫 withPreviousSDK: false # 🚫 - - template: ../jobs/vmr-build.yml@self + - template: ../jobs/vmr-build.yml parameters: # Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline buildName: Ubuntu2204_Offline_MsftSdk isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} vmrBranch: ${{ variables.VmrBranch }} architecture: x64 - pool: ${{ parameters.pool_Linux }} + pool: + name: ${{ variables.defaultPoolName }} + demands: ${{ variables.defaultPoolDemands }} container: ${{ parameters.ubuntu2204Container }} buildFromArchive: false # 🚫 enablePoison: false # 🚫 @@ -226,14 +237,14 @@ stages: # CI - Stage 1 arm64 Legs ------------------------------------ - - template: ../jobs/vmr-build.yml@self + - template: ../jobs/vmr-build.yml parameters: # Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline buildName: Ubuntu2204Arm64_Offline_MsftSdk isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} vmrBranch: ${{ variables.VmrBranch }} architecture: arm64 - pool: ${{ parameters.pool_LinuxArm64 }} + pool: ${{ parameters.poolInternalArm64 }} container: ${{ parameters.ubuntu2204ArmContainer }} buildFromArchive: false # 🚫 enablePoison: false # 🚫 @@ -244,14 +255,16 @@ stages: # CI - Stage 2 x64 Legs ------------------------------------ - - template: ../jobs/vmr-build.yml@self + - template: ../jobs/vmr-build.yml parameters: # Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline buildName: CentOSStream8_Online_CurrentSourceBuiltSdk isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} vmrBranch: ${{ variables.VmrBranch }} architecture: x64 - pool: ${{ parameters.pool_Linux }} + pool: + name: ${{ variables.defaultPoolName }} + demands: ${{ variables.defaultPoolDemands }} container: ${{ parameters.centOSStream8Container }} buildFromArchive: false # 🚫 enablePoison: false # 🚫 @@ -261,14 +274,16 @@ stages: withPreviousSDK: false # 🚫 reuseBuildArtifactsFrom: CentOSStream8_Online_MsftSdk - - template: ../jobs/vmr-build.yml@self + - template: ../jobs/vmr-build.yml parameters: # Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline buildName: Fedora38_Offline_CurrentSourceBuiltSdk isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} vmrBranch: ${{ variables.VmrBranch }} architecture: x64 - pool: ${{ parameters.pool_Linux }} + pool: + name: ${{ variables.defaultPoolName }} + demands: ${{ variables.defaultPoolDemands }} container: ${{ parameters.fedora38Container }} buildFromArchive: false # 🚫 enablePoison: false # 🚫 diff --git a/eng/pipelines/templates/variables/vmr-build.yml b/eng/pipelines/templates/variables/vmr-build.yml deleted file mode 100644 index 04873069a..000000000 --- a/eng/pipelines/templates/variables/vmr-build.yml +++ /dev/null @@ -1,24 +0,0 @@ -variables: - -- ${{ if eq(variables['System.TeamProject'], 'public') }}: - - name: defaultPoolName - value: NetCore-Public-XL - - name: poolImage_Linux - value: 1es-ubuntu-2004-open - - name: poolImage_LinuxArm64 - value: Mariner-2-Docker-ARM64 - - name: poolName_LinuxArm64 - value: Docker-Linux-Arm-Public -- ${{ else }}: - - ${{ if in(variables['Build.Reason'], 'PullRequest') }}: - - name: defaultPoolName - value: NetCore1ESPool-Internal-XL - - ${{ else }}: - - name: defaultPoolName - value: $(DncEngInternalBuildPool) - - name: poolImage_Linux - value: 1es-ubuntu-2204 - - name: poolImage_LinuxArm64 - value: Mariner-2-Docker-ARM64 - - name: poolName_LinuxArm64 - value: Docker-Linux-Arm-Internal diff --git a/eng/pipelines/vmr-build-pr.yml b/eng/pipelines/vmr-build-pr.yml deleted file mode 100644 index 3c51dfe6e..000000000 --- a/eng/pipelines/vmr-build-pr.yml +++ /dev/null @@ -1,56 +0,0 @@ -# This is the non-1ES PR pipeline source-building the VMR used in installer PRs -# https://dev.azure.com/dnceng-public/public/_build?definitionId=233 - -trigger: none -pr: - branches: - include: - - main - - release/* - -parameters: -- name: vmrBranch - displayName: dotnet/dotnet branch to push to - type: string - default: ' ' - -- name: disableVmrBuild - displayName: Skip source-building the VMR - type: boolean - default: false - -variables: -- ${{ if ne(parameters.vmrBranch, ' ') }}: - - name: VmrBranch - value: ${{ replace(parameters.vmrBranch, ' ', '') }} -- ${{ else }}: - - name: VmrBranch - value: release/8.0.1xx - -resources: - repositories: - - repository: vmr - type: github - name: dotnet/dotnet - endpoint: dotnet - ref: $(VmrBranch) - -stages: -# You can temporarily disable the VMR Build stage by setting the disableVmrBuild variable -- ${{ if not(parameters.disableVmrBuild) }}: - - template: templates/stages/vmr-build.yml - parameters: - vmrBranch: ${{ variables.VmrBranch }} - isBuiltFromVmr: false - -# In case the VMR Build stage is temporarily disabled, the VMR synchronization step is run to validate -# that the PR can be merged and later synchronized into the VMR without problems. -- ${{ else }}: - - stage: Synchronize_VMR - displayName: Synchronize VMR - dependsOn: [] - jobs: - - template: templates/jobs/vmr-synchronization.yml - parameters: - vmrBranch: ${{ variables.VmrBranch }} - noPush: true diff --git a/eng/pipelines/vmr-build.yml b/eng/pipelines/vmr-build.yml index 3f2e1c759..dc2873407 100644 --- a/eng/pipelines/vmr-build.yml +++ b/eng/pipelines/vmr-build.yml @@ -4,6 +4,10 @@ pr: include: - main - release/* + exclude: + - release/*.0.2xx + - release/*.0.3xx + - release/*.0.4xx parameters: - name: vmrBranch diff --git a/eng/pipelines/vmr-sync-internal.yml b/eng/pipelines/vmr-sync-internal.yml index cb0877ea2..0a10a518e 100644 --- a/eng/pipelines/vmr-sync-internal.yml +++ b/eng/pipelines/vmr-sync-internal.yml @@ -17,48 +17,21 @@ resources: name: dotnet-dotnet ref: $(Build.SourceBranch) - - repository: 1ESPipelineTemplates - type: git - name: 1ESPipelineTemplates/1ESPipelineTemplates - ref: refs/tags/release - parameters: - name: vmrBranch displayName: dotnet-dotnet branch to push to type: string default: ' ' -variables: -- template: /eng/common/templates-official/variables/pool-providers.yml@self - +variables: - ${{ if ne(parameters.vmrBranch, ' ') }}: - name: VmrBranch value: ${{ replace(parameters.vmrBranch, ' ', '') }} - ${{ else }}: - name: VmrBranch value: ${{ replace(replace(variables['Build.SourceBranch'], 'refs/heads/', ''), 'refs/pull/', '') }} - -extends: - template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates - parameters: - sdl: - sourceAnalysisPool: - name: $(DncEngInternalBuildPool) - image: 1es-windows-2022 - os: windows - - sourceRepositoriesToScan: - exclude: - - repository: vmr - - componentgovernance: - sourceScanPath: $(Agent.BuildDirectory)/vmr - ignoreDirectories: $(Agent.BuildDirectory)/vmr/src - - stages: - - stage: VMRSynchronization - displayName: VMR Synchronization - jobs: - - template: /eng/pipelines/templates/jobs/vmr-synchronization.yml@self - parameters: - vmrBranch: ${{ variables.VmrBranch }} \ No newline at end of file + +jobs: + - template: templates/jobs/vmr-synchronization.yml + parameters: + vmrBranch: ${{ variables.VmrBranch }} \ No newline at end of file diff --git a/eng/pipelines/vmr-sync.yml b/eng/pipelines/vmr-sync.yml index 7de3ef614..6659887f1 100644 --- a/eng/pipelines/vmr-sync.yml +++ b/eng/pipelines/vmr-sync.yml @@ -19,48 +19,23 @@ resources: endpoint: dotnet ref: $(Build.SourceBranch) - - repository: 1ESPipelineTemplates - type: git - name: 1ESPipelineTemplates/1ESPipelineTemplates - ref: refs/tags/release - parameters: - name: vmrBranch displayName: dotnet/dotnet branch to push to type: string default: ' ' -variables: -- template: /eng/common/templates-official/variables/pool-providers.yml@self - +variables: - ${{ if ne(parameters.vmrBranch, ' ') }}: - name: VmrBranch value: ${{ replace(parameters.vmrBranch, ' ', '') }} - ${{ else }}: - name: VmrBranch value: ${{ replace(replace(variables['Build.SourceBranch'], 'refs/heads/', ''), 'refs/pull/', '') }} - -extends: - template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates - parameters: - sdl: - sourceAnalysisPool: - name: $(DncEngInternalBuildPool) - image: 1es-windows-2022 - os: windows - - sourceRepositoriesToScan: - exclude: - - repository: vmr - - componentgovernance: - sourceScanPath: $(Agent.BuildDirectory)/vmr - ignoreDirectories: $(Agent.BuildDirectory)/vmr/src - - stages: - - stage: VMRSynchronization - displayName: VMR Synchronization - jobs: - - template: /eng/pipelines/templates/jobs/vmr-synchronization.yml@self - parameters: - vmrBranch: ${{ variables.VmrBranch }} + +jobs: + - template: /eng/pipelines/templates/jobs/vmr-synchronization.yml + parameters: + vmrBranch: ${{ variables.VmrBranch }} + + \ No newline at end of file diff --git a/src/SourceBuild/content/.config/guardian/.gdnbaselines b/src/SourceBuild/content/.config/guardian/.gdnbaselines deleted file mode 100644 index ce7a029cc..000000000 --- a/src/SourceBuild/content/.config/guardian/.gdnbaselines +++ /dev/null @@ -1,1315 +0,0 @@ -{ - "hydrated": false, - "properties": { - "helpUri": "https://eng.ms/docs/microsoft-security/security/azure-security/cloudai-security-fundamentals-engineering/security-integration/guardian-wiki/microsoft-guardian/general/baselines", - "hydrationStatus": "This file does not contain identifying data. It is safe to check into your repo. To hydrate this file with identifying data, run `guardian hydrate --help` and follow the guidance." - }, - "version": "1.0.0", - "baselines": { - "default": { - "name": "default", - "createdDate": "2024-04-03 14:41:43Z", - "lastUpdatedDate": "2024-04-03 14:41:43Z" - } - }, - "results": { - "5f3b52e23f96eb01bcfd73ead3cbaa2e1430de0006e5103109dd39bf9f292165": { - "signature": "5f3b52e23f96eb01bcfd73ead3cbaa2e1430de0006e5103109dd39bf9f292165", - "alternativeSignatures": [], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "72b28f655eadc78b21ab36a7f572708315d8d909d1b460162511e37086288e30": { - "signature": "72b28f655eadc78b21ab36a7f572708315d8d909d1b460162511e37086288e30", - "alternativeSignatures": [ - "60efb04c6e0431e477e792a96d32b30b3a309b4ee19fad084a015e2946985459" - ], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "08dcdf31a316917a50c97d16d8d4eca5dbd7528b8cfe8c9bd8b29fdd4dc3eb85": { - "signature": "08dcdf31a316917a50c97d16d8d4eca5dbd7528b8cfe8c9bd8b29fdd4dc3eb85", - "alternativeSignatures": [ - "c6b795bd087762188cd476b81ccdb474a25495b86b8080e1ab15c5592628b8af" - ], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "62e5fe288e1e21307317edab5d08f047ecdd01eac5c19660bab6c9ae96f8c8b5": { - "signature": "62e5fe288e1e21307317edab5d08f047ecdd01eac5c19660bab6c9ae96f8c8b5", - "alternativeSignatures": [ - "631ff94fe085c9754b83bd9fc2a15dccccccd067392cea1f520398874266248a" - ], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "6d4429751838adeb1f1b097b6b974a6a47d744871980ee54faeb7a4536183597": { - "signature": "6d4429751838adeb1f1b097b6b974a6a47d744871980ee54faeb7a4536183597", - "alternativeSignatures": [ - "c4538b540d00c41b9828ade572431cfd476ae40ebd4c6cfc635d06ac185972e3" - ], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "93735e0dba704ad832d7b3fdabfcda2875dee9adb24e3cd676fce3b612d116c3": { - "signature": "93735e0dba704ad832d7b3fdabfcda2875dee9adb24e3cd676fce3b612d116c3", - "alternativeSignatures": [], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "a5142e7bafbf664fdcb2d4d7071ca8427c7da0c8ba66cc7706c9c07b816f1201": { - "signature": "a5142e7bafbf664fdcb2d4d7071ca8427c7da0c8ba66cc7706c9c07b816f1201", - "alternativeSignatures": [], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "1ee555192f99f2751398509614249023216a98d148e57de41317ec60715374b0": { - "signature": "1ee555192f99f2751398509614249023216a98d148e57de41317ec60715374b0", - "alternativeSignatures": [ - "5d82fd3437c708ec3bfe674016099e5465194ebc53f7dd72061b98d7257a951f" - ], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "be4c5e062093fa08fe93f0753c3090b63af74dc4af4c04d781fddf9ec41db0d4": { - "signature": "be4c5e062093fa08fe93f0753c3090b63af74dc4af4c04d781fddf9ec41db0d4", - "alternativeSignatures": [ - "bafe4e1a197b7af8b8cfda4cafd8250a4a66a0ca18b82817e12d5a4d17350589" - ], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "c704b27a3590a23b240e9c261dc93c8f3c7871e4d471b5688c3609880396f672": { - "signature": "c704b27a3590a23b240e9c261dc93c8f3c7871e4d471b5688c3609880396f672", - "alternativeSignatures": [ - "0880869d43948d2f7050955aeb76733bc12ab82839563cbabff0dd36d0880a39" - ], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "b6aecc1d8697beab291f9925633b5ec3e37a088033efc7e93928fd9cac96cda4": { - "signature": "b6aecc1d8697beab291f9925633b5ec3e37a088033efc7e93928fd9cac96cda4", - "alternativeSignatures": [ - "985838b2d1518f507c85ae0f635951bad92dde58eb24c252d7e56fb6ccda6191" - ], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "ed7c9f876d0784c23991b9ce1abc7c0df6229e7eed8cda08e56315b5fdeb5fa0": { - "signature": "ed7c9f876d0784c23991b9ce1abc7c0df6229e7eed8cda08e56315b5fdeb5fa0", - "alternativeSignatures": [ - "d2f6b006ae6b54ff39886db273b9ffc9ba23f0a84861bbe028aa54343fb5c55b" - ], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "ae448b96e62d898485a9df57a24a920740c5504d4854e85e8060a1ba94752dbb": { - "signature": "ae448b96e62d898485a9df57a24a920740c5504d4854e85e8060a1ba94752dbb", - "alternativeSignatures": [ - "6590282ea3895180725cbb97a9e565571bb27b596bb6a6d1087b62078ed1d683" - ], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "2e86a1d345364972a25bfe0a38237afa382766115808bb86bac8ca03e4cca304": { - "signature": "2e86a1d345364972a25bfe0a38237afa382766115808bb86bac8ca03e4cca304", - "alternativeSignatures": [ - "c079fd753fcba1568d79c4bef9fd6200b494f1552bedc1e91902ec8f01081fd7" - ], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "5c349e8f183364d99cde545c6da7549c9d6227957c820fcde8e8beb2b40de39c": { - "signature": "5c349e8f183364d99cde545c6da7549c9d6227957c820fcde8e8beb2b40de39c", - "alternativeSignatures": [ - "8546393d391f4010c04ed43788c36626f870b02028937cf390014c660f657f7b" - ], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "a9e7b46f71cc21fd96e3bbb1c30a7beb36470f0a4c857794b4444856e54ffc2b": { - "signature": "a9e7b46f71cc21fd96e3bbb1c30a7beb36470f0a4c857794b4444856e54ffc2b", - "alternativeSignatures": [ - "34597b8dc5d2e482d7178a50440f3b8815c44e510906dd92a4d31d434c87053b" - ], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "3df69ea15defeb820ba0823dc80513e75a79b049dee023b51dee4419cd1d2276": { - "signature": "3df69ea15defeb820ba0823dc80513e75a79b049dee023b51dee4419cd1d2276", - "alternativeSignatures": [ - "deb5cfe250ae8f9c1bbcdf230c425dc071067ee26cc7b3d41b9fc078782febfc" - ], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "c2b86ae10a9ad117f56bf792ae0a8a99bfbe1945254d156dd685e41dc74dd5ed": { - "signature": "c2b86ae10a9ad117f56bf792ae0a8a99bfbe1945254d156dd685e41dc74dd5ed", - "alternativeSignatures": [ - "7c13381c5c5bf98666c53e6497f0d6c8b2463fd2d7e0a0084edce348edb2a98b" - ], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "7ec5369cb17143314826ef4e433320ab257e00485568fed9ca59d6ddf1ad166a": { - "signature": "7ec5369cb17143314826ef4e433320ab257e00485568fed9ca59d6ddf1ad166a", - "alternativeSignatures": [ - "7e1528556c5286830d73b23164ea8c99103c6344228bb91390c9943cb6090ff3" - ], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "e71596904ef990bac717b0973b8fd3e36d52b3a45713bf8babb88f1ab0493360": { - "signature": "e71596904ef990bac717b0973b8fd3e36d52b3a45713bf8babb88f1ab0493360", - "alternativeSignatures": [ - "ff25e34637fb05921a126d3143eef03b8006f580e993ef5a7d2e27ec5178ee9a" - ], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "32eb952e8561b331092ec83b626102388202071d192f9eb22c233b06ea90d2a1": { - "signature": "32eb952e8561b331092ec83b626102388202071d192f9eb22c233b06ea90d2a1", - "alternativeSignatures": [ - "cce04b0a7c54b775c1464a32d85804de7d1777ac2a6d21da8b080c29ac46162c" - ], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "7d3c27b6bd42f58e624890a1669c188c6afee080e6330673942d364641876d52": { - "signature": "7d3c27b6bd42f58e624890a1669c188c6afee080e6330673942d364641876d52", - "alternativeSignatures": [ - "29d9fec9e2b10d721512bb68a68759baa33b6bbc0683a2d3d5cdcb74894917ee" - ], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "42c9ee2033a50a53e2fcc83cb08b3a8c38a5c9e2230414ae0590d3c8f45a9a8d": { - "signature": "42c9ee2033a50a53e2fcc83cb08b3a8c38a5c9e2230414ae0590d3c8f45a9a8d", - "alternativeSignatures": [ - "44e2cd3b2773d63b155f2093202415744b74f8b5c47612ad92f2ffee3939cb2f" - ], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "ea00dd596b6f25ad7fb56f8433aa4889808c48a9d753eeb896438d871f1bbadf": { - "signature": "ea00dd596b6f25ad7fb56f8433aa4889808c48a9d753eeb896438d871f1bbadf", - "alternativeSignatures": [ - "e6e7be75b6234262188b18265bdef3aca61e7ad4b9e0712b34ad9af2605ff5bf" - ], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "b4e3d369cd32329e640bc7984528cdda54a9bdea2b52a5c3ed026fc57be64afd": { - "signature": "b4e3d369cd32329e640bc7984528cdda54a9bdea2b52a5c3ed026fc57be64afd", - "alternativeSignatures": [ - "8f19b3c3b99054f4c34e62dbb042d4505190bae61f7c815659e825e1e3f6585d" - ], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "869eabde635eff83abaf3ceae639a4dfe5b6e1fc2be56bde177999b341ee7fa7": { - "signature": "869eabde635eff83abaf3ceae639a4dfe5b6e1fc2be56bde177999b341ee7fa7", - "alternativeSignatures": [ - "879cee54b1ce34bf674d7bea56317d5e606a8a6d1909e28831a801c3c760547c" - ], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "c30ea658de240cc77f43da72a2ae66a8300716df1a36e5aad2ccf0041405512b": { - "signature": "c30ea658de240cc77f43da72a2ae66a8300716df1a36e5aad2ccf0041405512b", - "alternativeSignatures": [ - "f9010fdbf887fec3fb12dc784714ae4993cfbb0c279ceb32de179be14113851c" - ], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "29a080743f4448e5fb1c2556f824a2f4950ec05ae1d5baa76157bc6425e08a1e": { - "signature": "29a080743f4448e5fb1c2556f824a2f4950ec05ae1d5baa76157bc6425e08a1e", - "alternativeSignatures": [ - "f6f78c526c85382e749badcc83d5d3e81976879e727417fef1b81b83faec67f0" - ], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "5c1de06651f26dcbfaa7256b674dc725934d1892a58ab1655fed98c7d062c84c": { - "signature": "5c1de06651f26dcbfaa7256b674dc725934d1892a58ab1655fed98c7d062c84c", - "alternativeSignatures": [ - "6435a356edc13cd3ae7609656ff1920116c1f944e1d63b2ceec921d4e3f6464d" - ], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "dd15f0a91faa86197e2bc286d99e9b0e5e625930ad53a5fae4e0a8c2b80b91ee": { - "signature": "dd15f0a91faa86197e2bc286d99e9b0e5e625930ad53a5fae4e0a8c2b80b91ee", - "alternativeSignatures": [ - "6252f589ff1cb3d68f758c8f081fd3e59d8cc56bfaa29441b9e26b1cd5726faa" - ], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "3db9957bb879335816149b88a3fed78468210e7480dd31db37845b97d28078ad": { - "signature": "3db9957bb879335816149b88a3fed78468210e7480dd31db37845b97d28078ad", - "alternativeSignatures": [ - "4c6e2de131da98d97f9f4ab9a07fb90f6ca478f578d0bd4da7a7551683c886d7" - ], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "cda6b64f47374712a1488b1ca527f54310e135ceb7e4611e75f28aed7f4edd43": { - "signature": "cda6b64f47374712a1488b1ca527f54310e135ceb7e4611e75f28aed7f4edd43", - "alternativeSignatures": [ - "c7c9b966693a21385b7c2f4a36c5c3c6a410cda29716d1c10537f6463cb852af" - ], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "61eab78163233a43bc21bf8a2a762496cd63758852ed1afcfe73d4ebd90532e9": { - "signature": "61eab78163233a43bc21bf8a2a762496cd63758852ed1afcfe73d4ebd90532e9", - "alternativeSignatures": [ - "2584c057a56958edc47e8f9ed26ed2e4b2fbee706d4a5fe6793d42044754f016" - ], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "201a1737b9cd0a61c986dc37678141a290fe56e518c4d7401443d83f89635758": { - "signature": "201a1737b9cd0a61c986dc37678141a290fe56e518c4d7401443d83f89635758", - "alternativeSignatures": [ - "3b2032f4ca90c12c9b5ea35ac6e85ba10a32f7d018b39369e044ae4d039e000b" - ], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "bcb0788172282f0f5ab22907ec5070573092309654c8eb07dc92fb4e676ded80": { - "signature": "bcb0788172282f0f5ab22907ec5070573092309654c8eb07dc92fb4e676ded80", - "alternativeSignatures": [ - "8c37a63c016612477d48726a77b74eb798e45c09e6c2212fbd57ca10aa88dd59" - ], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "5dc266c64bff96e86a1a3907386531e16f0dcf38f5b1bcdba22f45e7965c6bf7": { - "signature": "5dc266c64bff96e86a1a3907386531e16f0dcf38f5b1bcdba22f45e7965c6bf7", - "alternativeSignatures": [ - "ad996650f8e2b17aeddcea222c0861f9cb257aee49f31e01a4de573d23e1b0fb" - ], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "845ca607828540eafa4053b4f9368b97c23258b9b47ceecbcec8bd7e5aa59302": { - "signature": "845ca607828540eafa4053b4f9368b97c23258b9b47ceecbcec8bd7e5aa59302", - "alternativeSignatures": [ - "c2cb1a24bf7f267ad949c325feaf69f29f60dd019f1b3879391f85f7d5316800" - ], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "89bed4bb6776c3155318e4ff38e5062f655834cebcdf6f65b08cbd2312ac75f8": { - "signature": "89bed4bb6776c3155318e4ff38e5062f655834cebcdf6f65b08cbd2312ac75f8", - "alternativeSignatures": [ - "c805484f8267753ac6867fe334b6ecfa42d2430b21488501a926b9d49a679bb1" - ], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "c2496232c1468a250e567517e0a7a71632e3ed60330784450511cef2a1164af0": { - "signature": "c2496232c1468a250e567517e0a7a71632e3ed60330784450511cef2a1164af0", - "alternativeSignatures": [ - "723a97522d855b779b011a0a6f84ea1ee7cf77d05f2b4808ffdbd521e655e6e3" - ], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "e75c5f821dc59179ed407ca3da917756cd0cff7aac1755df7ef0ef6bf087f80c": { - "signature": "e75c5f821dc59179ed407ca3da917756cd0cff7aac1755df7ef0ef6bf087f80c", - "alternativeSignatures": [ - "420deccac3e08a232a59caa2178b503d310d2645f847150b564dc8e02b28fbee" - ], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "ad85fce8c033defdd63db5aa4ec2b2197bbf9310b506241e88bcd48b5a3b41da": { - "signature": "ad85fce8c033defdd63db5aa4ec2b2197bbf9310b506241e88bcd48b5a3b41da", - "alternativeSignatures": [ - "784f946934a1f42d820c8a61ac865a094d735d0cfcca4c88fe10482306abf958" - ], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "316329783213340b7da3052b8177bd48e10a05bf242da08dc6f9785361be2389": { - "signature": "316329783213340b7da3052b8177bd48e10a05bf242da08dc6f9785361be2389", - "alternativeSignatures": [ - "2f83c91b8c20ef743240ee45997e2af37d73a0dd99d2ea345794960d775b567d" - ], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "2db32a47c814adc0ee80e257e1cb878a9054b92e6809cd9231690856066bcb33": { - "signature": "2db32a47c814adc0ee80e257e1cb878a9054b92e6809cd9231690856066bcb33", - "alternativeSignatures": [ - "249d66492a4d48df01ea2c04aa25e302ad17daf74d130194bec5a90405111da4" - ], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "d2e9bf6a7e357eb1b1d594a06ed00bdf9fa193110f08e45f8e748427a370bfba": { - "signature": "d2e9bf6a7e357eb1b1d594a06ed00bdf9fa193110f08e45f8e748427a370bfba", - "alternativeSignatures": [ - "41a0e4c2bbd23190b2ebaf6163c0a9471f126cd6c2144e8377d9cb1bf0a391ef" - ], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "c1e109d2139e82ef8545bb12a0431f4d25f2a805c9b5f71523515dbbb0be9fc3": { - "signature": "c1e109d2139e82ef8545bb12a0431f4d25f2a805c9b5f71523515dbbb0be9fc3", - "alternativeSignatures": [ - "69b330936de5c13b57fd7f0f7590a7e66efa3dba98715b5f07d8953662df5025" - ], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "ec60cc4e84b44896c9f5a516e705340feebdaa61be024c82b07b546d3ad0c276": { - "signature": "ec60cc4e84b44896c9f5a516e705340feebdaa61be024c82b07b546d3ad0c276", - "alternativeSignatures": [ - "f9c44b75edceaeaae9611fd772b6774ce086227bb3b758dd3844c57511fb2e7a" - ], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "5184980ee9ace427259fcaa3ee796a48efb25a7141fc16426c08dbc8903dbca9": { - "signature": "5184980ee9ace427259fcaa3ee796a48efb25a7141fc16426c08dbc8903dbca9", - "alternativeSignatures": [ - "0610a76e8ba9f8fef499d2364bac7db02436cc8f89cee26eac4c6c2c6cab952c" - ], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "148a534bb099170811f8dcc0d51c1caa399488739a5ee98fb12bee51c7a9244d": { - "signature": "148a534bb099170811f8dcc0d51c1caa399488739a5ee98fb12bee51c7a9244d", - "alternativeSignatures": [], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "1d9de8cd0e3cf1749dc40ad234b9d84e263f241dbcd8b35320808c8381840c3a": { - "signature": "1d9de8cd0e3cf1749dc40ad234b9d84e263f241dbcd8b35320808c8381840c3a", - "alternativeSignatures": [ - "8af561a51ebf9394b93708f512784edbbaa8c13872c2f56da4c5b418f71ad34d" - ], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "d71d8881e3ad39939ff9894639cdc0012d968b48038b872ca7eba15ba93cbfe9": { - "signature": "d71d8881e3ad39939ff9894639cdc0012d968b48038b872ca7eba15ba93cbfe9", - "alternativeSignatures": [ - "bea919b0d9a2e6c38a6de6300616becf31809eaa49616e63ab90118b5ec331eb" - ], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "4dbb69e7a5bbcaf97ee14aa268f0cc4b375111db79d91bc48b438f15e7f29859": { - "signature": "4dbb69e7a5bbcaf97ee14aa268f0cc4b375111db79d91bc48b438f15e7f29859", - "alternativeSignatures": [ - "52e95c355d30e2e33b6ad0cf11af5c31db038107a89dd120854c94857aa2298b" - ], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "2960b8fc6b1f6665b5988544f1d44a05dfe83b9b39a14efef5e042d7a78e4e19": { - "signature": "2960b8fc6b1f6665b5988544f1d44a05dfe83b9b39a14efef5e042d7a78e4e19", - "alternativeSignatures": [ - "b4177488d7a45f4a54472adf8bb97026f0799e61e10f580ea52fbbd74cf08f10" - ], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "c1c411bf7b80d684d2c444ed611f333f08f1073fbaaf4c6bd0238c16ffccbe4d": { - "signature": "c1c411bf7b80d684d2c444ed611f333f08f1073fbaaf4c6bd0238c16ffccbe4d", - "alternativeSignatures": [ - "8ca9e6612eb3802d5c1fd93ce0f1de61c2559512966fc97dcbeb017d1942c0fe" - ], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "a0437af80b26a79fc6c7e101114a0a455bd0bc7a4e9ccea1fa3b355aaac07390": { - "signature": "a0437af80b26a79fc6c7e101114a0a455bd0bc7a4e9ccea1fa3b355aaac07390", - "alternativeSignatures": [ - "495012003aa9faede4c4ad115a12784f6a8f549e1ebe976537b021d6e5296da9" - ], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "0df8574205ace03dd154be3c3a221b36feae675ac237c8fea3b994f48df75fb8": { - "signature": "0df8574205ace03dd154be3c3a221b36feae675ac237c8fea3b994f48df75fb8", - "alternativeSignatures": [ - "15f5632806a855b11f25dc0c899f5f3982b9f92340841b85b35f9f5666c36921" - ], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "851935ee9fe368011d0d65b595a839000849d57904224cd947664078ba46874d": { - "signature": "851935ee9fe368011d0d65b595a839000849d57904224cd947664078ba46874d", - "alternativeSignatures": [ - "c8aefc4c57da1e828bfa02df6e1abc444cc98f2e9ba3f1b0bb4a4f0c04d1fab0" - ], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "ba2a917a447947c7e8598dc49f18f6a918548051ed56fb0f38d801f52ebdaef0": { - "signature": "ba2a917a447947c7e8598dc49f18f6a918548051ed56fb0f38d801f52ebdaef0", - "alternativeSignatures": [ - "0460e5c64d667a95521ca05da96915a79178a361764141acf4bf7c4a75c3e47e" - ], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "91b70c20fca1cd70bc4d7a34ba446f9a79d78c3c73ed708750062fe49a55324e": { - "signature": "91b70c20fca1cd70bc4d7a34ba446f9a79d78c3c73ed708750062fe49a55324e", - "alternativeSignatures": [ - "c884dc16288b0bfa8d5e7f06638c7c61a16bc42328f5a32c43f1d39c38da31f8" - ], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "519f950c7bea3463674233b674b3093990f25167389e2d1ea82cfdf5b0ad0abf": { - "signature": "519f950c7bea3463674233b674b3093990f25167389e2d1ea82cfdf5b0ad0abf", - "alternativeSignatures": [ - "e3af28a3737f3eda0c96f52925a36770b7ccc6f3238b4ea855ce4b1d0e6e8f4b" - ], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "192073ddefc720c7b9af682598676a54d54492be32707bf4bef8b3233e8aa1bb": { - "signature": "192073ddefc720c7b9af682598676a54d54492be32707bf4bef8b3233e8aa1bb", - "alternativeSignatures": [ - "795fa0e8fdbd60d899b1372eb853ec5b0b9b32c2f9117364c2f63856b7b17763" - ], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "85c9f67cf21f805e1e507792f3b78c20703a374e04a7a50a071250d75a3a34c5": { - "signature": "85c9f67cf21f805e1e507792f3b78c20703a374e04a7a50a071250d75a3a34c5", - "alternativeSignatures": [ - "e387a1c8ec270a1be5c6048f2759118f30d2f43efceec3fae2aa37c892352391" - ], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "000bea6b6816c3cf71200ceeccd187ac5d43172eb225d70b53f27cf94e4e0091": { - "signature": "000bea6b6816c3cf71200ceeccd187ac5d43172eb225d70b53f27cf94e4e0091", - "alternativeSignatures": [ - "977df07ec18dc533ce706b09124ec76a13719ca51a7e101762a0fb49c99b6985" - ], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "cc40ef86620baaad1faea5a6f3f6b19268b9e8f2fe7169c37dd9d1b1216225b5": { - "signature": "cc40ef86620baaad1faea5a6f3f6b19268b9e8f2fe7169c37dd9d1b1216225b5", - "alternativeSignatures": [ - "154f374516f141697b001546e7871a8f6377f3da5d8a42565fc035fcacbc9d22" - ], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "f4c4a77a4a11940d05fa6484e202593866f3cc943f0679506a6dfbf3e2e3f254": { - "signature": "f4c4a77a4a11940d05fa6484e202593866f3cc943f0679506a6dfbf3e2e3f254", - "alternativeSignatures": [ - "70e7d79088b1beda828977ecbbfd908e56848a3f7b0963dcbabb087c49ad650c" - ], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "7918a138214555e83a85a32519dd6fc31971b28aa956f66583194530de8b009c": { - "signature": "7918a138214555e83a85a32519dd6fc31971b28aa956f66583194530de8b009c", - "alternativeSignatures": [ - "479b344b41e42fb75f1205d3643792af4211d89a7881dfac007fd6c7c5358e09" - ], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "fa7347c7f64562b9d7e0be884bcc9d60232f6995b2139a052bf4b8cfcc3d424a": { - "signature": "fa7347c7f64562b9d7e0be884bcc9d60232f6995b2139a052bf4b8cfcc3d424a", - "alternativeSignatures": [ - "8926b16a96043571d926ccc99741a5844bb54b1215ccc929568d2dc528da9e40" - ], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "3c494c3cdc3d2ab897a96f5b498fbf1731ba2c6dcc73e49399083635bc084e8a": { - "signature": "3c494c3cdc3d2ab897a96f5b498fbf1731ba2c6dcc73e49399083635bc084e8a", - "alternativeSignatures": [], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "8bb20ad2a210dc906e39ceb48b0a6a39b240878688ad6854161240ae3a597c87": { - "signature": "8bb20ad2a210dc906e39ceb48b0a6a39b240878688ad6854161240ae3a597c87", - "alternativeSignatures": [], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "486f45a6c6f00cc927a87f4b7b122829bee893d6f523fed279e7e2deda450aff": { - "signature": "486f45a6c6f00cc927a87f4b7b122829bee893d6f523fed279e7e2deda450aff", - "alternativeSignatures": [], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "643ded93447723ad1faad1de45b19108d986db08e488174a5422f3f1f7f0f7a3": { - "signature": "643ded93447723ad1faad1de45b19108d986db08e488174a5422f3f1f7f0f7a3", - "alternativeSignatures": [], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "51d877cdee6cab498e1a0fd4c4dd2702b3e5da9eb308e0a631d2104e2d3d2a8c": { - "signature": "51d877cdee6cab498e1a0fd4c4dd2702b3e5da9eb308e0a631d2104e2d3d2a8c", - "alternativeSignatures": [], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "849b1bea0ba2f8d1c24a58896b9d230ca317e8cff7e9540f73d578dd1aba12cb": { - "signature": "849b1bea0ba2f8d1c24a58896b9d230ca317e8cff7e9540f73d578dd1aba12cb", - "alternativeSignatures": [], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "c535332f090c89ae22a79aac4b9d344333c5479b891b79d72d252611c9364450": { - "signature": "c535332f090c89ae22a79aac4b9d344333c5479b891b79d72d252611c9364450", - "alternativeSignatures": [], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "bc8ce9f1fd92dd123db1b6f8c33d15123bc8f3c4cb4fd42c54b4a2c5210bb158": { - "signature": "bc8ce9f1fd92dd123db1b6f8c33d15123bc8f3c4cb4fd42c54b4a2c5210bb158", - "alternativeSignatures": [], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "9507f913c4445bebb9bdd471960011afa198c1e42d19c45d44aea58af61a137d": { - "signature": "9507f913c4445bebb9bdd471960011afa198c1e42d19c45d44aea58af61a137d", - "alternativeSignatures": [], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "9ac9e0a5efc7c0d1e6d89422ca8e70e913eaba647ef42650f0bbc50da080a556": { - "signature": "9ac9e0a5efc7c0d1e6d89422ca8e70e913eaba647ef42650f0bbc50da080a556", - "alternativeSignatures": [], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "5d49433b67f4a2f1b6b323c498722d16aeda2d8781dafe9fcb9faaf9db4ee3e1": { - "signature": "5d49433b67f4a2f1b6b323c498722d16aeda2d8781dafe9fcb9faaf9db4ee3e1", - "alternativeSignatures": [], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "71ee57f56c77339e4a0cb3f5bdfd05d15191136fc8ad887cef26fe1488522529": { - "signature": "71ee57f56c77339e4a0cb3f5bdfd05d15191136fc8ad887cef26fe1488522529", - "alternativeSignatures": [], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "74b8ab85959da39f4da6710c6375080c44c8929d6b68f59a06dede355aeffacc": { - "signature": "74b8ab85959da39f4da6710c6375080c44c8929d6b68f59a06dede355aeffacc", - "alternativeSignatures": [], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "ca37e6fb6eb26bdec92893b3f6b08f8f41e6241f573a1b8e14d4e4d4ff1d2c7a": { - "signature": "ca37e6fb6eb26bdec92893b3f6b08f8f41e6241f573a1b8e14d4e4d4ff1d2c7a", - "alternativeSignatures": [], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "d7657bb2e0603e7b353f7b1e1d884306fe44f116c7665192fd6b33003333ef7a": { - "signature": "d7657bb2e0603e7b353f7b1e1d884306fe44f116c7665192fd6b33003333ef7a", - "alternativeSignatures": [], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "90b7e7a132c8df4864a9ee49670cbaec9cbc5f5c53bf009eba5a583e0934a24f": { - "signature": "90b7e7a132c8df4864a9ee49670cbaec9cbc5f5c53bf009eba5a583e0934a24f", - "alternativeSignatures": [], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "8a5003e2db05146eaba3a7fc7aba715f51a5506b741a6ac2662e47e39c6165aa": { - "signature": "8a5003e2db05146eaba3a7fc7aba715f51a5506b741a6ac2662e47e39c6165aa", - "alternativeSignatures": [], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "02590eb0efbb241f09bae58f60907c6dee5b33507519a4be87e168a458c2b9cb": { - "signature": "02590eb0efbb241f09bae58f60907c6dee5b33507519a4be87e168a458c2b9cb", - "alternativeSignatures": [], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "df250772236d85876a9d789cca90b48e5eb79ad6cb13782465c8c88366c5d845": { - "signature": "df250772236d85876a9d789cca90b48e5eb79ad6cb13782465c8c88366c5d845", - "alternativeSignatures": [], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "3cd8e3eb9b94b01c93591c685406ea91d9d31b16aace0f109734e4bacb3838f2": { - "signature": "3cd8e3eb9b94b01c93591c685406ea91d9d31b16aace0f109734e4bacb3838f2", - "alternativeSignatures": [], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "e91e45a96bf36327f551eadf27d9598b3d058fc051b0f9f0f1da9420410dc79a": { - "signature": "e91e45a96bf36327f551eadf27d9598b3d058fc051b0f9f0f1da9420410dc79a", - "alternativeSignatures": [], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "1c8a3d52bb83c1fbd1208b94663769b6452e73988540113dff20bfb4df4ca010": { - "signature": "1c8a3d52bb83c1fbd1208b94663769b6452e73988540113dff20bfb4df4ca010", - "alternativeSignatures": [], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "8839c1c5ab6e962faf123ad7b79a584170d6491855f69555664986a425984a36": { - "signature": "8839c1c5ab6e962faf123ad7b79a584170d6491855f69555664986a425984a36", - "alternativeSignatures": [], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "d2df996be35f179b45a3bdc28fcd9d5254a924ab52d2ca14b068bfea35e65284": { - "signature": "d2df996be35f179b45a3bdc28fcd9d5254a924ab52d2ca14b068bfea35e65284", - "alternativeSignatures": [], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "7a20b01096651f581c51904be7cd1281150c40efc61352b70aabbca3c40ea177": { - "signature": "7a20b01096651f581c51904be7cd1281150c40efc61352b70aabbca3c40ea177", - "alternativeSignatures": [], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "ef394eaa05e6eb5af1f5e523fd01f4e970f36cb2c7eacb3d363b47c9f70b0fec": { - "signature": "ef394eaa05e6eb5af1f5e523fd01f4e970f36cb2c7eacb3d363b47c9f70b0fec", - "alternativeSignatures": [], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "cb83a69b59f2de3fa1d049750ddeb855030d5662c43a1c5fea6b95f01e21547f": { - "signature": "cb83a69b59f2de3fa1d049750ddeb855030d5662c43a1c5fea6b95f01e21547f", - "alternativeSignatures": [], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "d08376cdfec80b5c0884a8b85f18c8b34ffee19f1395d12aef1ffc2821120f03": { - "signature": "d08376cdfec80b5c0884a8b85f18c8b34ffee19f1395d12aef1ffc2821120f03", - "alternativeSignatures": [], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "ef471993ee9839701feba16b5b56a926545a165bf95224130d6c8a2bdafdd451": { - "signature": "ef471993ee9839701feba16b5b56a926545a165bf95224130d6c8a2bdafdd451", - "alternativeSignatures": [], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "d742600df5b4b6b71f65cf0079b09ec36a5d58bb4b8b07923b13ab8458f68a15": { - "signature": "d742600df5b4b6b71f65cf0079b09ec36a5d58bb4b8b07923b13ab8458f68a15", - "alternativeSignatures": [], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "fd9536ec348269dbb12b813270403b7410fc13575d1cbb7770604dcf54ee776b": { - "signature": "fd9536ec348269dbb12b813270403b7410fc13575d1cbb7770604dcf54ee776b", - "alternativeSignatures": [], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "1614f1f0821f8900c7c8d2cb3a784272518ef6b86fb82070bda88b4bac9dbda8": { - "signature": "1614f1f0821f8900c7c8d2cb3a784272518ef6b86fb82070bda88b4bac9dbda8", - "alternativeSignatures": [], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "3479973e9ab00c84264e70c5d7290a5bfda506aafdb08c3277cb1df5db688ab9": { - "signature": "3479973e9ab00c84264e70c5d7290a5bfda506aafdb08c3277cb1df5db688ab9", - "alternativeSignatures": [], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "e5bd231f55be121ed2579da9651c4ec0e661a386991ef8463facf3588c306a06": { - "signature": "e5bd231f55be121ed2579da9651c4ec0e661a386991ef8463facf3588c306a06", - "alternativeSignatures": [], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "19661fe89c5e1f59089cdec06cbdf6bdda2439b52731dfd630b50ff5885d6223": { - "signature": "19661fe89c5e1f59089cdec06cbdf6bdda2439b52731dfd630b50ff5885d6223", - "alternativeSignatures": [], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "3bf81d57b0872ef6c8ac7878513cb8f58044e07238883f71f24b09542a8d1a07": { - "signature": "3bf81d57b0872ef6c8ac7878513cb8f58044e07238883f71f24b09542a8d1a07", - "alternativeSignatures": [], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "2e07fdf491a04fc8a6cc50ae299f8345a81798499bda961a118e974970bb71a8": { - "signature": "2e07fdf491a04fc8a6cc50ae299f8345a81798499bda961a118e974970bb71a8", - "alternativeSignatures": [], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "560fdab2979120fa3cfd2d9865d1ce2c0ba164982cc086cdc871b7e16fd12466": { - "signature": "560fdab2979120fa3cfd2d9865d1ce2c0ba164982cc086cdc871b7e16fd12466", - "alternativeSignatures": [], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "489c5d92c47b3c961db0d5c32426a4d5fb48311e46ae49791be0f6ef03ddfc6e": { - "signature": "489c5d92c47b3c961db0d5c32426a4d5fb48311e46ae49791be0f6ef03ddfc6e", - "alternativeSignatures": [], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "5890ec8b0f533c8186a824f1b46b2d99c2d54e7ed09917e5fedcdaea19b34706": { - "signature": "5890ec8b0f533c8186a824f1b46b2d99c2d54e7ed09917e5fedcdaea19b34706", - "alternativeSignatures": [], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "70a8cd9f176fa02a78470ae78c285f56b617060ec339f0c8dfda095a5b0fc6c9": { - "signature": "70a8cd9f176fa02a78470ae78c285f56b617060ec339f0c8dfda095a5b0fc6c9", - "alternativeSignatures": [], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "7afd296a74705d2e561497c0ab8c3750179c1eff425f496297d3b877ff718526": { - "signature": "7afd296a74705d2e561497c0ab8c3750179c1eff425f496297d3b877ff718526", - "alternativeSignatures": [], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "6ffd69e0724ed3b57e926224932b0aeeed7a834ee5dc1ad24c3262deb49172d7": { - "signature": "6ffd69e0724ed3b57e926224932b0aeeed7a834ee5dc1ad24c3262deb49172d7", - "alternativeSignatures": [], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "ca298b6b96ebfae8f14e29993264310b89fd738b365c2e7ca04e7af1a5cd67b7": { - "signature": "ca298b6b96ebfae8f14e29993264310b89fd738b365c2e7ca04e7af1a5cd67b7", - "alternativeSignatures": [], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "8764975fced41745e1a9c844144b2aacd30d3fcd77a8c4b1067adc5f2cd8b990": { - "signature": "8764975fced41745e1a9c844144b2aacd30d3fcd77a8c4b1067adc5f2cd8b990", - "alternativeSignatures": [], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "7cc3b3782554547d94e0f2e8817dbf823a84de8a95b6b358bdd29067bcff64c3": { - "signature": "7cc3b3782554547d94e0f2e8817dbf823a84de8a95b6b358bdd29067bcff64c3", - "alternativeSignatures": [], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "db15b8200219494e427c3943404a81e931bf17af175823bc51da9b85b63a6831": { - "signature": "db15b8200219494e427c3943404a81e931bf17af175823bc51da9b85b63a6831", - "alternativeSignatures": [], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "979582e68b87ec6e4cd7d90df4e05f01a6f9150ed07a0abc205112a241f0c16f": { - "signature": "979582e68b87ec6e4cd7d90df4e05f01a6f9150ed07a0abc205112a241f0c16f", - "alternativeSignatures": [], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "56b251ecea166720fac682142922d79e01699a8cc576683b6d8944dfd3158de2": { - "signature": "56b251ecea166720fac682142922d79e01699a8cc576683b6d8944dfd3158de2", - "alternativeSignatures": [], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "cbcd76cbd2a6b0a8028fd6c3d1d11ee2e211519af2420396399c3c111a4da667": { - "signature": "cbcd76cbd2a6b0a8028fd6c3d1d11ee2e211519af2420396399c3c111a4da667", - "alternativeSignatures": [], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "8060e90601237ded928ae57570ef982dd3a57e7bffbec010fcd37e0bda518f10": { - "signature": "8060e90601237ded928ae57570ef982dd3a57e7bffbec010fcd37e0bda518f10", - "alternativeSignatures": [], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "bc4b0a2231b13e5472e1548250ef4d7174d130daf559bca81f5d3c2c0c169690": { - "signature": "bc4b0a2231b13e5472e1548250ef4d7174d130daf559bca81f5d3c2c0c169690", - "alternativeSignatures": [], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "91f0752674a19d0db604c50e23950746ff4d231cc76e40a7fa0f53dd5e855f4d": { - "signature": "91f0752674a19d0db604c50e23950746ff4d231cc76e40a7fa0f53dd5e855f4d", - "alternativeSignatures": [], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "889e33f8e52ecb1d2b98d28772c572c2a10f0dc0c22fcc03b1da03df008d5f91": { - "signature": "889e33f8e52ecb1d2b98d28772c572c2a10f0dc0c22fcc03b1da03df008d5f91", - "alternativeSignatures": [], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "6969ae787ed7e1caef670545de569929814479666e60a227abcb36395c3d3f60": { - "signature": "6969ae787ed7e1caef670545de569929814479666e60a227abcb36395c3d3f60", - "alternativeSignatures": [], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "81adfccafd8eb134b75b59de6d4d0d8198c4639a3972d8072b61c67c9e1a104d": { - "signature": "81adfccafd8eb134b75b59de6d4d0d8198c4639a3972d8072b61c67c9e1a104d", - "alternativeSignatures": [], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "cf0223227addcd8b17bc89e4e5f0ee9174bca83c9ffc5b5493ef74940b33b58c": { - "signature": "cf0223227addcd8b17bc89e4e5f0ee9174bca83c9ffc5b5493ef74940b33b58c", - "alternativeSignatures": [], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "fc000248c70e613f381ee770fb96dfd28e26766fa9627d28e5b9eb5fb314a3c8": { - "signature": "fc000248c70e613f381ee770fb96dfd28e26766fa9627d28e5b9eb5fb314a3c8", - "alternativeSignatures": [], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "2987ea627ea4f2effb417244c4aac8f554bf42136d6ebe0fef1df440410be09c": { - "signature": "2987ea627ea4f2effb417244c4aac8f554bf42136d6ebe0fef1df440410be09c", - "alternativeSignatures": [], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "4c2880cbace8da677942b80be039a982e356c18c827ebeddab265175c9640427": { - "signature": "4c2880cbace8da677942b80be039a982e356c18c827ebeddab265175c9640427", - "alternativeSignatures": [], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "849ea2c1bdff1b36df8848a7f8898f11e981c3ba8f9b033abd9d1e8b1a03c8ca": { - "signature": "849ea2c1bdff1b36df8848a7f8898f11e981c3ba8f9b033abd9d1e8b1a03c8ca", - "alternativeSignatures": [], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "1706aea6ec9bfbbe540cfab3713db9b1a9ebc7f475b49f2348860e3ee6d8e682": { - "signature": "1706aea6ec9bfbbe540cfab3713db9b1a9ebc7f475b49f2348860e3ee6d8e682", - "alternativeSignatures": [], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "8369054f43a96d4f463976b23773b2d22f8081d95f715161f019ceb58296d64a": { - "signature": "8369054f43a96d4f463976b23773b2d22f8081d95f715161f019ceb58296d64a", - "alternativeSignatures": [], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "4ab520e2ed77b36c88f9eeeb5473205fd7f8f0a761eacee4cbbff389368dad8f": { - "signature": "4ab520e2ed77b36c88f9eeeb5473205fd7f8f0a761eacee4cbbff389368dad8f", - "alternativeSignatures": [ - "7ad51ffeb7d5438f15781162de5183c58d5db2d195f96e8c3527451adeb4e02c" - ], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "96ab8bbaf30065be77880d679174d028a151c0fc888fca38a79038d341710563": { - "signature": "96ab8bbaf30065be77880d679174d028a151c0fc888fca38a79038d341710563", - "alternativeSignatures": [], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "7bda7ae4037698bbdf188b4d3fb8a82e99063a8df2dcfe5f66ef747e3bd3f1a0": { - "signature": "7bda7ae4037698bbdf188b4d3fb8a82e99063a8df2dcfe5f66ef747e3bd3f1a0", - "alternativeSignatures": [], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "a2dcb4a5d7e266049f9f865b27e69af19447e94f63ec9de8290763ddf901c756": { - "signature": "a2dcb4a5d7e266049f9f865b27e69af19447e94f63ec9de8290763ddf901c756", - "alternativeSignatures": [], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "3aaf66a9a1f5bfba3b78eb7964ce8bf4dcabf7132465a31e219c6961f53dec56": { - "signature": "3aaf66a9a1f5bfba3b78eb7964ce8bf4dcabf7132465a31e219c6961f53dec56", - "alternativeSignatures": [], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "c6ed8bf76382b72621892d895d0659eb8ed66ef400f5d38506a3b62129b0f60e": { - "signature": "c6ed8bf76382b72621892d895d0659eb8ed66ef400f5d38506a3b62129b0f60e", - "alternativeSignatures": [ - "07873a6bbdd04caf121ed279cd4c24e55fb79ae3e86083c413b839d8d5e81cba" - ], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "c511a0f0c15b79748a62ee0198689e7a0c8c2af102730c337823f6cd52b3ec66": { - "signature": "c511a0f0c15b79748a62ee0198689e7a0c8c2af102730c337823f6cd52b3ec66", - "alternativeSignatures": [ - "7142b2e2126a0c0e5bf2ad08e9e56d405620fbb9f12dfcd3f90a9dfcc30f8bf5" - ], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "bfe258b52e19062b9009a68549bff3b2c99a6105f493cbf14332b3366691d446": { - "signature": "bfe258b52e19062b9009a68549bff3b2c99a6105f493cbf14332b3366691d446", - "alternativeSignatures": [], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "52364f6839cf4bc824f1c82a31f3c7ee1cfb228383b3bee476ef7442526c0de8": { - "signature": "52364f6839cf4bc824f1c82a31f3c7ee1cfb228383b3bee476ef7442526c0de8", - "alternativeSignatures": [], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "cef12040ed2c91d3bd7eba717e6c4bff8e547cb6d2b40363f1d859b02c873276": { - "signature": "cef12040ed2c91d3bd7eba717e6c4bff8e547cb6d2b40363f1d859b02c873276", - "alternativeSignatures": [], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "ab290d190fa6582f2826c9b8524a4013ea67380f65328bc39c31dbcba59ec63c": { - "signature": "ab290d190fa6582f2826c9b8524a4013ea67380f65328bc39c31dbcba59ec63c", - "alternativeSignatures": [], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "710963884a4d1e73d1ff4da0db7e1c8e1eeae25fe4a9e3c1de8b5019bb5d9d74": { - "signature": "710963884a4d1e73d1ff4da0db7e1c8e1eeae25fe4a9e3c1de8b5019bb5d9d74", - "alternativeSignatures": [], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "db276fb1ea2a8e74e7ab80522362b8f402d361652ca823d7cab59465d038eb82": { - "signature": "db276fb1ea2a8e74e7ab80522362b8f402d361652ca823d7cab59465d038eb82", - "alternativeSignatures": [], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "807277ed6647bcdc3eab2e24d8fbcaca0a6506d2ed455248b0497ceb42831e30": { - "signature": "807277ed6647bcdc3eab2e24d8fbcaca0a6506d2ed455248b0497ceb42831e30", - "alternativeSignatures": [], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "685288ad132baddbcdf7a2201960f6d48805151f1aef2e094c4dbc16841b3e54": { - "signature": "685288ad132baddbcdf7a2201960f6d48805151f1aef2e094c4dbc16841b3e54", - "alternativeSignatures": [], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "e972eb97ea7ea4a9524820036a42557f13a48240b6083c7baa0d465c00adfdee": { - "signature": "e972eb97ea7ea4a9524820036a42557f13a48240b6083c7baa0d465c00adfdee", - "alternativeSignatures": [], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - }, - "1b2c907630acaff5b6e62eb4895043c82e93d885331f1f46296812634fd30abe": { - "signature": "1b2c907630acaff5b6e62eb4895043c82e93d885331f1f46296812634fd30abe", - "alternativeSignatures": [], - "memberOf": [ - "default" - ], - "createdDate": "2024-04-03 14:41:43Z" - } - } -} \ No newline at end of file diff --git a/src/SourceBuild/content/eng/pipelines/ci.yml b/src/SourceBuild/content/eng/pipelines/ci.yml index 0bf7fda81..7a6756c3e 100644 --- a/src/SourceBuild/content/eng/pipelines/ci.yml +++ b/src/SourceBuild/content/eng/pipelines/ci.yml @@ -7,6 +7,13 @@ trigger: - main - release/* - internal/release/* + exclude: + - release/*.0.2xx + - release/*.0.3xx + - release/*.0.4xx + - internal/release/*.0.2xx + - internal/release/*.0.3xx + - internal/release/*.0.4xx pr: branches: @@ -15,31 +22,10 @@ pr: - release/* - internal/release/* -resources: - repositories: - - repository: 1ESPipelineTemplates - type: git - name: 1ESPipelineTemplates/1ESPipelineTemplates - ref: refs/tags/release +stages: +- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - template: templates/stages/vmr-scan.yml -extends: - template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates +- template: /src/installer/eng/pipelines/templates/stages/vmr-build.yml parameters: - sdl: - sourceAnalysisPool: - name: NetCore1ESPool-Internal - image: 1es-windows-2022 - os: windows - - baseline: - baselineFile: $(Build.SourcesDirectory)\.config\guardian\.gdnbaselines - - customBuildTags: - - ES365AIMigrationTooling - - stages: - - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - template: /eng/pipelines/templates/stages/vmr-scan.yml@self - - template: /src/installer/eng/pipelines/templates/stages/vmr-build.yml@self - parameters: - isBuiltFromVmr: true + isBuiltFromVmr: true diff --git a/src/SourceBuild/content/eng/pipelines/pr.yml b/src/SourceBuild/content/eng/pipelines/pr.yml deleted file mode 100644 index dcebbcf54..000000000 --- a/src/SourceBuild/content/eng/pipelines/pr.yml +++ /dev/null @@ -1,18 +0,0 @@ -# This is the non-1ES PR pipeline for dotnet/dotnet -# https://dev.azure.com/dnceng-public/public/_build?definitionId=240 - -trigger: none -pr: - branches: - include: - - main - - release/* - - internal/release/* - -stages: -- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - template: templates/stages/vmr-scan.yml - -- template: /src/installer/eng/pipelines/templates/stages/vmr-build.yml - parameters: - isBuiltFromVmr: true diff --git a/src/SourceBuild/content/eng/pipelines/templates/stages/vmr-scan.yml b/src/SourceBuild/content/eng/pipelines/templates/stages/vmr-scan.yml index 28541d572..6024ce182 100644 --- a/src/SourceBuild/content/eng/pipelines/templates/stages/vmr-scan.yml +++ b/src/SourceBuild/content/eng/pipelines/templates/stages/vmr-scan.yml @@ -3,22 +3,17 @@ stages: displayName: Tag & Scan dependsOn: [] variables: - - ${{ if eq(variables['System.TeamProject'], 'public') }}: - - template: /eng/common/templates/variables/pool-providers.yml - - ${{ else }}: - - template: /eng/common/templates-official/variables/pool-providers.yml + - template: /eng/common/templates/variables/pool-providers.yml jobs: - job: Tag_n_Scan displayName: Tag & Scan pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: $(DncEngPublicBuildPool) - image: 1es-ubuntu-2004-open - os: linux + demands: ImageOverride -equals Build.Ubuntu.2004.Amd64.Open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $(DncEngInternalBuildPool) - image: 1es-ubuntu-2004 - os: linux + demands: ImageOverride -equals Build.Ubuntu.2004.Amd64 steps: - checkout: self diff --git a/src/core-sdk-tasks/CollatePackageDownloads.cs b/src/core-sdk-tasks/CollatePackageDownloads.cs index 1e0c8ab9e..9e31720fe 100644 --- a/src/core-sdk-tasks/CollatePackageDownloads.cs +++ b/src/core-sdk-tasks/CollatePackageDownloads.cs @@ -1,4 +1,7 @@ -ο»Ώusing System; +ο»Ώ// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +using System; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/src/core-sdk-tasks/GenerateMSBuildExtensionsSWR.cs b/src/core-sdk-tasks/GenerateMSBuildExtensionsSWR.cs index eab79f2b7..81f3943d2 100644 --- a/src/core-sdk-tasks/GenerateMSBuildExtensionsSWR.cs +++ b/src/core-sdk-tasks/GenerateMSBuildExtensionsSWR.cs @@ -24,7 +24,8 @@ namespace Microsoft.DotNet.Cli.Build AddFolder(sb, @"MSBuildSdkResolver", - @"MSBuild\Current\Bin\SdkResolvers\Microsoft.DotNet.MSBuildSdkResolver"); + @"MSBuild\Current\Bin\SdkResolvers\Microsoft.DotNet.MSBuildSdkResolver", + ngenAssemblies: true); AddFolder(sb, @"msbuildExtensions", @@ -39,7 +40,7 @@ namespace Microsoft.DotNet.Cli.Build return true; } - private void AddFolder(StringBuilder sb, string relativeSourcePath, string swrInstallDir) + private void AddFolder(StringBuilder sb, string relativeSourcePath, string swrInstallDir, bool ngenAssemblies = false) { string sourceFolder = Path.Combine(MSBuildExtensionsLayoutDirectory, relativeSourcePath); var files = Directory.GetFiles(sourceFolder) @@ -55,7 +56,16 @@ namespace Microsoft.DotNet.Cli.Build { sb.Append(@" file source=""$(PkgVS_Redist_Common_Net_Core_SDK_MSBuildExtensions)\"); sb.Append(Path.Combine(relativeSourcePath, Path.GetFileName(file))); - sb.AppendLine("\""); + sb.Append('"'); + + if (ngenAssemblies && file.EndsWith(".dll", StringComparison.OrdinalIgnoreCase)) + { + sb.Append(@" vs.file.ngenApplications=""[installDir]\Common7\IDE\vsn.exe"""); + sb.Append(@" vs.file.ngenApplications=""[installDir]\MSBuild\Current\Bin\MSBuild.exe"""); + sb.Append(" vs.file.ngenArchitecture=all"); + } + + sb.AppendLine(); } sb.AppendLine(); @@ -67,6 +77,7 @@ namespace Microsoft.DotNet.Cli.Build string newRelativeSourcePath = Path.Combine(relativeSourcePath, subfolderName); string newSwrInstallDir = Path.Combine(swrInstallDir, subfolderName); + // Don't propagate ngenAssemblies to subdirectories. AddFolder(sb, newRelativeSourcePath, newSwrInstallDir); } } diff --git a/src/core-sdk-tasks/GenerateSdkRuntimeIdentifierChain.cs b/src/core-sdk-tasks/GenerateSdkRuntimeIdentifierChain.cs index 028f1aa32..1e5c9d33e 100644 --- a/src/core-sdk-tasks/GenerateSdkRuntimeIdentifierChain.cs +++ b/src/core-sdk-tasks/GenerateSdkRuntimeIdentifierChain.cs @@ -1,4 +1,7 @@ -ο»Ώusing System; +ο»Ώ// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +using System; using System.Collections.Generic; using System.IO; using System.Linq; diff --git a/src/core-sdk-tasks/GetLinuxNativeInstallerDependencyVersions.cs b/src/core-sdk-tasks/GetLinuxNativeInstallerDependencyVersions.cs index 195ac196b..d4f324ce3 100644 --- a/src/core-sdk-tasks/GetLinuxNativeInstallerDependencyVersions.cs +++ b/src/core-sdk-tasks/GetLinuxNativeInstallerDependencyVersions.cs @@ -1,4 +1,7 @@ -ο»Ώusing System; +ο»Ώ// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +using System; using System.Collections.Generic; using System.IO; using System.Linq; diff --git a/src/core-sdk-tasks/GetRuntimePackRids.cs b/src/core-sdk-tasks/GetRuntimePackRids.cs index fa7b9b483..f03128599 100644 --- a/src/core-sdk-tasks/GetRuntimePackRids.cs +++ b/src/core-sdk-tasks/GetRuntimePackRids.cs @@ -1,4 +1,7 @@ -ο»Ώusing System; +ο»Ώ// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +using System; using System.Collections.Generic; using System.IO; using System.Linq; diff --git a/src/redist/targets/BuildCoreSdkTasks.targets b/src/redist/targets/BuildCoreSdkTasks.targets index d28d0aee1..0c1a3a4fc 100644 --- a/src/redist/targets/BuildCoreSdkTasks.targets +++ b/src/redist/targets/BuildCoreSdkTasks.targets @@ -19,27 +19,28 @@ Properties="ArtifactsDir=$(ArtifactsDir)tasks\"/> + + + + + + - - - - - - - - - - - - - - + + + + + + + + + diff --git a/src/redist/targets/BundledManifests.targets b/src/redist/targets/BundledManifests.targets index 73402bced..b107e442c 100644 --- a/src/redist/targets/BundledManifests.targets +++ b/src/redist/targets/BundledManifests.targets @@ -105,6 +105,22 @@ - + + + $(VersionPrefix)-baseline$(_BuildNumberLabels) + $(Version) + $(RedistLayoutPath)sdk-manifests\$(NetFeatureBand)\workloadsets\$(WorkloadSetVersion) + + + + + + + + + + + + diff --git a/test/EndToEnd/ValidateInsertedManifests.cs b/test/EndToEnd/ValidateInsertedManifests.cs index cdede126c..778c07ea7 100644 --- a/test/EndToEnd/ValidateInsertedManifests.cs +++ b/test/EndToEnd/ValidateInsertedManifests.cs @@ -27,14 +27,17 @@ namespace EndToEnd.Tests { foreach (var manifestDir in manifestVersionDir.EnumerateDirectories()) { - var manifestId = manifestDir.Name; + var manifestId = manifestVersionDir.Name; string manifestFile = manifestDir.GetFile("WorkloadManifest.json").FullName; - File.Exists(manifestFile).Should().BeTrue(); - using var fileStream = new FileStream(manifestFile, FileMode.Open, FileAccess.Read); - Action readManifest = () => WorkloadManifestReader.ReadWorkloadManifest(manifestId, fileStream, manifestFile); - readManifest.ShouldNotThrow("manifestId:" + manifestId + " manifestFile:" + manifestFile + "is invalid"); + if (!string.Equals(manifestId, "workloadsets")) + { + new FileInfo(manifestFile).Exists.Should().BeTrue(); + using var fileStream = new FileStream(manifestFile, FileMode.Open, FileAccess.Read); + Action readManifest = () => WorkloadManifestReader.ReadWorkloadManifest(manifestId, fileStream, manifestFile); + readManifest.ShouldNotThrow("manifestId:" + manifestId + " manifestFile:" + manifestFile + "is invalid"); + } } } diff --git a/test/SdkTests/TestConfig.xml b/test/SdkTests/TestConfig.xml index ed432ea13..1da2a5ee8 100644 --- a/test/SdkTests/TestConfig.xml +++ b/test/SdkTests/TestConfig.xml @@ -16,8 +16,6 @@ - - @@ -257,5 +255,17 @@ Skip="true" Issue="" Reason="Requires props file not in installer repo"/> + + +