Browse Source

Update dependencies from https://github.com/dotnet/arcade build 20201014.1 (#705)

[master] Update dependencies from dotnet/arcade
pull/706/head
dotnet-maestro[bot] 6 years ago
committed by GitHub
parent
commit
683afc4544
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 20
      eng/Version.Details.xml
  2. 4
      eng/common/cross/toolchain.cmake
  3. 1
      eng/common/performance/performance-setup.sh
  4. 2
      global.json

20
eng/Version.Details.xml

@ -3,25 +3,25 @@
<ProductDependencies>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.20509.12">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.20514.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>f2f45f7a856fe4949735e574f7a0350bda48264f</Sha>
<Sha>d3cea00bba6539c68436ac9b3d9665318d76b47d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.20509.12">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.20514.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>f2f45f7a856fe4949735e574f7a0350bda48264f</Sha>
<Sha>d3cea00bba6539c68436ac9b3d9665318d76b47d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SignTool" Version="6.0.0-beta.20509.12">
<Dependency Name="Microsoft.DotNet.SignTool" Version="6.0.0-beta.20514.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>f2f45f7a856fe4949735e574f7a0350bda48264f</Sha>
<Sha>d3cea00bba6539c68436ac9b3d9665318d76b47d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.20509.12">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.20514.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>f2f45f7a856fe4949735e574f7a0350bda48264f</Sha>
<Sha>d3cea00bba6539c68436ac9b3d9665318d76b47d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="6.0.0-beta.20509.12">
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="6.0.0-beta.20514.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>f2f45f7a856fe4949735e574f7a0350bda48264f</Sha>
<Sha>d3cea00bba6539c68436ac9b3d9665318d76b47d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Maestro.Client" Version="1.1.0-beta.19556.4">
<Uri>https://github.com/dotnet/arcade-services</Uri>

4
eng/common/cross/toolchain.cmake

@ -139,6 +139,10 @@ function(add_toolchain_linker_flag Flag)
set("CMAKE_SHARED_LINKER_FLAGS${CONFIG_SUFFIX}" "${CMAKE_SHARED_LINKER_FLAGS${CONFIG_SUFFIX}} ${Flag}" PARENT_SCOPE)
endfunction()
if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/lib/${TOOLCHAIN}")
add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib/${TOOLCHAIN}")
endif()
if(TARGET_ARCH_NAME STREQUAL "armel")
if(DEFINED TIZEN_TOOLCHAIN) # For Tizen only

1
eng/common/performance/performance-setup.sh

@ -201,6 +201,7 @@ if [[ "$internal" == true ]]; then
fi
if [[ "$mono_dotnet" != "" ]] && [[ "$monointerpreter" == "false" ]]; then
configurations="$configurations LLVM=$llvm MonoInterpreter=$monointerpreter MonoAOT=$monoaot"
extra_benchmark_dotnet_arguments="$extra_benchmark_dotnet_arguments --category-exclusion-filter NoMono"
fi

2
global.json

@ -11,6 +11,6 @@
}
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20509.12"
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20514.1"
}
}

Loading…
Cancel
Save