Commit graph

28376 commits

Author SHA1 Message Date
DotNet-Bot
c6896a6ef9 Dependency coherency updates
Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.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.WindowsDesktop.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NET.Workload.Emscripten.Manifest-6.0.100
 From Version 6.0.27 -> To Version 6.0.28 (parent: Microsoft.NET.Sdk
2024-02-16 19:03:43 +00:00
DotNet-Bot
2522c2fa34 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240215.60
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.128-servicing.24115.23 -> To Version 6.0.128-servicing.24115.60
2024-02-16 19:03:26 +00:00
DotNet-Bot
aaee2f9c98 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240215.23
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.127-servicing.24070.10 -> To Version 6.0.128-servicing.24115.23
2024-02-16 19:03:11 +00:00
dotnet-bot
54468bc255 Merge in 'release/6.0.4xx' changes 2024-02-16 18:18:42 +00:00
vseanreesermsft
2043d5094a
[release/6.0.4xx] Update dependencies from dotnet/arcade (#18699) 2024-02-16 10:09:13 -08:00
vseanreesermsft
d3aba2c15f
Merge branch 'release/6.0.4xx' into darc-release/6.0.4xx-ff6e2e78-db8c-49ab-b613-4dd2e712c855 2024-02-15 14:36:54 -08:00
dotnet-bot
c78f987a8f Merge in 'release/6.0.4xx' changes 2024-02-15 21:32:00 +00:00
Marc Paine
8219e93fb0
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.4xx' (#18624) 2024-02-15 13:23:14 -08:00
dotnet-maestro[bot]
683f2541f5 Update dependencies from https://github.com/dotnet/arcade build 20240213.1
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 6.0.0-beta.24059.3 -> To Version 6.0.0-beta.24113.1
2024-02-15 21:23:12 +00:00
dotnet-bot
5a5970d2b0 Merge in 'release/7.0.1xx' changes 2024-02-15 21:21:46 +00:00
dotnet-bot
0e679948e8 Merge in 'release/6.0.1xx' changes 2024-02-15 21:20:13 +00:00
Marc Paine
ec2666d766
[release/7.0.1xx] Update dependencies from dotnet/arcade (#18691) 2024-02-15 13:11:38 -08:00
Marc Paine
da8be456a0
[release/6.0.1xx] Update dependencies from dotnet/arcade (#18690) 2024-02-15 13:11:35 -08:00
dotnet-bot
8e5336d250 Merge in 'release/6.0.4xx' changes 2024-02-15 19:37:30 +00:00
Marc Paine
8403ba36c1
Merging internal commits for release/6.0.4xx (#18646) 2024-02-15 11:28:50 -08:00
dotnet-bot
b87bb768d7 Merge in 'release/7.0.1xx' changes 2024-02-15 17:31:23 +00:00
dotnet-bot
9bbc53e3eb Merge in 'release/6.0.1xx' changes 2024-02-15 17:31:11 +00:00
dotnet-maestro[bot]
e44eb502e4 Update dependencies from https://github.com/dotnet/arcade build 20240214.4
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 7.0.0-beta.24059.5 -> To Version 7.0.0-beta.24114.4
2024-02-15 17:29:14 +00:00
dotnet-maestro[bot]
1ecb3871ba Update dependencies from https://github.com/dotnet/arcade build 20240213.1
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 6.0.0-beta.24059.3 -> To Version 6.0.0-beta.24113.1
2024-02-15 17:28:46 +00:00
Marc Paine
c54f730528
Merging internal commits for release/7.0.1xx (#18647) 2024-02-15 09:22:35 -08:00
Marc Paine
11db46d6e6
Merging internal commits for release/6.0.1xx (#18645) 2024-02-15 09:22:24 -08:00
Marc Paine
40cc78385c
Merge branch 'release/6.0.4xx' into merge/release/6.0.1xx-to-release/6.0.4xx 2024-02-14 16:01:04 -08:00
vseanreesermsft
f134040a7a
Merge branch 'release/6.0.1xx' into internal-merge-6.0.1xx-2024-02-13-1014 2024-02-14 15:24:52 -08:00
vseanreesermsft
bcfaeb63cf
Merge branch 'release/7.0.1xx' into internal-merge-7.0.1xx-2024-02-13-1018 2024-02-14 15:24:13 -08:00
dotnet-bot
db24ba8328 Merge in 'release/7.0.1xx' changes 2024-02-14 01:34:57 +00:00
NET Source-Build Bot
ca56ddf2bd
.NET Source-Build 7.0.116 February 2024 Updates (#18653) 2024-02-14 01:26:10 +00:00
dotnet-bot
c82ae2956e Merge in 'release/6.0.1xx' changes 2024-02-14 01:20:00 +00:00
NET Source-Build Bot
d3036c5d99
.NET Source-Build 6.0.127 February 2024 Updates (#18652) 2024-02-14 01:11:47 +00:00
Sean Reeser
ddf5628c18 Merge commit 'c19b61c54981cf39a4d18c48450f3368f31fdee2' into internal-merge-7.0.1xx-2024-02-13-1018 2024-02-13 10:18:00 -08:00
Sean Reeser
c588cf14c3 Merge commit '2dae3fec70c788deec3f9ac96d42e335dda8522e' into internal-merge-6.0.4xx-2024-02-13-1014 2024-02-13 10:14:27 -08:00
Sean Reeser
1b28be9e7c Merge commit 'd761c25068115f91ba88cdeb5d72271757d0d0f0' into internal-merge-6.0.1xx-2024-02-13-1014 2024-02-13 10:14:17 -08:00
dotnet-bot
7bdf4aedfe Merge in 'release/7.0.1xx' changes 2024-02-12 17:52:09 +00:00
dotnet-bot
ee11fac206 Merge in 'release/6.0.1xx' changes 2024-02-12 17:52:02 +00:00
dotnet-bot
2ee5d1eef6 Merge in 'release/6.0.4xx' changes 2024-02-12 17:51:53 +00:00
Noah Gilson
d3c2fcfe45
[automated] Merge branch 'release/6.0.4xx' => 'release/7.0.1xx' (#18587) 2024-02-12 09:47:42 -08:00
Jacques Eloff
aa39fb2795
Update WiX to latest release (#18599) 2024-02-12 09:43:33 -08:00
Jacques Eloff
055887842a
Update to latest WiX version (#18606) 2024-02-12 09:43:24 -08:00
github-actions[bot]
b30ddf54fe
[release/6.0.4xx] Update to latest WiX version (#18607)
Co-authored-by: Jacques Eloff <joeloff@users.noreply.github.com>
2024-02-12 09:43:14 -08:00
Jason Zhai
da1ecd699f Merge branch 'release/7.0.3xx' into release/7.0.4xx 2024-02-08 17:44:06 -08:00
dotnet-bot
cd3210ccdf Merge in 'release/6.0.4xx' changes 2024-02-09 01:28:56 +00:00
v-wuzhai
f0110f5f5c
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.4xx' (#18542) 2024-02-08 17:20:32 -08:00
Jason Zhai
286d227a78 Merge branch 'release/6.0.1xx' into release/6.0.4xx 2024-02-06 22:13:08 -08:00
dotnet-bot
05d4da2da4 Merge in 'release/6.0.1xx' changes 2024-02-07 02:53:45 +00:00
v-wuzhai
0f86d2e134
Update branding to 6.0.128 (#18527) 2024-02-06 18:45:37 -08:00
dotnet-bot
dd6a4d8c36 Merge in 'release/6.0.4xx' changes 2024-02-06 22:31:26 +00:00
dotnet-bot
32704d12e3 Merge in 'release/7.0.1xx' changes 2024-02-06 22:31:20 +00:00
vseanreesermsft
a9611179db
Update branding to 6.0.420 (#18528) 2024-02-06 14:23:02 -08:00
vseanreesermsft
40f96df296
Update branding to 7.0.117 (#18529) 2024-02-06 14:22:57 -08:00
Sean Reeser
f32ea3eca6 Update branding to 6.0.128 2024-02-06 12:11:27 -08:00
DotNet Bot
d761c25068 Merged PR 36690: [internal/release/6.0.1xx] 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.27 to 6.0.27 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.27-servicing.24067.4 to 6.0.27-servicing.24070.4 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.27-servicing.24067.4 to 6.0.27-servicing.24070.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Ref**: from 6.0.27 to 6.0.27 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.27-servicing.24066.28 to 6.0.27-servicing.24069.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.27 to 6.0.27 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.27 to 6.0.27 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.27 to 6.0.27 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 6.0.27 to 6.0.27 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.27-servicing.24067.9 to 6.0.27-servicing.24070.2 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.27 to 6.0.27 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.27-servicing.24067.9 to 6.0.27-servicing.24070.2 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.27-servicing.24067.9 to 6.0.27-servicing.24070.2 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.27-servicing.24067.9 to 6.0.27-servicing.24070.2 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.127 to 6.0.127 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.127-servicing.24067.3 to 6.0.127-servicing.24070.3 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.127 to 6.0.127 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.27 to 6.0.27 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.27-servicing.24067.5 to 6.0.27-servicing.24070.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.27 to 6.0.27 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.27-servicing.24067.2 to 6.0.27-servicing.24070.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - ...
2024-01-21 17:44:58 +00:00