Jason Zhai
3a98864d75
Merge branch 'release/7.0.1xx' into release/7.0.3xx
2023-07-12 19:51:26 -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
355fe4120b
Merge in 'release/6.0.4xx' changes
2023-07-12 21:05:25 +00:00
dotnet-bot
30943937b3
Merge in 'release/6.0.1xx' changes
2023-07-12 21:02:42 +00:00
dotnet-bot
c814b20a86
Merge in 'release/7.0.3xx' changes
2023-07-12 20:59:34 +00: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]
5677e50878
[release/6.0.1xx] Update dependencies from dotnet/arcade ( #16969 )
...
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2023-07-12 13:53:44 -07:00
dotnet-maestro[bot]
c940151653
[release/7.0.3xx] Update dependencies from dotnet/arcade ( #16962 )
...
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2023-07-12 13:51:28 -07:00
dotnet-maestro[bot]
9460454a1d
[release/7.0.4xx] Update dependencies from dotnet/arcade ( #16963 )
...
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2023-07-12 13:51:19 -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
DotNet-Bot
d1ab1020fd
Update dependencies from https://github.com/dotnet/arcade build 20230711.3
...
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
From Version 6.0.0-beta.23313.5 -> To Version 6.0.0-beta.23361.3
2023-07-12 18:35:57 +00:00
dotnet-bot
7b89b61f03
Merge in 'release/6.0.3xx' changes
2023-07-12 18:30:19 +00:00
dotnet-bot
aeeca61d91
Merge in 'release/7.0.3xx' changes
2023-07-12 18:29:50 +00:00
Forgind
75f4ed5036
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx' ( #16949 )
2023-07-12 11:21:44 -07:00
Forgind
2acabacb0f
[automated] Merge branch 'release/7.0.1xx' => 'release/7.0.3xx' ( #16944 )
2023-07-12 11:21:26 -07:00
dotnet-bot
a34b113b63
Merge in 'release/6.0.1xx' changes
2023-07-12 16:58:53 +00:00
Matt Thalman
f326414f09
Update MissingXmlDoc baseline ( #16959 )
2023-07-12 16:50:32 +00:00
Marc Paine
cd4ab70550
Stabilize branding ( #16916 )
2023-07-12 09:28:40 -07:00
Jason Zhai
7381bec755
Try to resolve source-build patch conflicts
2023-07-12 01:42:25 -07:00
Jason Zhai
ba7651ffbc
Merge branch 'release/7.0.1xx' into release/7.0.3xx
2023-07-11 23:20:56 -07:00
Jason Zhai
eb232fd2eb
Merge branch 'release/6.0.1xx' into release/6.0.3xx
2023-07-11 23:03:16 -07:00
v-wuzhai
4968400e17
[release/7.0.4xx] Update dependencies from dotnet/sdk ( #16954 )
2023-07-11 22:37:12 -07:00
dotnet-maestro[bot]
67d2bafabf
Update dependencies from https://github.com/dotnet/sdk build 20230711.22
...
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
From Version 7.0.400-preview.23361.13 -> To Version 7.0.400
2023-07-12 00:03:10 +00:00
Marc Paine
eff002e760
[release/7.0.4xx] Update dependencies from dotnet/sdk ( #16952 )
2023-07-11 16:56:26 -07:00
dotnet-maestro[bot]
24d2abce13
Update dependencies from https://github.com/dotnet/sdk build 20230711.13
...
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
From Version 7.0.400-preview.23360.14 -> To Version 7.0.400-preview.23361.13
Dependency coherency updates
Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100
From Version 7.0.8 -> To Version 7.0.9 (parent: Microsoft.NET.Sdk
2023-07-11 23:02:44 +00: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
dotnet-bot
e4da153c52
Merge in 'release/6.0.1xx' changes
2023-07-11 19:09:06 +00:00
NET Source-Build Bot
03de5438b7
.NET Source-Build 6.0.120 July 2023 Updates ( #16942 )
2023-07-11 14:01:05 -05:00
dotnet-bot
96433bf8ee
Merge in 'release/6.0.1xx' changes
2023-07-11 18:55:52 +00:00
dotnet-bot
2960a542b2
Merge in 'release/7.0.3xx' changes
2023-07-11 18:48:36 +00:00
dotnet-bot
fbb15d2f08
Merge in 'release/6.0.4xx' changes
2023-07-11 18:48:02 +00:00
Marc Paine
810f8e82ba
Merging internal commits for release/6.0.1xx ( #16937 )
2023-07-11 11:47:50 -07:00
dotnet-bot
50c0dad894
Merge in 'release/6.0.3xx' changes
2023-07-11 18:44:46 +00:00
Marc Paine
6e5de6525b
Merging internal commits for release/7.0.3xx ( #16940 )
2023-07-11 11:35:58 -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
39702acb5c
Merge commit 'f500069cb7cdd01b435961287361b9ad21203c67' into internal-merge-7.0.3xx-2023-07-11-1023
2023-07-11 10:23:40 -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
62cc192c57
Add feed to find package with version 6.0.20
2023-07-11 03:25:34 -07:00