Skip to content

Commit

Permalink
[automated] Merge branch 'vs17.11' => 'vs17.12' (#11072)
Browse files Browse the repository at this point in the history
* Localized file check-in by OneLocBuild Task: Build definition ID 9434: Build ID 10000931 (#10267)

* Localized file check-in by OneLocBuild Task: Build definition ID 9434: Build ID 9752299
* Increase VersionPrefix version

---------

Co-authored-by: Jenny Bai <v-jennybai@microsoft.com>

* [17.11] Fix component governance alerts (#10520)

* Resolves CG alerts
---------

Co-authored-by: Rainer Sigwald <raines@microsoft.com>

* Assembly redirect fix (#10624)

* Fixing the assembly redirect

* [vs17.11] Update dependencies from dotnet/arcade (#10654)

* Update dependencies from https://github.com/dotnet/arcade build 20240910.4

Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.24311.3 -> To Version 8.0.0-beta.24460.4

* version bump

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Mariana Garces Dematte <magarces@microsoft.com>

* Upgrade system.text.json to 8.0.4 (#10650)

Will address dotnet/sdk#43339 when deployed in VS.

---------

Co-authored-by: Rainer Sigwald <raines@microsoft.com>

* disable loc (#10693)

Part of: #10665

Disabling localization for 17.11.

* [vs17.11] Update dependencies from dotnet/arcade (#10691)

* [vs17.11] Update dependencies from dotnet/arcade (#10793)

* Update dependencies from https://github.com/dotnet/arcade build 20241008.1

Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.24475.3 -> To Version 8.0.0-beta.24508.1

* bump the version

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: YuliiaKovalova <95473390+YuliiaKovalova@users.noreply.github.com>

* CG alert cleaning on VS17.11 (#10723)

* Bump Microsoft.IO.Redist to 6.0.1
* Bump version prefix to 17.11.11

* [vs17.11] Update dependencies from dotnet/arcade (#10832)

* [vs17.11] Update dependencies from dotnet/arcade (#10895)

* [vs17.11] Update dependencies from dotnet/arcade (#10990)

* Update dependencies from https://github.com/dotnet/arcade build 20241112.12

Microsoft.SourceBuild.Intermediate.arcade , 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.11.16

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Gang Wang <v-gaw@microsoft.com>

* Update dependencies from https://github.com/dotnet/arcade build 20241120.5

Microsoft.SourceBuild.Intermediate.arcade , 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.11.17

* [vs17.11] Run tests even if version is not bumped (#11060)

Backport of #11042 to vs17.11

* [vs17.11] Backport VS insertion pipeline YMLs (#11064)

Co-authored-by: Jan Provaznik <janprovaznik@microsoft.com>

* Eliminate the unnecessary change from vs17.11

* Remove duplicate version setting for System.Formats.Asn1

* Bump up version prefix to 17.12.18

---------

Co-authored-by: dotnet bot <dotnet-bot@dotnetfoundation.org>
Co-authored-by: Jenny Bai <v-jennybai@microsoft.com>
Co-authored-by: MichalPavlik <michalpavlik@outlook.com>
Co-authored-by: Rainer Sigwald <raines@microsoft.com>
Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Mariana Garces Dematte <magarces@microsoft.com>
Co-authored-by: YuliiaKovalova <95473390+YuliiaKovalova@users.noreply.github.com>
Co-authored-by: Gang Wang <v-gaw@microsoft.com>
Co-authored-by: Surayya Huseyn Zada <114938397+surayya-MS@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Jan Provaznik <janprovaznik@microsoft.com>
  • Loading branch information
12 people authored Dec 10, 2024
1 parent 84edf6c commit ed8c6ae
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit ed8c6ae

Please sign in to comment.