Merge pull request #7101 from MiYanni/netstandard-assetfix

NetStandard Common asset fix

Author: Maddie Clayton

tools/Common.Netcore.Dependencies.Test.targets

@@ -19,8 +19,7 @@
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
   </ItemGroup>
   <PropertyGroup>
-    <!-- <ScenarioTestToolsPath>$(MSBuildThisFileDirectory)..\src\packages\Microsoft.Azure.PowerShell.ScenarioTest.ResourceManager.1.0.93-preview\tools\</ScenarioTestToolsPath> -->
-    <ScenarioTestToolsPath>$(MSBuildThisFileDirectory)..\src\ResourceManager\Common\Commands.ScenarioTests.ResourceManager.Common\</ScenarioTestToolsPath>
+    <ScenarioTestToolsPath>$(NugetPackageRoot)microsoft.azure.powershell.scenariotest.resourcemanager\1.0.93-preview\tools\</ScenarioTestToolsPath>
   </PropertyGroup>
   <ItemGroup>
     <None Include="$(ScenarioTestToolsPath)Assert.ps1">

tools/Common.Netcore.Dependencies.targets

@@ -26,8 +26,7 @@
     <PackageReference Include="PowerShellStandard.Library" Version="5.1.0-preview-06" PrivateAssets="All" />
   </ItemGroup>
   <PropertyGroup>
-    <!-- <StorageToolsPath>$(MSBuildThisFileDirectory)..\src\packages\Microsoft.Azure.PowerShell.Storage.1.0.93-preview\tools\</StorageToolsPath> -->
-    <StorageToolsPath>$(MSBuildThisFileDirectory)..\src\Common\Commands.Common.Storage\</StorageToolsPath>
+    <StorageToolsPath>$(NugetPackageRoot)microsoft.azure.powershell.storage\1.0.93-preview\tools\</StorageToolsPath>
   </PropertyGroup>
   <ItemGroup Condition="'$(OmitJsonPackage)' != 'true'">
     <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />