diff --git a/build.cake b/build.cake index 9ff9897bcaedbf7432238bb0ed422590754a6e70..a3452b90d9d3d34bb1c3f1f1a8c688caaaaa3a53 100644 --- a/build.cake +++ b/build.cake @@ -17,11 +17,6 @@ var version = Argument("nugetVersion", ""); var gitlabProjectPath = Argument("gitlabProjectPath", ""); var gitlabProjectId = Argument("gitlabProjectId", ""); var gitlabToken = Argument("gitlabToken", ""); -var feed = new - { - Name = "LocalNuget", - Source = @"C:\LocalNuget" - }; // Define directories var projects = GetFiles("./**/*.csproj"); @@ -32,6 +27,7 @@ var projectName = solutionFile.GetFilenameWithoutExtension().ToString(); var nugetSource = "https://api.nuget.org/v3/index.json"; var assemblyInfoSubPath = "Properties/AssemblyInfo.cs"; var semanticVersion = ""; +string localNugetFeed; // get latest MSBuild version var vsLatest = VSWhereLatest(); @@ -39,6 +35,12 @@ var msBuildPathX64 = (vsLatest == null) ? null : vsLatest.CombineWithFilePath(". Setup(context =>{ nupkgDir = $"{artifactsDir.ToString()}/nupkg"; + var branch = GitVersion(new GitVersionSettings { + UpdateAssemblyInfo = false + }).BranchName.Replace("/", "-"); + + localNugetFeed = $"C:\\coscine\\LocalNugetFeeds\\{branch}"; + Information("{0}", branch); Information("Started at {0}", DateTime.Now); }); @@ -76,13 +78,9 @@ Task("Clean") Task("Restore") .Does(() =>{ - if (!NuGetHasSource(feed.Source)) - { - NuGetAddSource(feed.Name, feed.Source); - } - NuGetRestore(solutionFile, new NuGetRestoreSettings { - NoCache = true + NoCache = true, + FallbackSource = new List<string>{ localNugetFeed }, }); }); @@ -329,13 +327,14 @@ Task("NugetPushLocal") .Does(() =>{ var nupkgs = GetFiles($"{nupkgDir}/*.nupkg"); foreach(var nupkg in nupkgs) { - NuGetAdd(nupkg.ToString(), feed.Source); + NuGetAdd(nupkg.ToString(), localNugetFeed); } }); Task("Prerelease") .IsDependentOn("Build") -.IsDependentOn("CopyToArtifacts"); +.IsDependentOn("CopyToArtifacts") +.IsDependentOn("NugetPushLocal"); Task("Release") .IsDependentOn("NugetPack") diff --git a/src/ExampleProject.Tests/Properties/AssemblyInfo.cs b/src/ExampleProject.Tests/Properties/AssemblyInfo.cs index b2db8bf2dcffa9c68c348589870cc7efec7b5f12..c45bb32f9ea9cba1ae8babedb6fb21a73d1ab020 100644 --- a/src/ExampleProject.Tests/Properties/AssemblyInfo.cs +++ b/src/ExampleProject.Tests/Properties/AssemblyInfo.cs @@ -9,8 +9,8 @@ using System.Reflection; [assembly: AssemblyDescription("ExampleProject.Tests is a part of the CoScInE group.")] [assembly: AssemblyCompany("IT Center, RWTH Aachen University")] [assembly: AssemblyProduct("ExampleProject.Tests")] -[assembly: AssemblyVersion("1.5.0")] -[assembly: AssemblyFileVersion("1.5.0")] -[assembly: AssemblyInformationalVersion("1.5.0-topic-570-gitver0076")] +[assembly: AssemblyVersion("1.7.1")] +[assembly: AssemblyFileVersion("1.7.1")] +[assembly: AssemblyInformationalVersion("1.7.1")] [assembly: AssemblyCopyright("2020 IT Center, RWTH Aachen University")] diff --git a/src/ExampleProject.cmd/Properties/AssemblyInfo.cs b/src/ExampleProject.cmd/Properties/AssemblyInfo.cs index 16f7001bf3ff6d2d0dfed54a6113cfe7518abb71..72d1333faea8a382b43d95a26bc391dd0112f8f0 100644 --- a/src/ExampleProject.cmd/Properties/AssemblyInfo.cs +++ b/src/ExampleProject.cmd/Properties/AssemblyInfo.cs @@ -9,8 +9,8 @@ using System.Reflection; [assembly: AssemblyDescription("ExampleProject.cmd is a part of the CoScInE group.")] [assembly: AssemblyCompany("IT Center, RWTH Aachen University")] [assembly: AssemblyProduct("ExampleProject.cmd")] -[assembly: AssemblyVersion("1.5.0")] -[assembly: AssemblyFileVersion("1.5.0")] -[assembly: AssemblyInformationalVersion("1.5.0-topic-570-gitver0076")] +[assembly: AssemblyVersion("1.7.1")] +[assembly: AssemblyFileVersion("1.7.1")] +[assembly: AssemblyInformationalVersion("1.7.1")] [assembly: AssemblyCopyright("2020 IT Center, RWTH Aachen University")] diff --git a/src/ExampleProject/Properties/AssemblyInfo.cs b/src/ExampleProject/Properties/AssemblyInfo.cs index 7514ed9a40d3d45c37f8f7ee7dcb7c86539bbd97..351d5ca46b890c9be7fe14cc6a96527c4237d1a5 100644 --- a/src/ExampleProject/Properties/AssemblyInfo.cs +++ b/src/ExampleProject/Properties/AssemblyInfo.cs @@ -9,8 +9,8 @@ using System.Reflection; [assembly: AssemblyDescription("ExampleProject is a part of the CoScInE group.")] [assembly: AssemblyCompany("IT Center, RWTH Aachen University")] [assembly: AssemblyProduct("ExampleProject")] -[assembly: AssemblyVersion("1.5.0")] -[assembly: AssemblyFileVersion("1.5.0")] -[assembly: AssemblyInformationalVersion("1.5.0-topic-570-gitver0076")] +[assembly: AssemblyVersion("1.7.1")] +[assembly: AssemblyFileVersion("1.7.1")] +[assembly: AssemblyInformationalVersion("1.7.1")] [assembly: AssemblyCopyright("2020 IT Center, RWTH Aachen University")]