Skip to content

Commit 477cd30

Browse files
github-actions[bot]ForgindJanKrivaneksujitnayakYuliiaKovalova
authored
[automated] Merge branch 'vs17.8' => 'vs17.10' (#11235)
* Dont ngen taskhost Fixes our lack of optprof data (#8737) Don't ngen TaskHosts * Bump version * Bump version * Update System.Security.Cryptography.Pkcs * Bump version * Workaround for incorrect encoding of PUA range in GB18030 Uri string (#9751) * [release/vs17.7] Onboard 1es templates (#9924) * bump arcade version * bump MicrosoftNetCompilersToolsetVersion * bump MicrosoftNetCompilersToolsetVersion * update sha for Microsoft.Net.Compilers.Toolset * CG alert cleaning on VS17.8 (#10725) * Bump Microsoft.IO.Redist to 6.0.1 * Bump System.Formats.Asn1 to 8.0.1 * Bump System.Text.Json to 8.0.0.4 * Bump the dependencies of System.Text.Json * Add System.Formats.Asn1 8.0.1 to the pre-built exception list * Bump version prefix to 17.8.8 * Updated System.Collection.Immutable package to v8 * Adding System.Collections.Immutable 8.0.0 to the pre-built exception list * Updated Version.Details.xml * [vs17.8] update arcade and fix build (#10838) * Update dependencies from https://github.com/dotnet/arcade build 20241008.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.23425.2 -> To Version 8.0.0-beta.24508.1 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23423.1 -> To Version 1.0.0-beta.23475.1 (parent: Microsoft.DotNet.Arcade.Sdk * remove BuildXL from nuget config * compatibility suppressions * Update dependencies from https://github.com/dotnet/arcade build 20241… Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.24508.1 -> To Version 8.0.0-beta.24516.1 * include PortableRuntimeIdentifierGraph.json * Suppress a warning IDE0305 * bump version --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Jenny Bai <v-jennybai@microsoft.com> * [vs17.8] Sync internal and public branches (#10858) * Update dependencies from https://github.com/dotnet/arcade build 20241025.2 (#10894) * [vs17.8] Update dependencies from dotnet/arcade (#10986) * Update dependencies from https://github.com/dotnet/arcade build 20241112.12 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.24525.2 -> To Version 8.0.0-beta.24562.12 * Update VersionPrefix to 17.8.11 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Surayya Huseyn Zada <114938397+surayya-MS@users.noreply.github.com> * Update dependencies from https://github.com/dotnet/arcade build 20241120.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.24562.12 -> To Version 8.0.0-beta.24570.5 * Update VersionPrefix to 17.8.12 * [vs17.8] Backport VS insertion pipeline YMLs (#11066) Co-authored-by: Jan Provaznik <janprovaznik@microsoft.com> * Update .opt-prof.yml (#11112) * [vs17.8] Fix setting package versions in VS insertion (#11103) * fix setting package versions * use VS branch names in servicing package decision --------- Co-authored-by: Jan Provaznik <janprovaznik@microsoft.com> * Update vs/msbuild version (#11115) * Update vs/msbuild version * Bump version * Update xcopy-msbuild version to 17.8.5 (#11118) * Add inter-branch merge flow file (#11123) * Update .opt-prof.yml (#11121) * Bump up System.Text.Json to 8.0.5 (#11134) * [vs17.8] Update dependencies from dotnet/arcade (#11218) * Update dependencies from https://github.com/dotnet/arcade build 20241223.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.24570.5 -> To Version 8.0.0-beta.24623.2 * Update VersionPrefix to 17.8.16 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Tomas Bartonek <tom.bartonek@volny.cz> * disallow package conflicts by default and add override parameter (#11152) * [vs17.8] Update dependencies from dotnet/arcade (#11261) * Update dependencies from https://github.com/dotnet/arcade build 20250110.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.24623.2 -> To Version 8.0.0-beta.25060.1 * version bump --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Tomas Bartonek <tom.bartonek@volny.cz> * Don't autocomplete servicing insertions (#11283) * [vs17.8] Select proper VS channel (#11246) * Update .vsts-dotnet.yml * Update Versions.props * Update .vsts-dotnet.yml Co-authored-by: Rainer Sigwald <raines@microsoft.com> * Bump version --------- Co-authored-by: Rainer Sigwald <raines@microsoft.com> * [vs17.8] Update dependencies from dotnet/arcade (#11306) * Update dependencies from https://github.com/dotnet/arcade build 20250116.6 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25060.1 -> To Version 8.0.0-beta.25066.6 * Bump version --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Jan Krivanek <jankrivanek@microsoft.com> * Remove unnecessary change from branch vs17.8 * Bump up version prefix to 17.10.20 --------- Co-authored-by: Forgind <12969783+Forgind@users.noreply.github.com> Co-authored-by: Jan Krivanek <jankrivanek@microsoft.com> Co-authored-by: sujitnayak <sujitn@microsoft.com> Co-authored-by: YuliiaKovalova <95473390+YuliiaKovalova@users.noreply.github.com> Co-authored-by: YuliiaKovalova <ykovalova@microsoft.com> Co-authored-by: Surayya Huseyn Zada <shuseynzada@microsoft.com> Co-authored-by: Surayya Huseyn Zada <114938397+surayya-MS@users.noreply.github.com> Co-authored-by: Gang Wang <v-gaw@microsoft.com> Co-authored-by: Jan Provazník <janprovaznik@microsoft.com> Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Jenny Bai <v-jennybai@microsoft.com> Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Tomas Bartonek <tom.bartonek@volny.cz> Co-authored-by: Rainer Sigwald <raines@microsoft.com>
1 parent 939cc33 commit 477cd30

File tree

2 files changed

+25
-10
lines changed

2 files changed

+25
-10
lines changed

‎azure-pipelines/vs-insertion.yml‎

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
# To achieve insertion automation, this pipeline definition yml has to be on servicing branches and main.
33

44

5-
# Runs in 3 modes:
5+
# Runs in 3 modes:
66
# 1. daily main insertion from latest main CI.
7-
# - can be disabled in the UI by adding a custom schedule for any branch.
7+
# - can be disabled in the UI by adding a custom schedule for any branch.
88
# 2. trigger insert as a followup to a servicing CI run.
99
# - can be disabled in the UI by adding a custom CI trigger.
1010
# 3. manual insertion - select manually the TargetBranch and inserted CI run.
@@ -56,6 +56,10 @@ parameters:
5656
default: 183
5757
type: number
5858
displayName: 'Drop Retention Days (do not set to < 90)'
59+
- name: SkipUploadingPackages
60+
default: false
61+
type: boolean
62+
displayName: 'Skip uploading packages (set to true if inserting the same version multiple times)'
5963

6064
variables:
6165
# `auto` should work every time and selecting a branch in parameters is likely to fail due to incompatible versions in MSBuild and VS
@@ -95,8 +99,8 @@ variables:
9599
value: $(resources.pipeline.MSBuild.sourceCommit)
96100
- name: ArtifactPackagesPath
97101
value: $(Build.ArtifactStagingDirectory)/PackageArtifacts
98-
99-
- name: MSBuildPackagePattern
102+
103+
- name: MSBuildPackagePattern
100104
value: '$(ArtifactPackagesPath)/Microsoft.Build.*.nupkg'
101105
- name: StringToolsPackagePattern
102106
value: '$(ArtifactPackagesPath)/Microsoft.NET.StringTools*.nupkg'
@@ -200,7 +204,6 @@ extends:
200204
$MicrosoftNETStringToolsPackageVersion = $packageFile.BaseName.TrimStart("Microsoft.NET.StringTools")
201205
Write-Host "Setting MicrosoftNETStringToolsPackageVersion to '$MicrosoftNETStringToolsPackageVersion'"
202206
Write-Host "##vso[task.setvariable variable=MicrosoftNETStringToolsPackageVersion]$($MicrosoftNETStringToolsPackageVersion)"
203-
204207
$props = @(
205208
"VS.ExternalAPIs.MSBuild=$MSBuild_ExtApisPackageVersion",
206209
"Microsoft.Build=$MicrosoftNETStringToolsPackageVersion",
@@ -221,26 +224,38 @@ extends:
221224
$propsValue = $props -join ";"
222225
Write-Host "Setting InsertPackagePropsValues to '$propsValue'"
223226
Write-Host "##vso[task.setvariable variable=InsertPackagePropsValues]$($propsValue)"
227+
228+
# autocomplete main
229+
$autocomplete = "false"
230+
if ("$(InsertTargetBranch)" -eq "main")
231+
{
232+
$autocomplete = "true"
233+
}
234+
Write-Host "Setting AutoCompleteEnabled to '$autocomplete'"
235+
Write-Host "##vso[task.setvariable variable=AutoCompleteEnabled]$($autocomplete)"
236+
224237
- task: 1ES.PublishNuGet@1
225238
displayName: 'Push MSBuild CoreXT packages'
239+
condition: ${{ eq(parameters.SkipUploadingPackages, false) }}
226240
inputs:
227241
packageParentPath: '$(Build.ArtifactStagingDirectory)'
228242
packagesToPush: $(MSBuildPackagePattern);$(StringToolsPackagePattern);$(ExternalAPIsPackagePattern)
229243
nuGetFeedType: internal
230244
publishVstsFeed: VS
231-
allowPackageConflicts: true
245+
allowPackageConflicts: false
232246
- template: /azure-pipelines/WIFtoPATauth.yml@self
233247
parameters:
234248
wifServiceConnectionName: azure-public/vside package push
235249
deadPATServiceConnectionId: 42175e93-c771-4a4f-a132-3cca78f44b3b
236250
- task: 1ES.PublishNuGet@1
251+
condition: ${{ eq(parameters.SkipUploadingPackages, false) }}
237252
displayName: 'Push MSBuild packages to VSSDK'
238253
inputs:
239254
packageParentPath: '$(Build.ArtifactStagingDirectory)'
240255
packagesToPush: $(MSBuildPackagePattern);$(StringToolsPackagePattern)
241256
nuGetFeedType: external
242257
publishFeedCredentials: azure-public/vssdk
243-
allowPackageConflicts: true
258+
allowPackageConflicts: false
244259
- task: PowerShell@2
245260
name: PrintTargetBranch
246261
inputs:
@@ -262,6 +277,6 @@ extends:
262277
DefaultConfigValues: $(InsertConfigValues)
263278
InsertionReviewers: MSBuild,VS ProTools
264279
CustomScriptExecutionCommand: $(InsertCustomScriptExecutionCommand)
265-
AutoCompletePR: true
280+
AutoCompletePR: $(AutoCompleteEnabled)
266281
AutoCompleteMergeStrategy: Squash
267-
InsertionBuildPolicy: Request Perf DDRITs
282+
InsertionBuildPolicy: Request Perf DDRITs

‎eng/Versions.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See License.txt in the project root for full license information. -->
33
<Project>
44
<PropertyGroup>
5-
<VersionPrefix>17.10.19</VersionPrefix>
5+
<VersionPrefix>17.10.20</VersionPrefix>
66
<DotNetFinalVersionKind>release</DotNetFinalVersionKind>
77
<PackageValidationBaselineVersion>17.8.3</PackageValidationBaselineVersion>
88
<AssemblyVersion>15.1.0.0</AssemblyVersion>

0 commit comments

Comments
 (0)