Commit graph

28423 commits

Author SHA1 Message Date
DotNet Bot
ec22eb67d1 Merged PR 39046: [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**: 20240417.30
- **Date Produced**: April 17, 2024 10:15:05 PM UTC
- **Commit**: 6dac52db9a8196b2422d51c17bda4b3dd94f29e7
- **Branch**: refs/heads/internal/release/7.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.119 to 7.0.119][2]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.119-servicing.24217.6 to 7.0.119-servicing.24217.30][2]
  - **Microsoft.NET.Sdk**: [from 7.0.119-servicing.24217.6 to 7.0.119-servicing.24217.30][2]
  - **Microsoft.TemplateEngine.Cli**: [from 7.0.119-servicing.24217.6 to 7.0.119-servicing.24217.30][2]

[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCfc88a96016c2d1eb56edbf460a6d594e44d2cfb1&targetVersion=GC6dac52db9a8196b2422d51c17bda4b3dd94f29e7&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:65272799-fe4d-4dbf-f0fe-08da7ef63651)
2024-04-17 23:12:38 +00:00
DotNet Bot
4687bd2267 Merged PR 39027: [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.18 to 7.0.19 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.18-servicing.24170.3 to 7.0.19-servicing.24216.14 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.18-servicing.24170.3 to 7.0.19-servicing.24216.14 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Ref**: from 7.0.18 to 7.0.19 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: from 7.0.18-servicing.24169.14 to 7.0.19-servicing.24215.23 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.18 to 7.0.19 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 7.0.18 to 7.0.19 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 7.0.18 to 7.0.19 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 7.0.18 to 7.0.19 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.18-servicing.24169.24 to 7.0.19-servicing.24216.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.18 to 7.0.19 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.18-servicing.24169.24 to 7.0.19-servicing.24216.12 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 7.0.18-servicing.24169.24 to 7.0.19-servicing.24216.12 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-jwts**: from 7.0.18-servicing.24169.24 to 7.0.19-servicing.24216.12 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 7.0.18-servicing.24169.24 to 7.0.19-servicing.24216.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.18 to 7.0.19 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.18-servicing.24169.17 to 7.0.19-servicing.24216.14 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.18 to 7.0.19 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.18-servicing.24169.14 to 7.0.19-servicing.24216.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.18-servicing.24169.14 to 7.0.19-servicing.24215.23 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100**...
2024-04-17 18:38:34 +00:00
Michael Yanni
2381a3352d
[release/7.0.1xx] Update dependencies from dotnet/source-build-externals (#19502) 2024-04-17 08:56:34 -07:00
dotnet-maestro[bot]
04bf38d5b3 Update dependencies from https://github.com/dotnet/source-build-externals build 20240416.2
Microsoft.SourceBuild.Intermediate.source-build-externals
 From Version 7.0.0-alpha.1.24210.1 -> To Version 7.0.0-alpha.1.24216.2
2024-04-17 12:35:34 +00:00
Michael Yanni
d83fd4c5a5
[automated] Merge branch 'release/6.0.4xx' => 'release/7.0.1xx' (#19439) 2024-04-12 12:55:54 -07:00
Jacques Eloff
cea52fcafd
Update WiX to 3.14.1.8722 (#19408) 2024-04-12 10:15:55 -07:00
Jason Zhai
c069d5541b Merge branch 'release/6.0.4xx' into release/7.0.1xx 2024-04-11 23:42:27 -07:00
Michael Yanni
479481a19a
[release/7.0.1xx] Update dependencies from dotnet/source-build-externals (#19437) 2024-04-11 13:53:11 -07:00
Michael Yanni
37cde3336b
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.4xx' (#19425) 2024-04-11 10:40:24 -07:00
dotnet-maestro[bot]
67cd0dac2d Update dependencies from https://github.com/dotnet/source-build-externals build 20240410.1
Microsoft.SourceBuild.Intermediate.source-build-externals
 From Version 7.0.0-alpha.1.24201.2 -> To Version 7.0.0-alpha.1.24210.1
2024-04-11 12:37:50 +00:00
v-wuzhai
01940a9d1d
[automated] Merge branch 'release/6.0.4xx' => 'release/7.0.1xx' (#19431) 2024-04-11 01:18:16 -07:00
Jason Zhai
073953323a Merge branch 'release/6.0.1xx' into release/6.0.4xx 2024-04-10 22:59:02 -07:00
Jason Zhai
2d56bb8119 Merge branch 'release/6.0.4xx' into release/7.0.1xx 2024-04-10 22:45:00 -07:00
Michael Yanni
2747184d8d
[release/6.0.4xx] Update dependencies from dotnet/arcade (#19422) 2024-04-10 14:55:51 -07:00
Michael Yanni
5c48c422c3
[release/6.0.1xx] Update dependencies from dotnet/arcade (#19421) 2024-04-10 14:53:39 -07:00
Michael Yanni
53e0a410eb
[release/7.0.1xx] Update dependencies from dotnet/arcade (#19411) 2024-04-10 13:46:12 -07:00
Matt Thalman
436da5e6bb
Update SB SDK diff baseline (#19413) 2024-04-10 20:13:07 +00:00
Matt Thalman
8b00bdb59d
Update SB SDK diff baseline (#19414) 2024-04-10 19:45:17 +00:00
dotnet-maestro[bot]
fbfea7c0c3 Update dependencies from https://github.com/dotnet/arcade build 20240404.4
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 6.0.0-beta.24176.9 -> To Version 6.0.0-beta.24204.4
2024-04-10 18:00:04 +00:00
dotnet-maestro[bot]
b7e4f2a9a6 Update dependencies from https://github.com/dotnet/arcade build 20240404.4
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 6.0.0-beta.24176.9 -> To Version 6.0.0-beta.24204.4
2024-04-10 17:57:40 +00:00
dotnet-maestro[bot]
d18629dc95 Update dependencies from https://github.com/dotnet/arcade build 20240409.2
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 7.0.0-beta.24176.7 -> To Version 7.0.0-beta.24209.2
2024-04-10 17:10:07 +00:00
Oleksandr Didyk
a976090924
.NET Source-Build 6.0.129 April 2024 Updates (#19371) 2024-04-10 11:35:35 +02:00
Oleksandr Didyk
a0c84133de
.NET Source-Build 7.0.118 April 2024 Updates (#19381) 2024-04-10 11:35:18 +02:00
Michael Yanni
1a9770c225
Merging internal commits for release/7.0.1xx (#19378) 2024-04-09 14:51:41 -07:00
Michael Yanni
4969250c8c
Merging internal commits for release/6.0.1xx (#19375) 2024-04-09 14:51:05 -07:00
Michael Yanni
a5a242b3a9
Merging internal commits for release/6.0.4xx (#19374) 2024-04-09 14:51:00 -07:00
dotnet-sb-bot
2df25924d7 update global.json and Versions.props for .NET SDK 7.0.118 2024-04-09 20:12:09 +00:00
Sean Reeser
9ea370eaaa Merge commit 'ef7589b476034bb95ccba0abe6c9fc05d20ecf6f' into internal-merge-7.0.1xx-2024-04-09-1227 2024-04-09 12:27:15 -07:00
Sean Reeser
8ed11380d7 Merge commit '7c9bddb16035cbe6bf19e7cad6d2c694154529b4' into internal-merge-6.0.1xx-2024-04-09-1222 2024-04-09 12:22:33 -07:00
Sean Reeser
5532cc99d6 Merge commit '04f27549cdbdcb0d6784037693769c93ed1de787' into internal-merge-6.0.4xx-2024-04-09-1222 2024-04-09 12:22:24 -07:00
dotnet-sb-bot
4479dc8f02 update global.json and Versions.props for .NET SDK 6.0.129 2024-04-09 19:14:32 +00:00
v-wuzhai
92c8d58053
[automated] Merge branch 'release/6.0.4xx' => 'release/7.0.1xx' (#19295) 2024-04-07 22:40:16 -07:00
Jason Zhai
0ba027e471 Merge branch 'release/6.0.4xx' into release/7.0.1xx 2024-04-07 19:41:44 -07:00
Marc Paine
d7b3353516
Rewrite testhost.json (#19320) 2024-04-05 13:12:40 -07:00
Jakub Jareš
8f232fb8af
Merge branch 'release/6.0.4xx' into fix-newtonsoft-in-deps-6-0-4xx 2024-04-05 12:56:20 +02:00
Jakub Jareš
6bc4c2adf8 Rewrite testhost.json 2024-04-05 12:52:51 +02:00
Forgind
07e0cabba2
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.4xx' (#19280) 2024-04-03 09:41:12 -07:00
Forgind
4a916161c3
[automated] Merge branch 'release/6.0.4xx' => 'release/7.0.1xx' (#19276) 2024-04-03 09:40:09 -07:00
Jason Zhai
e88331d359 Merge branch 'release/6.0.4xx' into release/7.0.1xx 2024-04-02 19:44:41 -07:00
Jason Zhai
3350fd06f2 Merge branch 'release/6.0.1xx' into release/6.0.4xx 2024-04-02 19:41:35 -07:00
Forgind
df8d48bce0
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.4xx' (#18970) 2024-04-02 15:08:32 -07:00
Michael Yanni
4308c39b28
[6.0.1xx] Migrate to 1ES templates for internal builds (#19130)
Co-authored-by: Matt Thalman <mthalman@microsoft.com>
2024-04-02 15:07:15 -07:00
dotnet-maestro[bot]
59b9f4ee08
[release/6.0.4xx] Update dependencies from dotnet/source-build-reference-packages (#19149)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2024-04-02 15:06:58 -07:00
dotnet-maestro[bot]
8c3184079c
[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages (#19150)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2024-04-02 15:06:10 -07:00
dotnet-maestro[bot]
cd1c903806
[release/7.0.1xx] Update dependencies from dotnet/source-build-externals (#19162)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2024-04-02 15:05:48 -07:00
dotnet-maestro[bot]
d8d99de386
[release/7.0.1xx] Update dependencies from dotnet/source-build-reference-packages (#19153)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2024-04-02 15:04:32 -07:00
v-wuzhai
ee8c8a8d63
[release/6.0.1xx] Remove 2.1-5.0 templates (#19236) 2024-04-02 15:04:10 -07:00
v-wuzhai
cded9907f2
[release/7.0.1xx] Remove 2.1-5.0 templates (#19237) 2024-04-02 15:03:59 -07:00
Michael Yanni
7696697e0d
[6.0.4xx] Migrate to 1ES templates for internal builds (#19187)
Co-authored-by: Matt Thalman <mthalman@microsoft.com>
2024-04-02 15:03:37 -07:00
Michael Yanni
689d2d7021
[7.0.1xx] Migrate to 1ES templates for internal builds (#19188)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Matt Thalman <mthalman@microsoft.com>
2024-04-02 15:03:19 -07:00