Skip to content

[automated] Merge branch 'vs17.6' => 'vs17.8' #10056

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

Merged
rainersigwald merged 15 commits into from
Apr 24, 2024
Merged

[automated] Merge branch 'vs17.6' => 'vs17.8' #10056

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 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
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
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
540 changes: 290 additions & 250 deletions .vsts-dotnet.yml
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion 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.6</VersionPrefix><DotNetFinalVersionKind>release</DotNetFinalVersionKind>
<VersionPrefix>17.8.7</VersionPrefix><DotNetFinalVersionKind>release</DotNetFinalVersionKind>
<PackageValidationBaselineVersion>17.7.0</PackageValidationBaselineVersion>
<AssemblyVersion>15.1.0.0</AssemblyVersion>
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
Expand Down
35 changes: 18 additions & 17 deletions eng/common/SetupNugetSources.ps1
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion eng/common/darc-init.ps1
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion eng/common/darc-init.sh
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion eng/common/post-build/add-build-to-channel.ps1
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions eng/common/post-build/publish-using-darc.ps1
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion eng/common/post-build/trigger-subscriptions.ps1
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading