diff --git a/.vsts-dotnet-ci.yml b/.vsts-dotnet-ci.yml index daf200ae88e..35e433c7596 100644 --- a/.vsts-dotnet-ci.yml +++ b/.vsts-dotnet-ci.yml @@ -3,6 +3,16 @@ trigger: - exp/* - vs* +variables: +- ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + - group: AzureDevOps-Artifact-Feeds-Pats +- name: cfsNugetWarnLevel + value: warn +- name: nugetMultiFeedWarnLevel + value: none +- name: NugetSecurityAnalysisWarningLevel + value: none + jobs: - job: CheckVersionBumpOnReleaseBranches displayName: "Check Version Bump On Release Branches" @@ -66,6 +76,14 @@ jobs: pool: vmImage: 'windows-2022' steps: + - ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + - task: PowerShell@2 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) - task: BatchScript@1 displayName: cibuild_bootstrapped_msbuild.cmd inputs: @@ -137,6 +155,14 @@ jobs: pool: vmImage: 'windows-2022' steps: + - ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + - task: PowerShell@2 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) - task: BatchScript@1 displayName: cibuild_bootstrapped_msbuild.cmd inputs: @@ -192,6 +218,14 @@ jobs: name: VSEngSS-MicroBuild2022-1ES demands: agent.os -equals Windows_NT steps: + - ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + - task: PowerShell@2 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) - task: BatchScript@1 displayName: cibuild.cmd inputs: @@ -266,6 +300,14 @@ jobs: pool: vmImage: 'ubuntu-latest' steps: + - ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + - task: Bash@3 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh + arguments: $(Build.SourcesDirectory)/NuGet.config $Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) - bash: . 'eng/cibuild_bootstrapped_msbuild.sh' --onlyDocChanged $(onlyDocChanged) displayName: CI Build - task: PublishTestResults@2 @@ -323,6 +365,14 @@ jobs: pool: vmImage: 'macOS-latest' steps: + - ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + - task: Bash@3 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh + arguments: $(Build.SourcesDirectory)/NuGet.config $Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) - bash: . 'eng/cibuild_bootstrapped_msbuild.sh' --onlyDocChanged $(onlyDocChanged) displayName: CI Build - task: PublishTestResults@2 diff --git a/.vsts-dotnet.yml b/.vsts-dotnet.yml index 26acd42299c..ee5b594f9a9 100644 --- a/.vsts-dotnet.yml +++ b/.vsts-dotnet.yml @@ -38,6 +38,13 @@ variables: - name: Codeql.Enabled value: true - group: DotNet-MSBuild-SDLValidation-Params + - group: AzureDevOps-Artifact-Feeds-Pats + - name: cfsNugetWarnLevel + value: warn + - name: nugetMultiFeedWarnLevel + value: none + - name: NugetSecurityAnalysisWarningLevel + value: none resources: repositories: @@ -110,6 +117,14 @@ extends: - task: NuGetToolInstaller@1 displayName: 'Install NuGet.exe' + - task: PowerShell@2 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) + - task: NuGetCommand@2 displayName: Restore internal tools inputs: diff --git a/eng/Versions.props b/eng/Versions.props index 9f9705691ac..7667c6ff3c6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,7 +2,7 @@ - 17.10.7release + 17.10.8release 17.8.3 15.1.0.0 preview diff --git a/eng/build.ps1 b/eng/build.ps1 index eaf7cc577d8..d71fa299fd8 100644 --- a/eng/build.ps1 +++ b/eng/build.ps1 @@ -150,7 +150,7 @@ function Set-OptProfVariables() { function Check-EditedFiles() { # Log VSTS errors for changed lines - git --no-pager diff HEAD --unified=0 --no-color --exit-code | ForEach-Object { "##vso[task.logissue type=error] $_" } + git --no-pager diff HEAD --unified=0 --no-color --exit-code -- src/ | ForEach-Object { "##vso[task.logissue type=error] $_" } if ($LASTEXITCODE -ne 0) { throw "##vso[task.logissue type=error] After building, there are changed files. Please build locally and include these changes in your pull request." }