Commit graph

28633 commits

Author SHA1 Message Date
dotnet-bot
da48c574a4 Merge in 'release/7.0.3xx' changes 2023-10-18 05:57:32 +00:00
v-wuzhai
668a871cf0
[release/7.0.3xx] Update dependencies from dotnet/arcade (#17549) 2023-10-17 22:47:50 -07:00
DotNet-Bot
04962e3078 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231017.56
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.309 -> To Version 7.0.310

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.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.12 -> To Version 7.0.13 (parent: Microsoft.NET.Sdk
2023-10-18 03:22:59 +00:00
DotNet-Bot
4705b63277 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231017.42
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.309 -> To Version 7.0.310

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.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.12 -> To Version 7.0.13 (parent: Microsoft.NET.Sdk
2023-10-18 00:13:59 +00:00
Marc Paine
3c1a9bd832
[release/6.0.1xx] Update Windows SDK projection (#17540) 2023-10-17 13:23:08 -07:00
dotnet-bot
de60c7d168 Merge in 'release/7.0.3xx' changes 2023-10-17 20:09:30 +00:00
dotnet-maestro[bot]
aa942314ca Update dependencies from https://github.com/dotnet/arcade build 20231017.4
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 7.0.0-beta.23513.2 -> To Version 7.0.0-beta.23517.4
2023-10-17 20:02:01 +00:00
Marc Paine
6d083ff154
[release/7.0.3xx] Update Windows SDK projection (#17544) 2023-10-17 13:00:58 -07:00
Marc Paine
2b81cc5a75
[release/7.0.1xx] Update Windows SDK projection (#17543) 2023-10-17 13:00:56 -07:00
Marc Paine
e82a103355
[release/6.0.4xx] Update Windows SDK projection (#17542) 2023-10-17 13:00:54 -07:00
Marc Paine
f94804596c
[release/6.0.3xx] Update Windows SDK projection (#17541) 2023-10-17 13:00:51 -07:00
Manodasan Wignarajah
eee9b65420
Update Windows SDK projection 2023-10-17 11:27:27 -07:00
Manodasan Wignarajah
3f50f78ff7
Update Windows SDK projection 2023-10-17 11:26:23 -07:00
Manodasan Wignarajah
5b5d340010
Update Windows SDK projection 2023-10-17 11:25:03 -07:00
Manodasan Wignarajah
a7e0e0daac
Update Windows SDK projection 2023-10-17 11:24:02 -07:00
Manodasan Wignarajah
000f908958
Update Windows SDK Projection 2023-10-17 11:21:26 -07:00
dotnet-bot
e870570068 Merge in 'release/7.0.3xx' changes 2023-10-16 20:09:30 +00:00
dotnet-maestro[bot]
7b19e53bf2
[release/7.0.3xx] Update dependencies from dotnet/arcade (#17530)
[release/7.0.3xx] Update dependencies from dotnet/arcade
2023-10-16 20:01:22 +00:00
Marc Paine
f97658a0f2
[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx' (#17519) 2023-10-13 14:04:48 -07:00
Sean Reeser
30d2de7b69 Merged PR 34377: [internal/release/7.0.3xx] Merge from public
Merge from public release/7.0.3xx to internal/release/7.0.3xx and resolve conflicts if necessary
2023-10-13 19:14:09 +00:00
v-wuzhai
2254b2bcf7
[automated] Merge branch 'release/6.0.4xx' => 'release/7.0.1xx' (#17518) 2023-10-13 01:11:54 -07:00
Jason Zhai
857462dd02 Merge branch 'release/6.0.4xx' into release/7.0.1xx 2023-10-13 00:02:25 -07:00
Forgind
601374e078
Merge branch 'release/6.0.4xx' into merge/release/6.0.3xx-to-release/6.0.4xx 2023-10-12 15:30:38 -07:00
Marc Paine
611d25df33
[automated] Merge branch 'release/7.0.1xx' => 'release/7.0.3xx' (#17496) 2023-10-12 11:29:13 -07:00
Marc Paine
53d5202c74
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx' (#17499) 2023-10-12 11:29:00 -07:00
vseanreesermsft
74f428294c
[release/7.0.1xx] Update dependencies from dotnet/arcade (#17515) 2023-10-12 10:29:33 -07:00
dotnet-maestro[bot]
f756140b8e
[release/6.0.4xx] Update dependencies from dotnet/arcade (#17516)
[release/6.0.4xx] Update dependencies from dotnet/arcade
2023-10-12 17:25:14 +00:00
dotnet-maestro[bot]
0aae0479be Update dependencies from https://github.com/dotnet/arcade build 20231011.9
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 7.0.0-beta.23408.3 -> To Version 7.0.0-beta.23511.9
2023-10-12 15:13:23 +00:00
v-wuzhai
242c03a366
[release/7.0.3xx] Update dependencies from dotnet/arcade (#17507) 2023-10-11 19:24:15 -07:00
dotnet-maestro[bot]
8cf3bdf83c Update dependencies from https://github.com/dotnet/arcade build 20231011.9
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 7.0.0-beta.23478.1 -> To Version 7.0.0-beta.23511.9
2023-10-12 00:04:46 +00:00
Marc Paine
e67e392402
Merging internal commits for release/7.0.1xx (#17489) 2023-10-11 08:55:00 -07:00
Jason Zhai
b828069725 Merge branch 'release/7.0.1xx' into release/7.0.3xx 2023-10-10 23:26:29 -07:00
Jason Zhai
793a94f646 Merge branch 'release/6.0.1xx' into release/6.0.3xx 2023-10-10 23:20:07 -07:00
Nikola Milosavljevic
0099fd0189
.NET Source-Build 6.0.123 October 2023 Updates (#17494) 2023-10-11 01:51:41 +00:00
Marc Paine
8be1e68454
Merging internal commits for release/7.0.3xx (#17491) 2023-10-10 17:01:05 -07:00
Marc Paine
33fd743430
Merging internal commits for release/6.0.1xx (#17486) 2023-10-10 17:01:01 -07:00
Nikola Milosavljevic
010d736fac
.NET Source-Build 7.0.112 October 2023 Updates (#17495) 2023-10-10 15:41:29 -07:00
Marc Paine
8bf5117527
Merging internal commits for release/6.0.4xx (#17488) 2023-10-10 12:02:28 -07:00
Marc Paine
d3a6bc9876
Merging internal commits for release/6.0.3xx (#17487) 2023-10-10 12:02:26 -07:00
Sean Reeser
d79042907c Merge commit '552bd6c89b07627bc57be1c07b59e0e2c8934207' into internal-merge-7.0.3xx-2023-10-10-1031 2023-10-10 10:31:45 -07:00
Sean Reeser
d32ea57e46 Merge commit 'c97215789531577c81c203f54f4b03ca92ab771a' into internal-merge-7.0.1xx-2023-10-10-1031 2023-10-10 10:31:28 -07:00
Sean Reeser
45bf547321 Merge commit '6963d2d1e0eb7c42b773f62b1d34fe34a7182d17' into internal-merge-6.0.4xx-2023-10-10-1025 2023-10-10 10:25:21 -07:00
Sean Reeser
8f2dc4fec1 Merge commit 'bcbed60f06e45836728bb36dbb2ddfc52572b787' into internal-merge-6.0.3xx-2023-10-10-1025 2023-10-10 10:25:11 -07:00
Sean Reeser
b1a36abe2c Merge commit 'a33389fcc17c512c4ce21b1cf88863aa55e7307a' into internal-merge-6.0.1xx-2023-10-10-1024 2023-10-10 10:25:00 -07:00
Forgind
f6f1b4c098
[automated] Merge branch 'release/7.0.1xx' => 'release/7.0.3xx' (#17468) 2023-10-04 14:58:52 -07:00
Forgind
b97ea40f83
Merge branch 'release/7.0.3xx' into merge/release/7.0.1xx-to-release/7.0.3xx 2023-10-04 14:09:18 -07:00
Forgind
0dd530d64d
[automated] Merge branch 'release/6.0.4xx' => 'release/7.0.1xx' (#17465) 2023-10-04 14:00:27 -07:00
Forgind
58833719fe
Merge branch 'release/7.0.1xx' into merge/release/6.0.4xx-to-release/7.0.1xx 2023-10-04 12:53:49 -07:00
Forgind
bba905e405
[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx' (#17464) 2023-10-04 12:53:21 -07:00
Forgind
d6b7bfaf31
Merge branch 'release/6.0.4xx' into merge/release/6.0.3xx-to-release/6.0.4xx 2023-10-04 12:05:21 -07:00