Commit graph

27317 commits

Author SHA1 Message Date
Forgind
96ddfa6596
[automated] Merge branch 'release/6.0.4xx' => 'release/7.0.1xx' (#16926) 2023-07-11 10:36:52 -07:00
Michael Simons
786df50860 Resolve source-build patch conflicts 2023-07-11 14:31:03 +00:00
Jason Zhai
1ee0b6e012 Merge branch 'release/6.0.4xx' into release/7.0.1xx 2023-07-11 00:45:34 -07:00
Forgind
de86f1f4cd
[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx' (#16914) 2023-07-10 10:27:21 -07:00
Matt Thalman
c5f29a611d Update format patch 2023-07-10 09:31:51 -05:00
Matt Thalman
65db63eb44 Update format patch 2023-07-10 08:06:04 -05:00
Jason Zhai
bf62ec46b4 Merge branch 'release/6.0.3xx' into release/6.0.4xx 2023-07-09 22:51:32 -07:00
dotnet-maestro-bot
fd5696554a
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx' (#16898)
Co-authored-by: Nikola Milosavljevic <nikolam@microsoft.com>
Co-authored-by: Sean Reeser <v-seanreeser@microsoft.com>
Co-authored-by: Marc Paine <marcpop@microsoft.com>
Co-authored-by: Matt Thalman <mthalman@microsoft.com>
2023-07-07 13:07:58 -07:00
dotnet-maestro-bot
7a0352f5fb
[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx' (#16891)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: v-wuzhai <46013274+v-wuzhai@users.noreply.github.com>
Co-authored-by: Jason Zhai <v-wuzhai@microsoft.com>
Co-authored-by: Noah Gilson <noahgilson@microsoft.com>
Co-authored-by: Sean Reeser <v-seanreeser@microsoft.com>
Co-authored-by: Marc Paine <marcpop@microsoft.com>
Co-authored-by: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com>
Co-authored-by: Matt Thalman <mthalman@microsoft.com>
2023-07-06 10:09:19 -07:00
v-wuzhai
a2e9ed9df1
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx' (#16797) 2023-07-05 19:12:24 -07:00
Marc Paine
dae68bd9f7
Update branding to 7.0.110 (#16888) 2023-07-05 15:45:16 -07:00
Marc Paine
f3d7896093
Update branding to 6.0.413 (#16887) 2023-07-05 15:38:55 -07:00
Marc Paine
59ad809023
Update branding to 6.0.316 (#16886) 2023-07-05 15:11:44 -07:00
Sean Reeser
369e1e683a Update branding to 7.0.110 2023-07-05 14:38:56 -07:00
Sean Reeser
c6222f0702 Update branding to 6.0.413 2023-07-05 14:38:50 -07:00
Sean Reeser
ab99c450a0 Update branding to 6.0.316 2023-07-05 14:38:44 -07:00
Jason Zhai
3fbd26591e Merge branch 'release/6.0.1xx' into release/6.0.3xx 2023-06-24 22:42:40 -07:00
Matt Thalman
1aeb92395a
Fix SDK version of source-build global.json (#16798) 2023-06-23 18:31:22 +00:00
Matt Thalman
c255b45852
.NET Source-Build 7.0.108 June 2023 OOB Updates (#16795) 2023-06-23 17:27:37 +00:00
NET Source-Build Bot
8f7ebafe7b
.NET Source-Build 6.0.118 June 2023 Updates (#16670) 2023-06-23 14:27:22 +00:00
Nikola Milosavljevic
83d8c761bd
Update poison-usage baseline (#16775) 2023-06-21 21:20:41 +00:00
Marc Paine
220626aee9
Update branding to 6.0.120 (#16736) 2023-06-19 13:20:08 -07:00
Marc Paine
4d8f58d0a3
Update branding to 6.0.315 (#16737) 2023-06-19 13:20:06 -07:00
Marc Paine
b350e37726
Update branding to 6.0.412 (#16738) 2023-06-19 13:20:04 -07:00
Marc Paine
4b1013211a
Update branding to 7.0.109 (#16739) 2023-06-19 13:20:01 -07:00
Sean Reeser
92014f47c6 Update branding to 7.0.109 2023-06-19 10:36:48 -07:00
Sean Reeser
4359922858 Update branding to 6.0.412 2023-06-19 10:36:43 -07:00
Sean Reeser
7ffe202ef6 Update branding to 6.0.315 2023-06-19 10:36:37 -07:00
Sean Reeser
2c285f563a Update branding to 6.0.120 2023-06-19 10:36:32 -07:00
Michael Simons
523e11f7df
Update source-build-tarball-build-official.yml triggers (#16733) 2023-06-19 17:19:35 +00:00
Noah Gilson
e0d106f081
[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx' (#16695) 2023-06-16 10:58:42 -07:00
Noah Gilson
296c45e5f4
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx' (#16707) 2023-06-16 10:57:39 -07:00
Jason Zhai
078d557112 Fix the build errors 2023-06-15 22:31:35 -07:00
Jason Zhai
bb531ffeab Merge branch 'release/6.0.3xx' into release/6.0.4xx 2023-06-15 22:27:02 -07:00
Jason Zhai
d04344ab77 Merge branch 'release/6.0.1xx' into release/6.0.3xx 2023-06-15 20:09:53 -07:00
v-wuzhai
f036db2064
[release/6.0.4xx] Update dependencies from dotnet/arcade (#16697) 2023-06-15 19:52:16 -07:00
v-wuzhai
6b08d75c57
[release/7.0.1xx] Update dependencies from dotnet/arcade (#16698) 2023-06-15 19:51:12 -07:00
v-wuzhai
eedbfe2829
[release/6.0.1xx] Update dependencies from dotnet/arcade (#16700) 2023-06-15 19:50:35 -07:00
dotnet-maestro[bot]
5dd4806718 Update dependencies from https://github.com/dotnet/arcade build 20230613.5
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 6.0.0-beta.23211.7 -> To Version 6.0.0-beta.23313.5
2023-06-15 21:19:12 +00:00
dotnet-maestro[bot]
146d6510b5 Update dependencies from https://github.com/dotnet/arcade build 20230613.4
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 7.0.0-beta.23211.2 -> To Version 7.0.0-beta.23313.4
2023-06-15 20:51:46 +00:00
dotnet-maestro[bot]
298f1196d1 Update dependencies from https://github.com/dotnet/arcade build 20230613.5
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 6.0.0-beta.23211.7 -> To Version 6.0.0-beta.23313.5
2023-06-15 20:46:29 +00:00
Marc Paine
c46292b0fb
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx' (#16677) 2023-06-15 13:24:54 -07:00
Marc Paine
fae9cf2b3c
Merge branch 'release/6.0.3xx' into merge/release/6.0.1xx-to-release/6.0.3xx 2023-06-14 12:51:33 -07:00
Marc Paine
4f086a7b87
Merging internal commits for release/7.0.1xx (#16654) 2023-06-14 12:09:54 -07:00
Marc Paine
f5e0cb3a81
Merging internal commits for release/6.0.4xx (#16653) 2023-06-14 10:12:37 -07:00
Marc Paine
811412e5b2
Merging internal commits for release/6.0.3xx (#16652) 2023-06-14 10:12:33 -07:00
Marc Paine
d2b2e7974f
Merging internal commits for release/6.0.1xx (#16651) 2023-06-14 10:12:31 -07:00
NET Source-Build Bot
306c38cab9
.NET Source-Build 7.0.107 June 2023 Updates (#16669) 2023-06-13 22:34:15 +00:00
Marc Paine
4165f029f0
[release/6.0.1xx] Update Windows SDK projection (#16656) 2023-06-13 13:04:27 -07:00
Marc Paine
4ec8cbc53f
[release/7.0.1xx] Update Windows SDK projection (#16659) 2023-06-13 12:48:56 -07:00