From f89ca913bd84b2c4a908ea3cae0121a189fab179 Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Tue, 7 Dec 2021 16:56:40 -0800 Subject: [PATCH] Do not include msbuild folder in net6 packages --- build.cake | 49 ++++++++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 23 deletions(-) diff --git a/build.cake b/build.cake index ff737e9031..83a52ff6b3 100644 --- a/build.cake +++ b/build.cake @@ -919,51 +919,51 @@ Task("PublishNet6Builds") { if (!Platform.Current.IsWindows) { - PublishBuild(project, env, buildPlan, configuration, "linux-x64", "net6.0"); - PublishBuild(project, env, buildPlan, configuration, "linux-arm64", "net6.0"); - PublishBuild(project, env, buildPlan, configuration, "osx-x64", "net6.0"); - PublishBuild(project, env, buildPlan, configuration, "osx-arm64", "net6.0"); + PublishBuild(project, env, buildPlan, configuration, "linux-x64", "net6.0", includeMSBuild: false); + PublishBuild(project, env, buildPlan, configuration, "linux-arm64", "net6.0", includeMSBuild: false); + PublishBuild(project, env, buildPlan, configuration, "osx-x64", "net6.0", includeMSBuild: false); + PublishBuild(project, env, buildPlan, configuration, "osx-arm64", "net6.0", includeMSBuild: false); } else { - PublishBuild(project, env, buildPlan, configuration, "win7-x86", "net6.0"); - PublishBuild(project, env, buildPlan, configuration, "win7-x64", "net6.0"); - PublishBuild(project, env, buildPlan, configuration, "win10-arm64", "net6.0"); + PublishBuild(project, env, buildPlan, configuration, "win7-x86", "net6.0", includeMSBuild: false); + PublishBuild(project, env, buildPlan, configuration, "win7-x64", "net6.0", includeMSBuild: false); + PublishBuild(project, env, buildPlan, configuration, "win10-arm64", "net6.0", includeMSBuild: false); } } else if (Platform.Current.IsWindows) { if (Platform.Current.IsX86) { - PublishBuild(project, env, buildPlan, configuration, "win7-x86", "net6.0"); + PublishBuild(project, env, buildPlan, configuration, "win7-x86", "net6.0", includeMSBuild: false); } else if (Platform.Current.IsX64) { - PublishBuild(project, env, buildPlan, configuration, "win7-x64", "net6.0"); + PublishBuild(project, env, buildPlan, configuration, "win7-x64", "net6.0", includeMSBuild: false); } else { - PublishBuild(project, env, buildPlan, configuration, "win10-arm64", "net6.0"); + PublishBuild(project, env, buildPlan, configuration, "win10-arm64", "net6.0", includeMSBuild: false); } } else { if (Platform.Current.IsMacOS) { - PublishBuild(project, env, buildPlan, configuration, "osx-x64", "net6.0"); - PublishBuild(project, env, buildPlan, configuration, "osx-arm64", "net6.0"); + PublishBuild(project, env, buildPlan, configuration, "osx-x64", "net6.0", includeMSBuild: false); + PublishBuild(project, env, buildPlan, configuration, "osx-arm64", "net6.0", includeMSBuild: false); } else { - PublishBuild(project, env, buildPlan, configuration, "linux-x64", "net6.0"); - PublishBuild(project, env, buildPlan, configuration, "linux-arm64", "net6.0"); + PublishBuild(project, env, buildPlan, configuration, "linux-x64", "net6.0", includeMSBuild: false); + PublishBuild(project, env, buildPlan, configuration, "linux-arm64", "net6.0", includeMSBuild: false); } } } }); -string PublishBuild(string project, BuildEnvironment env, BuildPlan plan, string configuration, string rid, string framework) +string PublishBuild(string project, BuildEnvironment env, BuildPlan plan, string configuration, string rid, string framework, bool includeMSBuild) { var projectName = project + ".csproj"; var projectFileName = CombinePaths(env.Folders.Source, project, projectName); @@ -996,8 +996,11 @@ string PublishBuild(string project, BuildEnvironment env, BuildPlan plan, string throw; } - // Copy MSBuild to output - DirectoryHelper.Copy($"{env.Folders.MSBuild}", CombinePaths(outputFolder, ".msbuild")); + if (includeMSBuild) + { + // Copy MSBuild to output + DirectoryHelper.Copy($"{env.Folders.MSBuild}", CombinePaths(outputFolder, ".msbuild")); + } CopyExtraDependencies(env, outputFolder); AddOmniSharpBindingRedirects(outputFolder); @@ -1019,9 +1022,9 @@ Task("PublishWindowsBuilds") if (publishAll) { - var outputFolderX86 = PublishBuild(project, env, buildPlan, configuration, "win7-x86", "net472"); - var outputFolderX64 = PublishBuild(project, env, buildPlan, configuration, "win7-x64", "net472"); - var outputFolderArm64 = PublishBuild(project, env, buildPlan, configuration, "win10-arm64", "net472"); + var outputFolderX86 = PublishBuild(project, env, buildPlan, configuration, "win7-x86", "net472", includeMSBuild: true); + var outputFolderX64 = PublishBuild(project, env, buildPlan, configuration, "win7-x64", "net472", includeMSBuild: true); + var outputFolderArm64 = PublishBuild(project, env, buildPlan, configuration, "win10-arm64", "net472", includeMSBuild: true); outputFolder = Platform.Current.IsX86 ? outputFolderX86 @@ -1031,15 +1034,15 @@ Task("PublishWindowsBuilds") } else if (Platform.Current.IsX86) { - outputFolder = PublishBuild(project, env, buildPlan, configuration, "win7-x86", "net472"); + outputFolder = PublishBuild(project, env, buildPlan, configuration, "win7-x86", "net472", includeMSBuild: true); } else if (Platform.Current.IsX64) { - outputFolder = PublishBuild(project, env, buildPlan, configuration, "win7-x64", "net472"); + outputFolder = PublishBuild(project, env, buildPlan, configuration, "win7-x64", "net472", includeMSBuild: true); } else { - outputFolder = PublishBuild(project, env, buildPlan, configuration, "win10-arm64", "net472"); + outputFolder = PublishBuild(project, env, buildPlan, configuration, "win10-arm64", "net472", includeMSBuild: true); } CreateRunScript(project, outputFolder, env.Folders.ArtifactsScripts);