Commit graph

34229 commits

Author SHA1 Message Date
Marc Paine
3a7d324af7
Stabilize the 7.0 runtime pack and remove 7.0 templates (#19649) 2024-05-14 16:40:45 -07:00
NET Source-Build Bot
d387df33b0
.NET Source-Build 8.0.105 May 2024 Updates (#19754) 2024-05-14 14:57:32 -07:00
NET Source-Build Bot
d3db392d69
.NET Source-Build 6.0.130 May 2024 Updates (#19751) 2024-05-14 14:50:31 -07:00
Marc Paine
259d4d36e1
Merging internal commits for release/6.0.1xx (#19744) 2024-05-14 13:38:48 -07:00
Marc Paine
54c07c83cd
Merging internal commits for release/8.0.1xx (#19743) 2024-05-14 11:52:39 -07:00
Marc Paine
81c3660f88
Merging internal commits for release/6.0.4xx (#19745) 2024-05-14 11:52:30 -07:00
Sean Reeser
d72263767e Merge commit 'ae2bd4ec541f39c094376bdbc14138a38ec4caa1' into internal-merge-6.0.4xx-2024-05-14-1028 2024-05-14 10:28:37 -07:00
Sean Reeser
5ec71d06e8 Merge commit 'a883df0be948105c30b07338b747301318cdc2bc' into internal-merge-6.0.1xx-2024-05-14-1028 2024-05-14 10:28:27 -07:00
Sean Reeser
1bd8a8e553 Merge commit 'eae90abaafdc354f03ec5f9a441faf3a4e9e113a' into internal-merge-8.0.1xx-2024-05-14-1019 2024-05-14 10:19:49 -07:00
v-wuzhai
a18219d44b
[release/8.0.1xx] Update dependencies from dotnet/source-build-externals (#19732) 2024-05-13 19:12:41 -07:00
dotnet-maestro[bot]
2e6af4badc Update dependencies from https://github.com/dotnet/source-build-externals build 20240513.1
Microsoft.SourceBuild.Intermediate.source-build-externals
 From Version 8.0.0-alpha.1.24256.1 -> To Version 8.0.0-alpha.1.24263.1
2024-05-13 14:01:39 +00:00
v-wuzhai
5a1768b54b
[release/8.0.1xx] Update dependencies from dotnet/source-build-reference-packages (#19713) 2024-05-08 19:21:40 -07:00
dotnet-maestro[bot]
5e571f522f Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240507.2
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 8.0.0-alpha.1.24256.1 -> To Version 8.0.0-alpha.1.24257.2
2024-05-08 12:42:50 +00:00
Marc Paine
45fab0c0f1 Update to the source build reference package with 17.8.5 2024-05-07 16:11:46 -07:00
dotnet-maestro[bot]
5cfe201265
[release/8.0.1xx] Update dependencies from dotnet/source-build-reference-packages (#19701)
[release/8.0.1xx] Update dependencies from dotnet/source-build-reference-packages
2024-05-07 21:02:14 +00:00
v-wuzhai
ad7330569c
[release/8.0.1xx] Update dependencies from dotnet/source-build-externals (#19680) 2024-05-06 19:07:19 -07:00
dotnet-maestro-bot
a94d7b39b3
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.4xx' (#19688)
Co-authored-by: Matt Thalman <mthalman@microsoft.com>
2024-05-06 20:44:40 +00:00
Matt Thalman
9e764900e8
Migrate security-partners-dotnet pipeline to 1ES (#19621) 2024-05-06 14:19:05 -05:00
dotnet-maestro[bot]
d7f7c26a4d Update dependencies from https://github.com/dotnet/source-build-externals build 20240506.1
Microsoft.SourceBuild.Intermediate.source-build-externals
 From Version 8.0.0-alpha.1.24216.1 -> To Version 8.0.0-alpha.1.24256.1
2024-05-06 13:58:59 +00:00
v-wuzhai
309b559397
[automated] Merge branch 'release/6.0.4xx' => 'release/8.0.1xx' (#19676) 2024-05-06 02:45:55 -07:00
Jason Zhai
fa186793e5 Merge branch 'release/6.0.4xx' into release/8.0.1xx 2024-05-05 23:29:59 -07:00
v-wuzhai
6f09d2c420
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.4xx' (#19583) 2024-05-05 23:21:58 -07:00
Jason Zhai
ca14d50f79 Merge branch 'release/6.0.1xx' into release/6.0.4xx 2024-05-05 20:07:04 -07:00
v-wuzhai
edba3fb244
[release/8.0.1xx] Update dependencies from dotnet/source-build-reference-packages (#19657) 2024-05-05 19:29:58 -07:00
dotnet-maestro[bot]
b26fc36d37 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240501.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 8.0.0-alpha.1.24163.3 -> To Version 8.0.0-alpha.1.24251.1
2024-05-05 12:29:53 +00:00
dotnet-maestro[bot]
7671cdb9e7 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240501.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 8.0.0-alpha.1.24163.3 -> To Version 8.0.0-alpha.1.24251.1
2024-05-04 12:30:26 +00:00
dotnet-maestro[bot]
1816099882 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240501.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 8.0.0-alpha.1.24163.3 -> To Version 8.0.0-alpha.1.24251.1
2024-05-03 12:46:13 +00:00
Marc Paine
dd77368a22
Remove the 70 bundled version line 2024-05-02 15:36:07 -07:00
Marc Paine
c04fc8a632 Stabilize the 7.0 runtime pack
Remove the 7.0 templates
2024-05-02 13:42:16 -07:00
Marc Paine
31f2f7949d
Update branding to 8.0.106 (#19629) 2024-05-02 10:58:23 -07:00
Marc Paine
f1352c6bd7
Update branding to 6.0.423 (#19625) 2024-05-02 10:58:18 -07:00
Marc Paine
e4118ea665
Update branding to 6.0.131 (#19624) 2024-05-02 10:58:14 -07:00
Sean Reeser
1695d9b473 Update branding to 8.0.106 2024-05-01 14:46:37 -07:00
Sean Reeser
9175bb16aa Update branding to 6.0.423 2024-05-01 14:46:20 -07:00
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