Commit graph

28376 commits

Author SHA1 Message Date
DotNet-Bot
c6505a010c Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230816.25
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.307 -> To Version 7.0.308

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,Microsoft.NET.ILLink.Tasks,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.10 -> To Version 7.0.11 (parent: Microsoft.NET.Sdk
2023-08-16 21:30:42 +00:00
dotnet-bot
e15c54871d Merge in 'release/7.0.3xx' changes 2023-08-15 07:50:25 +00:00
v-wuzhai
ebfd74b99f
[automated] Merge branch 'release/7.0.1xx' => 'release/7.0.3xx' (#17186) 2023-08-15 00:42:22 -07:00
Jason Zhai
2dbb8f541d Merge branch 'release/7.0.1xx' into release/7.0.3xx 2023-08-15 00:10:06 -07:00
dotnet-bot
a7cf66e5b6 Merge in 'release/7.0.1xx' changes 2023-08-15 06:25:49 +00:00
v-wuzhai
18de2eb04b
[automated] Merge branch 'release/6.0.4xx' => 'release/7.0.1xx' (#17184) 2023-08-14 23:17:44 -07:00
Jason Zhai
35cc0eb708 Merge branch 'release/6.0.4xx' into release/7.0.1xx 2023-08-14 19:27:32 -07:00
v-wuzhai
9960d134a1
[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx' (#17171) 2023-08-14 18:52:25 -07:00
Jason Zhai
f3abd918cb Merge branch 'release/6.0.3xx' into release/6.0.4xx 2023-08-10 19:46:36 -07:00
Matt Thalman
cdfa6bad98 Merged PR 33071: Update 7.0 SDK diff
Update MSFT to SB SDK diff baseline
2023-08-10 19:58:12 +00:00
dotnet-bot
8af6f932d5 Merge in 'release/7.0.3xx' changes 2023-08-10 18:56:00 +00:00
Marc Paine
f3025fe86c
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx' (#17146) 2023-08-10 11:45:15 -07:00
Marc Paine
73402b23d5
[automated] Merge branch 'release/7.0.1xx' => 'release/7.0.3xx' (#17148) 2023-08-10 11:44:55 -07:00
dotnet-bot
0dee7ea267 Merge in 'release/7.0.1xx' changes 2023-08-10 06:52:29 +00:00
v-wuzhai
2501eb3e61
[automated] Merge branch 'release/6.0.4xx' => 'release/7.0.1xx' (#17163) 2023-08-09 23:44:46 -07:00
Jason Zhai
c3098a65da Merge branch 'release/7.0.4xx' 2023-08-09 22:50:56 -07:00
Jason Zhai
bc6663f989 Merge branch 'release/6.0.4xx' into release/7.0.1xx 2023-08-09 22:41:09 -07:00
dotnet-bot
be8b2ab844 Merge in 'release/7.0.1xx' changes 2023-08-09 18:32:00 +00:00
dotnet-maestro[bot]
66301b23fb
[release/7.0.1xx] Update dependencies from dotnet/arcade (#17160)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2023-08-09 11:23:55 -07:00
dotnet-maestro[bot]
95c297b5f7
[release/6.0.4xx] Update dependencies from dotnet/arcade (#17158)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2023-08-09 10:27:14 -07:00
dotnet-maestro[bot]
936590bd49
[release/6.0.1xx] Update dependencies from dotnet/arcade (#17161)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2023-08-09 10:25:31 -07:00
NET Source-Build Bot
f2a927934b
.NET Source-Build 6.0.121 August 2023 Updates (#17149) 2023-08-09 16:18:30 +00:00
Jason Zhai
f1de5c6ece Merge branch 'release/7.0.1xx' into release/7.0.3xx 2023-08-09 00:02:33 -07:00
dotnet-bot
39c800fbb7 Merge in 'release/7.0.3xx' changes 2023-08-09 06:12:03 +00:00
v-wuzhai
4082b3037c
[release/7.0.3xx] Update dependencies from dotnet/arcade (#17152) 2023-08-08 23:04:07 -07:00
dotnet-maestro[bot]
13a9c86583 Update dependencies from https://github.com/dotnet/arcade build 20230808.3
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 7.0.0-beta.23370.3 -> To Version 7.0.0-beta.23408.3
2023-08-08 23:59:03 +00:00
NET Source-Build Bot
51976bbb72
.NET Source-Build 7.0.110 August 2023 Updates (#17150) 2023-08-08 23:03:28 +00:00
Marc Paine
bf10800c27
Merging internal commits for release/6.0.1xx (#17134) 2023-08-08 15:08:38 -07:00
Matt Thalman
4ace1423c3 Remove extra XML doc entry 2023-08-08 15:32:35 -05:00
dotnet-bot
cf82f1b1f0 Merge in 'release/7.0.1xx' changes 2023-08-08 20:03:46 +00:00
vseanreesermsft
27ecd661b8
Merging internal commits for release/7.0.1xx (#17140)
Co-authored-by: Matt Thalman <Matt.Thalman@microsoft.com>
Co-authored-by: dotnet-bot <dotnet-bot@microsoft.com>
Co-authored-by: DotNet-Bot <dn-bot@microsoft.com>
Co-authored-by: Matt Mitchell <mmitche@microsoft.com>
2023-08-08 12:55:41 -07:00
Omair Majid
2a433a301f
[release/6.01xx] Update source-build CI to Fedora 38 (#16649) 2023-08-08 13:56:41 -05:00
dotnet-bot
d796b09e9d Merge in 'release/7.0.3xx' changes 2023-08-08 18:22:10 +00:00
Marc Paine
f935d3aa12
Merging internal commits for release/7.0.3xx (#17139) 2023-08-08 11:12:35 -07:00
Marc Paine
91e4326f3d
Merging internal commits for release/6.0.4xx (#17136) 2023-08-08 10:51:41 -07:00
Marc Paine
04357a1539
Merging internal commits for release/6.0.3xx (#17135) 2023-08-08 10:51:38 -07:00
Marc Paine
418f5d7f1c
[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx' (#17129) 2023-08-08 10:48:26 -07:00
Sean Reeser
ac2cf5e978 Merge commit '7b77e35a2bc056a01180bfdec51ad27a11b1d412' into internal-merge-7.0.3xx-2023-08-08-1042 2023-08-08 10:42:16 -07:00
Sean Reeser
4f13b144fe Merge commit '10710f7d8e8fa29aea83b7ba59c0e169a7afc008' into internal-merge-6.0.4xx-2023-08-08-1012 2023-08-08 10:12:47 -07:00
Sean Reeser
ea9b0feb0e Merge commit '5d26c38ee96606c1e474039d445c27cba6d2b229' into internal-merge-6.0.3xx-2023-08-08-1012 2023-08-08 10:12:38 -07:00
Sean Reeser
f8278428f7 Merge commit '00e4340849d26c84e65f750acb91355d4c40f9ae' into internal-merge-6.0.1xx-2023-08-08-1012 2023-08-08 10:12:29 -07:00
Jason Zhai
5d764e6709 Merge branch 'release/6.0.3xx' into release/6.0.4xx 2023-08-07 23:10:07 -07:00
v-wuzhai
8dd5e6171b
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx' (#17006) 2023-08-07 22:59:48 -07:00
Jason Zhai
ace7ff936f Merge branch 'release/6.0.1xx' into release/6.0.3xx 2023-08-02 00:23:52 -07:00
v-wuzhai
f06047209a
[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx' (#17111) 2023-08-02 00:21:25 -07:00
Marc Paine
0682e45ad0
Merge branch 'release/6.0.4xx' into merge/release/6.0.3xx-to-release/6.0.4xx 2023-08-01 14:45:25 -07:00
Marc Paine
05a4749353
[release/7.0.3xx] Update dependencies from dotnet/arcade (#17078) 2023-08-01 14:44:37 -07:00
dotnet-bot
f021bcb990 Merge in 'release/7.0.1xx' changes 2023-08-01 21:38:34 +00:00
Marc Paine
30ae40bc19
Update branding to 7.0.111 (#17107) 2023-08-01 14:30:39 -07:00
Marc Paine
0928e1c83d
Update branding to 6.0.414 (#17106) 2023-08-01 14:30:27 -07:00