Skip to content

Commit 8489906

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20250206.4 (#645)
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Helix.Sdk From Version 10.0.0-beta.25080.7 -> To Version 10.0.0-beta.25106.4 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 047727d commit 8489906

File tree

5 files changed

+121
-11
lines changed

5 files changed

+121
-11
lines changed

eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,23 @@
88
</Dependency>
99
</ProductDependencies>
1010
<ToolsetDependencies>
11-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25080.7">
11+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25106.4">
1212
<Uri>https://github.com/dotnet/arcade</Uri>
13-
<Sha>bbea86c614fcf4380c58c80eacd279a0b8305a79</Sha>
13+
<Sha>91630b31ce859c28f637b62b566ea8829b982f2c</Sha>
1414
</Dependency>
1515
<!-- Intermediate is necessary for source build. -->
16-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25080.7">
16+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25106.4">
1717
<Uri>https://github.com/dotnet/arcade</Uri>
18-
<Sha>bbea86c614fcf4380c58c80eacd279a0b8305a79</Sha>
18+
<Sha>91630b31ce859c28f637b62b566ea8829b982f2c</Sha>
1919
<SourceBuild RepoName="arcade" ManagedOnly="true" />
2020
</Dependency>
21-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25080.7">
21+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25106.4">
2222
<Uri>https://github.com/dotnet/arcade</Uri>
23-
<Sha>bbea86c614fcf4380c58c80eacd279a0b8305a79</Sha>
23+
<Sha>91630b31ce859c28f637b62b566ea8829b982f2c</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="10.0.0-beta.25080.7">
25+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="10.0.0-beta.25106.4">
2626
<Uri>https://github.com/dotnet/arcade</Uri>
27-
<Sha>bbea86c614fcf4380c58c80eacd279a0b8305a79</Sha>
27+
<Sha>91630b31ce859c28f637b62b566ea8829b982f2c</Sha>
2828
</Dependency>
2929
</ToolsetDependencies>
3030
</Dependencies>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
<PreReleaseVersionIteration>1</PreReleaseVersionIteration>
77
</PropertyGroup>
88
<PropertyGroup>
9-
<MicrosoftDotNetBuildTasksPackagingVersion>10.0.0-beta.25080.7</MicrosoftDotNetBuildTasksPackagingVersion>
9+
<MicrosoftDotNetBuildTasksPackagingVersion>10.0.0-beta.25106.4</MicrosoftDotNetBuildTasksPackagingVersion>
1010
</PropertyGroup>
1111
</Project>

eng/common/sdk-task.sh

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
#!/usr/bin/env bash
2+
3+
show_usage() {
4+
echo "Common settings:"
5+
echo " --task <value> Name of Arcade task (name of a project in SdkTasks directory of the Arcade SDK package)"
6+
echo " --restore Restore dependencies"
7+
echo " --verbosity <value> Msbuild verbosity: q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic]"
8+
echo " --help Print help and exit"
9+
echo ""
10+
echo "Command line arguments not listed above are passed thru to msbuild."
11+
}
12+
13+
source="${BASH_SOURCE[0]}"
14+
15+
# resolve $source until the file is no longer a symlink
16+
while [[ -h "$source" ]]; do
17+
scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
18+
source="$(readlink "$source")"
19+
# if $source was a relative symlink, we need to resolve it relative to the path where the
20+
# symlink file was located
21+
[[ $source != /* ]] && source="$scriptroot/$source"
22+
done
23+
scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
24+
25+
Build() {
26+
local target=$1
27+
local log_suffix=""
28+
[[ "$target" != "Execute" ]] && log_suffix=".$target"
29+
local log="$log_dir/$task$log_suffix.binlog"
30+
local output_path="$toolset_dir/$task/"
31+
32+
MSBuild "$taskProject" \
33+
/bl:"$log" \
34+
/t:"$target" \
35+
/p:Configuration="$configuration" \
36+
/p:RepoRoot="$repo_root" \
37+
/p:BaseIntermediateOutputPath="$output_path" \
38+
/v:"$verbosity" \
39+
$properties
40+
}
41+
42+
configuration="Debug"
43+
verbosity="minimal"
44+
restore=false
45+
help=false
46+
properties=''
47+
48+
while (($# > 0)); do
49+
lowerI="$(echo $1 | tr "[:upper:]" "[:lower:]")"
50+
case $lowerI in
51+
--task)
52+
task=$2
53+
shift 2
54+
;;
55+
--restore)
56+
restore=true
57+
shift 1
58+
;;
59+
--verbosity)
60+
verbosity=$2
61+
shift 2
62+
;;
63+
--help)
64+
help=true
65+
shift 1
66+
;;
67+
*)
68+
properties="$properties $1"
69+
shift 1
70+
;;
71+
esac
72+
done
73+
74+
ci=true
75+
binaryLog=true
76+
warnAsError=true
77+
78+
if $help; then
79+
show_usage
80+
exit 0
81+
fi
82+
83+
. "$scriptroot/tools.sh"
84+
InitializeToolset
85+
86+
if [[ -z "$task" ]]; then
87+
Write-PipelineTelemetryError -Category 'Task' -Name 'MissingTask' -Message "Missing required parameter '-task <value>'"
88+
ExitWithExitCode 1
89+
fi
90+
91+
taskProject=$(GetSdkTaskProject "$task")
92+
if [[ ! -e "$taskProject" ]]; then
93+
Write-PipelineTelemetryError -Category 'Task' -Name 'UnknownTask' -Message "Unknown task: $task"
94+
ExitWithExitCode 1
95+
fi
96+
97+
if $restore; then
98+
Build "Restore"
99+
fi
100+
101+
Build "Execute"
102+
103+
104+
ExitWithExitCode 0

eng/common/tools.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -528,6 +528,12 @@ function GetDarc {
528528
"$eng_root/common/darc-init.sh" --toolpath "$darc_path" $version
529529
}
530530

531+
# Returns a full path to an Arcade SDK task project file.
532+
function GetSdkTaskProject {
533+
taskName=$1
534+
echo "$(dirname $_InitializeToolset)/SdkTasks/$taskName.proj"
535+
}
536+
531537
ResolvePath "${BASH_SOURCE[0]}"
532538
_script_dir=`dirname "$_ResolvePath"`
533539

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
"dotnet": "10.0.100-alpha.1.25077.2"
44
},
55
"msbuild-sdks": {
6-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25080.7",
7-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25080.7",
6+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25106.4",
7+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25106.4",
88
"Microsoft.Build.Traversal": "3.4.0"
99
}
1010
}

0 commit comments

Comments
 (0)