Commit graph

29174 commits

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

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.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,Microsoft.SourceBuild.Intermediate.msbuild,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-19 00:28:58 +00:00
dotnet-bot
c14dbce2f0 Merge in 'release/7.0.4xx' changes 2023-10-18 23:22:37 +00:00
Marc Paine
016ae90d5e
Update branding to 7.0.404 (#17568) 2023-10-18 16:08:58 -07:00
Marc Paine
7322dae702
Update branding to 7.0.311 (#17567) 2023-10-18 16:08:55 -07:00
Marc Paine
faa1fe4b6d
Update branding to 7.0.114 (#17566) 2023-10-18 16:08:53 -07:00
Marc Paine
8de6656c8b
Update branding to 6.0.417 (#17565) 2023-10-18 16:08:50 -07:00
Marc Paine
a9e61e5c24
Update branding to 6.0.320 (#17564) 2023-10-18 16:08:48 -07:00
Sean Reeser
cd038f1eda Update branding to 7.0.404 2023-10-18 12:30:28 -07:00
Sean Reeser
db57dadd26 Update branding to 7.0.311 2023-10-18 12:30:23 -07:00
Sean Reeser
d9ec7ce28a Update branding to 7.0.114 2023-10-18 12:30:18 -07:00
Sean Reeser
40538ec519 Update branding to 6.0.417 2023-10-18 12:30:13 -07:00
Sean Reeser
3b8e5ee013 Update branding to 6.0.320 2023-10-18 12:30:08 -07:00
DotNet-Bot
5efd38a9be Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231018.6
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.402 -> To Version 7.0.403

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.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,Microsoft.SourceBuild.Intermediate.msbuild,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 08:35:57 +00:00
dotnet-bot
6ebb6af994 Merge in 'release/7.0.4xx' changes 2023-10-18 05:57:14 +00:00
v-wuzhai
5698554832
[release/7.0.4xx] Update dependencies from dotnet/arcade (#17550) 2023-10-17 22:48:23 -07:00
v-wuzhai
668a871cf0
[release/7.0.3xx] Update dependencies from dotnet/arcade (#17549) 2023-10-17 22:47:50 -07:00
DotNet-Bot
24d19a86a7 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231017.41
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.402 -> To Version 7.0.403

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.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,Microsoft.SourceBuild.Intermediate.msbuild,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:08:07 +00:00
Marc Paine
3c1a9bd832
[release/6.0.1xx] Update Windows SDK projection (#17540) 2023-10-17 13:23:08 -07:00
dotnet-bot
d4bc0aaf51 Merge in 'release/7.0.4xx' changes 2023-10-17 20:09:45 +00:00
dotnet-maestro[bot]
136ffd159a 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
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
8936542cfc
[release/7.0.4xx] Update Windows SDK projection (#17545) 2023-10-17 13:01:00 -07: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
7217411d6a
Update Windows SDK projection 2023-10-17 11:28:36 -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
ef5386847b Merge in 'release/7.0.4xx' changes 2023-10-16 20:09:31 +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
dotnet-maestro[bot]
8df8de9bec
[release/7.0.4xx] Update dependencies from dotnet/arcade (#17531)
[release/7.0.4xx] Update dependencies from dotnet/arcade
2023-10-16 20:01:16 +00:00
dotnet-bot
b62614e34c Merge in 'release/7.0.4xx' changes 2023-10-13 21:13:52 +00:00
Marc Paine
0b4181e517
[automated] Merge branch 'release/7.0.3xx' => 'release/7.0.4xx' (#17520) 2023-10-13 14:05:06 -07: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
207170c33c Merged PR 34378: [internal/release/7.0.4xx] Merge from public
Merge from public release/7.0.4xx to internal/release/7.0.4xx and resolve conflicts if necessary
2023-10-13 19:14:10 +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
Jason Zhai
c0661b465d Merge branch 'release/7.0.3xx' into release/7.0.4xx 2023-10-12 23:47:29 -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
540701fe40
[release/7.0.4xx] Update dependencies from dotnet/arcade (#17506) 2023-10-11 19:24:40 -07:00
v-wuzhai
242c03a366
[release/7.0.3xx] Update dependencies from dotnet/arcade (#17507) 2023-10-11 19:24:15 -07:00