Skip to content

[automated] Merge branch 'release/6.0.4xx' => 'release/7.0.1xx' #15243

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

Closed
dotnet-maestro-bot wants to merge 71 commits into from
Closed

[automated] Merge branch 'release/6.0.4xx' => 'release/7.0.1xx' #15243

Changes from 2 commits
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
c2237c3
Merge in 'release/6.0.4xx' changes
dotnet-bot Nov 1, 2022
d0835b5
Merge in 'release/6.0.4xx' changes
dotnet-bot Nov 2, 2022
e9a2693
Merge in 'release/6.0.4xx' changes
dotnet-bot Nov 3, 2022
43de9f5
Merge in 'release/6.0.4xx' changes
dotnet-bot Nov 3, 2022
4677e5b
Merge in 'release/6.0.4xx' changes
dotnet-bot Nov 4, 2022
4f8c1d8
Merge in 'release/6.0.4xx' changes
dotnet-bot Nov 8, 2022
a6afcac
Merge in 'release/6.0.4xx' changes
dotnet-bot Nov 9, 2022
2822bfa
Merge in 'release/6.0.4xx' changes
dotnet-bot Nov 10, 2022
3e3cbe9
Merge in 'release/6.0.4xx' changes
dotnet-bot Nov 11, 2022
3d646e4
Update dependencies from https://github.com/dotnet/arcade build 20221…
dotnet-maestro[bot] Nov 11, 2022
6406fa3
Merge pull request #14971 from dotnet/darc-release/6.0.1xx-47bfe37b-9…
v-wuzhai Nov 14, 2022
d3ff91c
Merge in 'release/6.0.4xx' changes
dotnet-bot Nov 14, 2022
7be65d9
Merge branch 'release/6.0.1xx' into release/6.0.3xx
Nov 14, 2022
86fd934
Update asp.net templates (#14955)
wtgodbe Nov 14, 2022
364781d
Update asp.net templates (#14956)
wtgodbe Nov 14, 2022
7773518
Merge in 'release/6.0.4xx' changes
dotnet-bot Nov 14, 2022
2db4ff9
Update dependencies from https://github.com/dotnet/arcade build 20221…
dotnet-maestro[bot] Nov 14, 2022
4ee7cf8
Update dependencies from https://github.com/dotnet/arcade build 20221…
dotnet-maestro[bot] Nov 14, 2022
5c86e04
Merge in 'release/6.0.4xx' changes
dotnet-bot Nov 14, 2022
6481ad0
Merge in 'release/6.0.4xx' changes
dotnet-bot Nov 14, 2022
92455e5
Merge pull request #14989 from dotnet/darc-release/6.0.1xx-3abf24e0-3…
marcpopMSFT Nov 14, 2022
b34c736
Merge pull request #14978 from dotnet-maestro-bot/merge/release/6.0.1…
marcpopMSFT Nov 15, 2022
948450c
Merge in 'release/6.0.4xx' changes
dotnet-bot Nov 15, 2022
0bc87ae
Update Windows SDK projection
manodasanW Nov 16, 2022
1fca57d
Update Windows SDK projection
manodasanW Nov 16, 2022
030676c
Update Windows SDK projection
manodasanW Nov 16, 2022
6cb05d5
Merge pull request #14999 from dotnet/manodasanW-patch-3
marcpopMSFT Nov 16, 2022
0107d40
Merge pull request #14998 from dotnet/manodasanW-patch-2
marcpopMSFT Nov 16, 2022
ffe70b9
Merge pull request #14997 from dotnet/manodasanW-patch-1
marcpopMSFT Nov 16, 2022
fc58d61
Merge in 'release/6.0.4xx' changes
dotnet-bot Nov 16, 2022
1a10487
Merge branch 'release/6.0.1xx' into release/6.0.3xx
Nov 17, 2022
9299e47
[release/6.0.1xx] Add CI for security-partners-dotnet (#14963)
lbussell Nov 17, 2022
3689844
Merge pull request #15006 from dotnet-maestro-bot/merge/release/6.0.1…
v-wuzhai Nov 18, 2022
28e0fa1
Merge branch 'release/6.0.3xx' into release/6.0.4xx
Nov 18, 2022
811ce48
Merge pull request #15014 from dotnet-maestro-bot/merge/release/6.0.3…
v-wuzhai Nov 18, 2022
c5cca2c
Merge in 'release/6.0.4xx' changes
dotnet-bot Nov 18, 2022
f7ab730
Merged PR 27621: [internal/release/6.0.4xx] Update dependencies from …
dotnet-bot Nov 18, 2022
13fcc4c
Merged PR 27686: [internal/release/6.0.4xx] Update dependencies from …
dotnet-bot Nov 20, 2022
eb6f31a
Update dependencies from https://github.com/dotnet/source-build-refer…
dotnet-maestro[bot] Nov 21, 2022
73a3117
Update dependencies from https://github.com/dotnet/source-build-refer…
dotnet-maestro[bot] Nov 21, 2022
0ad8f65
Merge pull request #15021 from dotnet/darc-release/6.0.4xx-617e5ab9-0…
v-wuzhai Nov 21, 2022
7d1d2ba
Merge in 'release/6.0.4xx' changes
dotnet-bot Nov 21, 2022
8cddaa7
Merged PR 27731: [internal/release/6.0.4xx] Update dependencies from …
dotnet-bot Nov 21, 2022
2e998bc
Merged PR 27765: [internal/release/6.0.4xx] Update dependencies from …
dotnet-bot Nov 22, 2022
be4f3ec
Merged PR 27854: [internal/release/6.0.4xx] Update dependencies from …
dotnet-bot Nov 29, 2022
a01a617
Update branding to 6.0.113
vseanreesermsft Nov 29, 2022
5621f19
Update branding to 6.0.308
vseanreesermsft Nov 29, 2022
41303c7
Update branding to 6.0.405
vseanreesermsft Nov 29, 2022
eead96c
Merge pull request #15052 from vseanreesermsft/branding-6.0.308-2022-…
marcpopMSFT Nov 29, 2022
7052aed
Merge pull request #15053 from vseanreesermsft/branding-6.0.405-2022-…
marcpopMSFT Nov 29, 2022
fd441fc
Merge in 'release/6.0.4xx' changes
dotnet-bot Nov 29, 2022
2ce3123
Merge pull request #15051 from vseanreesermsft/branding-6.0.113-2022-…
marcpopMSFT Nov 29, 2022
1674f77
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx' (#15058)
dotnet-maestro-bot Nov 30, 2022
97dc647
Update dependencies from https://github.com/dotnet/source-build-refer…
dotnet-maestro[bot] Nov 30, 2022
79caab7
Merge branch 'release/6.0.4xx' into merge/release/6.0.3xx-to-release/…
marcpopMSFT Nov 30, 2022
2b28337
Merge pull request #15066 from dotnet/darc-release/6.0.4xx-1cebb19e-c…
marcpopMSFT Nov 30, 2022
78c26b9
Merge pull request #15064 from dotnet-maestro-bot/merge/release/6.0.3…
marcpopMSFT Nov 30, 2022
cba1b3b
Merge in 'release/6.0.4xx' changes
dotnet-bot Nov 30, 2022
7d8d71a
Merged PR 27923: [internal/release/6.0.4xx] Update dependencies from …
dotnet-bot Dec 1, 2022
27ab360
Merged PR 28069: [internal/release/6.0.4xx] Update dependencies from …
dotnet-bot Dec 2, 2022
5174d50
.NET Source-Build 6.0.112 December 2022 Updates (#15127)
dotnet-sb-bot Dec 20, 2022
704c2ea
Merge branch 'release/6.0.1xx' into release/6.0.3xx
Dec 20, 2022
79613fc
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx' (#15154)
v-wuzhai Dec 20, 2022
26c5f71
Merge branch 'release/6.0.3xx' into release/6.0.4xx
Dec 21, 2022
86ea005
[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx' (#15157)
v-wuzhai Dec 21, 2022
b9ce8d0
Update branding to 6.0.406
vseanreesermsft Jan 3, 2023
13c09a7
Update branding to 6.0.406 (#15183)
marcpopMSFT Jan 3, 2023
56bcc63
Merge commit '27ab36058b70b2e05063911df631fbf17f954a35' into internal…
vseanreesermsft Jan 10, 2023
4beb82d
Merging internal commits for release/6.0.4xx (#15238)
marcpopMSFT Jan 10, 2023
7c2e144
[6.0.4xx] Update asp.net templates (#15244)
wtgodbe Jan 10, 2023
642af0b
Merge branch 'release/6.0.4xx' into release/7.0.1xx
Jan 11, 2023
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
12 changes: 6 additions & 6 deletions eng/ManualVersions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
Basically: In this file, choose the highest version when resolving merge conflicts.
-->
<PropertyGroup>
<MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>10.0.17763.27</MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>
<MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>10.0.18362.27</MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>
<MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>10.0.19041.27</MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>
<MicrosoftWindowsSDKNETRef10_0_20348PackageVersion>10.0.20348.27</MicrosoftWindowsSDKNETRef10_0_20348PackageVersion>
<MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>10.0.22000.27</MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>
<MicrosoftWindowsSDKNETRef10_0_22621PackageVersion>10.0.22621.27</MicrosoftWindowsSDKNETRef10_0_22621PackageVersion>
<MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>10.0.17763.28</MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>
<MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>10.0.18362.28</MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>
<MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>10.0.19041.28</MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>
<MicrosoftWindowsSDKNETRef10_0_20348PackageVersion>10.0.20348.28</MicrosoftWindowsSDKNETRef10_0_20348PackageVersion>
<MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>10.0.22000.28</MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>
<MicrosoftWindowsSDKNETRef10_0_22621PackageVersion>10.0.22621.28</MicrosoftWindowsSDKNETRef10_0_22621PackageVersion>
</PropertyGroup>
</Project>