Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[automated] Merge branch 'vs17.8' => 'vs17.10' #11124

Merged
merged 38 commits into from
Dec 13, 2024
Merged

[automated] Merge branch 'vs17.8' => 'vs17.10' #11124

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
6a01af7
Dont ngen taskhost Fixes our lack of optprof data (#8737)
Forgind May 9, 2023
d611cbf
Bump version
JanKrivanek Jun 20, 2023
c70978d
Merge pull request #8926 from JanKrivanek/vs17.6-optprof-patch
JanKrivanek Jun 21, 2023
c319e69
Bump version
JanKrivanek Jun 21, 2023
74e5766
Merge pull request #8932 from dotnet/JanKrivanek-patch-5
JanKrivanek Jun 21, 2023
69d3555
Update System.Security.Cryptography.Pkcs
JanKrivanek Jun 29, 2023
d193c88
Bump version
JanKrivanek Jun 29, 2023
2679cf5
Merge pull request #8977 from dotnet/JanKrivanek-patch-4
JanKrivanek Jun 29, 2023
d00a8a9
Workaround for incorrect encoding of PUA range in GB18030 Uri string …
sujitnayak Feb 20, 2024
1d1abd5
[release/vs17.7] Onboard 1es templates (#9924)
YuliiaKovalova Mar 28, 2024
05c7b41
bump arcade version
YuliiaKovalova Apr 22, 2024
ab6b461
bump MicrosoftNetCompilersToolsetVersion
YuliiaKovalova Apr 22, 2024
30ff340
bump MicrosoftNetCompilersToolsetVersion
YuliiaKovalova Apr 22, 2024
da7eb6c
update sha for Microsoft.Net.Compilers.Toolset
surayya-MS Apr 22, 2024
5eb99e6
Merge pull request #10053 from surayya-MS/exp/surayya-MS/1es_vs17.6
surayya-MS Apr 22, 2024
a4064f1
Merge branch 'vs17.8' into merge/vs17.6-to-vs17.8
surayya-MS Apr 24, 2024
4c8a0ca
CG alert cleaning on VS17.8 (#10725)
GangWang01 Oct 16, 2024
e657d4d
[vs17.8] update arcade and fix build (#10838)
JanProvaznik Oct 23, 2024
338edd9
[vs17.8] Sync internal and public branches (#10858)
YuliiaKovalova Oct 24, 2024
25135e6
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Oct 29, 2024
6802148
[vs17.8] Update dependencies from dotnet/arcade (#10986)
dotnet-maestro[bot] Nov 20, 2024
aeedcc8
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Nov 25, 2024
c1b109d
Update VersionPrefix to 17.8.12
surayya-MS Nov 28, 2024
8183f53
[vs17.8] Update dependencies from dotnet/arcade (#11030)
surayya-MS Nov 28, 2024
7bb97fb
[vs17.8] Backport VS insertion pipeline YMLs (#11066)
github-actions[bot] Dec 3, 2024
06cfc00
Update .opt-prof.yml (#11112)
JanKrivanek Dec 9, 2024
1b63486
[vs17.8] Fix setting package versions in VS insertion (#11103)
github-actions[bot] Dec 9, 2024
ff98e81
Update vs/msbuild version (#11115)
JanKrivanek Dec 9, 2024
54d16ed
Update xcopy-msbuild version to 17.8.5 (#11118)
GangWang01 Dec 10, 2024
d747003
Add inter-branch merge flow file (#11123)
GangWang01 Dec 11, 2024
c116a3b
Update .opt-prof.yml (#11121)
JanKrivanek Dec 11, 2024
61178e5
Merge branch 'vs17.10' into merge/vs17.8-to-vs17.10
GangWang01 Dec 12, 2024
e2abee0
Bump up System.Text.Json to 8.0.5 (#11134)
GangWang01 Dec 13, 2024
74afddb
Merge branch 'vs17.8' into merge/vs17.8-to-vs17.10
GangWang01 Dec 13, 2024
3dd8298
Merge branch 'vs17.10' into merge/vs17.8-to-vs17.10
GangWang01 Dec 13, 2024
ffecb32
Remove the change to CompatibilitySuppressions.xml
GangWang01 Dec 13, 2024
afea058
Remove unnecessary workaround for sdk 8.0.1xx bootstrap in the branch…
GangWang01 Dec 13, 2024
d0d79b9
Bump up version prefix to 17.10.14
GangWang01 Dec 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24562.12">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24570.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>42652ca52cd5f9f637fef2b3ab6148805e3c5168</Sha>
<Sha>3c7e11bf80279cde53a6251c4d0fa10e613fc739</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23475.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
Expand All @@ -81,9 +81,9 @@
<Sha>dc3d0694a4b31b8e27038431888cd4e8dd5b6cb6</Sha>
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.24562.12">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.24570.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>42652ca52cd5f9f637fef2b3ab6148805e3c5168</Sha>
<Sha>3c7e11bf80279cde53a6251c4d0fa10e613fc739</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
4 changes: 2 additions & 2 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<!-- 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. -->
<Project>
<PropertyGroup>
<VersionPrefix>17.8.11</VersionPrefix>
<VersionPrefix>17.8.12</VersionPrefix>
<DotNetFinalVersionKind>release</DotNetFinalVersionKind>
<PackageValidationBaselineVersion>17.7.0</PackageValidationBaselineVersion>
<AssemblyVersion>15.1.0.0</AssemblyVersion>
Expand Down Expand Up @@ -49,7 +49,7 @@
Otherwise, this version of dotnet will not be installed and the build will error out. -->
<DotNetCliVersion>$([System.Text.RegularExpressions.Regex]::Match($([System.IO.File]::ReadAllText('$(MSBuildThisFileDirectory)..\global.json')), '"dotnet": "([^"]*)"').Groups.get_Item(1))</DotNetCliVersion>
<MicrosoftCodeAnalysisCollectionsVersion>4.2.0-1.22102.8</MicrosoftCodeAnalysisCollectionsVersion>
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.24562.12</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.24570.5</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftExtensionsDependencyModelVersion>7.0.0</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftIORedistVersion>6.0.1</MicrosoftIORedistVersion>
<MicrosoftNetCompilersToolsetVersion>4.8.0-3.23465.5</MicrosoftNetCompilersToolsetVersion>
Expand Down
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@
"xcopy-msbuild": "17.6.0-2"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24562.12"
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24570.5"
}
}