diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index dff573a65..9d56e448e 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -75,13 +75,13 @@
       <Uri>https://github.com/dotnet/templating</Uri>
       <Sha>c3f88f3471bb22c489784faf5a84e44263f4f994</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk" Version="5.0.100-preview.3.20160.12">
+    <Dependency Name="Microsoft.NET.Sdk" Version="5.0.100-preview.3.20170.2">
       <Uri>https://github.com/dotnet/sdk</Uri>
-      <Sha>cda04f124e3571e186ecc8f26958ceeaffb2a469</Sha>
+      <Sha>ac7fd98a7b6f8e625aab8977029813bec6088e70</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="5.0.100-preview.3.20160.12">
+    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="5.0.100-preview.3.20170.2">
       <Uri>https://github.com/dotnet/sdk</Uri>
-      <Sha>cda04f124e3571e186ecc8f26958ceeaffb2a469</Sha>
+      <Sha>ac7fd98a7b6f8e625aab8977029813bec6088e70</Sha>
     </Dependency>
     <!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
     <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="5.0.0-preview.3.20169.4" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
diff --git a/eng/Versions.props b/eng/Versions.props
index a9ce1a6aa..a36c04969 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -49,8 +49,8 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/sdk -->
-    <MicrosoftNETSdkPackageVersion>5.0.100-preview.3.20160.12</MicrosoftNETSdkPackageVersion>
-    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>5.0.100-preview.3.20160.12</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
+    <MicrosoftNETSdkPackageVersion>5.0.100-preview.3.20170.2</MicrosoftNETSdkPackageVersion>
+    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>5.0.100-preview.3.20170.2</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
     <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
     <MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
   </PropertyGroup>
diff --git a/src/redist/targets/Crossgen.targets b/src/redist/targets/Crossgen.targets
index 1c19fd24c..f1db8315b 100644
--- a/src/redist/targets/Crossgen.targets
+++ b/src/redist/targets/Crossgen.targets
@@ -87,6 +87,14 @@
 
       <!-- FSharp.Build.dll causes the FSharp folder to be included. Remove it, as we don't want other FSharp dlls being included in the crossgen. -->
       <RemainingFolders Remove="$(PublishDir)FSharp\**\*" />
+
+      <!-- RemainingFolders should be ordered so that dependencies are first looked up in the leaf folders. 
+        Currently it is not ordered and crossgen is picking the wrong dlls when resolving dependencies: https://github.com/dotnet/core-sdk/pull/6774
+        As a partial solution, we remove the root folder from the list and put it back to the end.
+        Remove the following 2 lines when resolving this issue: https://github.com/dotnet/core-sdk/issues/6877 -->
+      <RemainingFolders Remove="$(SdkOutputDirectory.TrimEnd('\').TrimEnd('/'))" />
+      <RemainingFolders Include="$(SdkOutputDirectory.TrimEnd('\').TrimEnd('/'))" />
+
     </ItemGroup>
 
     <!-- Crossgen does not support generating symbols on Mac  -->