From 02dbcc0a416e3ace31932913b07e593e444bf634 Mon Sep 17 00:00:00 2001
From: Michael Simons <msimons@microsoft.com>
Date: Wed, 4 Aug 2021 20:10:53 -0500
Subject: [PATCH] Source build patches necessary for tarball build (#35024)
---
.azure/pipelines/ci.yml | 2 +-
eng/SourceBuild.props | 2 +-
eng/Tools.props | 2 +-
eng/tools/GenerateFiles/GenerateFiles.csproj | 1 +
eng/tools/RepoTasks/RepoTasks.csproj | 2 +-
5 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml
index 4652ac06ea5..dba29cb552c 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 27cbe920367..5c714e42c4e 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 a285c2406a1..a38257f7704 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 0ae5c9753e7..dbf9965bf96 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 e723beb3531..67e01850f83 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)'">
--
GitLab