Skip to content

Commit e1a0fb2

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[release/11.0.1xx-preview2] Source code updates from dotnet/msbuild (#4985)
[release/11.0.1xx-preview2] Source code updates from dotnet/msbuild
1 parent cf8c4fd commit e1a0fb2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+1204
-228
lines changed

‎src/msbuild/.vsts-dotnet-ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ jobs:
295295
name: NetCore-Public
296296
demands: ImageOverride -equals windows.vs2026preview.scout.amd64.open
297297
${{ if ne(variables['System.TeamProject'], 'public') }}:
298-
name: VSEngSS-MicroBuild2022-1ES
298+
name: VSEng-MicroBuildVSStable
299299
demands: agent.os -equals Windows_NT
300300
timeoutInMinutes: 120
301301
steps:

‎src/msbuild/.vsts-dotnet.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ extends:
7373
featureFlags:
7474
autoBaseline: true
7575
pool:
76-
name: VSEngSS-MicroBuild2022-1ES
76+
name: VSEng-MicroBuildVSStable
7777
os: windows
7878
sdl:
7979
policheck:

‎src/msbuild/azure-pipelines/.vsts-dotnet-build-jobs.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ parameters:
1616
jobs:
1717
- job: Windows_NT
1818
pool:
19-
name: VSEngSS-MicroBuild2022-1ES
19+
name: VSEng-MicroBuildVSStable
2020
demands:
2121
- agent.os -equals Windows_NT
2222

‎src/msbuild/azure-pipelines/.vsts-dotnet-exp-perf.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ extends:
6767
featureFlags:
6868
autoBaseline: true
6969
pool:
70-
name: VSEngSS-MicroBuild2022-1ES
70+
name: VSEng-MicroBuildVSStable
7171
os: windows
7272
sdl:
7373
policheck:

‎src/msbuild/azure-pipelines/vmr-sb-validation.yml‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
# MSBuild VMR source-build validation pipeline.
2+
#
3+
# Builds the VMR in source-build mode to validate MSBuild changes.
4+
# Supports passing extra MSBuild properties to stage 2 builds (e.g., -mt mode).
5+
#
6+
# Trigger: Manual only (queue from Azure DevOps UI)
7+
# Uses the same pattern as runtime's vmr-build-pr.yml.
8+
9+
trigger: none
10+
pr: none
11+
12+
parameters:
13+
- name: extraPropertiesStage2
14+
displayName: 'Extra MSBuild properties for stage 2 (e.g., /p:DotNetBuildMT=true)'
15+
type: string
16+
default: '/p:DotNetBuildMT=true /p:MSBuildMTExcludedReposOverride=arcade%3Bruntime%3Broslyn%3Baspnetcore%3Bsdk%3Befcore%3Bwinforms%3Bwpf%3Brazor%3Bsource-build-reference-packages'
17+
18+
variables:
19+
- template: /eng/common/templates/variables/pool-providers.yml@self
20+
21+
- name: skipComponentGovernanceDetection
22+
value: true
23+
24+
- name: Codeql.Enabled
25+
value: false
26+
27+
resources:
28+
repositories:
29+
- repository: vmr
30+
type: github
31+
name: dotnet/dotnet
32+
endpoint: dotnet
33+
34+
stages:
35+
- template: /eng/pipelines/templates/stages/vmr-build.yml@vmr
36+
parameters:
37+
isBuiltFromVmr: false
38+
scope: lite
39+
verifications: [ "source-build-stage1", "source-build-stage2" ]
40+
extraPropertiesStage2: ${{ parameters.extraPropertiesStage2 }}

‎src/msbuild/azure-pipelines/vs-insertion-experimental.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ extends:
6464
settings:
6565
networkIsolationPolicy: Permissive,CFSClean
6666
pool:
67-
name: VSEngSS-MicroBuild2022-1ES
67+
name: VSEng-MicroBuildVSStable
6868
stages:
6969
- stage: VSInsertion
7070
displayName: VS insertion

‎src/msbuild/azure-pipelines/vs-insertion.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ extends:
130130
settings:
131131
networkIsolationPolicy: Permissive,CFSClean
132132
pool:
133-
name: VSEngSS-MicroBuild2022-1ES
133+
name: VSEng-MicroBuildVSStable
134134
customBuildTags:
135135
- ES365AIMigrationTooling-Release
136136
stages:

‎src/msbuild/documentation/wiki/ChangeWaves.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ A wave of features is set to "rotate out" (i.e. become standard functionality) t
2424

2525
## Current Rotation of Change Waves
2626

27+
### 18.5
28+
- [FindUnderPath and AssignTargetPath tasks no longer throw on invalid path characters when using TaskEnvironment.GetAbsolutePath](https://github.com/dotnet/msbuild/pull/13069)
29+
- [AssignTargetPath on Linux respects case sensitivity of the file system instead of always ignoring case](https://github.com/dotnet/msbuild/pull/13069)
30+
2731
### 18.4
2832
- [Start throwing on null or empty paths in MultiProcess and MultiThreaded Task Environment Drivers.](https://github.com/dotnet/msbuild/pull/12914)
2933

‎src/msbuild/eng/Version.Details.props‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ This file should be imported by eng/Versions.props
2424
<SystemThreadingChannelsPackageVersion>10.0.2</SystemThreadingChannelsPackageVersion>
2525
<SystemThreadingTasksDataflowPackageVersion>10.0.2</SystemThreadingTasksDataflowPackageVersion>
2626
<!-- dotnet/arcade dependencies -->
27-
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26106.4</MicrosoftDotNetArcadeSdkPackageVersion>
28-
<MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.26106.4</MicrosoftDotNetXUnitExtensionsPackageVersion>
27+
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26119.2</MicrosoftDotNetArcadeSdkPackageVersion>
28+
<MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.26119.2</MicrosoftDotNetXUnitExtensionsPackageVersion>
2929
<!-- nuget/nuget.client dependencies -->
30-
<NuGetBuildTasksPackageVersion>7.4.0-rc.18</NuGetBuildTasksPackageVersion>
30+
<NuGetBuildTasksPackageVersion>7.5.0-rc.18</NuGetBuildTasksPackageVersion>
3131
<!-- dotnet/roslyn dependencies -->
32-
<MicrosoftNetCompilersToolsetPackageVersion>5.5.0-2.26105.1</MicrosoftNetCompilersToolsetPackageVersion>
32+
<MicrosoftNetCompilersToolsetPackageVersion>5.5.0-2.26114.2</MicrosoftNetCompilersToolsetPackageVersion>
3333
</PropertyGroup>
3434
<!--Property group for alternate package version names-->
3535
<PropertyGroup>

‎src/msbuild/eng/Version.Details.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="msbuild" Sha="2293c4c42809d258d5246ecaca1e986514cb425c" BarId="301941" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="msbuild" Sha="4c0aa722933ea491006247bbc0a484fa3c28cd14" BarId="302348" />
44
<ProductDependencies>
55
<!-- Necessary for source-build. This allows the live version of the package to be used by source-build. -->
66
<Dependency Name="System.CodeDom" Version="10.0.2">
@@ -106,21 +106,21 @@
106106
</Dependency>
107107
</ProductDependencies>
108108
<ToolsetDependencies>
109-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26106.4">
109+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26119.2">
110110
<Uri>https://github.com/dotnet/arcade</Uri>
111-
<Sha>58d75363f4b03e408aa2502e0db546173be722d4</Sha>
111+
<Sha>062ea8ab27da7dbb7d4f630bd50aeab94c9ffb93</Sha>
112112
</Dependency>
113-
<Dependency Name="NuGet.Build.Tasks" Version="7.4.0-rc.18">
113+
<Dependency Name="NuGet.Build.Tasks" Version="7.5.0-rc.18">
114114
<Uri>https://github.com/nuget/nuget.client</Uri>
115-
<Sha>4f7d030dc559f6334fc859e459b7e4023cbc59b3</Sha>
115+
<Sha>a527f9edd5b4b5b573f004609434b726ad324510</Sha>
116116
</Dependency>
117-
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="5.5.0-2.26105.1">
117+
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="5.5.0-2.26114.2">
118118
<Uri>https://github.com/dotnet/roslyn</Uri>
119-
<Sha>da86ec644af82dcb8575ff0c22ac6afdcd6b5066</Sha>
119+
<Sha>017cb895903426b1afd549f40e382d48dd044917</Sha>
120120
</Dependency>
121-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.26106.4">
121+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.26119.2">
122122
<Uri>https://github.com/dotnet/arcade</Uri>
123-
<Sha>58d75363f4b03e408aa2502e0db546173be722d4</Sha>
123+
<Sha>062ea8ab27da7dbb7d4f630bd50aeab94c9ffb93</Sha>
124124
</Dependency>
125125
</ToolsetDependencies>
126-
</Dependencies>
126+
</Dependencies>

0 commit comments

Comments
 (0)