Commit graph

28159 commits

Author SHA1 Message Date
dotnet-bot
f63658eea7 Merge in 'release/7.0.1xx' changes 2024-03-06 07:24:37 +00:00
v-wuzhai
1475541511
[automated] Merge branch 'release/6.0.4xx' => 'release/7.0.1xx' (#18740) 2024-03-06 15:15:03 +08:00
dotnet-bot
a8002fd3fe Merge in 'release/7.0.1xx' changes 2024-03-05 22:13:22 +00:00
Marc Paine
780dd29abc
Update branding to 7.0.118 (#18878) 2024-03-05 14:02:35 -08:00
Sean Reeser
599edfd2e9 Update branding to 7.0.118 2024-03-05 10:59:15 -08:00
dotnet-bot
17cc6a40d1 Merge in 'release/7.0.1xx' changes 2024-02-26 19:28:57 +00:00
Ella Hathaway
387338af69
Update 7.0 SDK diff baseline (#18781) 2024-02-26 19:19:42 +00:00
Jason Zhai
8c00090eed Merge branch 'release/6.0.4xx' into release/7.0.1xx 2024-02-21 19:06:00 -08:00
Sean Reeser
00be3a36b8 Merged PR 37584: [internal/release/7.0.1xx] Merge from public
Merge from public release/7.0.1xx to internal/release/7.0.1xx and resolve conflicts if necessary
2024-02-21 22:16:50 +00:00
dotnet-maestro[bot]
c5f74545ca
[release/6.0.4xx] Update dependencies from dotnet/source-build-reference-packages (#18733)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2024-02-21 13:56:58 -06:00
dotnet-maestro[bot]
4c11f5ca09
[release/7.0.1xx] Update dependencies from dotnet/source-build-reference-packages (#18736)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2024-02-21 13:46:01 -06:00
dotnet-bot
e32e276f34 Merge in 'release/7.0.1xx' changes 2024-02-17 14:18:15 +00:00
Matt Thalman
723427fa6b
Update SDK diff baseline (#18706) 2024-02-17 08:10:10 -06:00
DotNet Bot
e87ddaf2ea Merged PR 37443: [internal/release/7.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.AspNetCore.App.Ref**: from 7.0.17 to 7.0.17 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.17-servicing.24115.2 to 7.0.17-servicing.24116.13 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.17 to 7.0.17 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.17-servicing.24115.2 to 7.0.17-servicing.24116.13 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 7.0.17-servicing.24115.2 to 7.0.17-servicing.24116.13 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-jwts**: from 7.0.17-servicing.24115.2 to 7.0.17-servicing.24116.13 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 7.0.17-servicing.24115.2 to 7.0.17-servicing.24116.13 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651
- **Build**: 20240216.88
- **Date Produced**: February 17, 2024 1:27:54 AM UTC
- **Commit**: db7d0ce81917cecead7e0097923d4c1f84753293
- **Branch**: refs/heads/internal/release/7.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.117 to 7.0.117][1]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.117-servicing.24116.74 to 7.0.117-servicing.24116.88][1]
  - **Microsoft.NET.Sdk**: [from 7.0.117-servicing.24116.74 to 7.0.117-servicing.24116.88][1]
  - **Microsoft.TemplateEngine.Cli**: [from 7.0.117-servicing.24116.74 to 7.0.117-servicing.24116.88][1]
  - **Microsoft.AspNetCore.App.Ref**: [from 7.0.17 to 7.0.17][2]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 7.0.17-servicing.24115.2 to 7.0.17-servicing.24116.13][2]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 7.0.17 to 7.0.17][2]
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: [from 7.0.17-servicing.24115.2 to 7.0.17-servicing.24116.13][2]
  - **dotnet-dev-certs**: [from 7.0.17-servicing.24115.2 to 7.0.17-servicing.24116.13][2]
  - **dotnet-user-jwts**: [from 7.0.17-servicing.24115.2 to 7.0.17-servicing.24116.13][2]
  - **dotnet-user-secrets**: [from 7.0.17-servicing.24115.2 to 7.0.17-servicing.24116.13][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC4b35fcb31340c9f9c457e3c4a17858109d49e0fe&targe...
2024-02-17 03:05:17 +00:00
DotNet-Bot
20666fac28 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240216.88
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.117 -> To Version 7.0.117

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.17 -> To Version 7.0.17 (parent: Microsoft.NET.Sdk
2024-02-17 01:47:47 +00:00
DotNet Bot
e93de7fea6 Merged PR 37428: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk
This pull request updates the following dependencies

[marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651
- **Build**: 20240216.74
- **Date Produced**: February 17, 2024 12:21:28 AM UTC
- **Commit**: 4b35fcb31340c9f9c457e3c4a17858109d49e0fe
- **Branch**: refs/heads/internal/release/7.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.117 to 7.0.117][2]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.117-servicing.24116.16 to 7.0.117-servicing.24116.74][2]
  - **Microsoft.NET.Sdk**: [from 7.0.117-servicing.24116.16 to 7.0.117-servicing.24116.74][2]
  - **Microsoft.TemplateEngine.Cli**: [from 7.0.117-servicing.24116.16 to 7.0.117-servicing.24116.74][2]
  - **Microsoft.WindowsDesktop.App.Ref**: [from 7.0.17 to 7.0.17][3]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: [from 7.0.17-servicing.24115.4 to 7.0.17-servicing.24116.11][3]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: [from 7.0.17-servicing.24115.4 to 7.0.17-servicing.24116.11][3]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.17 to 7.0.17][3]
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 7.0.17-servicing.24115.10 to 7.0.17-servicing.24116.2][4]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.17 to 7.0.17][3]
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 7.0.17-servicing.24115.3 to 7.0.17-servicing.24116.10][5]

[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC937b442da08fbbfd22085eeff8a7cb01295c2ea6&targetVersion=GC4b35fcb31340c9f9c457e3c4a17858109d49e0fe&_a=files
[3]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GCc2fca339644c5d9626c72ceac378cf728dd0d56a&targetVersion=GC8e24710202fffe3656e6d26d6a03e53b3de83484&_a=files
[4]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GCfcbb04f265a8923c27ad55eaa51b1913b5db732e&targetVersion=GCa21b74e7f5e96ccb8d95dcde605669feb30f6c5b&_a=files
[5]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GC0b58a4b68b566568e74d51a6999f71108ff71f05&targetVersion=GC6b9b816bff16a1b507019fe6313b6baecb83b580&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:65272799-fe4d-4dbf-f0fe-08da7ef63651)

[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 7.0.17 to 7.0.17 (parent: Microsoft.N...
2024-02-17 01:02:11 +00:00
DotNet-Bot
f837228db5 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240216.74
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.117 -> To Version 7.0.117

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates
 From Version 7.0.17 -> To Version 7.0.17 (parent: Microsoft.NET.Sdk
2024-02-17 00:39:11 +00:00
DotNet-Bot
83ba947f11 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240216.58
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.117 -> To Version 7.0.117
2024-02-16 23:26:15 +00:00
DotNet Bot
f269760774 Merged PR 37376: [internal/release/7.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 7.0.16 to 7.0.17 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.16-servicing.24068.4 to 7.0.17-servicing.24115.4 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.16-servicing.24068.4 to 7.0.17-servicing.24115.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Ref**: from 7.0.16 to 7.0.17 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: from 7.0.16-servicing.24066.29 to 7.0.17-servicing.24115.8 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.16 to 7.0.17 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 7.0.16 to 7.0.17 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 7.0.16 to 7.0.17 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 7.0.16 to 7.0.17 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.16-servicing.24068.15 to 7.0.17-servicing.24115.2 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.16 to 7.0.17 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.16-servicing.24068.15 to 7.0.17-servicing.24115.2 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 7.0.16-servicing.24068.15 to 7.0.17-servicing.24115.2 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-jwts**: from 7.0.16-servicing.24068.15 to 7.0.17-servicing.24115.2 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 7.0.16-servicing.24068.15 to 7.0.17-servicing.24115.2 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.16 to 7.0.17 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.16-servicing.24067.11 to 7.0.17-servicing.24115.10 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.16 to 7.0.17 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.16-servicing.24068.4 to 7.0.17-servicing.24115.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.16-servicing.24066.29 to 7.0.17-servicing.24115.8 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100**: from 7.0...
2024-02-16 22:19:49 +00:00
DotNet-Bot
728212525f Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240216.16
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.116 -> To Version 7.0.117

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,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.16 -> To Version 7.0.17 (parent: Microsoft.NET.Sdk
2024-02-16 19:56:47 +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
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
Marc Paine
ec2666d766
[release/7.0.1xx] Update dependencies from dotnet/arcade (#18691) 2024-02-15 13:11:38 -08: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-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
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
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
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
dotnet-bot
7bdf4aedfe Merge in 'release/7.0.1xx' changes 2024-02-12 17:52:09 +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
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
v-wuzhai
0f86d2e134
Update branding to 6.0.128 (#18527) 2024-02-06 18:45:37 -08: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