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

…204.4 (dotnet#560) - Microsoft.DotNet.XUnitExtensions - 5.0.0-beta.19604.4 - Microsoft.DotNet.XUnitConsoleRunner - 2.5.1-beta.19604.4 - Microsoft.DotNet.VersionTools.Tasks - 5.0.0-beta.19604.4 - Microsoft.DotNet.ApiCompat - 5.0.0-beta.19604.4 - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19604.4 - Microsoft.DotNet.Build.Tasks.Configuration - 5.0.0-beta.19604.4 - Microsoft.DotNet.Build.Tasks.Feed - 5.0.0-beta.19604.4 - Microsoft.DotNet.Build.Tasks.Packaging - 5.0.0-beta.19604.4 - Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk - 5.0.0-beta.19604.4 - Microsoft.DotNet.CodeAnalysis - 5.0.0-beta.19604.4 - Microsoft.DotNet.GenAPI - 5.0.0-beta.19604.4 - Microsoft.DotNet.GenFacades - 5.0.0-beta.19604.4 - Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.19604.4 - Microsoft.DotNet.RemoteExecutor - 5.0.0-beta.19604.4
gugavaro · Dec 6, 2019 · 4528f84 · 4528f84
1 parent e385fff
commit 4528f84
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 53 deletions.
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -58,61 +58,61 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.19603.17">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.19604.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>b902fd6b6948e689a5128fa6d94dc7de13e6af84</Sha>
+      <Sha>f2999360b70f05d7738cbfa2b61d1fdaff4ee77d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.19603.17">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.19604.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>b902fd6b6948e689a5128fa6d94dc7de13e6af84</Sha>
+      <Sha>f2999360b70f05d7738cbfa2b61d1fdaff4ee77d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.19603.17">
+    <Dependency Name="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.19604.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>b902fd6b6948e689a5128fa6d94dc7de13e6af84</Sha>
+      <Sha>f2999360b70f05d7738cbfa2b61d1fdaff4ee77d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.19603.17">
+    <Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.19604.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>b902fd6b6948e689a5128fa6d94dc7de13e6af84</Sha>
+      <Sha>f2999360b70f05d7738cbfa2b61d1fdaff4ee77d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.GenFacades" Version="5.0.0-beta.19603.17">
+    <Dependency Name="Microsoft.DotNet.GenFacades" Version="5.0.0-beta.19604.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>b902fd6b6948e689a5128fa6d94dc7de13e6af84</Sha>
+      <Sha>f2999360b70f05d7738cbfa2b61d1fdaff4ee77d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="5.0.0-beta.19603.17">
+    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="5.0.0-beta.19604.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>b902fd6b6948e689a5128fa6d94dc7de13e6af84</Sha>
+      <Sha>f2999360b70f05d7738cbfa2b61d1fdaff4ee77d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.19603.17">
+    <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.19604.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>b902fd6b6948e689a5128fa6d94dc7de13e6af84</Sha>
+      <Sha>f2999360b70f05d7738cbfa2b61d1fdaff4ee77d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="5.0.0-beta.19603.17">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="5.0.0-beta.19604.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>b902fd6b6948e689a5128fa6d94dc7de13e6af84</Sha>
+      <Sha>f2999360b70f05d7738cbfa2b61d1fdaff4ee77d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="5.0.0-beta.19603.17">
+    <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="5.0.0-beta.19604.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>b902fd6b6948e689a5128fa6d94dc7de13e6af84</Sha>
+      <Sha>f2999360b70f05d7738cbfa2b61d1fdaff4ee77d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="5.0.0-beta.19603.17">
+    <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="5.0.0-beta.19604.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>b902fd6b6948e689a5128fa6d94dc7de13e6af84</Sha>
+      <Sha>f2999360b70f05d7738cbfa2b61d1fdaff4ee77d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Configuration" Version="5.0.0-beta.19603.17">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Configuration" Version="5.0.0-beta.19604.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>b902fd6b6948e689a5128fa6d94dc7de13e6af84</Sha>
+      <Sha>f2999360b70f05d7738cbfa2b61d1fdaff4ee77d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="5.0.0-beta.19603.17">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="5.0.0-beta.19604.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>b902fd6b6948e689a5128fa6d94dc7de13e6af84</Sha>
+      <Sha>f2999360b70f05d7738cbfa2b61d1fdaff4ee77d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="5.0.0-beta.19603.17">
+    <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="5.0.0-beta.19604.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>b902fd6b6948e689a5128fa6d94dc7de13e6af84</Sha>
+      <Sha>f2999360b70f05d7738cbfa2b61d1fdaff4ee77d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk" Version="5.0.0-beta.19603.17">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk" Version="5.0.0-beta.19604.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>b902fd6b6948e689a5128fa6d94dc7de13e6af84</Sha>
+      <Sha>f2999360b70f05d7738cbfa2b61d1fdaff4ee77d</Sha>
     </Dependency>
     <Dependency Name="optimization.windows_nt-x64.IBC.CoreFx" Version="99.99.99-master-20190716.1">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -31,16 +31,16 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Arcade dependencies -->
-    <MicrosoftDotNetApiCompatVersion>5.0.0-beta.19603.17</MicrosoftDotNetApiCompatVersion>
-    <MicrosoftDotNetBuildTasksFeedVersion>5.0.0-beta.19603.17</MicrosoftDotNetBuildTasksFeedVersion>
-    <MicrosoftDotNetCodeAnalysisVersion>5.0.0-beta.19603.17</MicrosoftDotNetCodeAnalysisVersion>
-    <MicrosoftDotNetGenAPIVersion>5.0.0-beta.19603.17</MicrosoftDotNetGenAPIVersion>
-    <MicrosoftDotNetGenFacadesVersion>5.0.0-beta.19603.17</MicrosoftDotNetGenFacadesVersion>
-    <MicrosoftDotNetXUnitExtensionsVersion>5.0.0-beta.19603.17</MicrosoftDotNetXUnitExtensionsVersion>
-    <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.19603.17</MicrosoftDotNetXUnitConsoleRunnerVersion>
-    <MicrosoftDotNetBuildTasksPackagingVersion>5.0.0-beta.19603.17</MicrosoftDotNetBuildTasksPackagingVersion>
-    <MicrosoftDotNetRemoteExecutorVersion>5.0.0-beta.19603.17</MicrosoftDotNetRemoteExecutorVersion>
-    <MicrosoftDotNetVersionToolsTasksVersion>5.0.0-beta.19603.17</MicrosoftDotNetVersionToolsTasksVersion>
+    <MicrosoftDotNetApiCompatVersion>5.0.0-beta.19604.4</MicrosoftDotNetApiCompatVersion>
+    <MicrosoftDotNetBuildTasksFeedVersion>5.0.0-beta.19604.4</MicrosoftDotNetBuildTasksFeedVersion>
+    <MicrosoftDotNetCodeAnalysisVersion>5.0.0-beta.19604.4</MicrosoftDotNetCodeAnalysisVersion>
+    <MicrosoftDotNetGenAPIVersion>5.0.0-beta.19604.4</MicrosoftDotNetGenAPIVersion>
+    <MicrosoftDotNetGenFacadesVersion>5.0.0-beta.19604.4</MicrosoftDotNetGenFacadesVersion>
+    <MicrosoftDotNetXUnitExtensionsVersion>5.0.0-beta.19604.4</MicrosoftDotNetXUnitExtensionsVersion>
+    <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.19604.4</MicrosoftDotNetXUnitConsoleRunnerVersion>
+    <MicrosoftDotNetBuildTasksPackagingVersion>5.0.0-beta.19604.4</MicrosoftDotNetBuildTasksPackagingVersion>
+    <MicrosoftDotNetRemoteExecutorVersion>5.0.0-beta.19604.4</MicrosoftDotNetRemoteExecutorVersion>
+    <MicrosoftDotNetVersionToolsTasksVersion>5.0.0-beta.19604.4</MicrosoftDotNetVersionToolsTasksVersion>
     <!-- Installer dependencies -->
     <MicrosoftNETCoreAppVersion>5.0.0-alpha.1.19562.8</MicrosoftNETCoreAppVersion>
     <MicrosoftNETCoreDotNetHostVersion>5.0.0-alpha.1.19563.6</MicrosoftNETCoreDotNetHostVersion>

diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake
@@ -71,17 +71,8 @@ endif()
 
 if(TARGET_ARCH_NAME MATCHES "^(arm|armel)$")
   add_compile_options(-mthumb)
-  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(-mfpu=vfpv3)
+  if(TARGET_ARCH_NAME STREQUAL "armel")
     add_compile_options(-mfloat-abi=softfp)
     if(DEFINED TIZEN_TOOLCHAIN)
       add_compile_options(-Wno-deprecated-declarations) # compile-time option

diff --git a/global.json b/global.json
@@ -12,10 +12,10 @@
     "python": "2.7.15"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.19603.17",
-    "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.19603.17",
-    "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.19603.17",
-    "Microsoft.DotNet.Build.Tasks.Configuration": "5.0.0-beta.19603.17",
+    "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.19604.4",
+    "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.19604.4",
+    "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.19604.4",
+    "Microsoft.DotNet.Build.Tasks.Configuration": "5.0.0-beta.19604.4",
     "FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
     "Microsoft.NET.Sdk.IL": "5.0.0-alpha1.19563.3",
     "Microsoft.Build.NoTargets": "1.0.53",