Skip to content

Commit d8f52c7

Browse files
Julien-MolinaJulien Molina
andauthored
Update default values & add build parameter (#76)
Co-authored-by: Julien Molina <julien.molina@xcomponent.com>
1 parent 301a355 commit d8f52c7

3 files changed

Lines changed: 12 additions & 11 deletions

File tree

Cake.XComponent.Test/XcBuildAliasesTest.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public void IfXcBuildIsProperlyExecuted_XcBuildBuild_ShouldReturn(Platform platf
3333
{
3434
XcBuild.TestCommandExecutor = new OkCommandExecutor();
3535
var cakeContext = Substitute.For<ICakeContext>();
36-
cakeContext.XcBuildBuild("", "", "", "", "", platform);
36+
cakeContext.XcBuildBuild("", "", "", "", "", "", platform);
3737
}
3838

3939
[TestCase(Platform.X64)]
@@ -77,7 +77,7 @@ public void IfXcBuildIsNotPresent_XcBuildBuild_ShouldThrowAnException(Platform p
7777
{
7878
XcBuild.TestCommandExecutor = new FailingCommandExecutor();
7979
var cakeContext = Substitute.For<ICakeContext>();
80-
Assert.Throws<XComponentException>(() => cakeContext.XcBuildBuild("", "", "", "", "", platform));
80+
Assert.Throws<XComponentException>(() => cakeContext.XcBuildBuild("", "", "", "", "", "", platform));
8181
}
8282

8383
[TestCase(Platform.X64)]
@@ -104,7 +104,7 @@ public void IfXcBuildIsPresentButExecutionFails_XcBuildBuild_ShouldThrowAnExcept
104104
{
105105
XcBuild.TestCommandExecutor = new FailingCommandExecutor();
106106
var cakeContext = Substitute.For<ICakeContext>();
107-
Assert.Throws<XComponentException>(() => cakeContext.XcBuildBuild("", "", "", "", "--fail", platform));
107+
Assert.Throws<XComponentException>(() => cakeContext.XcBuildBuild("", "", "", "", "", "--fail", platform));
108108
}
109109
}
110110
}

Cake.XComponent/XcBuild.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ internal XcBuild(ICakeContext context, Platform platform)
1616
_processCommandExecutor = new ProcessCommandExecutor(context, new PathFinder(context.Log).FindXcBuild(platform), "XcBuild");
1717
}
1818

19-
internal void Build(string project, string compiltationMode = "Debug", string environment = "Dev", string visualStudioVersion = "VS2015", string additionalArguments = "")
19+
internal void Build(string project, string compiltationMode = "Debug", string environment = "Dev", string visualStudioVersion = "VS2019", string framework = "Framework472", string additionalArguments = "")
2020
{
21-
var arguments = $"--build --project={project} --compilationmode={compiltationMode} --env={environment} --vs={visualStudioVersion} {additionalArguments}";
21+
var arguments = $"--build --project={project} --compilationmode={compiltationMode} --env={environment} --vs={visualStudioVersion} --framework={framework} {additionalArguments}";
2222
GetCommandExecutor().ExecuteCommand(arguments);
2323
}
2424

25-
internal void BuildComponent(string project, string component, string compiltationMode = "Debug", string environment = "Dev", string visualStudioVersion = "VS2015", string framework = "Framework452", string serializationtype = "Json", string logkeys = "", string additionalArguments = "")
25+
internal void BuildComponent(string project, string component, string compiltationMode = "Debug", string environment = "Dev", string visualStudioVersion = "VS2019", string framework = "Framework472", string serializationtype = "Json", string logkeys = "", string additionalArguments = "")
2626
{
2727
var logKeysArgument = string.IsNullOrEmpty(logkeys) ? string.Empty : $"--logkeys={logkeys}";
2828
var arguments = $"--build --project={project} --component=\"{component}\" --compilationmode={compiltationMode} --env={environment} --vs={visualStudioVersion} --framework={framework} --serializationtype=\"{serializationtype}\" {logKeysArgument} {additionalArguments}";

Cake.XComponent/XcBuildAliases.cs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,14 @@ public static class XcBuildAliases
1616
/// <param name="project">The project to build</param>
1717
/// <param name="compiltationMode">The compilation mode (Debug/Release)</param>
1818
/// <param name="environment">The XComponent environment (Dev/Prod/...)</param>
19-
/// <param name="visualStudioVersion">The version of Visual Studio (VS2013/VS2015)</param>
19+
/// <param name="visualStudioVersion">The version of Visual Studio (VS2013/VS2015/VS2017/VS2019)</param>
20+
/// <param name="framework">The version of .Net framework to use</param>
2021
/// <param name="additionalArguments">Additional arguments to pass to XComponent Build</param>
2122
/// <param name="platform">The platform used to launch the application</param>
2223
[CakeMethodAlias]
23-
public static void XcBuildBuild(this ICakeContext context, string project, string compiltationMode = "Debug", string environment = "Dev", string visualStudioVersion = "VS2015", string additionalArguments = "", Platform platform = Platform.X64)
24+
public static void XcBuildBuild(this ICakeContext context, string project, string compiltationMode = "Debug", string environment = "Dev", string visualStudioVersion = "VS2019", string framework = "Framework472", string additionalArguments = "", Platform platform = Platform.X64)
2425
{
25-
new XcBuild(context, platform).Build(project, compiltationMode, environment, visualStudioVersion, additionalArguments);
26+
new XcBuild(context, platform).Build(project, compiltationMode, environment, visualStudioVersion, framework, additionalArguments);
2627
}
2728

2829
/// <summary>
@@ -33,14 +34,14 @@ public static void XcBuildBuild(this ICakeContext context, string project, strin
3334
/// <param name="component">Th component to build</param>
3435
/// <param name="compiltationMode">The compilation mode (Debug/Release)</param>
3536
/// <param name="environment">The XComponent environment (Dev/Prod/...)</param>
36-
/// <param name="visualStudioVersion">The version of Visual Studio (VS2013/VS2015)</param>
37+
/// <param name="visualStudioVersion">The version of Visual Studio (VS2013/VS2015/VS2017/VS2019)</param>
3738
/// <param name="framework">The version of .Net framework to use</param>
3839
/// <param name="serializationtype">The serialization type</param>
3940
/// <param name="logkeys">The list of log keys used by this component</param>
4041
/// <param name="additionalArguments">Additional arguments to pass to XComponent Build</param>
4142
/// <param name="platform">The platform used to launch the application</param>
4243
[CakeMethodAlias]
43-
public static void XcBuildBuildComponent(this ICakeContext context, string project, string component, string compiltationMode = "Debug", string environment = "Dev", string visualStudioVersion = "VS2015", string framework = "Framework452", string serializationtype = "Json", string logkeys = "", string additionalArguments = "", Platform platform = Platform.X64)
44+
public static void XcBuildBuildComponent(this ICakeContext context, string project, string component, string compiltationMode = "Debug", string environment = "Dev", string visualStudioVersion = "VS2019", string framework = "Framework472", string serializationtype = "Json", string logkeys = "", string additionalArguments = "", Platform platform = Platform.X64)
4445
{
4546
new XcBuild(context, platform).BuildComponent(project, component, compiltationMode, environment, visualStudioVersion, framework, serializationtype, logkeys, additionalArguments);
4647
}

0 commit comments

Comments
 (0)