diff --git a/eng/pipelines/prepare-release.yml b/eng/pipelines/prepare-release.yml index e5f2ce1194..0b547a4690 100644 --- a/eng/pipelines/prepare-release.yml +++ b/eng/pipelines/prepare-release.yml @@ -33,13 +33,11 @@ stages: condition: succeeded() variables: - ${{ if and(eq(parameters.isOfficialBuild, true), or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/internal/release/'))) }}: - - group: DotNet-Diagnostics-Storage - group: Release-Pipeline steps: - ${{ if or(eq(parameters.isOfficialBuild, false), eq(variables['Build.SourceBranch'], 'refs/heads/main')) }}: - - script: '$(Build.Repository.LocalPath)\dotnet.cmd build $(Build.Repository.LocalPath)\eng\release\DiagnosticsReleaseTool\DiagnosticsReleaseTool.csproj -c Release /bl' - workingDirectory: '$(System.ArtifactsDirectory)' + - script: '$(Build.Repository.LocalPath)\dotnet.cmd build $(Build.Repository.LocalPath)\eng\release\DiagnosticsReleaseTool\DiagnosticsReleaseTool.csproj -c Release' displayName: 'Build Manifest generation and asset publishing tool' - ${{ elseif and(eq(parameters.isOfficialBuild, true), or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/internal/release/'))) }}: - task: UseDotNet@2 diff --git a/eng/pipelines/templateInternal.yml b/eng/pipelines/templateInternal.yml index af64305fd9..2f2c05b298 100644 --- a/eng/pipelines/templateInternal.yml +++ b/eng/pipelines/templateInternal.yml @@ -29,6 +29,9 @@ extends: enabled: true tsa: enabled: true + settings: + # Do not add CFSClean2 yet - microbuild needs some endpoints behind it. + networkIsolationPolicy: Permissive,CFSClean featureFlags: autoBaseline: true