Commit graph

34191 commits

Author SHA1 Message Date
Sean Reeser
e0f3d157d2 Update branding to 6.0.131 2024-05-01 14:46:16 -07:00
Rich Lander
44310139cf
Update-mariner-tag (#19617) 2024-05-01 08:05:01 -05:00
DotNet Bot
ae2bd4ec54 Merged PR 39289: [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.DotNet.Common.ItemTemplates**: from 6.0.422 to 6.0.422 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.422-rtm.24219.4 to 6.0.422-rtm.24229.7 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.422 to 6.0.422 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31
- **Build**: 20240429.15
- **Date Produced**: April 29, 2024 10:47:36 PM UTC
- **Commit**: b47e9d314726020921851f007797b479a5f6905e
- **Branch**: refs/heads/internal/release/6.0.4xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.422-servicing.24219.30 to 6.0.422-servicing.24229.15][1]
  - **Microsoft.NET.Sdk**: [from 6.0.422-servicing.24219.30 to 6.0.422-servicing.24229.15][1]
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.422 to 6.0.422][2]
  - **Microsoft.TemplateEngine.Cli**: [from 6.0.422-rtm.24219.4 to 6.0.422-rtm.24229.7][2]
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.422 to 6.0.422][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC8cf6c33a08b323b46d298b83937a623059638611&targetVersion=GCb47e9d314726020921851f007797b479a5f6905e&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GCeffe0d00ab994d57a5e1334667dec144f9f2a9e9&targetVersion=GC086db5520af132ac32dcf8cce8ad4d561b868363&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31)
2024-04-29 23:13:26 +00:00
DotNet Bot
a883df0be9 Merged PR 39288: [internal/release/6.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.DotNet.Common.ItemTemplates**: from 6.0.130 to 6.0.130 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.130-servicing.24216.15 to 6.0.130-servicing.24229.9 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.130 to 6.0.130 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698
- **Build**: 20240429.17
- **Date Produced**: April 29, 2024 10:42:03 PM UTC
- **Commit**: 0aff0db725f3979688ed1d6692f3507dc0e2daa2
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.130-servicing.24222.5 to 6.0.130-servicing.24229.17][1]
  - **Microsoft.NET.Sdk**: [from 6.0.130-servicing.24222.5 to 6.0.130-servicing.24229.17][1]
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.130 to 6.0.130][2]
  - **Microsoft.TemplateEngine.Cli**: [from 6.0.130-servicing.24216.15 to 6.0.130-servicing.24229.9][2]
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.130 to 6.0.130][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC214a5b1a89eab20d08419f9a446807ed91e48f25&targetVersion=GC0aff0db725f3979688ed1d6692f3507dc0e2daa2&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GCded0b713ad5db1c4cd83c8287624355038b864b4&targetVersion=GCf9d1cd96d58bf8e5fb569eaef4956089817c2842&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698)
2024-04-29 23:10:46 +00:00
DotNet Bot
eae90abaaf Merged PR 39213: [internal/release/8.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 8.0.5 to 8.0.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 8.0.5-servicing.24217.6 to 8.0.5-servicing.24224.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 8.0.5 to 8.0.5 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: from 8.0.5-servicing.24217.6 to 8.0.5-servicing.24224.4 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 8.0.5-servicing.24217.6 to 8.0.5-servicing.24224.4 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-jwts**: from 8.0.5-servicing.24217.6 to 8.0.5-servicing.24224.4 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 8.0.5-servicing.24217.6 to 8.0.5-servicing.24224.4 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:5d2948e4-7f4b-4c9a-54a4-08dbd5a5c4be)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: 5d2948e4-7f4b-4c9a-54a4-08dbd5a5c4be
- **Build**: 20240424.15
- **Date Produced**: April 24, 2024 9:30:46 PM UTC
- **Commit**: ecfb8a05aeaa93057ae0003d406280239b2c4c7b
- **Branch**: refs/heads/internal/release/8.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 8.0.105 to 8.0.105][1]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 8.0.105-servicing.24219.15 to 8.0.105-servicing.24224.15][1]
  - **Microsoft.NET.Sdk**: [from 8.0.105-servicing.24219.15 to 8.0.105-servicing.24224.15][1]
  - **Microsoft.TemplateEngine.Cli**: [from 8.0.105-servicing.24219.15 to 8.0.105-servicing.24224.15][1]
  - **Microsoft.AspNetCore.App.Ref**: [from 8.0.5 to 8.0.5][2]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 8.0.5-servicing.24217.6 to 8.0.5-servicing.24224.4][2]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 8.0.5 to 8.0.5][2]
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: [from 8.0.5-servicing.24217.6 to 8.0.5-servicing.24224.4][2]
  - **dotnet-dev-certs**: [from 8.0.5-servicing.24217.6 to 8.0.5-servicing.24224.4][2]
  - **dotnet-user-jwts**: [from 8.0.5-servicing.24217.6 to 8.0.5-servicing.24224.4][2]
  - **dotnet-user-secrets**: [from 8.0.5-servicing.24217.6 to 8.0.5-servicing.24224.4][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCbf69dc17dad41cb9e4963b397f721913899788ce&targetVersion=GCecfb8a05aeaa93057ae0003d406280...
2024-04-24 21:49:23 +00:00
dotnet-bot
927251530e Merge in 'release/6.0.1xx' changes 2024-04-24 18:34:52 +00:00
Ella Hathaway
6b41ecb70a
Update MsftToSbSdk.diff (#19569) 2024-04-24 11:25:10 -07:00
Nikola Milosavljevic (CLR)
63a6ed35e1 Merged PR 39154: Update MSBuild dependencies
Fixes: https://github.com/dotnet/source-build/issues/4344

https://github.com/dotnet/runtime/pull/100595 introduced two issues:
- Lower MSBuild version dependency - 17.8.3, instead of 17.8.5. This caused transitive package downgrade errors.
- Source-build dependency for MSBuild, in runtime repo. This caused downgrade of MSBuild repo in VMR, from 17.8.5 to 17.8.3.

Besides removing direct package references, the fix is to add a direct MSBuild source-build dependency in `installer` repo.

I'm also adding the missing MSBuild dependencies to runtime, for proper PVP flow. Without the explicit dependencies, my validation build was hitting an issue with `Microsoft.Build.Framework` package downgrade in
`src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks.csproj`:
```
    /vmr/src/runtime/artifacts/source-build/self/src/src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks.csproj : error NU1605: Warning As Error: Detected package downgrade: Microsoft.Build.Framework from 17.8.5 to 17.8.3. Reference the package directly from the project to select a different version.  [/vmr/src/runtime/artifacts/source-build/self/src/Build.proj]
    /vmr/src/runtime/artifacts/source-build/self/src/src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks.csproj : error NU1605:  Microsoft.NET.Sdk.WebAssembly.Pack.Tasks -> Microsoft.Build 17.8.5 -> Microsoft.Build.Framework (>= 17.8.5)  [/vmr/src/runtime/artifacts/source-build/self/src/Build.proj]
    /vmr/src/runtime/artifacts/source-build/self/src/src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks.csproj : error NU1605:  Microsoft.NET.Sdk.WebAssembly.Pack.Tasks -> Microsoft.Build.Framework (>= 17.8.3) [/vmr/src/runtime/artifacts/source-build/self/src/Build.proj]
```

Fully validated with an internal pipeline run: https://dev.azure.com/dnceng/internal/_build/results?buildId=2436369&view=results
2024-04-23 22:07:08 +00:00
Sean Reeser
9efa2d1b46 Merged PR 39163: Deleted Source Build patch for format repo 0002-Add-explicit-System.Text.Json...
Deleted Source Build patch for format repo 0002-Add-explicit-System.Text.Json-dependency.patch
2024-04-23 21:23:09 +00:00
dotnet-bot
1e1c1f8a1a Merge in 'release/8.0.1xx' changes 2024-04-23 20:31:47 +00:00
Ella Hathaway
8f1e5ee61f
Publish Test Results in PR Validation (#19533) 2024-04-23 13:22:11 -07:00
Nikola Milosavljevic
e8e88dee0e Fix the branch 2024-04-23 18:28:03 +00:00
dotnet-bot
be9294ee9c Merge in 'release/6.0.4xx' changes 2024-04-23 02:17:18 +00:00
v-wuzhai
1ac85a9fd3
[release/6.0.4xx] Update dependencies from dotnet/source-build-reference-packages (#19557) 2024-04-22 19:07:51 -07:00
Nikola Milosavljevic
496db681a9 Update MSBuild dependencies 2024-04-23 02:01:08 +00:00
dotnet-bot
ec841bc3e4 Merge in 'release/6.0.1xx' changes 2024-04-22 20:57:50 +00:00
dotnet-maestro[bot]
201e451886
[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages (#19556)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2024-04-22 13:48:05 -07:00
DotNet Bot
0ac2d170a8 Merged PR 39127: [internal/release/6.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 6.0.29 to 6.0.30 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.29-servicing.24171.9 to 6.0.30-servicing.24217.3 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.29-servicing.24171.9 to 6.0.30-servicing.24217.3 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Ref**: from 6.0.29 to 6.0.30 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.29-servicing.24171.5 to 6.0.30-servicing.24215.25 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.29 to 6.0.30 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.29 to 6.0.30 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.29 to 6.0.30 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 6.0.29 to 6.0.30 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.29-servicing.24171.8 to 6.0.30-servicing.24216.19 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.29 to 6.0.30 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.29-servicing.24171.8 to 6.0.30-servicing.24216.19 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.29-servicing.24171.8 to 6.0.30-servicing.24216.19 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.29-servicing.24171.8 to 6.0.30-servicing.24216.19 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.129 to 6.0.130 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.129-servicing.24171.8 to 6.0.130-servicing.24216.15 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.129 to 6.0.130 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.29 to 6.0.30 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.29-servicing.24171.6 to 6.0.30-servicing.24216.19 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.29 to 6.0.30 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.29-servicing.24171.7 to 6.0.30-servicing.24216.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
...
2024-04-22 20:43:25 +00:00
DotNet Bot
1e32a8348f Merged PR 39109: [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.DotNet.Common.ItemTemplates**: from 6.0.422 to 6.0.422 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.422-rtm.24218.5 to 6.0.422-rtm.24219.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.422 to 6.0.422 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31
- **Build**: 20240419.30
- **Date Produced**: April 20, 2024 1:55:25 AM UTC
- **Commit**: 8cf6c33a08b323b46d298b83937a623059638611
- **Branch**: refs/heads/internal/release/6.0.4xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.422-servicing.24218.15 to 6.0.422-servicing.24219.30][1]
  - **Microsoft.NET.Sdk**: [from 6.0.422-servicing.24218.15 to 6.0.422-servicing.24219.30][1]
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.422 to 6.0.422][2]
  - **Microsoft.TemplateEngine.Cli**: [from 6.0.422-rtm.24218.5 to 6.0.422-rtm.24219.4][2]
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.422 to 6.0.422][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC2633fcf4a1c687675464ba179c5c79ad5e75a237&targetVersion=GC8cf6c33a08b323b46d298b83937a623059638611&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GCef00e74f0a21b8a8192c1c409c154070ef39b95e&targetVersion=GCeffe0d00ab994d57a5e1334667dec144f9f2a9e9&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31)
2024-04-22 19:41:34 +00:00
dotnet-maestro[bot]
c88ad5affe Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240422.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.24217.1 -> To Version 6.0.0-servicing.24222.1
2024-04-22 18:06:16 +00:00
DotNet Bot
d223bfe80e Merged PR 39103: [internal/release/8.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk
This pull request updates the following dependencies

[marker]: <> (Begin:5d2948e4-7f4b-4c9a-54a4-08dbd5a5c4be)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: 5d2948e4-7f4b-4c9a-54a4-08dbd5a5c4be
- **Build**: 20240419.15
- **Date Produced**: April 19, 2024 10:20:05 PM UTC
- **Commit**: bf69dc17dad41cb9e4963b397f721913899788ce
- **Branch**: refs/heads/internal/release/8.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 8.0.105 to 8.0.105][1]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 8.0.105-servicing.24218.4 to 8.0.105-servicing.24219.15][1]
  - **Microsoft.NET.Sdk**: [from 8.0.105-servicing.24218.4 to 8.0.105-servicing.24219.15][1]
  - **Microsoft.TemplateEngine.Cli**: [from 8.0.105-servicing.24218.4 to 8.0.105-servicing.24219.15][1]

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

[DependencyUpdate]: <> (End)

[marker]: <> (End:5d2948e4-7f4b-4c9a-54a4-08dbd5a5c4be)
2024-04-20 01:20:24 +00:00
dotnet-bot
194d7f7c4c Merge in 'release/6.0.4xx' changes 2024-04-19 22:22:07 +00:00
Michael Yanni
70f9444495
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.4xx' (#19543) 2024-04-19 15:12:50 -07:00
Michael Yanni
d17dd8a47d Merge branch 'release/6.0.4xx' into merge/release/6.0.1xx-to-release/6.0.4xx
# Conflicts:
#	NuGet.config
2024-04-19 14:43:16 -07:00
Sean Reeser
1bb80d8d4a Merged PR 39093: [internal/release/8.0.1xx] ci and pr build: Update linux musl arm image to 'cbl-mariner-2.0-cross-arm-alpine'
ci and pr build: Update linux musl arm image to 'cbl-mariner-2.0-cross-arm-alpine'
2024-04-19 21:41:49 +00:00
DotNet Bot
ed3aeeda63 Merged PR 39096: [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.DotNet.Common.ItemTemplates**: from 6.0.422 to 6.0.422 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.422-rtm.24216.16 to 6.0.422-rtm.24218.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.422 to 6.0.422 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31
- **Build**: 20240418.15
- **Date Produced**: April 18, 2024 9:10:24 PM UTC
- **Commit**: 2633fcf4a1c687675464ba179c5c79ad5e75a237
- **Branch**: refs/heads/internal/release/6.0.4xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.422-servicing.24217.16 to 6.0.422-servicing.24218.15][1]
  - **Microsoft.NET.Sdk**: [from 6.0.422-servicing.24217.16 to 6.0.422-servicing.24218.15][1]
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.422 to 6.0.422][2]
  - **Microsoft.TemplateEngine.Cli**: [from 6.0.422-rtm.24216.16 to 6.0.422-rtm.24218.5][2]
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.422 to 6.0.422][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC83a874d0cffdd270df2889668bbbec6066dd46f6&targetVersion=GC2633fcf4a1c687675464ba179c5c79ad5e75a237&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC13683233bef71ad1d048e6481966879d52e1ccd5&targetVersion=GCef00e74f0a21b8a8192c1c409c154070ef39b95e&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31)
2024-04-19 20:48:33 +00:00
dotnet-bot
23f16427a0 Merge in 'release/8.0.1xx' changes 2024-04-19 19:20:40 +00:00
Jeremy Koritzinsky
05ce03283e
[release/8.0.1xx] Source-build dotnet/runtime patch: crashinfo.cpp/crasinfounix.cpp: use off_t instead of off64_t (#19544)
Co-authored-by: Michael Simons <msimons@microsoft.com>
2024-04-19 14:10:36 -05:00
Ella Hathaway
9255bc013b
Add SBRP DependencyPackageProjects Build Infra (#19419) 2024-04-19 11:07:59 -05:00
dotnet-bot
22d290a301 Merge in 'release/8.0.1xx' changes 2024-04-19 14:53:36 +00:00
Michael Simons
46532a34a8
Rename out of date alpine CI leg (#19542) 2024-04-19 14:44:31 +00:00
dotnet-bot
cef51fe557 Merge in 'release/8.0.1xx' changes 2024-04-19 13:31:44 +00:00
Ella Hathaway
ceb2adce4f
[8.0.1xx] Use correct image name for Arm pool (#19531) 2024-04-19 08:22:44 -05:00
Sean Reeser
93227d0c9e Merged PR 39065: [internal/release/6.0.4xx] Merge from public
Merge from public release/6.0.4xx to internal/release/6.0.4xx and resolve conflicts if necessary
2024-04-18 18:46:00 +00:00
DotNet Bot
785083ec77 Merged PR 39045: [internal/release/8.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 8.0.5 to 8.0.5 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0**: from 8.0.5-servicing.24216.13 to 8.0.5-servicing.24217.5 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0**: from 8.0.5-servicing.24216.13 to 8.0.5-servicing.24217.5 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.8.0**: from 8.0.5-servicing.24215.24 to 8.0.5-servicing.24216.15 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Ref**: from 8.0.5 to 8.0.5 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.8.0**: from 8.0.5-servicing.24215.24 to 8.0.5-servicing.24216.15 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 8.0.5 to 8.0.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 8.0.5 to 8.0.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.Platforms**: from 8.0.5-servicing.24215.24 to 8.0.5-servicing.24216.15 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 8.0.5 to 8.0.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 8.0.5-servicing.24216.11 to 8.0.5-servicing.24217.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 8.0.5 to 8.0.5 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: from 8.0.5-servicing.24216.11 to 8.0.5-servicing.24217.6 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 8.0.5-servicing.24216.11 to 8.0.5-servicing.24217.6 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-jwts**: from 8.0.5-servicing.24216.11 to 8.0.5-servicing.24217.6 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 8.0.5-servicing.24216.11 to 8.0.5-servicing.24217.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 8.0.5 to 8.0.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 8.0.5-servicing.24216.11 to 8.0.5-servicing.24217.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 8.0.5 to 8.0.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 8.0.5-servicing.24216.5 to 8.0.5-servicing.24217.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.NET.ILLink.Tasks**: from 8.0.5 to 8.0.5 (parent: Microsoft.NET.Sdk...
2024-04-18 18:25:33 +00:00
v-wuzhai
0f89ff8a9b
[release/6.0.4xx] Update dependencies from dotnet/source-build-reference-packages (#19514) 2024-04-17 19:22:40 -07:00
DotNet Bot
365f04e342 Merged PR 39043: [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.29 to 6.0.30 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.29-servicing.24171.9 to 6.0.30-servicing.24217.3 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.29-servicing.24171.9 to 6.0.30-servicing.24217.3 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 6.0.29 to 6.0.30 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.29-servicing.24171.8 to 6.0.30-servicing.24216.19 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.29 to 6.0.30 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.29-servicing.24171.8 to 6.0.30-servicing.24216.19 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.29-servicing.24171.8 to 6.0.30-servicing.24216.19 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.29-servicing.24171.8 to 6.0.30-servicing.24216.19 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.421 to 6.0.422 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.421-rtm.24171.7 to 6.0.422-rtm.24216.16 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.421 to 6.0.422 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.29 to 6.0.30 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.29-servicing.24171.6 to 6.0.30-servicing.24216.19 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.29 to 6.0.30 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.29-servicing.24171.7 to 6.0.30-servicing.24216.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31
- **Build**: 20240417.16
- **Date Produced**: April 17, 2024 6:35:52 PM UTC
- **Commit**: 83a874d0cffdd270df2889668bbbec6066dd46f6
- **Branch**: refs/heads/internal/release/6.0.4xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolve...
2024-04-17 23:13:47 +00:00
dotnet-maestro[bot]
28f0ea76ee Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240417.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.24172.6 -> To Version 6.0.0-servicing.24217.1
2024-04-17 21:27:04 +00:00
dotnet-bot
74d5c43866 Merge in 'release/8.0.1xx' changes 2024-04-17 21:03:53 +00:00
Rich Lander
903e15eef9
Update-eol-versions-8.0.1xx (#19318)
Co-authored-by: Michael Simons <msimons@microsoft.com>
2024-04-17 15:54:08 -05:00
DotNet Bot
9514c83bfb Merged PR 38998: [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.NETCore.App.Ref**: from 6.0.29 to 6.0.30 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.29-servicing.24171.5 to 6.0.30-servicing.24215.25 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.29 to 6.0.30 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.29 to 6.0.30 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.29 to 6.0.30 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Build**: from 17.3.2 to 17.3.4 (parent: Microsoft.NET.Sdk)
  - **NuGet.Build.Tasks**: from 6.3.4-rc.2 to 6.3.4-rc.2 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.29-servicing.24171.5 to 6.0.30-servicing.24215.25 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NET.Workload.Emscripten.Manifest-6.0.400**: from 6.0.29 to 6.0.30 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.6.0)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31
- **Build**: 20240416.41
- **Date Produced**: April 16, 2024 11:22:37 PM UTC
- **Commit**: 2f8fe578abbb1ff0586e1d11c17ead5fbbb4747d
- **Branch**: refs/heads/internal/release/6.0.4xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.421-servicing.24172.16 to 6.0.422-servicing.24216.41][1]
  - **Microsoft.NET.Sdk**: [from 6.0.421-servicing.24172.16 to 6.0.422-servicing.24216.41][1]
  - **Microsoft.NETCore.App.Ref**: [from 6.0.29 to 6.0.30][2]
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.29-servicing.24171.5 to 6.0.30-servicing.24215.25][2]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.29 to 6.0.30][2]
  - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.29 to 6.0.30][2]
  - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.29 to 6.0.30][2]
  - **Microsoft.Build**: [from 17.3.2 to 17.3.4][3]
  - **NuGet.Build.Tasks**: [from 6.3.4-rc.2 to 6.3.4-rc.2][4]
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.29-servicing.24171.5 to 6.0.30-servicing.24215.25][2]
  - **Microsoft.NET.Workload.Emscripten.Manifest-6.0.400**: [from 6.0.29 to 6.0.30][5]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCe35ea4...
2024-04-17 18:38:34 +00:00
DotNet Bot
e5cbc04786 Merged PR 39001: [internal/release/8.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 8.0.4 to 8.0.5 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0**: from 8.0.4-servicing.24169.24 to 8.0.5-servicing.24216.13 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0**: from 8.0.4-servicing.24169.24 to 8.0.5-servicing.24216.13 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.8.0**: from 8.0.4-servicing.24169.9 to 8.0.5-servicing.24215.24 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Ref**: from 8.0.4 to 8.0.5 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.8.0**: from 8.0.4-servicing.24169.9 to 8.0.5-servicing.24215.24 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 8.0.4 to 8.0.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 8.0.4 to 8.0.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.Platforms**: from 8.0.4-servicing.24169.9 to 8.0.5-servicing.24215.24 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 8.0.4 to 8.0.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 8.0.4-servicing.24170.14 to 8.0.5-servicing.24216.11 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 8.0.4 to 8.0.5 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: from 8.0.4-servicing.24170.14 to 8.0.5-servicing.24216.11 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 8.0.4-servicing.24170.14 to 8.0.5-servicing.24216.11 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-jwts**: from 8.0.4-servicing.24170.14 to 8.0.5-servicing.24216.11 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 8.0.4-servicing.24170.14 to 8.0.5-servicing.24216.11 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 8.0.4 to 8.0.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 8.0.4-servicing.24169.11 to 8.0.5-servicing.24216.11 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 8.0.4 to 8.0.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 8.0.4-servicing.24169.10 to 8.0.5-servicing.24216.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.NET.ILLink.Tasks**: from 8.0.4 to 8.0.5 (parent: Microsoft.N...
2024-04-17 18:38:32 +00:00
dotnet-bot
dd24b73944 Merge in 'release/8.0.1xx' changes 2024-04-16 20:52:00 +00:00
Marc Paine
79797800a3
[release/8.0.1xx] Update dependencies from dotnet/source-build-externals (#19485) 2024-04-16 13:41:45 -07:00
dotnet-maestro[bot]
61a252dfbc Update dependencies from https://github.com/dotnet/source-build-externals build 20240416.1
Microsoft.SourceBuild.Intermediate.source-build-externals
 From Version 8.0.0-alpha.1.24175.3 -> To Version 8.0.0-alpha.1.24216.1
2024-04-16 18:44:05 +00:00
Michael Yanni
16c903fd57
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.4xx' (#19458) 2024-04-12 13:04:10 -07:00
Jacques Eloff
09b5a52c2e
Update WiX to 3.14.1.8722 (#19407) 2024-04-12 11:01:27 -07:00
Jacques Eloff
b931c3d611
Update WiX to 3.14.1.8722 (#19406) 2024-04-12 10:57:49 -07:00
dotnet-bot
69964ca8df Merge in 'release/8.0.1xx' changes 2024-04-12 17:25:53 +00:00
Jacques Eloff
3224d04c10
Update WiX to 3.14.1.8722 (#19415) 2024-04-12 10:15:33 -07:00