Skip to content

Commit 431e64a

Browse files
committed
Using $(NugetPackageRoot) instead of local files for common package assets. Another option is $(NuGetPackageFolders). Also, may not contain a trailing slash? See EnsureTrailingSlash for MSBuild if it does need it at some point.
1 parent 98914d5 commit 431e64a

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

tools/Common.Netcore.Dependencies.Test.targets

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@
1919
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
2020
</ItemGroup>
2121
<PropertyGroup>
22-
<!-- <ScenarioTestToolsPath>$(MSBuildThisFileDirectory)..\src\packages\Microsoft.Azure.PowerShell.ScenarioTest.ResourceManager.1.0.93-preview\tools\</ScenarioTestToolsPath> -->
23-
<ScenarioTestToolsPath>$(MSBuildThisFileDirectory)..\src\ResourceManager\Common\Commands.ScenarioTests.ResourceManager.Common\</ScenarioTestToolsPath>
22+
<ScenarioTestToolsPath>$(NugetPackageRoot)Microsoft.Azure.PowerShell.ScenarioTest.ResourceManager.1.0.93-preview\tools\</ScenarioTestToolsPath>
2423
</PropertyGroup>
2524
<ItemGroup>
2625
<None Include="$(ScenarioTestToolsPath)Assert.ps1">

tools/Common.Netcore.Dependencies.targets

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@
2626
<PackageReference Include="PowerShellStandard.Library" Version="5.1.0-preview-06" PrivateAssets="All" />
2727
</ItemGroup>
2828
<PropertyGroup>
29-
<!-- <StorageToolsPath>$(MSBuildThisFileDirectory)..\src\packages\Microsoft.Azure.PowerShell.Storage.1.0.93-preview\tools\</StorageToolsPath> -->
30-
<StorageToolsPath>$(MSBuildThisFileDirectory)..\src\Common\Commands.Common.Storage\</StorageToolsPath>
29+
<StorageToolsPath>$(NugetPackageRoot)Microsoft.Azure.PowerShell.Storage.1.0.93-preview\tools\</StorageToolsPath>
3130
</PropertyGroup>
3231
<ItemGroup Condition="'$(OmitJsonPackage)' != 'true'">
3332
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />

0 commit comments

Comments
 (0)