Skip to content

Commit bde720c

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20201026.10 (dotnet#27283)
[master] Update dependencies from dotnet/arcade
1 parent bb5efb7 commit bde720c

20 files changed

+290
-2196
lines changed

Diff for: NuGet.config

-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22
<configuration>
33
<packageSources>
44
<clear />
5-
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
6-
<add key="darc-pub-dotnet-runtime-cf258a1-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-cf258a14-1/nuget/v3/index.json" />
7-
<add key="darc-pub-dotnet-efcore-73566d1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-efcore-73566d1f/nuget/v3/index.json" />
8-
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
95
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
106
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
117
<add key="dotnet5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json" />

Diff for: eng/Version.Details.xml

+6-6
Original file line numberDiff line numberDiff line change
@@ -313,17 +313,17 @@
313313
<Uri>https://github.com/dotnet/runtime</Uri>
314314
<Sha>693c1f05188330e270b01a6bce8ad22ab7b33f23</Sha>
315315
</Dependency>
316-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20506.7">
316+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.20526.10">
317317
<Uri>https://github.com/dotnet/arcade</Uri>
318-
<Sha>ee39cd1573dbb8011f343e1037af51d4fc00a747</Sha>
318+
<Sha>c0f916d7f45834c080bf6cce60cf2bcfa00bc0a7</Sha>
319319
</Dependency>
320-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="5.0.0-beta.20506.7">
320+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.20526.10">
321321
<Uri>https://github.com/dotnet/arcade</Uri>
322-
<Sha>ee39cd1573dbb8011f343e1037af51d4fc00a747</Sha>
322+
<Sha>c0f916d7f45834c080bf6cce60cf2bcfa00bc0a7</Sha>
323323
</Dependency>
324-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20506.7">
324+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.20526.10">
325325
<Uri>https://github.com/dotnet/arcade</Uri>
326-
<Sha>ee39cd1573dbb8011f343e1037af51d4fc00a747</Sha>
326+
<Sha>c0f916d7f45834c080bf6cce60cf2bcfa00bc0a7</Sha>
327327
</Dependency>
328328
</ToolsetDependencies>
329329
</Dependencies>

Diff for: eng/Versions.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@
139139
<MicrosoftEntityFrameworkCorePackageVersion>6.0.0-alpha.1.20526.2</MicrosoftEntityFrameworkCorePackageVersion>
140140
<MicrosoftEntityFrameworkCoreDesignPackageVersion>6.0.0-alpha.1.20526.2</MicrosoftEntityFrameworkCoreDesignPackageVersion>
141141
<!-- Packages from dotnet/arcade -->
142-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>5.0.0-beta.20506.7</MicrosoftDotNetBuildTasksInstallersPackageVersion>
142+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>6.0.0-beta.20526.10</MicrosoftDotNetBuildTasksInstallersPackageVersion>
143143
</PropertyGroup>
144144
<!--
145145

Diff for: eng/common/SetupNugetSources.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# This file should be removed as part of this issue: https://github.com/dotnet/arcade/issues/4080
55
#
66
# What the script does is iterate over all package sources in the pointed NuGet.config and add a credential entry
7-
# under <packageSourceCredentials> for each Maestro's managed private feed. Two additional credential
7+
# under <packageSourceCredentials> for each Maestro's managed private feed. Two additional credential
88
# entries are also added for the two private static internal feeds: dotnet3-internal and dotnet3-internal-transport.
99
#
1010
# This script needs to be called in every job that will restore packages and which the base repo has
@@ -68,7 +68,7 @@ if [ "$?" != "0" ]; then
6868
sed -i.bak "s|$ConfigNodeHeader|$ConfigNodeHeader${NL}$PackageSourcesTemplate|" $ConfigFile
6969
fi
7070

71-
# Ensure there is a <packageSourceCredentials>...</packageSourceCredentials> section.
71+
# Ensure there is a <packageSourceCredentials>...</packageSourceCredentials> section.
7272
grep -i "<packageSourceCredentials>" $ConfigFile
7373
if [ "$?" != "0" ]; then
7474
echo "Adding <packageSourceCredentials>...</packageSourceCredentials> section."
@@ -138,7 +138,7 @@ IFS=$PrevIFS
138138

139139
for FeedName in ${PackageSources[@]} ; do
140140
# Check if there is no existing credential for this FeedName
141-
grep -i "<$FeedName>" $ConfigFile
141+
grep -i "<$FeedName>" $ConfigFile
142142
if [ "$?" != "0" ]; then
143143
echo "Adding credentials for $FeedName."
144144

Diff for: eng/common/build.ps1

-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ Param(
77
[string] $msbuildEngine = $null,
88
[bool] $warnAsError = $true,
99
[bool] $nodeReuse = $true,
10-
[bool] $useDefaultDotnetInstall = $false,
1110
[switch][Alias('r')]$restore,
1211
[switch] $deployDeps,
1312
[switch][Alias('b')]$build,
@@ -66,7 +65,6 @@ function Print-Usage() {
6665
Write-Host " -prepareMachine Prepare machine for CI run, clean up processes after build"
6766
Write-Host " -warnAsError <value> Sets warnaserror msbuild parameter ('true' or 'false')"
6867
Write-Host " -msbuildEngine <value> Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)."
69-
Write-Host " -useDefaultDotnetInstall <value> Use dotnet-install.* scripts from public location as opposed to from eng common folder"
7068
Write-Host ""
7169

7270
Write-Host "Command line arguments not listed above are passed thru to msbuild."

Diff for: eng/common/build.sh

+1-8
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ usage()
3636
echo " --prepareMachine Prepare machine for CI run, clean up processes after build"
3737
echo " --nodeReuse <value> Sets nodereuse msbuild parameter ('true' or 'false')"
3838
echo " --warnAsError <value> Sets warnaserror msbuild parameter ('true' or 'false')"
39-
echo " --useDefaultDotnetInstall <value> Use dotnet-install.* scripts from public location as opposed to from eng common folder"
40-
4139
echo ""
4240
echo "Command line arguments not listed above are passed thru to msbuild."
4341
echo "Arguments can also be passed in with a single hyphen."
@@ -80,7 +78,6 @@ prepare_machine=false
8078
verbosity='minimal'
8179
runtime_source_feed=''
8280
runtime_source_feed_key=''
83-
use_default_dotnet_install=false
8481

8582
properties=''
8683
while [[ $# > 0 ]]; do
@@ -159,14 +156,10 @@ while [[ $# > 0 ]]; do
159156
runtime_source_feed=$2
160157
shift
161158
;;
162-
-runtimesourcefeedkey)
159+
-runtimesourcefeedkey)
163160
runtime_source_feed_key=$2
164161
shift
165162
;;
166-
-usedefaultdotnetinstall)
167-
use_default_dotnet_install=$2
168-
shift
169-
;;
170163
*)
171164
properties="$properties $1"
172165
;;

Diff for: eng/common/cross/build-rootfs.sh

+1
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,7 @@ elif [[ -n $__CodeName ]]; then
329329
chroot $__RootfsDir apt-get -f -y install
330330
chroot $__RootfsDir apt-get -y install $__UbuntuPackages
331331
chroot $__RootfsDir symlinks -cr /usr
332+
chroot $__RootfsDir apt clean
332333

333334
if [ $__SkipUnmount == 0 ]; then
334335
umount $__RootfsDir/* || true

Diff for: eng/common/cross/toolchain.cmake

+4
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,10 @@ function(add_toolchain_linker_flag Flag)
139139
set("CMAKE_SHARED_LINKER_FLAGS${CONFIG_SUFFIX}" "${CMAKE_SHARED_LINKER_FLAGS${CONFIG_SUFFIX}} ${Flag}" PARENT_SCOPE)
140140
endfunction()
141141

142+
if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
143+
add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/lib/${TOOLCHAIN}")
144+
add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib/${TOOLCHAIN}")
145+
endif()
142146

143147
if(TARGET_ARCH_NAME STREQUAL "armel")
144148
if(DEFINED TIZEN_TOOLCHAIN) # For Tizen only

0 commit comments

Comments
 (0)