build

build_tools.cmd

@@ -13,10 +13,8 @@ call msbuild /m /p:Configuration=%target_configuration%,Platform=%target_platfor
 if "%target_platform%"=="ARM" goto :exit
 if "%target_platform%"=="ARM64" goto :exit
 
-call nuget restore cppwinrt.sln
 call msbuild /m /p:Configuration=%target_configuration%,Platform=%target_platform%,CppWinRTBuildVersion=%target_version% cppwinrt.sln /t:cppwinrt
 call build_projection %target_platform% %target_configuration%
 call msbuild /m /p:Configuration=%target_configuration%,Platform=%target_platform%,CppWinRTBuildVersion=%target_version% cppwinrt.sln /t:test\test
 
-call nuget restore natvis\cppwinrtvisualizer.sln
 call msbuild /p:Configuration=%target_configuration%,Platform=%target_platform%,CppWinRTBuildVersion=%target_version% natvis\cppwinrtvisualizer.sln

test/nuget/Directory.Build.props

@@ -19,9 +19,9 @@
         <CppWinRTVerbosity>high</CppWinRTVerbosity>
         <CppWinRTPlatform>$(Platform)</CppWinRTPlatform>
         <CppWinRTPlatform Condition="'$(Platform)'=='Win32' or '$(Platform)'=='ARM' or '$(Platform)'=='ARM64'">x86</CppWinRTPlatform>
-        <CppWinRTPath>$(SolutionDir)..\..\..\..\..\_build\Windows\$(CppWinRTPlatform)\$(Configuration)\</CppWinRTPath>
+        <CppWinRTPath>$(SolutionDir)..\..\_build\$(CppWinRTPlatform)\$(Configuration)\</CppWinRTPath>
     </PropertyGroup>
 
-    <Import Project="..\..\..\..\nuget\Microsoft.Windows.CppWinRT.props" />
+    <Import Project="$(SolutionDir)..\..\nuget\Microsoft.Windows.CppWinRT.props" />
 
 </Project>

test/nuget/Directory.Build.targets

@@ -6,6 +6,6 @@
 
     <Import Condition="Exists($([MSBuild]::GetPathOfFileAbove('Directory.Build.targets','$(MSBuildThisFileDirectory)../')))" Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.targets','$(MSBuildThisFileDirectory)../'))" />
 
-    <Import Project="..\..\..\..\nuget\Microsoft.Windows.CppWinRT.targets" />
+    <Import Project="$(SolutionDir)..\..\nuget\Microsoft.Windows.CppWinRT.targets" />
 
 </Project>