Skip to content

Commit

Permalink
Revert "Remove source-build workaround for sourcelink submodule issue (
Browse files Browse the repository at this point in the history
…#39324)" (#39356)

This reverts commit 9b049bd.
  • Loading branch information
MichaelSimons committed Jan 6, 2022
1 parent aaf1fc6 commit 00f7e1f
Showing 1 changed file with 14 additions and 0 deletions.
14 changes: 14 additions & 0 deletions eng/SourceBuild.props
Expand Up @@ -3,6 +3,7 @@
<PropertyGroup>
<GitHubRepositoryName>aspnetcore</GitHubRepositoryName>
<SourceBuildManagedOnly>true</SourceBuildManagedOnly>
<CloneSubmodulesToInnerSourceBuildRepo>false</CloneSubmodulesToInnerSourceBuildRepo>
</PropertyGroup>

<Target Name="PrepareGlobalJsonForSourceBuild"
Expand All @@ -13,6 +14,19 @@
WorkingDirectory="$(InnerSourceBuildRepoRoot)" />
</Target>

<!--
Init submodules - temporarary workaround for https://github.com/dotnet/sourcelink/pull/653
-->
<Target Name="InitSubmodules"
DependsOnTargets="PrepareInnerSourceBuildRepoRoot"
BeforeTargets="RunInnerSourceBuildCommand">

<Exec
Command="git submodule update --init --recursive"
WorkingDirectory="$(InnerSourceBuildRepoRoot)"
EnvironmentVariables="@(InnerBuildEnv)" />
</Target>

<!--
Remove inner source .globalconfig file as both the inner and outer config files get loaded and cause a conflict.
Leaving the inner will cause all conflicting settings to be ignored.
Expand Down

0 comments on commit 00f7e1f

Please sign in to comment.