Skip to content

Commit cb8ae89

Browse files
authored
[main] Source code updates from dotnet/dotnet (#48982)
2 parents 184eb43 + e4cbbcf commit cb8ae89

8 files changed

+371
-370
lines changed

Directory.Build.props

+3
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,9 @@
6262

6363
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
6464
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
65+
66+
<!-- https://github.com/dotnet/source-build/issues/4115. -->
67+
<PublishWindowsPdb>false</PublishWindowsPdb>
6568
</PropertyGroup>
6669

6770
<PropertyGroup Condition="'$(IsTestProject)' == 'true'">

eng/Version.Details.xml

+243-243
Large diffs are not rendered by default.

eng/Versions.props

+119-119
Large diffs are not rendered by default.

eng/common/tools.ps1

+1-3
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,6 @@ $ErrorActionPreference = 'Stop'
6868
# True if the build is a product build
6969
[bool]$productBuild = if (Test-Path variable:productBuild) { $productBuild } else { $false }
7070

71-
[String[]]$properties = if (Test-Path variable:properties) { $properties } else { @() }
72-
7371
function Create-Directory ([string[]] $path) {
7472
New-Item -Path $path -Force -ItemType 'Directory' | Out-Null
7573
}
@@ -853,7 +851,7 @@ function MSBuild-Core() {
853851

854852
# When running on Azure Pipelines, override the returned exit code to avoid double logging.
855853
# Skip this when the build is a child of the VMR orchestrator build.
856-
if ($ci -and $env:SYSTEM_TEAMPROJECT -ne $null -and !$productBuild -and -not($properties -like "*DotNetBuildRepo=true*")) {
854+
if ($ci -and $env:SYSTEM_TEAMPROJECT -ne $null -and !$productBuild) {
857855
Write-PipelineSetResult -Result "Failed" -Message "msbuild execution failed."
858856
# Exiting with an exit code causes the azure pipelines task to log yet another "noise" error
859857
# The above Write-PipelineSetResult will cause the task to be marked as failure without adding yet another error

eng/common/tools.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,7 @@ function MSBuild-Core {
507507

508508
# When running on Azure Pipelines, override the returned exit code to avoid double logging.
509509
# Skip this when the build is a child of the VMR orchestrator build.
510-
if [[ "$ci" == true && -n ${SYSTEM_TEAMPROJECT:-} && "$product_build" != true && "$properties" != *"DotNetBuildRepo=true"* ]]; then
510+
if [[ "$ci" == true && -n ${SYSTEM_TEAMPROJECT:-} && "$product_build" != true ]]; then
511511
Write-PipelineSetResult -result "Failed" -message "msbuild execution failed."
512512
# Exiting with an exit code causes the azure pipelines task to log yet another "noise" error
513513
# The above Write-PipelineSetResult will cause the task to be marked as failure without adding yet another error

eng/restore-toolset.ps1

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ function InitializeCustomSDKToolset {
1010

1111
# The following frameworks and tools are used only for testing.
1212
# Do not attempt to install them in source build.
13-
if ($productBuild -or $properties -like "*DotNetBuildRepo=true*") {
13+
if ($productBuild) {
1414
return
1515
}
1616

eng/restore-toolset.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ function InitializeCustomSDKToolset {
77

88
# The following frameworks and tools are used only for testing.
99
# Do not attempt to install them in source build.
10-
if [[ $product_build == true || $properties == *"DotNetBuildRepo=true"* ]]; then
10+
if [[ $product_build == true ]]; then
1111
return
1212
fi
1313

global.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
}
1515
},
1616
"msbuild-sdks": {
17-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25263.108",
18-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25263.108",
17+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25265.101",
18+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25265.101",
1919
"Microsoft.Build.NoTargets": "3.7.0",
2020
"Microsoft.Build.Traversal": "3.4.0"
2121
}

0 commit comments

Comments
 (0)