File tree 8 files changed +371
-370
lines changed
8 files changed +371
-370
lines changed Original file line number Diff line number Diff line change 62
62
63
63
<ManagePackageVersionsCentrally >true</ManagePackageVersionsCentrally >
64
64
<CentralPackageTransitivePinningEnabled >true</CentralPackageTransitivePinningEnabled >
65
+
66
+ <!-- https://github.com/dotnet/source-build/issues/4115. -->
67
+ <PublishWindowsPdb >false</PublishWindowsPdb >
65
68
</PropertyGroup >
66
69
67
70
<PropertyGroup Condition =" '$(IsTestProject)' == 'true'" >
Load Diff Large diffs are not rendered by default.
Load Diff Large diffs are not rendered by default.
Original file line number Diff line number Diff line change @@ -68,8 +68,6 @@ $ErrorActionPreference = 'Stop'
68
68
# True if the build is a product build
69
69
[bool ]$productBuild = if (Test-Path variable:productBuild) { $productBuild } else { $false }
70
70
71
- [String []]$properties = if (Test-Path variable:properties) { $properties } else { @ () }
72
-
73
71
function Create-Directory ([string []] $path ) {
74
72
New-Item - Path $path - Force - ItemType ' Directory' | Out-Null
75
73
}
@@ -853,7 +851,7 @@ function MSBuild-Core() {
853
851
854
852
# When running on Azure Pipelines, override the returned exit code to avoid double logging.
855
853
# 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 ) {
857
855
Write-PipelineSetResult - Result " Failed" - Message " msbuild execution failed."
858
856
# Exiting with an exit code causes the azure pipelines task to log yet another "noise" error
859
857
# The above Write-PipelineSetResult will cause the task to be marked as failure without adding yet another error
Original file line number Diff line number Diff line change @@ -507,7 +507,7 @@ function MSBuild-Core {
507
507
508
508
# When running on Azure Pipelines, override the returned exit code to avoid double logging.
509
509
# 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
511
511
Write-PipelineSetResult -result " Failed" -message " msbuild execution failed."
512
512
# Exiting with an exit code causes the azure pipelines task to log yet another "noise" error
513
513
# The above Write-PipelineSetResult will cause the task to be marked as failure without adding yet another error
Original file line number Diff line number Diff line change @@ -10,7 +10,7 @@ function InitializeCustomSDKToolset {
10
10
11
11
# The following frameworks and tools are used only for testing.
12
12
# Do not attempt to install them in source build.
13
- if ($productBuild -or $properties -like " *DotNetBuildRepo=true* " ) {
13
+ if ($productBuild ) {
14
14
return
15
15
}
16
16
Original file line number Diff line number Diff line change @@ -7,7 +7,7 @@ function InitializeCustomSDKToolset {
7
7
8
8
# The following frameworks and tools are used only for testing.
9
9
# Do not attempt to install them in source build.
10
- if [[ $product_build == true || $properties == * " DotNetBuildRepo=true " * ]]; then
10
+ if [[ $product_build == true ]]; then
11
11
return
12
12
fi
13
13
Original file line number Diff line number Diff line change 14
14
}
15
15
},
16
16
"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 " ,
19
19
"Microsoft.Build.NoTargets" : " 3.7.0" ,
20
20
"Microsoft.Build.Traversal" : " 3.4.0"
21
21
}
You can’t perform that action at this time.
0 commit comments