Commit graph

33615 commits

Author SHA1 Message Date
Matt Mitchell
e2c18edf74 When laying out the PKG contents copy only aspnet shared framework
When switching to using the full archives rather than the now-removed aspnet internal archive, this place should have been changed along with GenerateLayout.targets. Because we failed to do so, we appear to be double-distributing .NET runtime and host in the PKGs. The runtime should simply be chained in via a dependent PKG.
2023-09-14 09:08:30 -07:00
Matt Thalman
3e46029791
Include tgz file extension for list of cloaked files (#17360) 2023-09-14 14:58:53 +00:00
DotNet-Bot
9ab857dce4 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230913.60
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.415-servicing.23462.23 -> To Version 6.0.415-servicing.23463.60

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.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.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,Microsoft.DotNet.Wpf.ProjectTemplates
 From Version 6.0.22 -> To Version 6.0.23 (parent: Microsoft.NET.Sdk
2023-09-14 07:42:20 +00:00
DotNet-Bot
15eea5a29a Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230913.46
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.415-servicing.23462.23 -> To Version 6.0.415-servicing.23463.46

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.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.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
 From Version 6.0.22 -> To Version 6.0.23 (parent: Microsoft.NET.Sdk
2023-09-14 03:43:17 +00:00
DotNet-Bot
6264b298a6 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230912.21
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.318-servicing.23453.13 -> To Version 6.0.318-servicing.23462.21
2023-09-14 02:54:58 +00:00
DotNet Bot
872283f656 Merged PR 33563: [internal/release/6.0.4xx] Update dependencies from dnceng/internal/dotnet-sdk
This pull request updates the following dependencies

[marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31
- **Build**: 20230912.23
- **Date Produced**: September 12, 2023 9:45:03 PM UTC
- **Commit**: 8e1ee785d23839ac8aaa6342c18b3e54dadfe455
- **Branch**: refs/heads/internal/release/6.0.4xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.414-servicing.23425.32 to 6.0.415-servicing.23462.23][3]
  - **Microsoft.NET.Sdk**: [from 6.0.414-servicing.23425.32 to 6.0.415-servicing.23462.23][3]

[3]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCe15f4d6367&targetVersion=GC8e1ee785d2&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31)
2023-09-14 02:52:19 +00:00
DotNet Bot
72ecba4f2b Merged PR 33564: [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk
This pull request updates the following dependencies

[marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9
- **Build**: 20230903.13
- **Date Produced**: September 4, 2023 6:17:38 AM UTC
- **Commit**: 9acb30f9c8cdf9cdaeb015bcd3060ae5f47593d7
- **Branch**: refs/heads/internal/release/6.0.3xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.317-servicing.23425.24 to 6.0.318-servicing.23453.13][1]
  - **Microsoft.NET.Sdk**: [from 6.0.317-servicing.23425.24 to 6.0.318-servicing.23453.13][1]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCda716438f2&targetVersion=GC9acb30f9c8&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9)
2023-09-14 02:51:54 +00:00
DotNet-Bot
2f6d09c852 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230912.22
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.123-servicing.23453.12 -> To Version 6.0.123-servicing.23462.22
2023-09-14 02:48:53 +00:00
DotNet Bot
528c684519 Merged PR 33562: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk
This pull request updates the following dependencies

[marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698
- **Build**: 20230903.12
- **Date Produced**: September 4, 2023 6:16:56 AM UTC
- **Commit**: 5c256633d1ecbdf0a252f0ae8a8f6ac80b1daeff
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.122-servicing.23425.21 to 6.0.123-servicing.23453.12][1]
  - **Microsoft.NET.Sdk**: [from 6.0.122-servicing.23425.21 to 6.0.123-servicing.23453.12][1]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC851641e40c&targetVersion=GC5c256633d1&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698)
2023-09-14 02:44:26 +00:00
DotNet Bot
9778f6d7d6 Merged PR 33452: [internal/release/7.0.4xx] Update dependencies from dnceng/internal/dotnet-sdk
This pull request updates the following dependencies

[marker]: <> (Begin:42f6b899-0677-45e7-d6f8-08db826b460b)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: 42f6b899-0677-45e7-d6f8-08db826b460b
- **Build**: 20230828.8
- **Date Produced**: August 29, 2023 4:13:53 AM UTC
- **Commit**: 5e4a3b029243c5cac0139ceff151422971ded738
- **Branch**: refs/heads/internal/release/7.0.4xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.401 to 7.0.401][1]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.401-servicing.23425.43 to 7.0.401-servicing.23428.8][1]
  - **Microsoft.NET.Sdk**: [from 7.0.401-servicing.23425.43 to 7.0.401-servicing.23428.8][1]
  - **Microsoft.TemplateEngine.Cli**: [from 7.0.401-servicing.23425.43 to 7.0.401-servicing.23428.8][1]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC2838d93742&targetVersion=GC5e4a3b0292&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:42f6b899-0677-45e7-d6f8-08db826b460b)
2023-09-14 02:44:09 +00:00
Jason Zhai
cb9f4e3410 Merge branch 'release/7.0.3xx' into release/7.0.4xx 2023-09-13 19:17:27 -07:00
Jason Zhai
40215eb0b8 Merge branch 'release/6.0.3xx' into release/6.0.4xx 2023-09-13 19:13:49 -07:00
dotnet-bot
58f301a234 Merge in 'release/7.0.3xx' changes 2023-09-14 02:02:23 +00:00
dotnet-bot
3dd3c1ee77 Merge in 'release/6.0.3xx' changes 2023-09-14 02:01:51 +00:00
v-wuzhai
ec56994f9c
[release/8.0.1xx] Update dependencies from dotnet/source-build-reference-packages (#17352) 2023-09-14 01:54:32 +00:00
v-wuzhai
b8d6c9df84
[automated] Merge branch 'release/7.0.1xx' => 'release/7.0.3xx' (#17347) 2023-09-14 01:53:22 +00:00
v-wuzhai
7171c500e4
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx' (#17350) 2023-09-14 01:52:25 +00:00
dotnet-bot
aead905c1e Merge in 'release/6.0.1xx' changes 2023-09-13 16:08:13 +00:00
b5fbd1b9bf
[release/6.0.1xx] Fix aspnetcore build on musl-libc platforms (#17324) 2023-09-13 10:57:52 -05:00
Matt Thalman
d9c22e3197
Merge branch 'release/8.0.1xx' into internal-merge-8.0.1xx-2023-09-12-1259 2023-09-13 07:57:12 -05:00
Matt Thalman
71aecd9e42 Revert eng changes 2023-09-13 07:55:38 -05:00
dotnet-maestro[bot]
a4a0db2017 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20230912.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 8.0.0-alpha.1.23461.1 -> To Version 8.0.0-alpha.1.23462.1
2023-09-13 12:30:25 +00:00
Jason Zhai
534924d8ad Merge branch 'release/7.0.1xx' into release/7.0.3xx 2023-09-12 23:59:40 -07:00
Jason Zhai
0a49407f60 Merge branch 'release/6.0.1xx' into release/6.0.3xx 2023-09-12 23:51:43 -07:00
NET Source-Build Bot
5e71ffbd44
.NET Source-Build 8.0.100-rc.1.23455.8 September 2023 Updates (#17349) 2023-09-12 22:26:36 +00:00
DotNet-Bot
73452f5f4a Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230912.23
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.414-servicing.23425.32 -> To Version 6.0.415-servicing.23462.23
2023-09-12 22:08:31 +00:00
dotnet-bot
3288abff4a Merge in 'release/6.0.1xx' changes 2023-09-12 21:40:44 +00:00
Noah Gilson
18327ecb64
Merging internal commits for release/6.0.1xx (#17338) 2023-09-12 14:31:34 -07:00
Noah Gilson
d166f99d5c
[release/8.0.1xx] Update dependencies from dotnet/source-build-reference-packages (#17331) 2023-09-12 14:19:13 -07:00
dotnet-bot
d85753bd93 Merge in 'release/7.0.1xx' changes 2023-09-12 21:16:08 +00:00
Matt Thalman
74f493e1dc
Revert SB test change 2023-09-12 16:15:16 -05:00
Matt Thalman
fa5effbd67
Remove rc1 suffix from branch name 2023-09-12 16:11:36 -05:00
NET Source-Build Bot
0c7d38132a
.NET Source-Build 7.0.111 September 2023 Updates (#17341) 2023-09-12 16:06:51 -05:00
dotnet-bot
8442a3def3 Merge in 'release/6.0.3xx' changes 2023-09-12 20:42:00 +00:00
dotnet-bot
64d7d8f07b Merge in 'release/6.0.4xx' changes 2023-09-12 20:41:45 +00:00
dotnet-bot
21c0df6055 Merge in 'release/7.0.1xx' changes 2023-09-12 20:41:36 +00:00
dotnet-bot
d7d294d675 Merge in 'release/7.0.3xx' changes 2023-09-12 20:41:29 +00:00
dotnet-bot
5d5419746d Merge in 'release/7.0.4xx' changes 2023-09-12 20:37:54 +00:00
Noah Gilson
c013db3ada
Merging internal commits for release/6.0.3xx (#17337) 2023-09-12 13:32:25 -07:00
Noah Gilson
8ae8f086bc
Merging internal commits for release/6.0.4xx (#17336) 2023-09-12 13:32:15 -07:00
Noah Gilson
3f7c8d8f8c
Merging internal commits for release/7.0.1xx (#17335) 2023-09-12 13:32:10 -07:00
Noah Gilson
804f67d6fd
Merging internal commits for release/7.0.3xx (#17334) 2023-09-12 13:32:06 -07:00
dotnet-maestro[bot]
41e083dd5c
[release/8.0.1xx] Update dependencies from dotnet/arcade (#17330)
[release/8.0.1xx] Update dependencies from dotnet/arcade
2023-09-12 20:31:56 +00:00
Noah Gilson
3d3c47e44e
Merging internal commits for release/7.0.4xx (#17333) 2023-09-12 13:29:28 -07:00
Noah Gilson
03e20d0ad6
Merge branch 'release/8.0.1xx' into darc-release/8.0.1xx-0c092716-bba0-41a8-9dfc-ae3851765523 2023-09-12 13:24:12 -07:00
Noah Gilson
e8b10aca50
[release/8.0.1xx] Update dependencies from dotnet/source-build-externals (#17332) 2023-09-12 13:24:05 -07:00
Matt Thalman
b4ecb7a6de
Remove rc1 suffix from branch name 2023-09-12 15:16:19 -05:00
Sean Reeser
c778b45b64 Merge commit 'e14caf947f' into internal-merge-8.0.1xx-2023-09-12-1259 2023-09-12 12:59:20 -07:00
Sean Reeser
6935c9da09 Merge commit 'dc5a76ad5c' into internal-merge-6.0.1xx-2023-09-12-1023 2023-09-12 10:23:22 -07:00
Sean Reeser
817f6beb0d Merge commit 'd9644dc1fe' into internal-merge-6.0.3xx-2023-09-12-1023 2023-09-12 10:23:13 -07:00