diff --git a/build/RepositoryBuild.targets b/build/RepositoryBuild.targets
index 957d9630d9..0e0216fbde 100644
--- a/build/RepositoryBuild.targets
+++ b/build/RepositoryBuild.targets
@@ -23,7 +23,7 @@
     <!-- If we are building a sub-graph, we need to re-examine the list of artifacts that will actual build. -->
     <MSBuild Projects="$(MSBuildProjectFullPath)"
              Targets="GetArtifactInfo"
-             Properties="RepositoryRoot=$(SubmoduleRoot)%(RepositoryBuildOrder.Identity)\;Configuration=$(Configuration);BuildNumber=$(BuildNumber)"
+             Properties="RepositoryRoot=$(SubmoduleRoot)%(RepositoryBuildOrder.Identity)\;Configuration=$(Configuration);BuildNumber=$(BuildNumber);DesignTimeBuild=true"
              Condition="'$(BuildGraphOf)' != ''">
       <Output TaskParameter="TargetOutputs" ItemName="PinnedArtifactInfo" />
     </MSBuild>
diff --git a/build/repo.targets b/build/repo.targets
index f69cbe77cc..3bd55133bd 100644
--- a/build/repo.targets
+++ b/build/repo.targets
@@ -47,7 +47,7 @@
 
     <MSBuild Projects="$(MSBuildProjectFullPath)"
              Targets="GetArtifactInfo"
-             Properties="RepositoryRoot=%(Repository.RootPath);Configuration=$(Configuration);BuildNumber=$(BuildNumber)"
+             Properties="RepositoryRoot=%(Repository.RootPath);Configuration=$(Configuration);BuildNumber=$(BuildNumber);DesignTimeBuild=true"
              ContinueOnError="WarnAndContinue">
       <Output TaskParameter="TargetOutputs" ItemName="ArtifactInfo" />
     </MSBuild>
@@ -66,7 +66,7 @@
     -->
     <MSBuild Projects="$(MSBuildProjectFullPath)"
              Targets="GetArtifactInfo"
-             Properties="RepositoryRoot=%(ShippedRepository.RootPath);Configuration=$(Configuration);BuildNumber=$(BuildNumber);IsFinalBuild=true"
+             Properties="RepositoryRoot=%(ShippedRepository.RootPath);Configuration=$(Configuration);BuildNumber=$(BuildNumber);IsFinalBuild=true;DesignTimeBuild=true"
              ContinueOnError="WarnAndContinue"
              Condition="'%(ShippedRepository.Identity)' != ''">
       <Output TaskParameter="TargetOutputs" ItemName="ShippedArtifactInfo" />
diff --git a/korebuild-lock.txt b/korebuild-lock.txt
index 0fb680d9b6..7c2e97aa79 100644
--- a/korebuild-lock.txt
+++ b/korebuild-lock.txt
@@ -1,2 +1,2 @@
-version:2.1.0-preview1-15646
-commithash:c390edb6f73e3ab992402835c004414c1fadfd4a
+version:2.1.0-preview1-15651
+commithash:ebf2365121c2c6a6a0fbfa9b0f37bb5effc89323
diff --git a/modules/DotNetTools b/modules/DotNetTools
index 3c20e7c45b..d81f23e159 160000
--- a/modules/DotNetTools
+++ b/modules/DotNetTools
@@ -1 +1 @@
-Subproject commit 3c20e7c45beb5d45547b549964a3da83b2e8303e
+Subproject commit d81f23e1599cd7c464ae51c3d5605c37b0421450
diff --git a/modules/Templating b/modules/Templating
index e7749b9ccc..54a989bc29 160000
--- a/modules/Templating
+++ b/modules/Templating
@@ -1 +1 @@
-Subproject commit e7749b9ccc9dba2483c01587d0ab6ae521970996
+Subproject commit 54a989bc29519c24bf025dbd694873c33bbb6c95