Switch Razzle submodule's Tools directory out for NuGet packages

EnlistmentInfo.props

@@ -5,11 +5,16 @@
     <ProjectDepotRoot>$(MSBuildThisFileDirectory)</ProjectDepotRoot>
     <SubmoduleRoot>$(MSBuildThisFileDirectory)\src</SubmoduleRoot>
     <NuGetPackageRestorePath>$(ProjectDepotRoot)\src\Packages\</NuGetPackageRestorePath>
-    <ModuleDefinitionsDirectory>$(MSBuildThisFileDirectory)Tools\ModuleTargets\Modules\</ModuleDefinitionsDirectory>
     <DeployExtension Condition=" '$(IsLabBuild)' == 'true' ">false</DeployExtension>
     <ModuleName>Microsoft.VisualStudio.Validation</ModuleName>
+
+    <VSToolsDeRazzlePath>$(NuGetPackageRestorePath)VS.Tools.Derazzle.1.0.150317.2\</VSToolsDeRazzlePath>
+    <VSToolsModuleTargetsPath>$(NuGetPackageRestorePath)VS.Tools.ModuleTargets.1.0.150313.1\</VSToolsModuleTargetsPath>
+    <VSToolsDevDivFilesPath>$(NuGetPackageRestorePath)VS.Tools.DevDivFiles.1.0.150305.3\</VSToolsDevDivFilesPath>
+    
+    <ModuleDefinitionsDirectory>$(VSToolsModuleTargetsPath)Modules\</ModuleDefinitionsDirectory>
   </PropertyGroup>
 
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), EnlistmentInfo.xml))\EnlistmentInfo.xml" />
-  <Import Project="$(DepotRoot)\Tools\Derazzle\Common.props"/>
+  <Import Project="$(VSToolsDeRazzlePath)Common.props"/>
 </Project>

EnlistmentInfo.targets

@@ -4,7 +4,7 @@
     <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
   </PropertyGroup>
 
-  <Import Project="$(DepotRoot)\Tools\Derazzle\Common.targets"/>
+  <Import Project="$(VSToolsDeRazzlePath)Common.targets"/>
 
   <ItemDefinitionGroup>
     <FilesToSign Condition=" '$(DevDivProjectType)' == 'product' ">

Razzle

@@ -1 +1 @@
-Subproject commit af5130be98ed3e5192f0c10c7efcb60345c41915
+Subproject commit ddaeb58c8f8fe17a5d4092c9a84029beb2418b98

nuget.config

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <config>
+    <add key="DefaultPushSource" value="\\cpvsbuild\drops\vsideproj\Packages" />
+  </config>
+  <activePackageSource>
+    <add key="All" value="(Aggregate source)" />
+  </activePackageSource>
+  <packageSources>
+    <clear/>
+    <add key="nuget.org" value="https://www.nuget.org/api/v2/" />
+    <add key="VSIDEProj (cpvsbuild)" value="\\cpvsbuild\drops\vsideproj\Packages" />
+    <add key="VSPackages" value="\\airstore\dd\nuget" />
+  </packageSources>
+  <disabledPackageSources>
+    <clear/>
+  </disabledPackageSources>
+</configuration>

src/.nuget/packages.config

@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="NuProj" version="0.9.3-beta" />
+  <package id="VS.Tools.Derazzle" version="1.0.150317.2" />
+  <package id="VS.Tools.DevDivFiles" version="1.0.150305.3" />
+  <package id="VS.ToolsFiles" version="1.0.150317.2" />
 </packages>

src/Microsoft.VisualStudio.Validation/Microsoft.VisualStudio.Validation.csproj

@@ -58,7 +58,7 @@
     <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\Razzle\src\Tools\RunMeElevated.cmd">
+    <None Include="$(NuGetPackageRestorePath)VS.ToolsFiles.*\RunMeElevated.cmd">
       <Link>UpdateVS\RunMeElevated.cmd</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
@@ -67,7 +67,7 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="..\..\Razzle\src\Tools\Elevate.exe">
+    <Content Include="$(NuGetPackageRestorePath)VS.ToolsFiles.*\Elevate.exe">
       <Link>UpdateVS\Elevate.exe</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>