From 1671c15726d4da635100585b52a41dcb8a8a8c88 Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Mon, 17 Aug 2020 18:53:08 -0700 Subject: [PATCH] Include version matched target files with minimal MSBuild --- build.cake | 14 +++++++++++--- tools/packages.config | 2 +- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/build.cake b/build.cake index f7a8acc6d3..6259399984 100644 --- a/build.cake +++ b/build.cake @@ -331,6 +331,14 @@ Task("CreateMSBuildFolder") } } + Information("Copying MSBuild runtime..."); + + var msbuildSourceFolder = CombinePaths(env.Folders.Tools, "Microsoft.Build.Runtime", "contentFiles", "any", "net472"); + DirectoryHelper.Copy(msbuildSourceFolder, msbuildCurrentBinTargetFolder, copySubDirectories: false); + + var msbuild15SourceFolder = CombinePaths(msbuildSourceFolder, "Current"); + DirectoryHelper.Copy(msbuild15SourceFolder, msbuildCurrentTargetFolder); + Information("Copying MSBuild libraries..."); foreach (var library in msbuildLibraries) @@ -457,9 +465,9 @@ Task("CreateMSBuildFolder") source: CombinePaths(env.Folders.Tools, "Newtonsoft.Json", "lib", "net45", "Newtonsoft.Json.dll"), destination: CombinePaths(msbuildCurrentBinTargetFolder, "Newtonsoft.Json.dll")); - // Copy content of Microsoft.Net.Compilers - Information("Copying Microsoft.Net.Compilers..."); - var compilersSourceFolder = CombinePaths(env.Folders.Tools, "Microsoft.Net.Compilers", "tools"); + // Copy content of Microsoft.Net.Compilers.Toolset + Information("Copying Microsoft.Net.Compilers.Toolset..."); + var compilersSourceFolder = CombinePaths(env.Folders.Tools, "Microsoft.Net.Compilers.Toolset", "tasks", "net472"); var compilersTargetFolder = CombinePaths(msbuildCurrentBinTargetFolder, "Roslyn"); DirectoryHelper.Copy(compilersSourceFolder, compilersTargetFolder); diff --git a/tools/packages.config b/tools/packages.config index 0f487fa89f..8f4ea53235 100644 --- a/tools/packages.config +++ b/tools/packages.config @@ -7,7 +7,7 @@ - +