Skip to content

Commit 670f269

Browse files
GangWang01GangWang01
committed
Merge branch 'vs17.11' into merge/vs17.10-to-vs17.11
2 parents 7c2b926 + e4f5b93 commit 670f269

File tree

548 files changed

+22716
-3809
lines changed

Some content is hidden

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

548 files changed

+22716
-3809
lines changed

‎.config/guardian/.gdnbaselines‎

Lines changed: 40 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,45 @@
5252
"createdDate": "2024-03-14 12:01:14Z",
5353
"expirationDate": "2024-08-31 12:48:32Z",
5454
"justification": "This error is baselined with an expiration date of 180 days from 2024-03-14 12:48:32Z"
55+
},
56+
"24491acb7bf0f8b072d9fbd2f6efcf1bdf6e9506ff3f7a9f9c803445c55b7bd9": {
57+
"signature": "24491acb7bf0f8b072d9fbd2f6efcf1bdf6e9506ff3f7a9f9c803445c55b7bd9",
58+
"alternativeSignatures": [
59+
"2dc3f5f5423a151deb6a74413f2798ade061c1f50519daeed42acfd2caebed03"
60+
],
61+
"target": ".packages/drop.app/18.165.29912-buildid11693003/lib/net45/ContentStoreApp.Full/x64/BuildXLAria.dll",
62+
"memberOf": [
63+
"default"
64+
],
65+
"tool": "binskim",
66+
"ruleId": "BA2008",
67+
"createdDate": "2024-06-19 17:22:41Z"
68+
},
69+
"1dc1a6797e20d1319df1cb8d4df5c6f6194ce4e87151bf801fb9bf2d038ccfaf": {
70+
"signature": "1dc1a6797e20d1319df1cb8d4df5c6f6194ce4e87151bf801fb9bf2d038ccfaf",
71+
"alternativeSignatures": [
72+
"f52bc24a2feebdcb7b1192ac2debea8da9ca5d012a6719e905b16f979711ceca"
73+
],
74+
"target": ".packages/drop.app/18.165.29912-buildid11693003/lib/net45/ContentStoreApp.Full/x64/BuildXLNatives.dll",
75+
"memberOf": [
76+
"default"
77+
],
78+
"tool": "binskim",
79+
"ruleId": "BA2008",
80+
"createdDate": "2024-06-19 17:22:41Z"
81+
},
82+
"5bf3f552d54adcae12d7f1e79d47b5a9392c774f03943793cd1a0f7bb2eef28b": {
83+
"signature": "5bf3f552d54adcae12d7f1e79d47b5a9392c774f03943793cd1a0f7bb2eef28b",
84+
"alternativeSignatures": [
85+
"ea4d59d18cbff7ffab4bb678927fc6fee763539a51cfbf5aae60ae1b8123a6ba"
86+
],
87+
"target": ".packages/drop.app/18.165.29912-buildid11693003/lib/net45/ContentStoreApp.Full/x64/ClientTelemetry.dll",
88+
"memberOf": [
89+
"default"
90+
],
91+
"tool": "binskim",
92+
"ruleId": "BA2007",
93+
"createdDate": "2024-06-19 17:22:41Z"
5594
}
5695
}
57-
}
96+
}

‎.editorconfig‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# editorconfig.org
1+
# editorconfig.org
22

33
# top-most EditorConfig file
44
root = true
@@ -163,6 +163,9 @@ dotnet_code_quality.ca2208.api_surface = public
163163
# CA1852: Seal internal types
164164
dotnet_diagnostic.ca1852.severity = warning
165165

166+
# CA2000: Dispose objects before losing scope
167+
dotnet_diagnostic.ca2000.severity = error
168+
166169
# RS0037: Enable tracking of nullability of reference types in the declared API
167170
# Our API is not annotated but new classes get nullable enabled so disable this.
168171
# We'd be happy if everything was annotated and this could be removed.
@@ -409,3 +412,6 @@ dotnet_diagnostic.IDE0290.severity = suggestion
409412
dotnet_diagnostic.IDE0300.severity = suggestion
410413
dotnet_diagnostic.IDE0301.severity = suggestion
411414
dotnet_diagnostic.IDE0305.severity = suggestion
415+
416+
# Temporarily disable SA1010 "Opening square brackets should not be preceded by a space" until https://github.com/DotNetAnalyzers/StyleCopAnalyzers/issues/3687 is fixed
417+
dotnet_diagnostic.SA1010.severity = none

‎.exp-insertions.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,15 +166,16 @@ jobs:
166166
Write-Host "Detected drop.exe path: $dropExePath"
167167
168168
Write-Host "Downloading VS msbuild"
169-
& "$dropExePath" get --patAuthEnvVar 'cloudbuild-token' -u "$(MSBuildDropPath)\$(VSVersion)" -d "$(System.ArtifactsDirectory)/VSMSBuildDrop"
169+
$patAuthEnvVar = "SYSTEM_ACCESSTOKEN"
170+
& "$dropExePath" get --patAuthEnvVar $patAuthEnvVar -u "$(MSBuildDropPath)\$(VSVersion)" -d "$(System.ArtifactsDirectory)/VSMSBuildDrop"
170171
Write-Host "Download of VS msbuild finished"
171172
172173
Write-Host "Copying VS msbuild to $(Pipeline.Workspace)/VSMSBuild"
173174
Copy-Item -Path "$(System.ArtifactsDirectory)/VSMSBuildDrop/*" -Destination "$(Pipeline.Workspace)/VSMSBuild" -Recurse
174175
Write-Host "Copy of VS msbuild finished"
175176
displayName: Download msbuild vs drop
176177
env:
177-
cloudbuild-token: $(cloudbuild-token)
178+
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
178179
179180
- task: DownloadBuildArtifacts@1
180181
inputs:

‎.vsts-dotnet-ci.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ jobs:
2525
$isVersionBumped = $false
2626
if ($changedVersionsFile -ne $null) {
2727
$difference = git diff HEAD~1 $versionsFile
28-
$changedContent = $difference -join " "
28+
$changedContent = $difference -join "%"
2929
# 'DotNetFinalVersionKind' is expected to be added only during the initial setup of the release branch
30-
$initialCommitPattern = '-\s*<VersionPrefix>\d+\.\d+\.\d+<\/VersionPrefix> \+\s*<VersionPrefix>\d+\.\d+\.\d+<\/VersionPrefix>.*<DotNetFinalVersionKind>release<\/DotNetFinalVersionKind>'
30+
$initialCommitPattern = '-\s*<VersionPrefix>\d+\.\d+\.\d+<\/VersionPrefix>%.*\+\s*<VersionPrefix>\d+\.\d+\.\d+<\/VersionPrefix><DotNetFinalVersionKind>release<\/DotNetFinalVersionKind>'
3131
$isInitialCommit = $changedContent -match $initialCommitPattern
32-
$pattern = '-\s*<VersionPrefix>\d+\.\d+\.(?<previous>\d+)<\/VersionPrefix>.* \+\s*<VersionPrefix>\d+\.\d+\.(?<current>\d+)<\/VersionPrefix>'
32+
$pattern = '-\s*<VersionPrefix>\d+\.\d+\.(?<previous>\d+)<\/VersionPrefix>.*%\+\s*<VersionPrefix>\d+\.\d+\.(?<current>\d+)<\/VersionPrefix>'
3333
if (!($isInitialCommit) -and ($changedContent -match $pattern)) {
3434
try {
3535
$previousPatch = [Convert]::ToInt32($Matches.previous)

‎.vsts-dotnet.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ variables:
3434
- name: SourceBranch
3535
value: ''
3636
- name: EnableReleaseOneLocBuild
37-
value: false # Disable loc for vs17.10 now that it's shipped
37+
value: false # disable loc for vs17.11
3838
- name: Codeql.Enabled
3939
value: true
4040
- group: DotNet-MSBuild-SDLValidation-Params

‎MSBuild.Dev.slnf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99
"src\\Framework\\Microsoft.Build.Framework.csproj",
1010
"src\\MSBuild.UnitTests\\Microsoft.Build.CommandLine.UnitTests.csproj",
1111
"src\\MSBuild\\MSBuild.csproj",
12+
"src\\StringTools\\StringTools.csproj",
1213
"src\\Tasks.UnitTests\\Microsoft.Build.Tasks.UnitTests.csproj",
1314
"src\\Tasks\\Microsoft.Build.Tasks.csproj",
15+
"src\\UnitTests.Shared\\Microsoft.Build.UnitTests.Shared.csproj",
1416
"src\\Utilities.UnitTests\\Microsoft.Build.Utilities.UnitTests.csproj",
1517
"src\\Utilities\\Microsoft.Build.Utilities.csproj",
16-
"src\\Xunit.NetCore.Extensions\\Xunit.NetCore.Extensions.csproj",
17-
"src\\StringTools\\StringTools.csproj",
18-
"src\\UnitTests.Shared\\Microsoft.Build.UnitTests.Shared.csproj"
18+
"src\\Xunit.NetCore.Extensions\\Xunit.NetCore.Extensions.csproj"
1919
]
2020
}
2121
}

‎MSBuild.sln‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MSBuild.VSSetup.Arm64", "sr
8080
EndProject
8181
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Build.UnitTests.Shared", "src\UnitTests.Shared\Microsoft.Build.UnitTests.Shared.csproj", "{52A0B9C1-23B7-4CCC-B3FC-BDBA1C619E2A}"
8282
EndProject
83+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Build.BuildCheck.UnitTests", "src\BuildCheck.UnitTests\Microsoft.Build.BuildCheck.UnitTests.csproj", "{434CC6DB-1E66-4FB1-A66C-D5BBE99F0ED8}"
84+
EndProject
85+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Build.Templates", "template_feed\Microsoft.Build.Templates.csproj", "{A86EE74A-AEF0-42ED-A5A7-7A54BC0773D8}"
86+
EndProject
8387
Global
8488
GlobalSection(SolutionConfigurationPlatforms) = preSolution
8589
Debug|Any CPU = Debug|Any CPU
@@ -864,6 +868,54 @@ Global
864868
{52A0B9C1-23B7-4CCC-B3FC-BDBA1C619E2A}.Release|x64.Build.0 = Release|x64
865869
{52A0B9C1-23B7-4CCC-B3FC-BDBA1C619E2A}.Release|x86.ActiveCfg = Release|Any CPU
866870
{52A0B9C1-23B7-4CCC-B3FC-BDBA1C619E2A}.Release|x86.Build.0 = Release|Any CPU
871+
{434CC6DB-1E66-4FB1-A66C-D5BBE99F0ED8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
872+
{434CC6DB-1E66-4FB1-A66C-D5BBE99F0ED8}.Debug|Any CPU.Build.0 = Debug|Any CPU
873+
{434CC6DB-1E66-4FB1-A66C-D5BBE99F0ED8}.Debug|ARM64.ActiveCfg = Debug|arm64
874+
{434CC6DB-1E66-4FB1-A66C-D5BBE99F0ED8}.Debug|ARM64.Build.0 = Debug|arm64
875+
{434CC6DB-1E66-4FB1-A66C-D5BBE99F0ED8}.Debug|x64.ActiveCfg = Debug|x64
876+
{434CC6DB-1E66-4FB1-A66C-D5BBE99F0ED8}.Debug|x64.Build.0 = Debug|x64
877+
{434CC6DB-1E66-4FB1-A66C-D5BBE99F0ED8}.Debug|x86.ActiveCfg = Debug|Any CPU
878+
{434CC6DB-1E66-4FB1-A66C-D5BBE99F0ED8}.Debug|x86.Build.0 = Debug|Any CPU
879+
{434CC6DB-1E66-4FB1-A66C-D5BBE99F0ED8}.MachineIndependent|Any CPU.ActiveCfg = MachineIndependent|Any CPU
880+
{434CC6DB-1E66-4FB1-A66C-D5BBE99F0ED8}.MachineIndependent|Any CPU.Build.0 = MachineIndependent|Any CPU
881+
{434CC6DB-1E66-4FB1-A66C-D5BBE99F0ED8}.MachineIndependent|ARM64.ActiveCfg = MachineIndependent|arm64
882+
{434CC6DB-1E66-4FB1-A66C-D5BBE99F0ED8}.MachineIndependent|ARM64.Build.0 = MachineIndependent|arm64
883+
{434CC6DB-1E66-4FB1-A66C-D5BBE99F0ED8}.MachineIndependent|x64.ActiveCfg = MachineIndependent|x64
884+
{434CC6DB-1E66-4FB1-A66C-D5BBE99F0ED8}.MachineIndependent|x64.Build.0 = MachineIndependent|x64
885+
{434CC6DB-1E66-4FB1-A66C-D5BBE99F0ED8}.MachineIndependent|x86.ActiveCfg = MachineIndependent|Any CPU
886+
{434CC6DB-1E66-4FB1-A66C-D5BBE99F0ED8}.MachineIndependent|x86.Build.0 = MachineIndependent|Any CPU
887+
{434CC6DB-1E66-4FB1-A66C-D5BBE99F0ED8}.Release|Any CPU.ActiveCfg = Release|Any CPU
888+
{434CC6DB-1E66-4FB1-A66C-D5BBE99F0ED8}.Release|Any CPU.Build.0 = Release|Any CPU
889+
{434CC6DB-1E66-4FB1-A66C-D5BBE99F0ED8}.Release|ARM64.ActiveCfg = Release|arm64
890+
{434CC6DB-1E66-4FB1-A66C-D5BBE99F0ED8}.Release|ARM64.Build.0 = Release|arm64
891+
{434CC6DB-1E66-4FB1-A66C-D5BBE99F0ED8}.Release|x64.ActiveCfg = Release|x64
892+
{434CC6DB-1E66-4FB1-A66C-D5BBE99F0ED8}.Release|x64.Build.0 = Release|x64
893+
{434CC6DB-1E66-4FB1-A66C-D5BBE99F0ED8}.Release|x86.ActiveCfg = Release|Any CPU
894+
{434CC6DB-1E66-4FB1-A66C-D5BBE99F0ED8}.Release|x86.Build.0 = Release|Any CPU
895+
{A86EE74A-AEF0-42ED-A5A7-7A54BC0773D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
896+
{A86EE74A-AEF0-42ED-A5A7-7A54BC0773D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
897+
{A86EE74A-AEF0-42ED-A5A7-7A54BC0773D8}.Debug|ARM64.ActiveCfg = Debug|Any CPU
898+
{A86EE74A-AEF0-42ED-A5A7-7A54BC0773D8}.Debug|ARM64.Build.0 = Debug|Any CPU
899+
{A86EE74A-AEF0-42ED-A5A7-7A54BC0773D8}.Debug|x64.ActiveCfg = Debug|Any CPU
900+
{A86EE74A-AEF0-42ED-A5A7-7A54BC0773D8}.Debug|x64.Build.0 = Debug|Any CPU
901+
{A86EE74A-AEF0-42ED-A5A7-7A54BC0773D8}.Debug|x86.ActiveCfg = Debug|Any CPU
902+
{A86EE74A-AEF0-42ED-A5A7-7A54BC0773D8}.Debug|x86.Build.0 = Debug|Any CPU
903+
{A86EE74A-AEF0-42ED-A5A7-7A54BC0773D8}.MachineIndependent|Any CPU.ActiveCfg = MachineIndependent|Any CPU
904+
{A86EE74A-AEF0-42ED-A5A7-7A54BC0773D8}.MachineIndependent|Any CPU.Build.0 = MachineIndependent|Any CPU
905+
{A86EE74A-AEF0-42ED-A5A7-7A54BC0773D8}.MachineIndependent|ARM64.ActiveCfg = MachineIndependent|Any CPU
906+
{A86EE74A-AEF0-42ED-A5A7-7A54BC0773D8}.MachineIndependent|ARM64.Build.0 = MachineIndependent|Any CPU
907+
{A86EE74A-AEF0-42ED-A5A7-7A54BC0773D8}.MachineIndependent|x64.ActiveCfg = MachineIndependent|Any CPU
908+
{A86EE74A-AEF0-42ED-A5A7-7A54BC0773D8}.MachineIndependent|x64.Build.0 = MachineIndependent|Any CPU
909+
{A86EE74A-AEF0-42ED-A5A7-7A54BC0773D8}.MachineIndependent|x86.ActiveCfg = MachineIndependent|Any CPU
910+
{A86EE74A-AEF0-42ED-A5A7-7A54BC0773D8}.MachineIndependent|x86.Build.0 = MachineIndependent|Any CPU
911+
{A86EE74A-AEF0-42ED-A5A7-7A54BC0773D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
912+
{A86EE74A-AEF0-42ED-A5A7-7A54BC0773D8}.Release|Any CPU.Build.0 = Release|Any CPU
913+
{A86EE74A-AEF0-42ED-A5A7-7A54BC0773D8}.Release|ARM64.ActiveCfg = Release|Any CPU
914+
{A86EE74A-AEF0-42ED-A5A7-7A54BC0773D8}.Release|ARM64.Build.0 = Release|Any CPU
915+
{A86EE74A-AEF0-42ED-A5A7-7A54BC0773D8}.Release|x64.ActiveCfg = Release|Any CPU
916+
{A86EE74A-AEF0-42ED-A5A7-7A54BC0773D8}.Release|x64.Build.0 = Release|Any CPU
917+
{A86EE74A-AEF0-42ED-A5A7-7A54BC0773D8}.Release|x86.ActiveCfg = Release|Any CPU
918+
{A86EE74A-AEF0-42ED-A5A7-7A54BC0773D8}.Release|x86.Build.0 = Release|Any CPU
867919
EndGlobalSection
868920
GlobalSection(SolutionProperties) = preSolution
869921
HideSolutionNode = FALSE

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
The Microsoft Build Engine is a platform for building applications. This engine, also known as MSBuild, provides an XML schema for a project file that controls how the build platform processes and builds software. Visual Studio uses MSBuild, but MSBuild can run without Visual Studio. By invoking msbuild.exe on your project or solution file, you can orchestrate and build products in environments where Visual Studio isn't installed.
44

5-
For more information on MSBuild, see the [MSBuild documentation](https://docs.microsoft.com/visualstudio/msbuild/msbuild) on docs.microsoft.com.
5+
For more information on MSBuild, see the [MSBuild documentation](https://learn.microsoft.com/visualstudio/msbuild/msbuild) on learn.microsoft.com.
66

77
The [changelog](documentation/Changelog.md) has detailed information about changes made in different releases.
88

@@ -15,12 +15,12 @@ For the full supported experience, you will need to have Visual Studio 2022 or h
1515
To get started on **Visual Studio 2022**:
1616

1717
1. [Install Visual Studio 2022](https://www.visualstudio.com/vs/). Select the following Workloads:
18-
- .NET desktop development
19-
- .NET Core cross-platform development
18+
- .NET desktop development
19+
- .NET Core cross-platform development
2020
2. Ensure [long path support](https://learn.microsoft.com/windows/win32/fileio/maximum-file-path-limitation?tabs=registry#enable-long-paths-in-windows-10-version-1607-and-later) is enabled at the Windows level.
2121
3. Open a `Developer Command Prompt for VS 2022` prompt.
2222
4. Clone the source code: `git clone https://github.com/dotnet/msbuild`
23-
- You may have to [download Git](https://git-scm.com/downloads) first.
23+
- You may have to [download Git](https://git-scm.com/downloads) first.
2424
5. Run `.\build.cmd` from the root of the repo to build the code. This also restores packages needed to open the projects in Visual Studio.
2525
6. Open `MSBuild.sln` or `MSBuild.Dev.slnf` in Visual Studio 2022.
2626

‎documentation/README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ The folder contains collection of docs and references for MSBuild, detailed info
5353
* [Low priority nodes](specs/low-priority-switch.md)
5454
* [Threading in MSBuild worker nodes](specs/threading.md)
5555
* [Nodes orchestration](wiki/Nodes-Orchestration.md)
56+
* [Logging Internals](wiki/Logging-Internals.md)
5657
* [Project cache plugin](specs/project-cache.md)
5758
* [Support for remote host objects](specs/remote-host-object.md)
5859
* [Static graph](specs/static-graph.md)

0 commit comments

Comments
 (0)