diff --git a/.vsts-dotnet-ci.yml b/.vsts-dotnet-ci.yml index 60a757b7803..d143b8b6b19 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" @@ -65,6 +75,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: @@ -136,6 +154,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: @@ -191,6 +217,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: @@ -265,6 +299,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 @@ -322,6 +364,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 8d1e966bdf7..957d9965892 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/azure-pipelines/vs-insertion.yml b/azure-pipelines/vs-insertion.yml index 16de6ced0f1..01178c98a5e 100644 --- a/azure-pipelines/vs-insertion.yml +++ b/azure-pipelines/vs-insertion.yml @@ -102,11 +102,6 @@ variables: value: '$(ArtifactPackagesPath)/Microsoft.NET.StringTools*.nupkg' - name: ExternalAPIsPackagePattern value: '$(ArtifactPackagesPath)/VS.ExternalAPIs.*.nupkg' - # servicing branches until 17.12 also include Microsoft.Build.Engine and Microsoft.Build.Conversion.Core - - name: EngineIncludedProps - value: VS.ExternalAPIs.MSBuild=$(MSBuild_ExtApisPackageVersion);Microsoft.Build=$(MicrosoftNETStringToolsPackageVersion);Microsoft.Build.Conversion.Core=$(MicrosoftNETStringToolsPackageVersion);Microsoft.Build.Engine=$(MicrosoftNETStringToolsPackageVersion);Microsoft.Build.Framework=$(MicrosoftNETStringToolsPackageVersion);Microsoft.Build.Tasks.Core=$(MicrosoftNETStringToolsPackageVersion);Microsoft.Build.Utilities.Core=$(MicrosoftNETStringToolsPackageVersion);Microsoft.NET.StringTools=$(MicrosoftNETStringToolsPackageVersion) - - name: NoEngineProps - value: VS.ExternalAPIs.MSBuild=$(MSBuild_ExtApisPackageVersion);Microsoft.Build=$(MicrosoftNETStringToolsPackageVersion);Microsoft.Build.Framework=$(MicrosoftNETStringToolsPackageVersion);Microsoft.Build.Tasks.Core=$(MicrosoftNETStringToolsPackageVersion);Microsoft.Build.Utilities.Core=$(MicrosoftNETStringToolsPackageVersion);Microsoft.NET.StringTools=$(MicrosoftNETStringToolsPackageVersion) extends: template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates @@ -191,28 +186,41 @@ extends: steps: - task: Powershell@2 name: PwshMungeExternalAPIsPkgVersion - displayName: Munge ExternalAPIs package version + displayName: Munge ExternalAPIs package version and set props inputs: targetType: inline script: | $folder = "$(Build.ArtifactStagingDirectory)/PackageArtifacts/VS.ExternalAPIs.*.nupkg" $packageFile = Get-ChildItem -Path $folder -Filter VS.ExternalAPIs.*.nupkg | Select-Object -First 1 - $packageVersion = $packageFile.BaseName.TrimStart("VS.ExternalAPIs.MSBuild") - Write-Host "Setting MSBuild_ExtApisPackageVersion to '$packageVersion'" - Write-Host "##vso[task.setvariable variable=MSBuild_ExtApisPackageVersion]$($packageVersion)" + $MSBuild_ExtApisPackageVersion = $packageFile.BaseName.TrimStart("VS.ExternalAPIs.MSBuild") + Write-Host "Setting MSBuild_ExtApisPackageVersion to '$MSBuild_ExtApisPackageVersion'" + Write-Host "##vso[task.setvariable variable=MSBuild_ExtApisPackageVersion]$($MSBuild_ExtApisPackageVersion)" $folder = "$(Build.ArtifactStagingDirectory)/PackageArtifacts/Microsoft.NET.StringTools*.nupkg" $packageFile = Get-ChildItem -Path $folder -Filter Microsoft.NET.StringTools*.nupkg | Select-Object -First 1 - $packageVersion = $packageFile.BaseName.TrimStart("Microsoft.NET.StringTools") - Write-Host "Setting MicrosoftNETStringToolsPackageVersion to '$packageVersion'" - Write-Host "##vso[task.setvariable variable=MicrosoftNETStringToolsPackageVersion]$($packageVersion)" - if ("$(InsertTargetBranch)" -in @("vs17.0", "vs17.3", "vs17.6", "vs17.8", "vs17.10", "vs17.11", "vs17.12")) - { - Write-Host "##vso[task.setvariable variable=InsertPackagePropsValues]$($EngineIncludedProps)" - } - else + $MicrosoftNETStringToolsPackageVersion = $packageFile.BaseName.TrimStart("Microsoft.NET.StringTools") + Write-Host "Setting MicrosoftNETStringToolsPackageVersion to '$MicrosoftNETStringToolsPackageVersion'" + Write-Host "##vso[task.setvariable variable=MicrosoftNETStringToolsPackageVersion]$($MicrosoftNETStringToolsPackageVersion)" + + $props = @( + "VS.ExternalAPIs.MSBuild=$MSBuild_ExtApisPackageVersion", + "Microsoft.Build=$MicrosoftNETStringToolsPackageVersion", + "Microsoft.Build.Framework=$MicrosoftNETStringToolsPackageVersion", + "Microsoft.Build.Tasks.Core=$MicrosoftNETStringToolsPackageVersion", + "Microsoft.Build.Utilities.Core=$MicrosoftNETStringToolsPackageVersion", + "Microsoft.NET.StringTools=$MicrosoftNETStringToolsPackageVersion" + ) + # servicing branches until 17.12 also include Microsoft.Build.Engine and Microsoft.Build.Conversion.Core + if ("$(InsertTargetBranch)" -in @("rel/d17.0", "rel/d17.3", "rel/d17.6", "rel/d17.8", "rel/d17.10", "rel/d17.11", "rel/d17.12")) + { - Write-Host "##vso[task.setvariable variable=InsertPackagePropsValues]$($NoEngineProps)" + $props += @( + "Microsoft.Build.Conversion.Core=$MicrosoftNETStringToolsPackageVersion", + "Microsoft.Build.Engine=$MicrosoftNETStringToolsPackageVersion" + ) } + $propsValue = $props -join ";" + Write-Host "Setting InsertPackagePropsValues to '$propsValue'" + Write-Host "##vso[task.setvariable variable=InsertPackagePropsValues]$($propsValue)" - task: 1ES.PublishNuGet@1 displayName: 'Push MSBuild CoreXT packages' inputs: diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index 3297ebc78a2..f3417f14836 100644 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -8,14 +8,14 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index abf48903ae9..7897fb4aadc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -53,9 +53,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9f4b1f5d664afdfc80e1508ab7ed099dff210fbd + 81cabf2857a01351e5ab578947c7403a5b128ad1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 0ec094e2860..aaca0a64666 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,7 +2,7 @@ - 17.11.19 + 17.11.20 release 17.10.4 15.1.0.0 @@ -27,6 +27,7 @@ 8.0.0 8.0.0 + 8.0.1 + diff --git a/src/MSBuild/app.amd64.config b/src/MSBuild/app.amd64.config index 5d4d6d24d95..220b47db42b 100644 --- a/src/MSBuild/app.amd64.config +++ b/src/MSBuild/app.amd64.config @@ -134,8 +134,8 @@ - - + + diff --git a/src/MSBuild/app.config b/src/MSBuild/app.config index 8372bfd8727..1a256448a58 100644 --- a/src/MSBuild/app.config +++ b/src/MSBuild/app.config @@ -94,7 +94,7 @@ - +