Commit graph

33999 commits

Author SHA1 Message Date
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
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
Nikola Milosavljevic
496db681a9 Update MSBuild dependencies 2024-04-23 02:01:08 +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
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
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
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
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
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
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
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
dotnet-bot
dd7afce69b Merge in 'release/8.0.1xx' changes 2024-04-10 20:56:06 +00:00
Michael Yanni
2140d0b1cd
[release/8.0.1xx] Update dependencies from dotnet/arcade (#19418) 2024-04-10 13:45:50 -07:00
dotnet-maestro[bot]
413d203d59 Update dependencies from https://github.com/dotnet/arcade build 20240404.3
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 8.0.0-beta.24179.4 -> To Version 8.0.0-beta.24204.3
2024-04-10 17:50:12 +00:00
dotnet-bot
16bb39a605 Merge in 'release/8.0.1xx' changes 2024-04-10 17:47:08 +00:00
Ella Hathaway
b978fe7153
Add 1ES PT baseline for VMR (#19336) 2024-04-10 10:37:25 -07:00
dotnet-bot
f7543f82c7 Merge in 'release/8.0.1xx' changes 2024-04-10 15:06:11 +00:00
Oleksandr Didyk
191cbe4e19
.NET Source-Build 8.0.104 April 2024 Updates (#19380) 2024-04-10 16:57:10 +02:00
Matt Thalman
670c190634
Merge branch 'release/8.0.1xx' into 8.0.104-apr2024-source-build-1712692980 2024-04-10 08:30:23 -05:00
dotnet-bot
51285c7e4e Merge in 'release/8.0.1xx' changes 2024-04-09 22:00:08 +00:00
Michael Yanni
93809b2bdc
Merging internal commits for release/8.0.1xx (#19373) 2024-04-09 14:50:47 -07:00
dotnet-sb-bot
96b43b4156 update global.json and Versions.props for .NET SDK 8.0.104 2024-04-09 20:03:10 +00:00
Sean Reeser
2c05a9eec6 Merge commit '034f91fcc0c48f527c56ae748103d193bb0ee06b' into internal-merge-8.0.1xx-2024-04-09-1217 2024-04-09 12:17:17 -07:00
dotnet-bot
b95a8138d1 Merge in 'release/8.0.1xx' changes 2024-04-09 09:54:59 +00:00
v-wuzhai
048be551ec
[automated] Merge branch 'release/7.0.4xx' => 'release/8.0.1xx' (#19361) 2024-04-09 02:45:34 -07:00
Jason Zhai
5d0c113c91 Merge branch 'release/8.0.3xx' 2024-04-08 23:56:43 -07:00
v-wuzhai
3106619442
[automated] Merge branch 'release/7.0.3xx' => 'release/7.0.4xx' (#19345) 2024-04-08 23:50:34 -07:00
dotnet-bot
bf9339a2f9 Merge in 'release/8.0.1xx' changes 2024-04-08 19:06:19 +00:00
Ella Hathaway
1f755295b5
[8.0.1xx] Update scancode to 32.1.0 (#19357) 2024-04-08 18:57:20 +00:00
dotnet-bot
a4eebb1211 Merge in 'release/8.0.1xx' changes 2024-04-08 15:45:16 +00:00
Oleksandr Didyk
9d937ca9cd
[8.0.1xx] Trigger sdk diff tests on every VMR release build (#19353) 2024-04-08 17:35:42 +02:00
Oleksandr.Didyk
b6e59e6bd1 add trigger to sdk diff tests from vmr for release branches 2024-04-08 16:11:31 +02:00
Jason Zhai
0c8710794c Merge branch 'release/7.0.3xx' into release/7.0.4xx 2024-04-07 22:43:10 -07:00
v-wuzhai
812d7c7f91
[automated] Merge branch 'release/7.0.1xx' => 'release/7.0.3xx' (#19293) 2024-04-07 19:23:15 -07:00
dotnet-bot
309682552c Merge in 'release/8.0.1xx' changes 2024-04-07 07:59:55 +00:00
v-wuzhai
7758e5ba3e
[automated] Merge branch 'release/7.0.4xx' => 'release/8.0.1xx' (#19294) 2024-04-07 00:50:51 -07:00
Jason Zhai
040fdc4184 Merge branch 'release/7.0.1xx' into release/7.0.3xx 2024-04-06 20:14:54 -07:00
Jason Zhai
1aa17f885a Merge branch 'release/7.0.4xx' into release/8.0.1xx 2024-04-06 20:08:42 -07:00
Marc Paine
bf62110642
[release/7.0.3xx] Update dependencies from dotnet/arcade (#19327) 2024-04-05 13:13:21 -07:00