Update dependencies from https://github.com/dotnet/arcade build 20200…

…210.11 (#1703) - Microsoft.DotNet.ApiCompat - 5.0.0-beta.20110.11 - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20110.11 - Microsoft.DotNet.Build.Tasks.Packaging - 5.0.0-beta.20110.11 - Microsoft.DotNet.CodeAnalysis - 5.0.0-beta.20110.11 - Microsoft.DotNet.GenAPI - 5.0.0-beta.20110.11 - Microsoft.DotNet.GenFacades - 5.0.0-beta.20110.11
dotnet · Feb 11, 2020 · 6a5f4e7 · 6a5f4e7
1 parent ebb32ce
commit 6a5f4e7
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 19 deletions.
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -3,29 +3,29 @@
   <ProductDependencies>
   </ProductDependencies>
   <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>
-      <Sha>b0e8d3944155f94f83deea8afe025debe369e69f</Sha>
+      <Sha>56e162725058d80918f7aa7e0e689e1fde5c2106</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.20109.1">
+    <Dependency Name="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.20110.11">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>b0e8d3944155f94f83deea8afe025debe369e69f</Sha>
+      <Sha>56e162725058d80918f7aa7e0e689e1fde5c2106</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="5.0.0-beta.20109.1">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="5.0.0-beta.20110.11">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>b0e8d3944155f94f83deea8afe025debe369e69f</Sha>
+      <Sha>56e162725058d80918f7aa7e0e689e1fde5c2106</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="5.0.0-beta.20109.1">
+    <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="5.0.0-beta.20110.11">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>b0e8d3944155f94f83deea8afe025debe369e69f</Sha>
+      <Sha>56e162725058d80918f7aa7e0e689e1fde5c2106</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.20109.1">
+    <Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.20110.11">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>b0e8d3944155f94f83deea8afe025debe369e69f</Sha>
+      <Sha>56e162725058d80918f7aa7e0e689e1fde5c2106</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.GenFacades" Version="5.0.0-beta.20109.1">
+    <Dependency Name="Microsoft.DotNet.GenFacades" Version="5.0.0-beta.20110.11">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>b0e8d3944155f94f83deea8afe025debe369e69f</Sha>
+      <Sha>56e162725058d80918f7aa7e0e689e1fde5c2106</Sha>
     </Dependency>
     <Dependency Name="System.Reflection.Emit" Version="5.0.0-alpha.1.19563.6">
       <Uri>https://github.com/dotnet/corefx</Uri>

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -18,11 +18,11 @@
     <NetStandardLibraryPackage>netstandard.library</NetStandardLibraryPackage>
   </PropertyGroup>
   <PropertyGroup>
-    <MicrosoftDotNetApiCompatPackageVersion>5.0.0-beta.20109.1</MicrosoftDotNetApiCompatPackageVersion>
-    <MicrosoftDotNetBuildTasksPackagingPackageVersion>5.0.0-beta.20109.1</MicrosoftDotNetBuildTasksPackagingPackageVersion>
-    <MicrosoftDotNetCodeAnalysisPackageVersion>5.0.0-beta.20109.1</MicrosoftDotNetCodeAnalysisPackageVersion>
-    <MicrosoftDotNetGenAPIPackageVersion>5.0.0-beta.20109.1</MicrosoftDotNetGenAPIPackageVersion>
-    <MicrosoftDotNetGenFacadesPackageVersion>5.0.0-beta.20109.1</MicrosoftDotNetGenFacadesPackageVersion>
+    <MicrosoftDotNetApiCompatPackageVersion>5.0.0-beta.20110.11</MicrosoftDotNetApiCompatPackageVersion>
+    <MicrosoftDotNetBuildTasksPackagingPackageVersion>5.0.0-beta.20110.11</MicrosoftDotNetBuildTasksPackagingPackageVersion>
+    <MicrosoftDotNetCodeAnalysisPackageVersion>5.0.0-beta.20110.11</MicrosoftDotNetCodeAnalysisPackageVersion>
+    <MicrosoftDotNetGenAPIPackageVersion>5.0.0-beta.20110.11</MicrosoftDotNetGenAPIPackageVersion>
+    <MicrosoftDotNetGenFacadesPackageVersion>5.0.0-beta.20110.11</MicrosoftDotNetGenFacadesPackageVersion>
     <SystemReflectionEmitPackageVersion>5.0.0-alpha.1.19563.6</SystemReflectionEmitPackageVersion>
     <SystemReflectionEmitILGenerationPackageVersion>5.0.0-alpha.1.19563.6</SystemReflectionEmitILGenerationPackageVersion>
     <SystemReflectionEmitLightweightPackageVersion>5.0.0-alpha.1.19563.6</SystemReflectionEmitLightweightPackageVersion>

diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake
@@ -71,7 +71,17 @@ endif()
 
 if(TARGET_ARCH_NAME MATCHES "^(arm|armel)$")
   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")
     add_compile_options(-mfloat-abi=softfp)
     if(DEFINED TIZEN_TOOLCHAIN)

diff --git a/global.json b/global.json
@@ -3,6 +3,6 @@
     "dotnet": "3.0.101"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20109.1"
+    "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20110.11"
   }
 }