Commit graph

25299 commits

Author SHA1 Message Date
Marc Paine
4d8f58d0a3
Update branding to 6.0.315 (#16737) 2023-06-19 13:20:06 -07:00
Marc Paine
b350e37726
Update branding to 6.0.412 (#16738) 2023-06-19 13:20:04 -07:00
Sean Reeser
4359922858 Update branding to 6.0.412 2023-06-19 10:36:43 -07:00
Sean Reeser
7ffe202ef6 Update branding to 6.0.315 2023-06-19 10:36:37 -07:00
Sean Reeser
2c285f563a Update branding to 6.0.120 2023-06-19 10:36:32 -07:00
DotNet Bot
a08fa77a97 Merged PR 31998: [internal/release/6.0.4xx] Update dependencies from dnceng/internal/dotnet-sdk
This pull request updates the following dependencies

[marker]: <> (Begin:Coherency Updates)
## Coherency Updates

The following updates ensure that dependencies with a *CoherentParentDependency*
attribute were produced in a build used as input to the parent dependency's build.
See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview)

[DependencyUpdate]: <> (Begin)

- **Coherency Updates**:
  - **Microsoft.WindowsDesktop.App.Ref**: from 6.0.18 to 6.0.19 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.18-servicing.23272.2 to 6.0.19-servicing.23316.3 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.18-servicing.23272.2 to 6.0.19-servicing.23316.3 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.18-servicing.23269.7 to 6.0.19-servicing.23313.25 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Ref**: from 6.0.18 to 6.0.19 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.18-servicing.23269.7 to 6.0.19-servicing.23313.25 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.18 to 6.0.19 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.18 to 6.0.19 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.18 to 6.0.19 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.Platforms**: from 6.0.10 to 6.0.11 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 6.0.18 to 6.0.19 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.18-servicing.23269.9 to 6.0.19-servicing.23315.15 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.18 to 6.0.19 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.18-servicing.23269.9 to 6.0.19-servicing.23315.15 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.18-servicing.23269.9 to 6.0.19-servicing.23315.15 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.18-servicing.23269.9 to 6.0.19-servicing.23315.15 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.410 to 6.0.411 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.410-rtm.23272.7 to 6.0.411-rtm.23316.14 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.410 to 6.0.411 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.18 to 6.0.19 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.18-servicing.23272.1 to 6.0.19-servicing.23314.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.w...
2023-06-16 23:29:08 +00:00
DotNet Bot
33c72df7e2 [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk
- Coherency Updates:
  - Microsoft.WindowsDesktop.App.Ref: from 6.0.18 to 6.0.19 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.18-servicing.23272.2 to 6.0.19-servicing.23316.3 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0: from 6.0.18-servicing.23272.2 to 6.0.19-servicing.23316.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Ref: from 6.0.18 to 6.0.19 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.TargetingPack.x64.6.0: from 6.0.18-servicing.23269.7 to 6.0.19-servicing.23313.25 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.18 to 6.0.19 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Host.win-x64: from 6.0.18 to 6.0.19 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.DotNetHostResolver: from 6.0.18 to 6.0.19 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.Platforms: from 6.0.10 to 6.0.11 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref: from 6.0.18 to 6.0.19 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.18-servicing.23269.9 to 6.0.19-servicing.23315.15 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.18 to 6.0.19 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.18-servicing.23269.9 to 6.0.19-servicing.23315.15 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 6.0.18-servicing.23269.9 to 6.0.19-servicing.23315.15 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 6.0.18-servicing.23269.9 to 6.0.19-servicing.23315.15 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Common.ItemTemplates: from 6.0.118 to 6.0.119 (parent: Microsoft.NET.Sdk)
  - Microsoft.TemplateEngine.Cli: from 6.0.118-servicing.23272.5 to 6.0.119-servicing.23316.12 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Common.ProjectTemplates.6.0: from 6.0.118 to 6.0.119 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.18 to 6.0.19 (parent: Microsoft.NET.Sdk)
  - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.18-servicing.23272.1 to 6.0.19-servicing.23314.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.18 to 6.0.19 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.18-servicing.23272.2 to 6.0.19-servicing.23314.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.18-servicing.23269.7 to 6.0.19-servicing.23313.25 (parent: Microsoft.NET.Sdk)
  - Microsoft.NET.Workload.Emscripten.Manifest-6.0.100: from 6.0.18 to 6.0.19 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.6.0)
2023-06-16 22:41:44 +00:00
DotNet-Bot
f2c3021a19 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230616.46
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.410-servicing.23272.38 -> To Version 6.0.411-servicing.23316.46

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.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.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates
 From Version 6.0.18 -> To Version 6.0.19 (parent: Microsoft.NET.Sdk
2023-06-16 22:40:28 +00:00
DotNet Bot
1f8fa50d1b [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk 2023-06-16 22:32:11 +00:00
DotNet Bot
da2f850509 [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk
- Coherency Updates:
  - Microsoft.WindowsDesktop.App.Ref: from 6.0.18 to 6.0.19 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.18-servicing.23272.2 to 6.0.19-servicing.23315.1 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0: from 6.0.18-servicing.23272.2 to 6.0.19-servicing.23315.1 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.18-servicing.23269.7 to 6.0.19-servicing.23313.25 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Ref: from 6.0.18 to 6.0.19 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.TargetingPack.x64.6.0: from 6.0.18-servicing.23269.7 to 6.0.19-servicing.23313.25 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.18 to 6.0.19 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Host.win-x64: from 6.0.18 to 6.0.19 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.DotNetHostResolver: from 6.0.18 to 6.0.19 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.Platforms: from 6.0.10 to 6.0.11 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref: from 6.0.18 to 6.0.19 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.18-servicing.23269.9 to 6.0.19-servicing.23313.28 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.18 to 6.0.19 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.18-servicing.23269.9 to 6.0.19-servicing.23313.28 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 6.0.18-servicing.23269.9 to 6.0.19-servicing.23313.28 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 6.0.18-servicing.23269.9 to 6.0.19-servicing.23313.28 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Common.ItemTemplates: from 6.0.313 to 6.0.314 (parent: Microsoft.NET.Sdk)
  - Microsoft.TemplateEngine.Cli: from 6.0.313-servicing.23272.6 to 6.0.314-servicing.23314.10 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Common.ProjectTemplates.6.0: from 6.0.313 to 6.0.314 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.18 to 6.0.19 (parent: Microsoft.NET.Sdk)
  - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.18-servicing.23272.1 to 6.0.19-servicing.23314.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.18 to 6.0.19 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.18-servicing.23272.2 to 6.0.19-servicing.23314.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
2023-06-16 19:25:45 +00:00
dotnet-bot
c91fe96afd Merge in 'release/6.0.4xx' changes 2023-06-16 18:08:04 +00:00
dotnet-bot
78fc420074 Merge in 'release/6.0.3xx' changes 2023-06-16 18:07:06 +00:00
Noah Gilson
e0d106f081
[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx' (#16695) 2023-06-16 10:58:42 -07:00
Noah Gilson
296c45e5f4
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx' (#16707) 2023-06-16 10:57:39 -07:00
Sean Reeser
c4224a2c39 Merged PR 31963: [internal/release/6.0.1xx] Merge from public
Merge from public release/6.0.1xx to internal/release/6.0.1xx and resolve conflicts if necessary
2023-06-16 17:01:13 +00:00
Jason Zhai
078d557112 Fix the build errors 2023-06-15 22:31:35 -07:00
Jason Zhai
bb531ffeab Merge branch 'release/6.0.3xx' into release/6.0.4xx 2023-06-15 22:27:02 -07:00
Jason Zhai
d04344ab77 Merge branch 'release/6.0.1xx' into release/6.0.3xx 2023-06-15 20:09:53 -07:00
dotnet-bot
cf27aa8b9b Merge in 'release/6.0.4xx' changes 2023-06-16 03:02:44 +00:00
v-wuzhai
f036db2064
[release/6.0.4xx] Update dependencies from dotnet/arcade (#16697) 2023-06-15 19:52:16 -07:00
v-wuzhai
eedbfe2829
[release/6.0.1xx] Update dependencies from dotnet/arcade (#16700) 2023-06-15 19:50:35 -07:00
DotNet Bot
717240d065 [internal/release/6.0.3xx] Update dependencies from dotnet/arcade 2023-06-15 22:02:18 +00:00
dotnet-maestro[bot]
5dd4806718 Update dependencies from https://github.com/dotnet/arcade build 20230613.5
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 6.0.0-beta.23211.7 -> To Version 6.0.0-beta.23313.5
2023-06-15 21:19:12 +00:00
dotnet-maestro[bot]
298f1196d1 Update dependencies from https://github.com/dotnet/arcade build 20230613.5
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 6.0.0-beta.23211.7 -> To Version 6.0.0-beta.23313.5
2023-06-15 20:46:29 +00:00
dotnet-bot
f11f230328 Merge in 'release/6.0.3xx' changes 2023-06-15 20:34:40 +00:00
Marc Paine
c46292b0fb
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx' (#16677) 2023-06-15 13:24:54 -07:00
DotNet Bot
50296d00ff [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk 2023-06-15 08:03:53 +00:00
DotNet Bot
5cae2790d7 [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk 2023-06-14 22:36:12 +00:00
Marc Paine
fae9cf2b3c
Merge branch 'release/6.0.3xx' into merge/release/6.0.1xx-to-release/6.0.3xx 2023-06-14 12:51:33 -07:00
dotnet-bot
4c3f528462 Merge in 'release/6.0.4xx' changes 2023-06-14 17:20:46 +00:00
dotnet-bot
765d9f722d Merge in 'release/6.0.3xx' changes 2023-06-14 17:20:26 +00:00
dotnet-bot
4311d271e6 Merge in 'release/6.0.1xx' changes 2023-06-14 17:20:25 +00:00
Marc Paine
f5e0cb3a81
Merging internal commits for release/6.0.4xx (#16653) 2023-06-14 10:12:37 -07:00
Marc Paine
811412e5b2
Merging internal commits for release/6.0.3xx (#16652) 2023-06-14 10:12:33 -07:00
Marc Paine
d2b2e7974f
Merging internal commits for release/6.0.1xx (#16651) 2023-06-14 10:12:31 -07:00
dotnet-bot
799aeedcfe Merge in 'release/6.0.1xx' changes 2023-06-13 20:12:38 +00:00
Marc Paine
4165f029f0
[release/6.0.1xx] Update Windows SDK projection (#16656) 2023-06-13 13:04:27 -07:00
dotnet-bot
c5a0cfd4ac Merge in 'release/6.0.4xx' changes 2023-06-13 19:34:27 +00:00
dotnet-bot
379b292fef Merge in 'release/6.0.3xx' changes 2023-06-13 19:29:43 +00:00
Marc Paine
56a8be417e
[release/6.0.4xx] Update Windows SDK projection (#16658) 2023-06-13 12:26:13 -07:00
Marc Paine
15435505e3
[release/6.0.3xx] Update Windows SDK projection (#16657) 2023-06-13 12:21:14 -07:00
Manodasan Wignarajah
c9f58f8391
Update Windows SDK projection 2023-06-13 11:26:29 -07:00
Manodasan Wignarajah
806ef9c26b
Update ManualVersions.props 2023-06-13 11:24:53 -07:00
Manodasan Wignarajah
f671b74651
Update ManualVersions.props 2023-06-13 11:22:54 -07:00
Sean Reeser
98d0bd76ee Merge commit '28c7c894a318575fbc2f290db2c5b0d95bf1fc60' into internal-merge-6.0.4xx-2023-06-13-1011 2023-06-13 10:11:08 -07:00
Sean Reeser
f775ed6b1b Merge commit '4985279bcb64c58fee0be4c2bef6c0f02bb130aa' into internal-merge-6.0.3xx-2023-06-13-1010 2023-06-13 10:10:59 -07:00
Sean Reeser
5de38c5c12 Merge commit 'b8b476fbe60becae6d0c3d36b7ba964aeee3523d' into internal-merge-6.0.1xx-2023-06-13-1010 2023-06-13 10:10:49 -07:00
dotnet-bot
4c1fe79041 Merge in 'release/6.0.1xx' changes 2023-06-06 23:04:16 +00:00
Marc Paine
34f576b409
Update branding to 6.0.119 (#16597) 2023-06-06 15:56:24 -07:00
dotnet-bot
2a92e54f5c Merge in 'release/6.0.4xx' changes 2023-06-06 21:34:55 +00:00