Skip to content

Commit 88759c9

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Update dependencies from dotnet/arcade (#1080)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 00d535b commit 88759c9

File tree

4 files changed

+31
-16
lines changed

4 files changed

+31
-16
lines changed

‎eng/Version.Details.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,25 +15,25 @@
1515
</Dependency>
1616
</ProductDependencies>
1717
<ToolsetDependencies>
18-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22221.2">
18+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22222.4">
1919
<Uri>https://github.com/dotnet/arcade</Uri>
20-
<Sha>daab9b4d3afbde7ed92882f0f0c540ef5e015fd2</Sha>
20+
<Sha>5f04b602a86b74f6cdd12f48aca2d1868e6425f3</Sha>
2121
</Dependency>
22-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.22221.2">
22+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.22222.4">
2323
<Uri>https://github.com/dotnet/arcade</Uri>
24-
<Sha>daab9b4d3afbde7ed92882f0f0c540ef5e015fd2</Sha>
24+
<Sha>5f04b602a86b74f6cdd12f48aca2d1868e6425f3</Sha>
2525
</Dependency>
26-
<Dependency Name="Microsoft.DotNet.SignTool" Version="7.0.0-beta.22221.2">
26+
<Dependency Name="Microsoft.DotNet.SignTool" Version="7.0.0-beta.22222.4">
2727
<Uri>https://github.com/dotnet/arcade</Uri>
28-
<Sha>daab9b4d3afbde7ed92882f0f0c540ef5e015fd2</Sha>
28+
<Sha>5f04b602a86b74f6cdd12f48aca2d1868e6425f3</Sha>
2929
</Dependency>
30-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22221.2">
30+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22222.4">
3131
<Uri>https://github.com/dotnet/arcade</Uri>
32-
<Sha>daab9b4d3afbde7ed92882f0f0c540ef5e015fd2</Sha>
32+
<Sha>5f04b602a86b74f6cdd12f48aca2d1868e6425f3</Sha>
3333
</Dependency>
34-
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="7.0.0-beta.22221.2">
34+
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="7.0.0-beta.22222.4">
3535
<Uri>https://github.com/dotnet/arcade</Uri>
36-
<Sha>daab9b4d3afbde7ed92882f0f0c540ef5e015fd2</Sha>
36+
<Sha>5f04b602a86b74f6cdd12f48aca2d1868e6425f3</Sha>
3737
</Dependency>
3838
<Dependency Name="Microsoft.DotNet.Maestro.Client" Version="1.1.0-beta.20258.6">
3939
<Uri>https://github.com/dotnet/arcade-services</Uri>

‎eng/Versions.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,8 @@
104104
<XUnitVersion>2.4.1</XUnitVersion>
105105
<XUnitAbstractionsVersion>2.0.3</XUnitAbstractionsVersion>
106106
<XUnitVSRunnerVersion>2.4.1</XUnitVSRunnerVersion>
107-
<MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.22221.2</MicrosoftDotNetBuildTasksFeedVersion>
108-
<MicrosoftDotNetSignToolVersion>7.0.0-beta.22221.2</MicrosoftDotNetSignToolVersion>
107+
<MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.22222.4</MicrosoftDotNetBuildTasksFeedVersion>
108+
<MicrosoftDotNetSignToolVersion>7.0.0-beta.22222.4</MicrosoftDotNetSignToolVersion>
109109
<MicrosoftAzureDocumentDBVersion>1.22.0</MicrosoftAzureDocumentDBVersion>
110110
<MicrosoftAzureCosmosDBTableVersion>1.1.2</MicrosoftAzureCosmosDBTableVersion>
111111
<MicrosoftAspNetCoreAllVersion>2.0.0</MicrosoftAspNetCoreAllVersion>
@@ -115,7 +115,7 @@
115115
<MicrosoftDotNetMaestroClientVersion>1.1.0-beta.20258.6</MicrosoftDotNetMaestroClientVersion>
116116
<MicrosoftSourceLinkGitHubVersion>1.1.0-beta-21228-01</MicrosoftSourceLinkGitHubVersion>
117117
<MicrosoftSourceLinkAzureReposGitVersion>1.1.0-beta-21228-01</MicrosoftSourceLinkAzureReposGitVersion>
118-
<MicrosoftDotNetSwaggerGeneratorMSBuildVersion>7.0.0-beta.22221.2</MicrosoftDotNetSwaggerGeneratorMSBuildVersion>
118+
<MicrosoftDotNetSwaggerGeneratorMSBuildVersion>7.0.0-beta.22222.4</MicrosoftDotNetSwaggerGeneratorMSBuildVersion>
119119
<XliffTasksVersion>1.0.0-beta.21265.1</XliffTasksVersion>
120120
<MicrosoftDotNetMaestroTasksVersion>1.1.0-beta.21228.1</MicrosoftDotNetMaestroTasksVersion>
121121
<MicrosoftDotNetXHarnessCLIVersion>1.0.0-prerelease.21264.3</MicrosoftDotNetXHarnessCLIVersion>

‎eng/common/cross/build-rootfs.sh

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@ set -e
44

55
usage()
66
{
7-
echo "Usage: $0 [BuildArch] [CodeName] [lldbx.y] [--skipunmount] --rootfsdir <directory>]"
7+
echo "Usage: $0 [BuildArch] [CodeName] [lldbx.y] [llvmx[.y]] [--skipunmount] --rootfsdir <directory>]"
88
echo "BuildArch can be: arm(default), armel, arm64, x86"
99
echo "CodeName - optional, Code name for Linux, can be: xenial(default), zesty, bionic, alpine, alpine3.13 or alpine3.14. If BuildArch is armel, LinuxCodeName is jessie(default) or tizen."
1010
echo " for FreeBSD can be: freebsd12, freebsd13"
1111
echo " for illumos can be: illumos."
1212
echo "lldbx.y - optional, LLDB version, can be: lldb3.9(default), lldb4.0, lldb5.0, lldb6.0 no-lldb. Ignored for alpine and FreeBSD"
13+
echo "llvmx[.y] - optional, LLVM version for LLVM related packages."
1314
echo "--skipunmount - optional, will skip the unmount of rootfs folder."
1415
echo "--use-mirror - optional, use mirror URL to fetch resources, when available."
1516
exit 1
@@ -48,6 +49,7 @@ __AlpinePackages+=" gettext-dev"
4849
__AlpinePackages+=" icu-dev"
4950
__AlpinePackages+=" libunwind-dev"
5051
__AlpinePackages+=" lttng-ust-dev"
52+
__AlpinePackages+=" compiler-rt-static"
5153

5254
# CoreFX dependencies
5355
__UbuntuPackages+=" libcurl4-openssl-dev"
@@ -164,6 +166,15 @@ while :; do
164166
no-lldb)
165167
unset __LLDB_Package
166168
;;
169+
llvm*)
170+
version="$(echo "$lowerI" | tr -d '[:alpha:]-=')"
171+
parts=(${version//./ })
172+
__LLVM_MajorVersion="${parts[0]}"
173+
__LLVM_MinorVersion="${parts[1]}"
174+
if [[ -z "$__LLVM_MinorVersion" && "$__LLVM_MajorVersion" -le 6 ]]; then
175+
__LLVM_MinorVersion=0;
176+
fi
177+
;;
167178
xenial) # Ubuntu 16.04
168179
if [ "$__CodeName" != "jessie" ]; then
169180
__CodeName=xenial
@@ -261,6 +272,10 @@ if [ "$__BuildArch" == "armel" ]; then
261272
fi
262273
__UbuntuPackages+=" ${__LLDB_Package:-}"
263274

275+
if [ ! -z "$__LLVM_MajorVersion" ]; then
276+
__UbuntuPackages+=" libclang-common-${__LLVM_MajorVersion}${__LLVM_MinorVersion:+.$__LLVM_MinorVersion}-dev"
277+
fi
278+
264279
if [ -z "$__RootfsDir" ] && [ ! -z "$ROOTFS_DIR" ]; then
265280
__RootfsDir=$ROOTFS_DIR
266281
fi

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"vswhere": "2.5.2"
1313
},
1414
"msbuild-sdks": {
15-
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22221.2",
16-
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22221.2"
15+
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22222.4",
16+
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22222.4"
1717
}
1818
}

0 commit comments

Comments
 (0)