File tree Expand file tree Collapse file tree 8 files changed +13
-16
lines changed Expand file tree Collapse file tree 8 files changed +13
-16
lines changed Original file line number Diff line number Diff line change 1
1
<?xml version =" 1.0" encoding =" utf-8" ?>
2
2
<Dependencies >
3
- <Source Uri =" https://github.com/dotnet/dotnet" Mapping =" source-build-externals" Sha =" 85778473549347b3e4bad3ea009e9438df7b11bb " BarId =" 267776 " />
3
+ <Source Uri =" https://github.com/dotnet/dotnet" Mapping =" source-build-externals" Sha =" 170498a9429a5553fe7ac0ec2341d19bbb97cbe8 " BarId =" 268722 " />
4
4
<ToolsetDependencies >
5
5
<Dependency Name =" Microsoft.Build" Version =" 17.14.0-preview-24619-01" >
6
6
<Uri >https://github.com/dotnet/msbuild</Uri >
7
7
<Sha >e9b99f554a3c298e1106ea171f5a0462780af2c5</Sha >
8
8
</Dependency >
9
- <Dependency Name =" Microsoft.DotNet.Arcade.Sdk" Version =" 10.0.0-beta.25260.104 " >
9
+ <Dependency Name =" Microsoft.DotNet.Arcade.Sdk" Version =" 10.0.0-beta.25267.102 " >
10
10
<Uri >https://github.com/dotnet/dotnet</Uri >
11
- <Sha >85778473549347b3e4bad3ea009e9438df7b11bb </Sha >
11
+ <Sha >170498a9429a5553fe7ac0ec2341d19bbb97cbe8 </Sha >
12
12
</Dependency >
13
13
</ToolsetDependencies >
14
14
</Dependencies >
Original file line number Diff line number Diff line change @@ -127,7 +127,7 @@ function Build {
127
127
/ p:Deploy= $deploy `
128
128
/ p:Test= $test `
129
129
/ p:Pack= $pack `
130
- / p:DotNetBuildRepo = $productBuild `
130
+ / p:DotNetBuild = $productBuild `
131
131
/ p:IntegrationTest= $integrationTest `
132
132
/ p:PerformanceTest= $performanceTest `
133
133
/ p:Sign= $sign `
Original file line number Diff line number Diff line change @@ -129,14 +129,14 @@ while [[ $# > 0 ]]; do
129
129
-pack)
130
130
pack=true
131
131
;;
132
- -sourcebuild|-sb)
132
+ -sourcebuild|-source-build|- sb)
133
133
build=true
134
134
source_build=true
135
135
product_build=true
136
136
restore=true
137
137
pack=true
138
138
;;
139
- -productBuild |-pb)
139
+ -productbuild|-product-build |-pb)
140
140
build=true
141
141
product_build=true
142
142
restore=true
@@ -241,7 +241,7 @@ function Build {
241
241
/p:RepoRoot=" $repo_root " \
242
242
/p:Restore=$restore \
243
243
/p:Build=$build \
244
- /p:DotNetBuildRepo =$product_build \
244
+ /p:DotNetBuild =$product_build \
245
245
/p:DotNetBuildSourceOnly=$source_build \
246
246
/p:Rebuild=$rebuild \
247
247
/p:Test=$test \
Original file line number Diff line number Diff line change @@ -51,13 +51,12 @@ steps:
51
51
${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \
52
52
--configuration $buildConfig \
53
53
--restore --build --pack -bl \
54
+ --source-build \
54
55
${{ parameters.platform.buildArguments }} \
55
56
$internalRuntimeDownloadArgs \
56
57
$targetRidArgs \
57
58
$baseRidArgs \
58
59
$portableBuildArgs \
59
- /p:DotNetBuildSourceOnly=true \
60
- /p:DotNetBuildRepo=true \
61
60
displayName : Build
62
61
63
62
- template : /eng/common/core-templates/steps/publish-pipeline-artifacts.yml
Original file line number Diff line number Diff line change @@ -68,7 +68,7 @@ function InstallDarcCli {
68
68
fi
69
69
fi
70
70
71
- local arcadeServicesSource=" https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools /nuget/v3/index.json"
71
+ local arcadeServicesSource=" https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng /nuget/v3/index.json"
72
72
73
73
echo " Installing Darc CLI version $darcVersion ..."
74
74
echo " You may need to restart your command shell if this is the first dotnet tool you have installed."
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 1
1
{
2
2
"tools" : {
3
- "dotnet" : " 10.0.100-preview.3.25201.16 "
3
+ "dotnet" : " 10.0.100-preview.5.25265.106 "
4
4
},
5
5
"msbuild-sdks" : {
6
- "Microsoft.DotNet.Arcade.Sdk" : " 10.0.0-beta.25260.104 " ,
6
+ "Microsoft.DotNet.Arcade.Sdk" : " 10.0.0-beta.25267.102 " ,
7
7
"Microsoft.Build.NoTargets" : " 3.7.0"
8
8
}
9
9
}
You can’t perform that action at this time.
0 commit comments