mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Update dependencies from https://github.com/dotnet/arcade build 20200210.11 (#6339)

Browse source 
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20110.11
This commit is contained in:
dotnet-maestro[bot] 2020-02-11 13:49:59 +00:00 committed by GitHub
parent 46e245debc
commit f5608a7d0a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
eng/Version.Details.xml
View file

@ -104,9 +104,9 @@
</Dependency> </Dependency>
</ProductDependencies> </ProductDependencies>
<ToolsetDependencies> <ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20109.1"> <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20110.11">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b0e8d3944155f94f83deea8afe025debe369e69f</Sha> <Sha>56e162725058d80918f7aa7e0e689e1fde5c2106</Sha>
</Dependency> </Dependency>
</ToolsetDependencies> </ToolsetDependencies>
</Dependencies> </Dependencies>

12
eng/common/cross/toolchain.cmake
View file

@ -71,7 +71,17 @@ endif()
if(TARGET_ARCH_NAME MATCHES "^(arm|armel)$") if(TARGET_ARCH_NAME MATCHES "^(arm|armel)$")
add_compile_options(-mthumb) add_compile_options(-mthumb)
add_compile_options(-mfpu=vfpv3) if (NOT DEFINED CLR_ARM_FPU_TYPE)
set (CLR_ARM_FPU_TYPE vfpv3)
endif (NOT DEFINED CLR_ARM_FPU_TYPE)
add_compile_options (-mfpu=${CLR_ARM_FPU_TYPE})
if (NOT DEFINED CLR_ARM_FPU_CAPABILITY)
set (CLR_ARM_FPU_CAPABILITY 0x7)
endif (NOT DEFINED CLR_ARM_FPU_CAPABILITY)
add_definitions (-DCLR_ARM_FPU_CAPABILITY=${CLR_ARM_FPU_CAPABILITY})
if(TARGET_ARCH_NAME STREQUAL "armel") if(TARGET_ARCH_NAME STREQUAL "armel")
add_compile_options(-mfloat-abi=softfp) add_compile_options(-mfloat-abi=softfp)
if(DEFINED TIZEN_TOOLCHAIN) if(DEFINED TIZEN_TOOLCHAIN)

2
global.json
View file

@ -3,6 +3,6 @@
"dotnet": "5.0.100-alpha1-015949" "dotnet": "5.0.100-alpha1-015949"
}, },
"msbuild-sdks": { "msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20109.1" "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20110.11"
} }
} }