diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj
index 890fdb89e..2520c2bf7 100644
--- a/src/redist/redist.csproj
+++ b/src/redist/redist.csproj
@@ -5,5 +5,7 @@
     <CopyBuildOutputToPublishDirectory>false</CopyBuildOutputToPublishDirectory>
   </PropertyGroup>
 
+  <Import Project="targets\BuildCoreSdkTasks.targets" />
+
 
 </Project>
diff --git a/src/redist/targets/BuildCoreSdkTasks.targets b/src/redist/targets/BuildCoreSdkTasks.targets
new file mode 100644
index 000000000..ad40a1693
--- /dev/null
+++ b/src/redist/targets/BuildCoreSdkTasks.targets
@@ -0,0 +1,17 @@
+<Project>
+  <PropertyGroup>
+    <CoreSdkTaskDll>$(ArtifactsDir)tasks\bin\core-sdk-tasks\$(Configuration)\$(CoreSdkTargetFramework)\core-sdk-tasks.dll</CoreSdkTaskDll>
+    <CoreSdkTaskProject>$(RepoRoot)src\core-sdk-tasks\core-sdk-tasks.csproj</CoreSdkTaskProject>
+  </PropertyGroup>
+  <Target Name="BuildCoreSdkTasks" BeforeTargets="_CheckForInvalidConfigurationAndPlatform">
+    <!-- Use a different ArtifactsDir for this invocation so that the tasks project can be part of the solution
+         (for easy editing), but we don't hit problems with the tasks DLL being locked when we try to build the solution. -->
+
+    <MSBuild Projects="$(CoreSdkTaskProject)"
+             Properties="ArtifactsDir=$(ArtifactsDir)tasks\;Phase=Restore"
+             Targets="Restore"/>
+
+    <MSBuild Projects="$(CoreSdkTaskProject)"
+             Properties="ArtifactsDir=$(ArtifactsDir)tasks\"/>
+  </Target>
+</Project>