Commit graph

14294 commits

Author SHA1 Message Date
Sean Reeser
26d171b756 Merged PR 38056: [internal/release/7.0.3xx] Merge from public
Merge from public release/7.0.3xx to internal/release/7.0.3xx and resolve conflicts if necessary
2024-03-13 16:27:02 +00:00
Jason Zhai
1e8c62c481 Merge branch 'release/7.0.1xx' into release/7.0.3xx 2024-03-13 00:45:12 -07:00
NET Source-Build Bot
016e1e4c01
.NET Source-Build 7.0.117 March 2024 Updates (#19005) 2024-03-12 14:46:04 -06:00
dotnet-maestro[bot]
1267eea058 Update dependencies from https://github.com/dotnet/source-build-externals build 20240312.2
Microsoft.SourceBuild.Intermediate.source-build-externals
 From Version 7.0.0-alpha.1.24158.4 -> To Version 7.0.0-alpha.1.24162.2
2024-03-12 15:56:12 +00:00
Jason Zhai
8615f79204 Merge branch 'release/7.0.1xx' into release/7.0.3xx 2024-03-10 23:11:32 -07:00
v-wuzhai
b788e35827
[release/7.0.3xx] Update dependencies from dotnet/source-build-externals (#18933) 2024-03-11 10:24:43 +08:00
dotnet-maestro[bot]
44583e7fac Update dependencies from https://github.com/dotnet/arcade build 20240310.1
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 7.0.0-beta.24155.3 -> To Version 7.0.0-beta.24160.1
2024-03-11 01:36:33 +00:00
dotnet-maestro[bot]
36e3ca0708 Update dependencies from https://github.com/dotnet/source-build-externals build 20240308.4
Microsoft.SourceBuild.Intermediate.source-build-externals
 From Version 7.0.0-alpha.1.24059.2 -> To Version 7.0.0-alpha.1.24158.4
2024-03-09 13:35:15 +00:00
dotnet-maestro[bot]
4d50dca68f Update dependencies from https://github.com/dotnet/source-build-externals build 20240308.4
Microsoft.SourceBuild.Intermediate.source-build-externals
 From Version 7.0.0-alpha.1.24059.2 -> To Version 7.0.0-alpha.1.24158.4
2024-03-08 23:18:49 +00:00
dotnet-maestro[bot]
eb3b53bb68 Update dependencies from https://github.com/dotnet/arcade build 20240305.3
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 7.0.0-beta.24129.5 -> To Version 7.0.0-beta.24155.3
2024-03-06 22:39:07 +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
v-wuzhai
ee748b88df
[release/7.0.3xx] Update dependencies from dotnet/arcade (#18829) 2024-03-06 14:53:49 +08:00
Sean Reeser
f6ef7ba8a7 Update branding to 7.0.315 2024-03-05 10:59:19 -08:00
Sean Reeser
599edfd2e9 Update branding to 7.0.118 2024-03-05 10:59:15 -08:00
dotnet-maestro[bot]
f08697a21d Update dependencies from https://github.com/dotnet/arcade build 20240229.5
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 7.0.0-beta.24114.4 -> To Version 7.0.0-beta.24129.5
2024-03-01 17:14:02 +00:00
dotnet-maestro[bot]
4283e1fa5e Update dependencies from https://github.com/dotnet/arcade build 20240229.3
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 7.0.0-beta.24114.4 -> To Version 7.0.0-beta.24129.3
2024-03-01 02:44:31 +00:00
Jason Zhai
8c00090eed Merge branch 'release/6.0.4xx' into release/7.0.1xx 2024-02-21 19:06:00 -08: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]
f33042e267
[release/7.0.3xx] Update dependencies from dotnet/source-build-reference-packages (#18734)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2024-02-21 13:56:40 -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
3698cb9b01 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240216.90
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.314 -> To Version 7.0.314

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:50:54 +00:00
DotNet-Bot
e8f7dba262 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240216.75
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.314 -> To Version 7.0.314

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,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
 From Version 7.0.17 -> To Version 7.0.17 (parent: Microsoft.NET.Sdk
2024-02-17 00:42:36 +00:00
DotNet-Bot
1a8e33984f Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240216.52
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.314 -> To Version 7.0.314

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-16 22:40:49 +00:00
DotNet-Bot
2b39998aea Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240216.15
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.314 -> To Version 7.0.314

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,VS.Redist.Common.NetCore.SharedFramework.x64.7.0
 From Version 7.0.16 -> To Version 7.0.17 (parent: Microsoft.NET.Sdk
2024-02-16 20:12:22 +00:00
DotNet Bot
36390376cd Merged PR 37082: [internal/release/7.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk
This pull request updates the following dependencies

[marker]: <> (Begin:ca5481e4-f667-4dcd-b176-08db3b93de76)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: ca5481e4-f667-4dcd-b176-08db3b93de76
- **Build**: 20240215.73
- **Date Produced**: February 16, 2024 6:19:15 AM UTC
- **Commit**: 1b8dad6090439c845af7b824a639776d8cb6ebe0
- **Branch**: refs/heads/internal/release/7.0.3xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.313 to 7.0.314][11]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.313-servicing.24069.10 to 7.0.314-servicing.24115.73][11]
  - **Microsoft.NET.Sdk**: [from 7.0.313-servicing.24069.10 to 7.0.314-servicing.24115.73][11]
  - **Microsoft.TemplateEngine.Cli**: [from 7.0.313-servicing.24069.10 to 7.0.314-servicing.24115.73][11]
  - **Microsoft.NETCore.App.Ref**: [from 7.0.16 to 7.0.17][12]
  - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: [from 7.0.16-servicing.24066.29 to 7.0.17-servicing.24114.21][12]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 7.0.16 to 7.0.17][12]
  - **Microsoft.NETCore.App.Host.win-x64**: [from 7.0.16 to 7.0.17][12]
  - **Microsoft.NETCore.DotNetHostResolver**: [from 7.0.16 to 7.0.17][12]
  - **Microsoft.AspNetCore.App.Ref**: [from 7.0.16 to 7.0.17][13]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 7.0.16-servicing.24068.15 to 7.0.17-servicing.24113.13][13]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 7.0.16 to 7.0.17][13]
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: [from 7.0.16-servicing.24068.15 to 7.0.17-servicing.24113.13][13]
  - **dotnet-dev-certs**: [from 7.0.16-servicing.24068.15 to 7.0.17-servicing.24113.13][13]
  - **dotnet-user-jwts**: [from 7.0.16-servicing.24068.15 to 7.0.17-servicing.24113.13][13]
  - **dotnet-user-secrets**: [from 7.0.16-servicing.24068.15 to 7.0.17-servicing.24113.13][13]
  - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: [from 7.0.16-servicing.24066.29 to 7.0.17-servicing.24114.21][12]
  - **Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100**: [from 7.0.16 to 7.0.17][14]
  - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: [from 7.0.16-servicing.24066.29 to 7.0.17-servicing.24114.21][12]
  - **Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100**: [from 7.0.16 to 7.0.17][14]

[11]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCe526ba29cdfac238c7dc40905b855b2ddc7d9d77&targetVersion=GC1b8dad6090439c845af7b824a639776d8cb6ebe0&_a=files
[12]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC567edafe6106e6b769c64f6a2ed876190baa642a&targetVersion=GC2aef67c5b99de279b9acbcddd89310515b4f8eff&_a=files
[13]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GC610fe433e07b32ed451ed99d07df63be47c29050&targetVersion=GC1fe4cc0a785efc50422ea03d8b762a856fee4298&_a=files
[14]: https://github.com...
2024-02-16 19:00:48 +00:00
DotNet-Bot
3772ddc3aa Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240215.73
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.313 -> To Version 7.0.314

Dependency coherency updates

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,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 06:38:43 +00:00
DotNet-Bot
498860c346 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240215.62
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.313 -> To Version 7.0.314

Dependency coherency updates

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,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 04:31:50 +00: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
bedc675600
[automated] Merge branch 'release/7.0.1xx' => 'release/7.0.3xx' (#18625) 2024-02-15 13:23:56 -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
Marc Paine
1f9d55ca69
[release/7.0.3xx] Update dependencies from dotnet/arcade (#18675) 2024-02-15 13:21:34 -08:00
DotNet-Bot
25f8bbf230 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240215.27
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.313 -> To Version 7.0.314

Dependency coherency updates

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,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-15 19:28:47 +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]
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]
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
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
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
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
DotNet-Bot
f7f55356b3 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240206.50
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.313 -> To Version 7.0.314
2024-02-07 06:52:51 +00:00
Jason Zhai
286d227a78 Merge branch 'release/6.0.1xx' into release/6.0.4xx 2024-02-06 22:13:08 -08:00