Skip to content

Commit e3219a9

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20250206.4 (#7382)
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions 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 e19aa2a commit e3219a9

File tree

5 files changed

+127
-17
lines changed

5 files changed

+127
-17
lines changed

‎eng/Version.Details.xml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,38 +7,38 @@
77
</Dependency>
88
</ProductDependencies>
99
<ToolsetDependencies>
10-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25080.7">
10+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25106.4">
1111
<Uri>https://github.com/dotnet/arcade</Uri>
12-
<Sha>bbea86c614fcf4380c58c80eacd279a0b8305a79</Sha>
12+
<Sha>91630b31ce859c28f637b62b566ea8829b982f2c</Sha>
1313
</Dependency>
14-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25080.7">
14+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25106.4">
1515
<Uri>https://github.com/dotnet/arcade</Uri>
16-
<Sha>bbea86c614fcf4380c58c80eacd279a0b8305a79</Sha>
16+
<Sha>91630b31ce859c28f637b62b566ea8829b982f2c</Sha>
1717
</Dependency>
18-
<Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.25080.7">
18+
<Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.25106.4">
1919
<Uri>https://github.com/dotnet/arcade</Uri>
20-
<Sha>bbea86c614fcf4380c58c80eacd279a0b8305a79</Sha>
20+
<Sha>91630b31ce859c28f637b62b566ea8829b982f2c</Sha>
2121
</Dependency>
22-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25080.7">
22+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25106.4">
2323
<Uri>https://github.com/dotnet/arcade</Uri>
24-
<Sha>bbea86c614fcf4380c58c80eacd279a0b8305a79</Sha>
24+
<Sha>91630b31ce859c28f637b62b566ea8829b982f2c</Sha>
2525
</Dependency>
2626
<!-- Stay on package 8.0 until we stop testing for net6.0
2727
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24212.4">
2828
<Uri>https://github.com/dotnet/arcade</Uri>
2929
<Sha>812d978c303174dc1aa305d7359e79053d7d4971</Sha>
3030
</Dependency> -->
31-
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="10.0.0-beta.25080.7">
31+
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="10.0.0-beta.25106.4">
3232
<Uri>https://github.com/dotnet/arcade</Uri>
33-
<Sha>bbea86c614fcf4380c58c80eacd279a0b8305a79</Sha>
33+
<Sha>91630b31ce859c28f637b62b566ea8829b982f2c</Sha>
3434
</Dependency>
35-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25080.7">
35+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25106.4">
3636
<Uri>https://github.com/dotnet/arcade</Uri>
37-
<Sha>bbea86c614fcf4380c58c80eacd279a0b8305a79</Sha>
37+
<Sha>91630b31ce859c28f637b62b566ea8829b982f2c</Sha>
3838
</Dependency>
39-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25080.7">
39+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25106.4">
4040
<Uri>https://github.com/dotnet/arcade</Uri>
41-
<Sha>bbea86c614fcf4380c58c80eacd279a0b8305a79</Sha>
41+
<Sha>91630b31ce859c28f637b62b566ea8829b982f2c</Sha>
4242
</Dependency>
4343
</ToolsetDependencies>
4444
</Dependencies>

‎eng/Versions.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24212.4</MicrosoftDotNetBuildTasksTemplatingVersion>
9595
<MicrosoftDotNetPlatformAbstractionsVersion>5.0.0-preview.5.20278.1</MicrosoftDotNetPlatformAbstractionsVersion>
9696
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.24525.2</MicrosoftDotNetRemoteExecutorVersion>
97-
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25080.7</MicrosoftDotNetXUnitExtensionsVersion>
97+
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25106.4</MicrosoftDotNetXUnitExtensionsVersion>
9898
<MicrosoftExtensionsDependencyModelVersion>8.0.2</MicrosoftExtensionsDependencyModelVersion>
9999
<MicrosoftMLOnnxTestModelsVersion>0.0.6-test</MicrosoftMLOnnxTestModelsVersion>
100100
<MicrosoftMLTensorFlowTestModelsVersion>0.0.13-test</MicrosoftMLTensorFlowTestModelsVersion>

‎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
@@ -13,8 +13,8 @@
1313
}
1414
},
1515
"msbuild-sdks": {
16-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25080.7",
17-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25080.7",
16+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25106.4",
17+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25106.4",
1818
"Microsoft.Build.NoTargets": "3.7.0",
1919
"Microsoft.Build.Traversal": "3.2.0"
2020
}

0 commit comments

Comments
 (0)