Cleanup nuspec

src/Setup/DevDivInsertionFiles/BuildDevDivInsertionFiles.vb

-Imports <xmlns:wix="http://schemas.microsoft.com/wix/2006/wi">
-Imports <xmlns:msbuild="http://schemas.microsoft.com/developer/msbuild/2003">
-Imports <xmlns:vsix="http://schemas.microsoft.com/developer/vsx-schema/2011">
-Imports <xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension">
-Imports System.IO.Packaging
+Imports System.IO.Packaging
 Imports System.IO
 Imports System.Threading
 Imports Newtonsoft.Json
 Imports Newtonsoft.Json.Linq
 Imports System.Reflection.PortableExecutable
 Imports System.Reflection.Metadata
-Imports Roslyn.BuildDevDivInsertionFiles
-Imports System.Security.Cryptography
-Imports System.Text
 Imports System.Runtime.InteropServices
 
 Public Class BuildDevDivInsertionFiles
@@ -1043,8 +1036,7 @@ Public Class BuildDevDivInsertionFiles
         filesToInsert.GroupBy(Function(x) x).All(Function(g) g.Count() = 1)
 
 
-        Const toolsetDir As String = "VS_Toolset_Files"
-        Dim outputFolder = GetAbsolutePathInOutputDirectory(toolsetDir)
+        Dim outputFolder = GetAbsolutePathInOutputDirectory(PackageName)
 
         Directory.CreateDirectory(outputFolder)
 
@@ -1097,10 +1089,10 @@ set DEVPATH=%RoslynToolsRoot%;%DEVPATH%"
                           <version>0.0</version>
                       </metadata>
                       <files>
-                          <file src=<%= Path.Combine(outputFolder, " Init.cmd") %>/>
+                          <file src="Init.cmd"/>
                           <%= filesToInsert.
                               OrderBy(Function(f) f).
-                              Select(Function(f) <file src=<%= Path.Combine(outputFolder, f) %> xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd"/>) %>
+                              Select(Function(f) <file src=<%= f %> xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd"/>) %>
                       </files>
                   </package>
 

src/Setup/DevDivPackages/Roslyn.proj

@@ -4,6 +4,7 @@
   <Import Project="..\..\..\build\Targets\Settings.props" />
   <PropertyGroup>
     <InsertionFilesDir>$(OutDir)DevDivInsertionFiles</InsertionFilesDir>
+    <VsToolsetDir>$(InsertionFilesDir)\VS.Tools.Roslyn</VsToolsetDir>
     <PackagesOutDir>$(OutDir)DevDivPackages\Roslyn</PackagesOutDir>
   </PropertyGroup>
   <ItemGroup>
@@ -11,17 +12,19 @@
       <Version>$(NuGetPerBuildPreReleaseVersion)</Version>
       <!-- TFS build number isn't set on CI server -->
       <Version Condition="'$(NuGetPerBuildPreReleaseVersion)' == ''">$(NuGetReleaseVersion)-cibuild</Version>
+      <BaseDir>$(OutDir)</BaseDir>
     </NuSpec>
-    <NuSpec Include="$(InsertionFilesDir)\VS_Toolset_files\VS.Tools.Roslyn.nuspec">
+    <NuSpec Include="$(VsToolsetDir)\VS.Tools.Roslyn.nuspec">
       <Version>$(NuGetPerBuildPreReleaseVersion)</Version>
       <!-- TFS build number isn't set on CI server -->
       <Version Condition="'$(NuGetPerBuildPreReleaseVersion)' == ''">$(NuGetReleaseVersion)-cibuild</Version>
+      <BaseDir>$(VsToolsetDir)</BaseDir>
     </NuSpec>
   </ItemGroup>
   <Target Name="Build" Inputs="@(NuSpec)" Outputs="@(NuSpec -> $(PackagesOutDir)\%(Filename)%(Extension).%(Version).nupkg">
     <MakeDir Directories="$(PackagesOutDir)" Condition="!Exists('$(PackagesOutDir)')" />
     <!-- nuget doesn't set exitcode when the value of an arg is invalid -->
-    <Exec Command="Pack.cmd %(NuSpec.FullPath) %(NuSpec.Version) $(OutDir) $(PackagesOutDir)"
+    <Exec Command="Pack.cmd %(NuSpec.FullPath) %(NuSpec.Version) $(NuSpec.BaseDir) $(PackagesOutDir)"
           CustomErrorRegularExpression="pack: invalid arguments" />
   </Target>
   <Target Name="Clean">