Skip to content

Commit 6eacb34

Browse files
[main] Source code updates from dotnet/dotnet (#489)
* Update dependencies from https://github.com/dotnet/dotnet build 268047 * Update dependencies from https://github.com/dotnet/dotnet build 268099 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25263.104 -> 10.0.0-beta.25260.104) * Update dependencies from https://github.com/dotnet/dotnet build 268384 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25263.108 -> 10.0.0-beta.25260.104) * Update dependencies from https://github.com/dotnet/dotnet build 268651 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25265.101 -> 10.0.0-beta.25260.104) * Update dependencies from https://github.com/dotnet/dotnet build 268722 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25266.103 -> 10.0.0-beta.25260.104) --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent a4f971d commit 6eacb34

File tree

8 files changed

+13
-16
lines changed

8 files changed

+13
-16
lines changed

eng/Version.Details.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<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" />
44
<ToolsetDependencies>
55
<Dependency Name="Microsoft.Build" Version="17.14.0-preview-24619-01">
66
<Uri>https://github.com/dotnet/msbuild</Uri>
77
<Sha>e9b99f554a3c298e1106ea171f5a0462780af2c5</Sha>
88
</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">
1010
<Uri>https://github.com/dotnet/dotnet</Uri>
11-
<Sha>85778473549347b3e4bad3ea009e9438df7b11bb</Sha>
11+
<Sha>170498a9429a5553fe7ac0ec2341d19bbb97cbe8</Sha>
1212
</Dependency>
1313
</ToolsetDependencies>
1414
</Dependencies>

eng/common/build.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ function Build {
127127
/p:Deploy=$deploy `
128128
/p:Test=$test `
129129
/p:Pack=$pack `
130-
/p:DotNetBuildRepo=$productBuild `
130+
/p:DotNetBuild=$productBuild `
131131
/p:IntegrationTest=$integrationTest `
132132
/p:PerformanceTest=$performanceTest `
133133
/p:Sign=$sign `

eng/common/build.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,14 +129,14 @@ while [[ $# > 0 ]]; do
129129
-pack)
130130
pack=true
131131
;;
132-
-sourcebuild|-sb)
132+
-sourcebuild|-source-build|-sb)
133133
build=true
134134
source_build=true
135135
product_build=true
136136
restore=true
137137
pack=true
138138
;;
139-
-productBuild|-pb)
139+
-productbuild|-product-build|-pb)
140140
build=true
141141
product_build=true
142142
restore=true
@@ -241,7 +241,7 @@ function Build {
241241
/p:RepoRoot="$repo_root" \
242242
/p:Restore=$restore \
243243
/p:Build=$build \
244-
/p:DotNetBuildRepo=$product_build \
244+
/p:DotNetBuild=$product_build \
245245
/p:DotNetBuildSourceOnly=$source_build \
246246
/p:Rebuild=$rebuild \
247247
/p:Test=$test \

eng/common/core-templates/steps/source-build.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,12 @@ steps:
5151
${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \
5252
--configuration $buildConfig \
5353
--restore --build --pack -bl \
54+
--source-build \
5455
${{ parameters.platform.buildArguments }} \
5556
$internalRuntimeDownloadArgs \
5657
$targetRidArgs \
5758
$baseRidArgs \
5859
$portableBuildArgs \
59-
/p:DotNetBuildSourceOnly=true \
60-
/p:DotNetBuildRepo=true \
6160
displayName: Build
6261

6362
- template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml

eng/common/darc-init.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ function InstallDarcCli {
6868
fi
6969
fi
7070

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"
7272

7373
echo "Installing Darc CLI version $darcVersion..."
7474
echo "You may need to restart your command shell if this is the first dotnet tool you have installed."

eng/common/tools.ps1

Lines changed: 1 addition & 3 deletions
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

Lines changed: 1 addition & 1 deletion
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

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"tools": {
3-
"dotnet": "10.0.100-preview.3.25201.16"
3+
"dotnet": "10.0.100-preview.5.25265.106"
44
},
55
"msbuild-sdks": {
6-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25260.104",
6+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25267.102",
77
"Microsoft.Build.NoTargets": "3.7.0"
88
}
99
}

0 commit comments

Comments
 (0)