diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml
index 4652ac06ea56f24c1c11d71994bca7549920dcf5..dba29cb552c44934c9a67497e119ac67d5b8b8f2 100644
--- a/.azure/pipelines/ci.yml
+++ b/.azure/pipelines/ci.yml
@@ -754,7 +754,7 @@ stages:
       platform:
         name: 'Managed'
         container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-f39df28-20191023143754'
-        buildScript: './eng/build.sh $(_PublishArgs)'
+        buildScript: './eng/build.sh $(_PublishArgs) --no-build-repo-tasks'
         skipPublishValidation: true
 
   # Publish to the BAR
diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props
index 27cbe920367a516136494bcaea672ded51847b05..5c714e42c4e16b741961809643e92181d94bc71a 100644
--- a/eng/SourceBuild.props
+++ b/eng/SourceBuild.props
@@ -47,7 +47,7 @@
           BeforeTargets="Execute">
 
     <Exec
-      Command="./eng/build.sh --only-build-repo-tasks"
+      Command="./eng/build.sh --only-build-repo-tasks -bl"
       WorkingDirectory="$(InnerSourceBuildRepoRoot)"
       EnvironmentVariables="@(InnerBuildEnv)" />
   </Target>
diff --git a/eng/Tools.props b/eng/Tools.props
index a285c2406a151d1738e40360970990a79af266ee..a38257f7704fa7c545c933413c96affbfd4d39bf 100644
--- a/eng/Tools.props
+++ b/eng/Tools.props
@@ -13,7 +13,7 @@
   <!-- Update the generated files when we restore projects. Skip in desktop msbuild due to VS 16.8 requirements. -->
   <Target Name="GenerateDirectoryBuildFiles"
       AfterTargets="Restore"
-      Condition=" '$(DotNetBuildFromSource)' != 'true' AND '$(MSBuildRuntimeType)' == 'core' ">
+      Condition=" '$(MSBuildRuntimeType)' == 'core' ">
     <!-- Separate invocations and use different properties to ensure second can load the restored package info. -->
     <MSBuild Projects="$(RepoRoot)eng\tools\GenerateFiles\GenerateFiles.csproj"
         RemoveProperties="BaseIntermediateOutputPath"
diff --git a/eng/tools/GenerateFiles/GenerateFiles.csproj b/eng/tools/GenerateFiles/GenerateFiles.csproj
index 0ae5c9753e78287e5911fcbc8972fcb9fcb9d7a2..dbf9965bf960f75cf4f48333c259ad38e01f98f6 100644
--- a/eng/tools/GenerateFiles/GenerateFiles.csproj
+++ b/eng/tools/GenerateFiles/GenerateFiles.csproj
@@ -2,6 +2,7 @@
   <PropertyGroup>
     <!-- Use fixed version instead of $(DefaultNetCoreTargetFramework) to avoid needing workarounds set up here. -->
     <TargetFramework>net5.0</TargetFramework>
+    <ExcludeFromSourceBuild>false</ExcludeFromSourceBuild>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/eng/tools/RepoTasks/RepoTasks.csproj b/eng/tools/RepoTasks/RepoTasks.csproj
index e723beb3531bc082201513276b22f01298d60a6f..67e01850f836de79a1ce99adfda5e53a2bbe68c5 100644
--- a/eng/tools/RepoTasks/RepoTasks.csproj
+++ b/eng/tools/RepoTasks/RepoTasks.csproj
@@ -16,7 +16,7 @@
 
   <ItemGroup>
     <PackageReference Include="NuGet.Packaging" Version="$(NuGetPackagingVersion)" />
-    <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="2.1.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionsDependencyModelVersion)" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'">