From 6e08daf4f1b19d4b16c3f8b6b3e46e8caaf6c608 Mon Sep 17 00:00:00 2001
From: Tim Mullender <tim.mullender@wandisco.com>
Date: Fri, 19 Jun 2020 11:30:21 +0100
Subject: [PATCH 1/2] Adding target attribute to nuspec file elements

---
 powershell/generators/nuspec.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/powershell/generators/nuspec.ts b/powershell/generators/nuspec.ts
index 79d3f77ddf..5bc1f9e4d3 100644
--- a/powershell/generators/nuspec.ts
+++ b/powershell/generators/nuspec.ts
@@ -37,10 +37,10 @@ export async function generateNuspec(project: Project) {
     <!-- https://github.com/NuGet/Home/issues/3584 -->
     <file src="${removeCd(project.dll)}" target="${removeCd(project.binFolder)}" />
     <file src="${removeCd(project.binFolder)}/${project.dllName}.deps.json" target="${removeCd(project.binFolder)}" />
-    <file src="${removeCd(project.internalFolder)}/**/*.*" exclude="${removeCd(project.internalFolder)}/readme.md" />
-    <file src="${removeCd(project.customFolder)}/**/*.*" exclude="${removeCd(project.customFolder)}/readme.md;${removeCd(project.customFolder)}/**/*.cs" />
-    <file src="${removeCd(project.docsFolder)}/**/*.md" exclude="${removeCd(project.docsFolder)}/readme.md" />
-    <file src="${removeCd(project.exportsFolder)}/**/ProxyCmdletDefinitions.ps1" />
+    <file src="${removeCd(project.internalFolder)}/**/*.*" exclude="${removeCd(project.internalFolder)}/readme.md" target="${removeCd(project.internalFolder)}" />
+    <file src="${removeCd(project.customFolder)}/**/*.*" exclude="${removeCd(project.customFolder)}/readme.md;${removeCd(project.customFolder)}/**/*.cs" target="${removeCd(project.customFolder)}" />
+    <file src="${removeCd(project.docsFolder)}/**/*.md" exclude="${removeCd(project.docsFolder)}/readme.md" target="${removeCd(project.docsFolder)}" />
+    <file src="${removeCd(project.exportsFolder)}/**/ProxyCmdletDefinitions.ps1" target="${removeCd(project.exportsFolder)}" />
   </files>
 </package>`, undefined, 'source-file-other');
 }

From 498a04109615e94b7b49303bc506c055b45b4af1 Mon Sep 17 00:00:00 2001
From: Tim Mullender <tim.mullender@wandisco.com>
Date: Wed, 24 Jun 2020 14:13:39 +0100
Subject: [PATCH 2/2] Using backslash path separator in nuspec for cross
 platform compatability

---
 powershell/generators/nuspec.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/powershell/generators/nuspec.ts b/powershell/generators/nuspec.ts
index 5bc1f9e4d3..15bc147ae4 100644
--- a/powershell/generators/nuspec.ts
+++ b/powershell/generators/nuspec.ts
@@ -36,11 +36,11 @@ export async function generateNuspec(project: Project) {
     <file src="${removeCd(project.psm1)}" />
     <!-- https://github.com/NuGet/Home/issues/3584 -->
     <file src="${removeCd(project.dll)}" target="${removeCd(project.binFolder)}" />
-    <file src="${removeCd(project.binFolder)}/${project.dllName}.deps.json" target="${removeCd(project.binFolder)}" />
-    <file src="${removeCd(project.internalFolder)}/**/*.*" exclude="${removeCd(project.internalFolder)}/readme.md" target="${removeCd(project.internalFolder)}" />
-    <file src="${removeCd(project.customFolder)}/**/*.*" exclude="${removeCd(project.customFolder)}/readme.md;${removeCd(project.customFolder)}/**/*.cs" target="${removeCd(project.customFolder)}" />
-    <file src="${removeCd(project.docsFolder)}/**/*.md" exclude="${removeCd(project.docsFolder)}/readme.md" target="${removeCd(project.docsFolder)}" />
-    <file src="${removeCd(project.exportsFolder)}/**/ProxyCmdletDefinitions.ps1" target="${removeCd(project.exportsFolder)}" />
+    <file src="${removeCd(project.binFolder)}\\${project.dllName}.deps.json" target="${removeCd(project.binFolder)}" />
+    <file src="${removeCd(project.internalFolder)}\\**\\*.*" exclude="${removeCd(project.internalFolder)}\\readme.md" target="${removeCd(project.internalFolder)}" />
+    <file src="${removeCd(project.customFolder)}\\**\\*.*" exclude="${removeCd(project.customFolder)}\\readme.md;${removeCd(project.customFolder)}\\**\\*.cs" target="${removeCd(project.customFolder)}" />
+    <file src="${removeCd(project.docsFolder)}\\**\\*.md" exclude="${removeCd(project.docsFolder)}\\readme.md" target="${removeCd(project.docsFolder)}" />
+    <file src="${removeCd(project.exportsFolder)}\\**\\ProxyCmdletDefinitions.ps1" target="${removeCd(project.exportsFolder)}" />
   </files>
 </package>`, undefined, 'source-file-other');
 }