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.

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 'release/8.0.3xx' => 'release/8.0.4xx' #42081

Merged
merged 92 commits into from
Jul 11, 2024
Merged
Changes from 2 commits
Commits
Show all changes
92 commits
Select commit Hold shift + click to select a range
9d7d8a9
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Mar 6, 2024
e034f40
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Mar 6, 2024
476e05f
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Mar 6, 2024
1316d74
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Mar 6, 2024
ae5e27e
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Mar 6, 2024
9e13bb7
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Mar 6, 2024
3442027
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Mar 6, 2024
94ec8d1
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Mar 6, 2024
bca7e36
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Mar 7, 2024
3142356
Merge in 'release/6.0.1xx' changes
dotnet-bot Mar 7, 2024
6982d95
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Mar 7, 2024
03b6899
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Mar 7, 2024
1f15699
Merge in 'release/6.0.1xx' changes
dotnet-bot Mar 7, 2024
58cbfd4
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Mar 7, 2024
1385b1d
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Mar 9, 2024
6974929
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Mar 12, 2024
9f8b5dc
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Mar 12, 2024
c47d4aa
Merge in 'release/6.0.1xx' changes
dotnet-bot Mar 12, 2024
d8cdca2
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Mar 12, 2024
588bbed
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Mar 12, 2024
6cfbc4f
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Mar 12, 2024
7e2542b
Merge in 'release/6.0.1xx' changes
dotnet-bot Mar 12, 2024
578d1c9
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Mar 12, 2024
9c0fa40
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Mar 12, 2024
4d030ec
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Mar 13, 2024
9898136
Merged PR 37863: [internal/release/6.0.1xx] Update dependencies from …
dotnet-bot Mar 13, 2024
a63f0d2
Merged PR 38108: [internal/release/6.0.1xx] Merge from public
vseanreesermsft Mar 14, 2024
d3b0f64
Merge in 'release/6.0.1xx' changes
dotnet-bot Mar 14, 2024
cca8816
Add nuget localization to the dependency flow
marcpopMSFT Mar 18, 2024
3b69be4
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Mar 19, 2024
de4bc12
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Mar 19, 2024
1e5245a
Merged PR 38233: [internal/release/6.0.1xx] Update dependencies from …
dotnet-bot Mar 19, 2024
2019b41
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Mar 19, 2024
45400bb
Merged PR 38260: [internal/release/6.0.1xx] Update dependencies from …
dotnet-bot Mar 19, 2024
5920d53
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Mar 20, 2024
6afbebc
Merged PR 38296: [internal/release/6.0.1xx] Update dependencies from …
dotnet-bot Mar 20, 2024
f1451cc
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Mar 20, 2024
c38b658
Merged PR 38313: [internal/release/6.0.1xx] Update dependencies from …
dotnet-bot Mar 20, 2024
90724bc
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Mar 20, 2024
1db16cc
Merged PR 38316: [internal/release/6.0.1xx] Update dependencies from …
dotnet-bot Mar 20, 2024
cafb3f2
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Mar 20, 2024
6eebf20
Merged PR 38334: [internal/release/6.0.1xx] Update dependencies from …
dotnet-bot Mar 20, 2024
1e23809
Merged PR 38433: [internal/release/6.0.1xx] Update dependencies from …
dotnet-bot Mar 21, 2024
2b0455d
Merged PR 38443: [internal/release/6.0.1xx] Update dependencies from …
dotnet-bot Mar 22, 2024
c5a811d
Merged PR 38478: [internal/release/6.0.1xx] Update dependencies from …
dotnet-bot Mar 22, 2024
ffe5009
Merge in 'release/6.0.1xx' changes
dotnet-bot Apr 2, 2024
1d89732
Add nuget localization to the dependency flow (#39584)
marcpopMSFT Apr 3, 2024
26665d2
Merge commit 'c5a811d50196cfc9525891c16b256ee4962b20e1' into internal…
vseanreesermsft Apr 9, 2024
caa08f3
Merging internal commits for release/6.0.1xx (#40080)
MiYanni Apr 9, 2024
fb41331
Merge in 'release/6.0.1xx' changes
dotnet-bot Apr 9, 2024
954d1ed
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Apr 10, 2024
f8ce9de
[release/6.0.1xx] Update dependencies from dotnet/arcade (#40109)
v-wuzhai Apr 11, 2024
7fe2c97
Merge in 'release/6.0.1xx' changes
dotnet-bot Apr 11, 2024
a79a54a
Merged PR 38987: [internal/release/6.0.1xx] Update dependencies from …
dotnet-bot Apr 16, 2024
5ab2294
Merged PR 39000: [internal/release/6.0.1xx] Update dependencies from …
dotnet-bot Apr 17, 2024
214a5b1
Merged PR 39108: Updated restore-toolset.sh - skip toolset for source…
vseanreesermsft Apr 22, 2024
0aff0db
Merged PR 39287: [internal/release/6.0.1xx] Update dependencies from …
dotnet-bot Apr 29, 2024
bba9797
Update branding to 6.0.131
vseanreesermsft May 1, 2024
76684ff
Update branding to 6.0.131 (#40609)
marcpopMSFT May 2, 2024
03720f7
Merge commit '0aff0db725f3979688ed1d6692f3507dc0e2daa2' into internal…
vseanreesermsft May 14, 2024
405bc53
simplify the globaljson test logic
marcpopMSFT May 14, 2024
36cc6c7
Merging internal commits for release/6.0.1xx (#40875)
marcpopMSFT May 15, 2024
6b67549
Merge branch 'release/6.0.1xx' into release/6.0.4xx
v-wuzhai May 15, 2024
00721e5
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.4xx' (#40889)
v-wuzhai May 15, 2024
5c66768
Update branding to 6.0.424
vseanreesermsft May 17, 2024
5f0dc4a
Update branding to 6.0.424 (#40946)
marcpopMSFT May 17, 2024
93a962f
Update dependencies from https://github.com/dotnet/linker build 20240…
dotnet-maestro[bot] May 17, 2024
b52d686
Update dependencies from https://github.com/dotnet/linker build 20240…
dotnet-maestro[bot] May 17, 2024
24c1e02
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] May 20, 2024
48dca38
[release/6.0.4xx] Update dependencies from dotnet/arcade (#41005)
marcpopMSFT May 20, 2024
1f9cbf4
Merge branch 'release/6.0.4xx' into darc-release/6.0.4xx-3f7a7b87-623…
marcpopMSFT May 20, 2024
5fa6e8c
Update dependencies from https://github.com/dotnet/linker build 20240…
dotnet-maestro[bot] May 20, 2024
037df91
[release/6.0.4xx] Update dependencies from dotnet/linker (#40980)
v-wuzhai May 21, 2024
5090172
2024-06 CTL
dtivel Jun 12, 2024
a1950ff
Update arcade
mmitche Jul 2, 2024
9ffffc7
Use delegation SAS for internal builds
mmitche Jul 2, 2024
74ed3d7
Update branding to 6.0.425
vseanreesermsft Jul 2, 2024
902e113
Update branding to 6.0.425 (#41920)
joeloff Jul 2, 2024
cc61242
[release/6.0.4xx] Switch to dSAS for internal runtimes (#41914)
joeloff Jul 2, 2024
1935c3c
[release/6.0.4xx] Trusted roots: 2024-06 CTL (#41602)
joeloff Jul 2, 2024
7a77e99
Onboard new inter-branch merge flow [Workflow]
Jun 20, 2024
5de1f4e
[release/6.0.4xx] Onboard new inter-branch merge flow [Workflow] (#41…
v-wuzhai Jul 4, 2024
51315ea
Merge branch 'release/8.0.1xx' of https://github.com/dotnet/sdk into …
v-wuzhai Jul 4, 2024
4fa176d
Update dependencies from https://github.com/dotnet/razor build 202407…
dotnet-maestro[bot] Jul 6, 2024
6046bbe
Update dependencies from https://github.com/dotnet/razor build 202407…
dotnet-maestro[bot] Jul 7, 2024
2d53dd4
[release/8.0.3xx] Update dependencies from dotnet/razor (#42001)
v-wuzhai Jul 8, 2024
ffe8b16
[automated] Merge branch 'release/6.0.4xx' => 'release/8.0.1xx' (#41969)
marcpopMSFT Jul 9, 2024
cc090c3
Merge branch 'release/8.0.3xx' of https://github.com/dotnet/sdk into …
v-wuzhai Jul 10, 2024
a7eaffb
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Jul 10, 2024
f1f392c
[release/8.0.3xx] Update dependencies from dotnet/arcade (#42069)
marcpopMSFT Jul 10, 2024
27d0853
[automated] Merge branch 'release/8.0.1xx' => 'release/8.0.3xx' (#42050)
v-wuzhai Jul 11, 2024
ecfc48d
Merge branch 'release/8.0.4xx' of https://github.com/dotnet/sdk into …
v-wuzhai Jul 11, 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
2 changes: 1 addition & 1 deletion eng/Versions.props
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@
</PropertyGroup>
<!-- Repo Version Information -->
<PropertyGroup>
<VersionPrefix>6.0.424</VersionPrefix>
<VersionPrefix>6.0.425</VersionPrefix>
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
<!-- Enable to remove prerelease label. -->
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">true</StabilizePackageVersion>