Skip to content

Commit e091dbc

Browse files
committed
Add conditional fallback .props imports to allow updates to SourceLink
- These preserve the task-assembly properties during NuGet updates while leaving normal versioned imports and automatic SourceLink upgrades intact. Can be reverted after NuGet/Home#7347 is fixed. ***NO_CI***
1 parent 914112c commit e091dbc

1 file changed

Lines changed: 3 additions & 0 deletions

File tree

‎nanoFramework.System.Threading/nanoFramework.System.Threading.nfproj‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,9 @@
9494
<Error Condition="!Exists('..\packages\Nerdbank.GitVersioning.3.10.94\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Nerdbank.GitVersioning.3.10.94\build\Nerdbank.GitVersioning.targets'))" />
9595
</Target>
9696
<Import Project="..\packages\Nerdbank.GitVersioning.3.10.94\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\packages\Nerdbank.GitVersioning.3.10.94\build\Nerdbank.GitVersioning.targets')" />
97+
<!-- Keep task assembly properties available during NuGet's intermediate import removal. -->
98+
<Import Project="..\packages\Microsoft.Build.Tasks.Git.*\build\Microsoft.Build.Tasks.Git.props" Condition="'$(MicrosoftBuildTasksGitAssemblyFile)' == ''" />
99+
<Import Project="..\packages\Microsoft.SourceLink.Common.*\build\Microsoft.SourceLink.Common.props" Condition="'$(_MicrosoftSourceLinkCommonAssemblyFile)' == ''" />
97100
<Import Project="..\packages\Microsoft.Build.Tasks.Git.10.0.300\build\Microsoft.Build.Tasks.Git.targets" Condition="Exists('..\packages\Microsoft.Build.Tasks.Git.10.0.300\build\Microsoft.Build.Tasks.Git.targets')" />
98101
<Import Project="..\packages\Microsoft.SourceLink.Common.10.0.300\build\Microsoft.SourceLink.Common.targets" Condition="Exists('..\packages\Microsoft.SourceLink.Common.10.0.300\build\Microsoft.SourceLink.Common.targets')" />
99102
<Import Project="..\packages\Microsoft.SourceLink.GitHub.10.0.300\build\Microsoft.SourceLink.GitHub.targets" Condition="Exists('..\packages\Microsoft.SourceLink.GitHub.10.0.300\build\Microsoft.SourceLink.GitHub.targets')" />

0 commit comments

Comments
 (0)