Skip to content

Commit 00f7e1f

Browse files
Revert "Remove source-build workaround for sourcelink submodule issue (#39324)" (#39356)
This reverts commit 9b049bd.
1 parent aaf1fc6 commit 00f7e1f

File tree

1 file changed

+14
-0
lines changed

1 file changed

+14
-0
lines changed

eng/SourceBuild.props

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<PropertyGroup>
44
<GitHubRepositoryName>aspnetcore</GitHubRepositoryName>
55
<SourceBuildManagedOnly>true</SourceBuildManagedOnly>
6+
<CloneSubmodulesToInnerSourceBuildRepo>false</CloneSubmodulesToInnerSourceBuildRepo>
67
</PropertyGroup>
78

89
<Target Name="PrepareGlobalJsonForSourceBuild"
@@ -13,6 +14,19 @@
1314
WorkingDirectory="$(InnerSourceBuildRepoRoot)" />
1415
</Target>
1516

17+
<!--
18+
Init submodules - temporarary workaround for https://github.com/dotnet/sourcelink/pull/653
19+
-->
20+
<Target Name="InitSubmodules"
21+
DependsOnTargets="PrepareInnerSourceBuildRepoRoot"
22+
BeforeTargets="RunInnerSourceBuildCommand">
23+
24+
<Exec
25+
Command="git submodule update --init --recursive"
26+
WorkingDirectory="$(InnerSourceBuildRepoRoot)"
27+
EnvironmentVariables="@(InnerBuildEnv)" />
28+
</Target>
29+
1630
<!--
1731
Remove inner source .globalconfig file as both the inner and outer config files get loaded and cause a conflict.
1832
Leaving the inner will cause all conflicting settings to be ignored.

0 commit comments

Comments
 (0)