dotnet-bot
f55a61f5ac
Merge in 'release/7.0.1xx' changes
2023-07-14 18:17:51 +00:00
Forgind
75b787625a
[automated] Merge branch 'release/6.0.4xx' => 'release/7.0.1xx' ( #16986 )
2023-07-14 11:08:08 -07:00
Jason Zhai
78cdd6d8ba
Merge branch 'release/6.0.4xx' into release/7.0.1xx
2023-07-13 19:37:41 -07:00
Forgind
4223ef804e
[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx' ( #16967 )
2023-07-13 12:49:43 -07:00
Jason Zhai
0cc3091826
Merge branch 'release/6.0.3xx' into release/6.0.4xx
2023-07-12 20:05:55 -07:00
dotnet-bot
9e5ae07e57
Merge in 'release/7.0.1xx' changes
2023-07-13 00:07:22 +00:00
Matt Thalman
4bf374a7b1
Update SB SDK diff baseline ( #16973 )
2023-07-12 16:57:31 -07:00
dotnet-bot
22e9ed43f1
Merge in 'release/7.0.1xx' changes
2023-07-12 20:58:57 +00:00
dotnet-maestro[bot]
a1073db7fc
[release/6.0.4xx] Update dependencies from dotnet/arcade ( #16968 )
...
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2023-07-12 13:55:29 -07:00
dotnet-maestro[bot]
ae5b538ae4
[release/7.0.1xx] Update dependencies from dotnet/arcade ( #16964 )
...
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2023-07-12 13:50:38 -07:00
Forgind
75f4ed5036
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx' ( #16949 )
2023-07-12 11:21:44 -07:00
Jason Zhai
eb232fd2eb
Merge branch 'release/6.0.1xx' into release/6.0.3xx
2023-07-11 23:03:16 -07:00
dotnet-bot
5e9cfaf200
Merge in 'release/7.0.1xx' changes
2023-07-11 19:46:11 +00:00
NET Source-Build Bot
2c2d698597
.NET Source-Build 7.0.109 July 2023 Updates ( #16943 )
2023-07-11 14:34:43 -05:00
dotnet-bot
8eb60d7b75
Merge in 'release/7.0.1xx' changes
2023-07-11 19:23:54 +00:00
Marc Paine
d1746a1c30
Merging internal commits for release/7.0.1xx ( #16941 )
2023-07-11 12:14:03 -07:00
NET Source-Build Bot
03de5438b7
.NET Source-Build 6.0.120 July 2023 Updates ( #16942 )
2023-07-11 14:01:05 -05:00
Marc Paine
810f8e82ba
Merging internal commits for release/6.0.1xx ( #16937 )
2023-07-11 11:47:50 -07:00
Marc Paine
2bc80e92a1
Merging internal commits for release/6.0.4xx ( #16939 )
2023-07-11 11:35:46 -07:00
Marc Paine
eb4b20c720
Merging internal commits for release/6.0.3xx ( #16938 )
2023-07-11 11:35:33 -07:00
dotnet-bot
fbd1585a18
Merge in 'release/7.0.1xx' changes
2023-07-11 17:45:26 +00:00
Forgind
96ddfa6596
[automated] Merge branch 'release/6.0.4xx' => 'release/7.0.1xx' ( #16926 )
2023-07-11 10:36:52 -07:00
Sean Reeser
0743ee8b28
Merge commit '3e9283a8e906761fcf9973c0007a75c0eb20baea' into internal-merge-7.0.1xx-2023-07-11-1023
2023-07-11 10:23:49 -07:00
Sean Reeser
272b39f66e
Merge commit 'ee124f7fe1946ba82febd79ef25c3040de461d3a' into internal-merge-6.0.4xx-2023-07-11-1017
2023-07-11 10:17:06 -07:00
Sean Reeser
8ad8121e95
Merge commit '2282fe998c54635c744653971f1903f98a33d49b' into internal-merge-6.0.3xx-2023-07-11-1016
2023-07-11 10:16:57 -07:00
Sean Reeser
3ee1863ab0
Merge commit 'd63b17be66f766a5381950bce677884e4e3bb5b6' into internal-merge-6.0.1xx-2023-07-11-1016
2023-07-11 10:16:47 -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
Matt Thalman
bd99c96e72
Include RID in SB artifact file names ( #16855 )
2023-07-06 08:40:35 -05:00
Matt Thalman
03d62bc222
Update SB SDK diff baseline for 6.0 ( #16822 )
2023-07-06 08:39:16 -05: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
38091caf0e
Update branding to 6.0.121 ( #16885 )
2023-07-05 16:13:32 -07:00
dotnet-bot
3ee9391fd7
Merge in 'release/7.0.1xx' changes
2023-07-05 22:52:58 +00: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
Sean Reeser
cd4682850c
Update branding to 6.0.121
2023-07-05 14:38:38 -07:00
Nikola Milosavljevic
5bf1bb2bab
Fix System.Text.Json poison instances ( #16826 )
2023-06-28 10:29:15 -07:00
Jason Zhai
3fbd26591e
Merge branch 'release/6.0.1xx' into release/6.0.3xx
2023-06-24 22:42:40 -07:00
dotnet-bot
d63b17be66
Merge in 'release/6.0.1xx' changes
2023-06-23 18:40:24 +00:00
Matt Thalman
1aeb92395a
Fix SDK version of source-build global.json ( #16798 )
2023-06-23 18:31:22 +00:00
