Skip to content

Commit a86a08b

Browse files
Remove condition on the import of VisualStudio.targets
This condition has the side effect of changing the packages that we depend on, depending on the type of MSBuild used to restore packages. This is because VisualStudio.targets iself contains PackageReferences. This can cause all sorts of slowdowns when restore needs to rerun a lot.
1 parent 91630b3 commit a86a08b

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/Microsoft.DotNet.Arcade.Sdk/tools/Imports.targets

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
<Import Project="Performance.targets" Condition="'$(DisableArcadeTestFramework)' != 'true'" />
1717
<Import Project="Localization.targets" />
18-
<Import Project="VisualStudio.targets" Condition="'$(UsingToolVSSDK)' == 'true' and ('$(IsVsixProject)' == 'true' or '$(IsSwixProject)' == 'true' or '$(GeneratePkgDefFile)' == 'true') and '$(MSBuildRuntimeType)' != 'Core'"/>
18+
<Import Project="VisualStudio.targets" Condition="'$(UsingToolVSSDK)' == 'true' and ('$(IsVsixProject)' == 'true' or '$(IsSwixProject)' == 'true' or '$(GeneratePkgDefFile)' == 'true')"/>
1919
<Import Project="OptimizationData.targets" Condition="'$(UsingToolIbcOptimization)' == 'true'"/>
2020
<Import Project="SymStore.targets" Condition="'$(ContinuousIntegrationBuild)' == 'true' and '$(OS)' == 'Windows_NT'"/>
2121

src/Microsoft.DotNet.Arcade.Sdk/tools/Settings.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@
2323
<Import Project="TargetFrameworkDefaults.props"/>
2424

2525
<Import Project="Compiler.props" Condition="'$(UsingToolMicrosoftNetCompilers)' == 'true'" />
26-
<Import Project="VisualStudio.props" Condition="'$(UsingToolVSSDK)' == 'true' and '$(MSBuildRuntimeType)' != 'Core'"/>
26+
<Import Project="VisualStudio.props" Condition="'$(UsingToolVSSDK)' == 'true'"/>
2727

2828
</Project>

0 commit comments

Comments
 (0)