Commit graph

29872 commits

Author SHA1 Message Date
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
Marc Paine
750d085ffc
[release/7.0.4xx] Update dependencies from dotnet/arcade (#18674) 2024-02-15 13:22:45 -08:00
Marc Paine
10d6ea9dcc
Merging internal commits for release/7.0.4xx (#18649) 2024-02-15 13:22:30 -08:00
Marc Paine
1f9d55ca69
[release/7.0.3xx] Update dependencies from dotnet/arcade (#18675) 2024-02-15 13:21:34 -08:00
Marc Paine
ec2666d766
[release/7.0.1xx] Update dependencies from dotnet/arcade (#18691) 2024-02-15 13:11:38 -08:00
Marc Paine
cd2eaf8a6c
Merging internal commits for release/7.0.3xx (#18648) 2024-02-15 11:29:05 -08:00
Marc Paine
8403ba36c1
Merging internal commits for release/6.0.4xx (#18646) 2024-02-15 11:28:50 -08: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
Marc Paine
c54f730528
Merging internal commits for release/7.0.1xx (#18647) 2024-02-15 09:22:35 -08:00
dotnet-maestro[bot]
c89e3ce0fe 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.24065.4 -> To Version 7.0.0-beta.24114.4
2024-02-15 17:00:18 +00:00
dotnet-maestro[bot]
bf88ec8a07 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.24065.4 -> To Version 7.0.0-beta.24114.4
2024-02-15 17:00:13 +00:00
dotnet-maestro[bot]
1e00c4cd39 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.24065.4 -> To Version 7.0.0-beta.24114.4
2024-02-15 15:59:14 +00:00
dotnet-maestro[bot]
932aab20dc 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.24065.4 -> To Version 7.0.0-beta.24114.4
2024-02-15 15:59:14 +00: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
Marc Paine
9d335b6802
Merge branch 'release/7.0.3xx' into merge/release/7.0.1xx-to-release/7.0.3xx 2024-02-14 16:00:43 -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-maestro[bot]
52f9570557 Update dependencies from https://github.com/dotnet/arcade build 20240214.2
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 7.0.0-beta.24065.4 -> To Version 7.0.0-beta.24114.2
2024-02-14 22:09:48 +00:00
dotnet-maestro[bot]
5f3a791781 Update dependencies from https://github.com/dotnet/arcade build 20240214.2
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 7.0.0-beta.24065.4 -> To Version 7.0.0-beta.24114.2
2024-02-14 22:07:13 +00:00
dotnet-maestro[bot]
cb33239406 Update dependencies from https://github.com/dotnet/arcade build 20240214.2
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 7.0.0-beta.24065.4 -> To Version 7.0.0-beta.24114.2
2024-02-14 22:05:05 +00:00
dotnet-maestro[bot]
37fb25fbf7 Update dependencies from https://github.com/dotnet/arcade build 20240214.2
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 7.0.0-beta.24065.4 -> To Version 7.0.0-beta.24114.2
2024-02-14 22:05:03 +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
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
7a683de69a Merge commit 'cf888f0acf835543d5c6fee46e61477eb0270287' into internal-merge-7.0.4xx-2024-02-13-1018 2024-02-13 10:18:17 -08:00
Sean Reeser
a174ab6d40 Merge commit '7b4633fafd38f8d3bed1bb864156177c6fd98586' into internal-merge-7.0.3xx-2024-02-13-1018 2024-02-13 10:18:09 -08: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
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
github-actions[bot]
331c3a1909
[release/7.0.3xx] Update WiX to latest release (#18601)
Co-authored-by: Jacques Eloff <joeloff@users.noreply.github.com>
2024-02-12 09:43:10 -08:00
github-actions[bot]
29eedea286
[release/7.0.4xx] Update WiX to latest release (#18602)
Co-authored-by: Jacques Eloff <joeloff@users.noreply.github.com>
2024-02-12 09:43:05 -08:00
Jason Zhai
da1ecd699f Merge branch 'release/7.0.3xx' into release/7.0.4xx 2024-02-08 17:44:06 -08:00
Jason Zhai
44616b8271 Merge branch 'release/7.0.3xx' into release/7.0.4xx 2024-02-08 17:41:23 -08:00
v-wuzhai
f0110f5f5c
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.4xx' (#18542) 2024-02-08 17:20:32 -08:00
v-wuzhai
1ee28a650b
[automated] Merge branch 'release/7.0.1xx' => 'release/7.0.3xx' (#18538) 2024-02-08 17:20:22 -08:00
Jason Zhai
6b42d31870 Merge branch 'release/7.0.1xx' into release/7.0.3xx 2024-02-06 23:29:25 -08:00
Jason Zhai
286d227a78 Merge branch 'release/6.0.1xx' into release/6.0.4xx 2024-02-06 22:13:08 -08:00
v-wuzhai
0f86d2e134
Update branding to 6.0.128 (#18527) 2024-02-06 18:45:37 -08: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
vseanreesermsft
a6060b24f3
Update branding to 7.0.314 (#18530) 2024-02-06 14:22:53 -08:00
vseanreesermsft
1b55ed31b5
Update branding to 7.0.407 (#18531) 2024-02-06 14:22:50 -08:00
Sean Reeser
f32ea3eca6 Update branding to 6.0.128 2024-02-06 12:11:27 -08:00
DotNet Bot
2dae3fec70 Merged PR 36689: [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.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.419 to 6.0.419 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.419-rtm.24067.1 to 6.0.419-rtm.24070.2 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.419 to 6.0.419 (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)
  - **VS.Redist....
2024-01-21 17:44:38 +00:00
DotNet Bot
7b4633fafd Merged PR 36665: [internal/release/7.0.3xx] 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.AspNetCore.App.Ref**: from 7.0.16 to 7.0.16 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.16-servicing.24067.19 to 7.0.16-servicing.24068.15 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.16 to 7.0.16 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.16-servicing.24067.19 to 7.0.16-servicing.24068.15 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 7.0.16-servicing.24067.19 to 7.0.16-servicing.24068.15 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-jwts**: from 7.0.16-servicing.24067.19 to 7.0.16-servicing.24068.15 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 7.0.16-servicing.24067.19 to 7.0.16-servicing.24068.15 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

[marker]: <> (End:Coherency Updates)

[marker]: <> (Begin:ca5481e4-f667-4dcd-b176-08db3b93de76)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: ca5481e4-f667-4dcd-b176-08db3b93de76
- **Build**: 20240119.10
- **Date Produced**: January 19, 2024 6:17:10 PM UTC
- **Commit**: e526ba29cdfac238c7dc40905b855b2ddc7d9d77
- **Branch**: refs/heads/internal/release/7.0.3xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.313 to 7.0.313][1]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.313-servicing.24068.62 to 7.0.313-servicing.24069.10][1]
  - **Microsoft.NET.Sdk**: [from 7.0.313-servicing.24068.62 to 7.0.313-servicing.24069.10][1]
  - **Microsoft.TemplateEngine.Cli**: [from 7.0.313-servicing.24068.62 to 7.0.313-servicing.24069.10][1]
  - **Microsoft.AspNetCore.App.Ref**: [from 7.0.16 to 7.0.16][2]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 7.0.16-servicing.24067.19 to 7.0.16-servicing.24068.15][2]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 7.0.16 to 7.0.16][2]
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: [from 7.0.16-servicing.24067.19 to 7.0.16-servicing.24068.15][2]
  - **dotnet-dev-certs**: [from 7.0.16-servicing.24067.19 to 7.0.16-servicing.24068.15][2]
  - **dotnet-user-jwts**: [from 7.0.16-servicing.24067.19 to 7.0.16-servicing.24068.15][2]
  - **dotnet-user-secrets**: [from 7.0.16-servicing.24067.19 to 7.0.16-servicing.24068.15][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC1f3b71634ebe0f75164461f73d6305d1aeb44...
2024-01-19 18:41:14 +00:00
DotNet Bot
cf888f0acf Merged PR 36664: [internal/release/7.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.AspNetCore.App.Ref**: from 7.0.16 to 7.0.16 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.16-servicing.24067.19 to 7.0.16-servicing.24068.15 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.16 to 7.0.16 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.16-servicing.24067.19 to 7.0.16-servicing.24068.15 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 7.0.16-servicing.24067.19 to 7.0.16-servicing.24068.15 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-jwts**: from 7.0.16-servicing.24067.19 to 7.0.16-servicing.24068.15 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 7.0.16-servicing.24067.19 to 7.0.16-servicing.24068.15 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

[marker]: <> (End:Coherency Updates)

[marker]: <> (Begin:42f6b899-0677-45e7-d6f8-08db826b460b)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: 42f6b899-0677-45e7-d6f8-08db826b460b
- **Build**: 20240119.9
- **Date Produced**: January 19, 2024 6:12:06 PM UTC
- **Commit**: 1c116bc27e66738427df5f153c2514c606a85b3a
- **Branch**: refs/heads/internal/release/7.0.4xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.406 to 7.0.406][1]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.406-servicing.24068.63 to 7.0.406-servicing.24069.9][1]
  - **Microsoft.NET.Sdk**: [from 7.0.406-servicing.24068.63 to 7.0.406-servicing.24069.9][1]
  - **Microsoft.TemplateEngine.Cli**: [from 7.0.406-servicing.24068.63 to 7.0.406-servicing.24069.9][1]
  - **Microsoft.AspNetCore.App.Ref**: [from 7.0.16 to 7.0.16][2]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 7.0.16-servicing.24067.19 to 7.0.16-servicing.24068.15][2]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 7.0.16 to 7.0.16][2]
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: [from 7.0.16-servicing.24067.19 to 7.0.16-servicing.24068.15][2]
  - **dotnet-dev-certs**: [from 7.0.16-servicing.24067.19 to 7.0.16-servicing.24068.15][2]
  - **dotnet-user-jwts**: [from 7.0.16-servicing.24067.19 to 7.0.16-servicing.24068.15][2]
  - **dotnet-user-secrets**: [from 7.0.16-servicing.24067.19 to 7.0.16-servicing.24068.15][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCa537404e0e29590402a7d3be677507541ce07e38&...
2024-01-19 18:41:00 +00:00
DotNet-Bot
dd89f67b32 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240119.10
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.313 -> To Version 7.0.313

Dependency coherency updates

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
 From Version 7.0.16 -> To Version 7.0.16 (parent: Microsoft.NET.Sdk
2024-01-19 18:36:49 +00:00
DotNet-Bot
bef5262c3d Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240119.9
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.406 -> To Version 7.0.406

Dependency coherency updates

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
 From Version 7.0.16 -> To Version 7.0.16 (parent: Microsoft.NET.Sdk
2024-01-19 18:31:32 +00:00