Skip to content

Commit

Permalink
Merge pull request #2300 from JoeRobich/remove-msbuild-folder
Browse files Browse the repository at this point in the history 
Do not include msbuild folder in net6 packages
  • Loading branch information
@filipw
filipw authored Dec 8, 2021
2 parents 6068b51 + f89ca91 commit 52f9ed3
Showing 1 changed file with 26 additions and 23 deletions.
49 changes: 26 additions & 23 deletions build.cake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand All @@ -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
Expand All @@ -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);
Expand Down

0 comments on commit 52f9ed3

Please sign in to comment.