Skip to content

Commit cb74df4

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20210713.2 (#4671)
[main] Update dependencies from dotnet/arcade
1 parent 4a9e3c2 commit cb74df4

File tree

4 files changed

+22
-18
lines changed

4 files changed

+22
-18
lines changed

‎eng/Version.Details.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,25 @@
44
<ProductDependencies>
55
</ProductDependencies>
66
<ToolsetDependencies>
7-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21359.3">
7+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21363.2">
88
<Uri>https://github.com/dotnet/arcade</Uri>
9-
<Sha>55262f114b0c1b82f0b081bca0d919b657ba24c5</Sha>
9+
<Sha>1b053babb8a542e3ab20f93b3d0aedc732b7e0c7</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.DotNet.SignTool" Version="6.0.0-beta.21359.3">
11+
<Dependency Name="Microsoft.DotNet.SignTool" Version="6.0.0-beta.21363.2">
1212
<Uri>https://github.com/dotnet/arcade</Uri>
13-
<Sha>55262f114b0c1b82f0b081bca0d919b657ba24c5</Sha>
13+
<Sha>1b053babb8a542e3ab20f93b3d0aedc732b7e0c7</Sha>
1414
</Dependency>
15-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21359.3">
15+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21363.2">
1616
<Uri>https://github.com/dotnet/arcade</Uri>
17-
<Sha>55262f114b0c1b82f0b081bca0d919b657ba24c5</Sha>
17+
<Sha>1b053babb8a542e3ab20f93b3d0aedc732b7e0c7</Sha>
1818
</Dependency>
19-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.21359.3">
19+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.21363.2">
2020
<Uri>https://github.com/dotnet/arcade</Uri>
21-
<Sha>55262f114b0c1b82f0b081bca0d919b657ba24c5</Sha>
21+
<Sha>1b053babb8a542e3ab20f93b3d0aedc732b7e0c7</Sha>
2222
</Dependency>
23-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.21359.3">
23+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.21363.2">
2424
<Uri>https://github.com/dotnet/arcade</Uri>
25-
<Sha>55262f114b0c1b82f0b081bca0d919b657ba24c5</Sha>
25+
<Sha>1b053babb8a542e3ab20f93b3d0aedc732b7e0c7</Sha>
2626
</Dependency>
2727
</ToolsetDependencies>
2828
</Dependencies>

‎eng/Versions.props

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
</PropertyGroup>
2424
<!-- Arcade dependencies -->
2525
<PropertyGroup>
26-
<MicrosoftDotNetArcadeSdkPackageVersion>6.0.0-beta.21359.3</MicrosoftDotNetArcadeSdkPackageVersion>
27-
<MicrosoftDotNetHelixSdkPackageVersion>6.0.0-beta.21359.3</MicrosoftDotNetHelixSdkPackageVersion>
28-
<MicrosoftDotNetGenFacadesPackageVersion>6.0.0-beta.21359.3</MicrosoftDotNetGenFacadesPackageVersion>
29-
<MicrosoftDotNetXUnitExtensionsPackageVersion>6.0.0-beta.21359.3</MicrosoftDotNetXUnitExtensionsPackageVersion>
30-
<MicrosoftDotNetSignToolVersion>6.0.0-beta.21359.3</MicrosoftDotNetSignToolVersion>
26+
<MicrosoftDotNetArcadeSdkPackageVersion>6.0.0-beta.21363.2</MicrosoftDotNetArcadeSdkPackageVersion>
27+
<MicrosoftDotNetHelixSdkPackageVersion>6.0.0-beta.21363.2</MicrosoftDotNetHelixSdkPackageVersion>
28+
<MicrosoftDotNetGenFacadesPackageVersion>6.0.0-beta.21363.2</MicrosoftDotNetGenFacadesPackageVersion>
29+
<MicrosoftDotNetXUnitExtensionsPackageVersion>6.0.0-beta.21363.2</MicrosoftDotNetXUnitExtensionsPackageVersion>
30+
<MicrosoftDotNetSignToolVersion>6.0.0-beta.21363.2</MicrosoftDotNetSignToolVersion>
3131
</PropertyGroup>
3232
<!-- CoreFx dependencies -->
3333
<PropertyGroup>

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ __AlpinePackages="alpine-base"
3333
__AlpinePackages+=" build-base"
3434
__AlpinePackages+=" linux-headers"
3535
__AlpinePackagesEdgeCommunity=" lldb-dev"
36-
__AlpinePackagesEdgeMain=" llvm10-libs"
3736
__AlpinePackagesEdgeMain+=" python3"
3837
__AlpinePackagesEdgeMain+=" libedit"
3938

@@ -115,6 +114,8 @@ while :; do
115114
__UbuntuArch=s390x
116115
__UbuntuRepo="http://ports.ubuntu.com/ubuntu-ports/"
117116
__UbuntuPackages=$(echo ${__UbuntuPackages} | sed 's/ libunwind8-dev//')
117+
__UbuntuPackages=$(echo ${__UbuntuPackages} | sed 's/ libomp-dev//')
118+
__UbuntuPackages=$(echo ${__UbuntuPackages} | sed 's/ libomp5//')
118119
unset __LLDB_Package
119120
;;
120121
x86)
@@ -191,6 +192,8 @@ while :; do
191192
__CodeName=alpine
192193
__UbuntuRepo=
193194
__AlpineVersion=3.9
195+
__AlpinePackagesEdgeMain+=" llvm11-libs"
196+
__AlpinePackagesEdgeMain+=" clang-libs"
194197
;;
195198
alpine3.13)
196199
__CodeName=alpine
@@ -201,6 +204,7 @@ while :; do
201204
__AlpinePackagesEdgeCommunity=
202205
__AlpinePackages+=$__AlpinePackagesEdgeMain
203206
__AlpinePackagesEdgeMain=
207+
__AlpinePackages+=" llvm10-libs"
204208
;;
205209
freebsd11)
206210
__FreeBSDBase="11.3-RELEASE"

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"version": "6.0.100-preview.4.21255.9"
1414
},
1515
"msbuild-sdks": {
16-
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21359.3",
17-
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21359.3"
16+
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21363.2",
17+
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21363.2"
1818
}
1919
}

0 commit comments

Comments
 (0)