Skip to content

Commit 4eb6867

Browse files
dotnet-maestro[bot]ViktorHofer
dotnet-maestro[bot]
and
ViktorHofer
authored
[main] Update dependencies from dotnet/arcade (#46584)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Viktor Hofer <[email protected]>
1 parent 49903f3 commit 4eb6867

File tree

6 files changed

+130
-154
lines changed

6 files changed

+130
-154
lines changed

‎eng/Version.Details.xml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -640,34 +640,34 @@
640640
</Dependency>
641641
</ProductDependencies>
642642
<ToolsetDependencies>
643-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25104.2">
643+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25106.1">
644644
<Uri>https://github.com/dotnet/arcade</Uri>
645-
<Sha>5d30877b1eb318583acd5f2cd3f3a80e77b3add2</Sha>
645+
<Sha>7b55911d7fd2ff7837d4212e7b49541e2f0f8909</Sha>
646646
</Dependency>
647-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25104.2">
647+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25106.1">
648648
<Uri>https://github.com/dotnet/arcade</Uri>
649-
<Sha>5d30877b1eb318583acd5f2cd3f3a80e77b3add2</Sha>
649+
<Sha>7b55911d7fd2ff7837d4212e7b49541e2f0f8909</Sha>
650650
</Dependency>
651-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25104.2">
651+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25106.1">
652652
<Uri>https://github.com/dotnet/arcade</Uri>
653-
<Sha>5d30877b1eb318583acd5f2cd3f3a80e77b3add2</Sha>
653+
<Sha>7b55911d7fd2ff7837d4212e7b49541e2f0f8909</Sha>
654654
</Dependency>
655-
<Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.25104.2">
655+
<Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.25106.1">
656656
<Uri>https://github.com/dotnet/arcade</Uri>
657-
<Sha>5d30877b1eb318583acd5f2cd3f3a80e77b3add2</Sha>
657+
<Sha>7b55911d7fd2ff7837d4212e7b49541e2f0f8909</Sha>
658658
</Dependency>
659-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25104.2">
659+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25106.1">
660660
<Uri>https://github.com/dotnet/arcade</Uri>
661-
<Sha>5d30877b1eb318583acd5f2cd3f3a80e77b3add2</Sha>
661+
<Sha>7b55911d7fd2ff7837d4212e7b49541e2f0f8909</Sha>
662662
</Dependency>
663-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25104.2">
663+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25106.1">
664664
<Uri>https://github.com/dotnet/arcade</Uri>
665-
<Sha>5d30877b1eb318583acd5f2cd3f3a80e77b3add2</Sha>
665+
<Sha>7b55911d7fd2ff7837d4212e7b49541e2f0f8909</Sha>
666666
</Dependency>
667667
<!-- Intermediate is necessary for source build. -->
668-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25104.2">
668+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25106.1">
669669
<Uri>https://github.com/dotnet/arcade</Uri>
670-
<Sha>5d30877b1eb318583acd5f2cd3f3a80e77b3add2</Sha>
670+
<Sha>7b55911d7fd2ff7837d4212e7b49541e2f0f8909</Sha>
671671
<SourceBuild RepoName="arcade" ManagedOnly="true" />
672672
</Dependency>
673673
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-preview.2.25104.7">

‎eng/Versions.props‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -266,10 +266,10 @@
266266
</PropertyGroup>
267267
<PropertyGroup>
268268
<!-- Dependencies from https://github.com/dotnet/arcade -->
269-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.25104.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
270-
<MicrosoftDotNetSignToolVersion>10.0.0-beta.25104.2</MicrosoftDotNetSignToolVersion>
271-
<MicrosoftDotNetXliffTasksVersion>10.0.0-beta.25104.2</MicrosoftDotNetXliffTasksVersion>
272-
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25104.2</MicrosoftDotNetXUnitExtensionsVersion>
269+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.25106.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
270+
<MicrosoftDotNetSignToolVersion>10.0.0-beta.25106.1</MicrosoftDotNetSignToolVersion>
271+
<MicrosoftDotNetXliffTasksVersion>10.0.0-beta.25106.1</MicrosoftDotNetXliffTasksVersion>
272+
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25106.1</MicrosoftDotNetXUnitExtensionsVersion>
273273
</PropertyGroup>
274274
<PropertyGroup>
275275
<!-- Dependencies from https://github.com/dotnet/sourcelink -->

‎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
@@ -17,8 +17,8 @@
1717
"cmake": "latest"
1818
},
1919
"msbuild-sdks": {
20-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25104.2",
21-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25104.2",
20+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25106.1",
21+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25106.1",
2222
"Microsoft.Build.NoTargets": "3.7.0",
2323
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1"
2424
}

‎src/SourceBuild/patches/arcade/0001-Revert-update-System.CommandLine-15474.patch‎

Lines changed: 0 additions & 134 deletions
This file was deleted.

0 commit comments

Comments
 (0)