diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 4903ba5..c8bb929 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,10 +3,10 @@ "isRoot": true, "tools": { "cake.tool": { - "version": "1.3.0", + "version": "2.2.0", "commands": [ "dotnet-cake" ] } } -} \ No newline at end of file +} diff --git a/FNA.Settings.props b/FNA.Settings.props new file mode 100644 index 0000000..4ff94ac --- /dev/null +++ b/FNA.Settings.props @@ -0,0 +1,6 @@ + + + + + + diff --git a/build.cake b/build.cake index ce207fd..a342f60 100644 --- a/build.cake +++ b/build.cake @@ -8,8 +8,8 @@ var branch = Argument("branch", "main"); var config = Argument("configuration", "Release"); Task("Prepare").Does(() => { - DotNetCoreRestore("MLEM.sln"); - DotNetCoreRestore("MLEM.FNA.sln"); + DotNetRestore("MLEM.sln"); + DotNetRestore("MLEM.FNA.sln"); if (branch != "release") { var buildNum = EnvironmentVariable("BUILD_NUMBER"); @@ -21,32 +21,30 @@ Task("Prepare").Does(() => { }); Task("Build").IsDependentOn("Prepare").Does(() =>{ - var settings = new DotNetCoreBuildSettings { + var settings = new DotNetBuildSettings { Configuration = config, ArgumentCustomization = args => args.Append($"/p:Version={version}") }; - foreach (var project in GetFiles("**/MLEM*.csproj")) - DotNetCoreBuild(project.FullPath, settings); - DotNetCoreBuild("Demos/Demos.csproj", settings); - DotNetCoreBuild("Demos/Demos.FNA.csproj", settings); + DotNetBuild("MLEM.sln", settings); + DotNetBuild("MLEM.FNA.sln", settings); }); Task("Test").IsDependentOn("Build").Does(() => { - var settings = new DotNetCoreTestSettings { + var settings = new DotNetTestSettings { Configuration = config, Collectors = {"XPlat Code Coverage"} }; - DotNetCoreTest("Tests/Tests.csproj", settings); - DotNetCoreTest("Tests/Tests.FNA.csproj", settings); + DotNetTest("Tests/Tests.csproj", settings); + DotNetTest("Tests/Tests.FNA.csproj", settings); }); Task("Pack").IsDependentOn("Test").Does(() => { - var settings = new DotNetCorePackSettings { + var settings = new DotNetPackSettings { Configuration = config, ArgumentCustomization = args => args.Append($"/p:Version={version}") }; foreach (var project in GetFiles("**/MLEM*.csproj")) - DotNetCorePack(project.FullPath, settings); + DotNetPack(project.FullPath, settings); }); Task("Push").WithCriteria(branch == "main" || branch == "release").IsDependentOn("Pack").Does(() => {