From 508312b34a2ca5e5f7ad21b81da76a4035aefd0b Mon Sep 17 00:00:00 2001
From: Andy Gocke <angocke@microsoft.com>
Date: Wed, 15 Mar 2017 01:55:38 -0700
Subject: [PATCH] Use absolute paths in nuspec

---
 .../DevDivInsertionFiles/BuildDevDivInsertionFiles.vb     | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/Setup/DevDivInsertionFiles/BuildDevDivInsertionFiles.vb b/src/Setup/DevDivInsertionFiles/BuildDevDivInsertionFiles.vb
index 646a6912ad7..5bb63c194f6 100644
--- a/src/Setup/DevDivInsertionFiles/BuildDevDivInsertionFiles.vb
+++ b/src/Setup/DevDivInsertionFiles/BuildDevDivInsertionFiles.vb
@@ -1042,7 +1042,9 @@ Public Class BuildDevDivInsertionFiles
         ' No duplicates are allowed
         filesToInsert.GroupBy(Function(x) x).All(Function(g) g.Count() = 1)
 
-        Dim outputFolder = GetAbsolutePathInOutputDirectory("VS_Toolset_Files")
+
+        Const toolsetDir As String = "VS_Toolset_Files"
+        Dim outputFolder = GetAbsolutePathInOutputDirectory(toolsetDir)
 
         Directory.CreateDirectory(outputFolder)
 
@@ -1095,10 +1097,10 @@ set DEVPATH=%RoslynToolsRoot%;%DEVPATH%"
                           <version>0.0</version>
                       </metadata>
                       <files>
-                          <file src="Init.cmd"/>
+                          <file src=<%= Path.Combine(outputFolder, " Init.cmd") %>/>
                           <%= filesToInsert.
                               OrderBy(Function(f) f).
-                              Select(Function(f) <file src=<%= f %> xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd"/>) %>
+                              Select(Function(f) <file src=<%= Path.Combine(outputFolder, f) %> xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd"/>) %>
                       </files>
                   </package>
 
-- 
GitLab