Work around changed $(PublishDepsFilePath) value in recent SDKs

dougbu · dougbu · commit a4834b70f7c4 · 2020-04-26T22:05:44.000-07:00
- do not attempt to copy aspnetcorev2_inprocess.dll, even when RID specified
diff --git a/src/Servers/IIS/IIS/test/testassets/TestTasks/InjectRequestHandler.cs b/src/Servers/IIS/IIS/test/testassets/TestTasks/InjectRequestHandler.cs
@@ -52,13 +52,11 @@ private static void Main(string[] args)
             }
             else
             {
-                bitness.Add(new JProperty(aspnetcoreV2Name, new JObject(
+                var bitnessString = rid.Substring(rid.Length - 3, 3);
+                bitness.Add(new JProperty($"{bitnessString}/{aspnetcoreV2Name}", new JObject(
                     new JProperty("rid", rid),
                     new JProperty("assetType", "native")
                 )));
-                var outputFolder = Path.GetDirectoryName(depsFile);
-                var bitnessString = rid.Substring(rid.Length - 3, 3);
-                File.Copy(Path.Combine(outputFolder, bitnessString, aspnetcoreV2Name), Path.Combine(outputFolder, aspnetcoreV2Name), overwrite: true);
             }
 
             targetLibrary =

Original file line number	Diff line number	Diff line change
`@@ -52,13 +52,11 @@ private static void Main(string[] args)`
`52`	`52`	`}`
`53`	`53`	`else`
`54`	`54`	`{`
`55`		`- bitness.Add(new JProperty(aspnetcoreV2Name, new JObject(`
	`55`	`+ var bitnessString = rid.Substring(rid.Length - 3, 3);`
	`56`	`+ bitness.Add(new JProperty($"{bitnessString}/{aspnetcoreV2Name}", new JObject(`
`56`	`57`	`new JProperty("rid", rid),`
`57`	`58`	`new JProperty("assetType", "native")`
`58`	`59`	`)));`
`59`		`- var outputFolder = Path.GetDirectoryName(depsFile);`
`60`		`- var bitnessString = rid.Substring(rid.Length - 3, 3);`
`61`		`- File.Copy(Path.Combine(outputFolder, bitnessString, aspnetcoreV2Name), Path.Combine(outputFolder, aspnetcoreV2Name), overwrite: true);`
`62`	`60`	`}`
`63`	`61`
`64`	`62`	`targetLibrary =`