Skip to content

Commit ee6c7ba

Browse files
filipwfilipw
committed
updated build scripts
1 parent dc2d4b9 commit ee6c7ba

File tree

2 files changed

+47
-81
lines changed

2 files changed

+47
-81
lines changed

‎build/Build.csx

Lines changed: 24 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,39 +9,45 @@ using static ChangeLog;
99
using static FileUtils;
1010
using System.Xml.Linq;
1111

12+
DotNet.Build(dotnetScriptProjectFolder);
13+
DotNet.Test(testProjectFolder);
1214

15+
// desktop CLR tests should only run on Windows
16+
// we can run them on Mono in the future using the xunit runner instead of dotnet test
17+
if (BuildEnvironment.IsWindows)
18+
{
19+
DotNet.Test(testDesktopProjectFolder);
20+
}
1321

14-
DotNet.Build(DotnetScriptProjectFolder);
15-
DotNet.Test(TestProjectFolder);
16-
DotNet.Publish(DotnetScriptProjectFolder, PublishArtifactsFolder, NetCoreApp20);
22+
DotNet.Publish(dotnetScriptProjectFolder, publishArtifactsFolder, NetCoreApp20);
1723

1824
// We only publish packages from Windows/AppVeyor
1925
if (BuildEnvironment.IsWindows)
2026
{
2127

2228
using(var globalToolBuildFolder = new DisposableFolder())
2329
{
24-
Copy(SolutionFolder, globalToolBuildFolder.Path);
30+
Copy(solutionFolder, globalToolBuildFolder.Path);
2531
PatchTargetFramework(globalToolBuildFolder.Path, NetCoreApp21);
2632
PatchPackAsTool(globalToolBuildFolder.Path);
2733
PatchPackageId(globalToolBuildFolder.Path, GlobalToolPackageId);
2834
PatchContent(globalToolBuildFolder.Path);
29-
DotNet.Pack(Path.Combine(globalToolBuildFolder.Path,"Dotnet.Script"),NuGetArtifactsFolder);
35+
DotNet.Pack(Path.Combine(globalToolBuildFolder.Path,"Dotnet.Script"), nuGetArtifactsFolder);
3036
}
3137

3238
using(var nugetPackageBuildFolder = new DisposableFolder())
3339
{
34-
Copy(SolutionFolder, nugetPackageBuildFolder.Path);
40+
Copy(solutionFolder, nugetPackageBuildFolder.Path);
3541
PatchTargetFramework(nugetPackageBuildFolder.Path, NetCoreApp20);
36-
DotNet.Pack(Path.Combine(nugetPackageBuildFolder.Path,"Dotnet.Script"),NuGetArtifactsFolder);
42+
DotNet.Pack(Path.Combine(nugetPackageBuildFolder.Path,"Dotnet.Script"), nuGetArtifactsFolder);
3743
}
3844

39-
DotNet.Pack(DotnetScriptCoreProjectFolder, NuGetArtifactsFolder);
40-
DotNet.Pack(DotnetScriptDependencyModelProjectFolder, NuGetArtifactsFolder);
41-
DotNet.Pack(DotnetScriptDependencyModelNuGetProjectFolder, NuGetArtifactsFolder);
45+
DotNet.Pack(dotnetScriptCoreProjectFolder, nuGetArtifactsFolder);
46+
DotNet.Pack(dotnetScriptDependencyModelProjectFolder, nuGetArtifactsFolder);
47+
DotNet.Pack(dotnetScriptDependencyModelNuGetProjectFolder, nuGetArtifactsFolder);
4248

43-
Choco.Pack(DotnetScriptProjectFolder, PublishArtifactsFolder, ChocolateyArtifactsFolder);
44-
Zip(PublishArchiveFolder, PathToGitHubReleaseAsset);
49+
Choco.Pack(dotnetScriptProjectFolder, publishArtifactsFolder, chocolateyArtifactsFolder);
50+
Zip(publishArchiveFolder, pathToGitHubReleaseAsset);
4551

4652
if (BuildEnvironment.IsSecure)
4753
{
@@ -50,23 +56,23 @@ if (BuildEnvironment.IsWindows)
5056
if (Git.Default.IsTagCommit())
5157
{
5258
Git.Default.RequreCleanWorkingTree();
53-
await ReleaseManagerFor(Owner,ProjectName,BuildEnvironment.GitHubAccessToken)
54-
.CreateRelease(Git.Default.GetLatestTag(), PathToReleaseNotes, new [] { new ZipReleaseAsset(PathToGitHubReleaseAsset) });
55-
NuGet.TryPush(NuGetArtifactsFolder);
56-
Choco.TryPush(ChocolateyArtifactsFolder, BuildEnvironment.ChocolateyApiKey);
59+
await ReleaseManagerFor(owner, projectName,BuildEnvironment.GitHubAccessToken)
60+
.CreateRelease(Git.Default.GetLatestTag(), pathToReleaseNotes, new [] { new ZipReleaseAsset(pathToGitHubReleaseAsset) });
61+
NuGet.TryPush(nuGetArtifactsFolder);
62+
Choco.TryPush(chocolateyArtifactsFolder, BuildEnvironment.ChocolateyApiKey);
5763
}
5864
}
5965
}
6066

6167
private async Task CreateReleaseNotes()
6268
{
6369
Logger.Log("Creating release notes");
64-
var generator = ChangeLogFrom(Owner, ProjectName, BuildEnvironment.GitHubAccessToken).SinceLatestTag();
70+
var generator = ChangeLogFrom(owner, projectName, BuildEnvironment.GitHubAccessToken).SinceLatestTag();
6571
if (!Git.Default.IsTagCommit())
6672
{
6773
generator = generator.IncludeUnreleased();
6874
}
69-
await generator.Generate(PathToReleaseNotes);
75+
await generator.Generate(pathToReleaseNotes);
7076
}
7177

7278
private void PatchTargetFramework(string solutionFolder, string targetFramework)

‎build/BuildContext.csx

Lines changed: 23 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -3,75 +3,35 @@ using static FileUtils;
33
using System.Xml.Linq;
44

55
const string NetCoreApp20 = "netcoreapp2.0";
6-
76
const string NetCoreApp21 = "netcoreapp2.1";
8-
97
const string GlobalToolPackageId = "dotnet-script";
108

11-
string Version;
12-
13-
string GitHubArtifactsFolder;
14-
15-
string GitHubReleaseAsset;
16-
17-
string GitHubReleaseNoteAsset;
18-
19-
string NuGetArtifactsFolder;
20-
21-
string ChocolateyArtifactsFolder;
22-
23-
string PublishArtifactsFolder;
24-
25-
string PublishArchiveFolder;
26-
27-
string SolutionFolder;
28-
29-
string DotnetScriptProjectFolder;
30-
31-
string DotnetScriptCoreProjectFolder;
32-
33-
string DotnetScriptDependencyModelProjectFolder;
34-
35-
string DotnetScriptDependencyModelNuGetProjectFolder;
36-
37-
string Root;
38-
39-
string TestProjectFolder;
40-
41-
string PathToReleaseNotes;
42-
43-
string PathToGitHubReleaseAsset;
44-
45-
string Owner;
46-
47-
string ProjectName;
48-
49-
Owner = "filipw";
50-
ProjectName = "dotnet-script";
51-
Root = FileUtils.GetScriptFolder();
52-
SolutionFolder = Path.Combine(Root,"..","src");
53-
DotnetScriptProjectFolder = Path.Combine(Root, "..", "src", "Dotnet.Script");
54-
DotnetScriptCoreProjectFolder = Path.Combine(Root, "..", "src", "Dotnet.Script.Core");
55-
DotnetScriptDependencyModelProjectFolder = Path.Combine(Root, "..", "src", "Dotnet.Script.DependencyModel");
56-
DotnetScriptDependencyModelNuGetProjectFolder = Path.Combine(Root, "..", "src", "Dotnet.Script.DependencyModel.NuGet");
57-
TestProjectFolder = Path.Combine(Root, "..", "src", "Dotnet.Script.Tests");
58-
59-
var artifactsFolder = CreateDirectory(Root, "Artifacts");
60-
GitHubArtifactsFolder = CreateDirectory(artifactsFolder, "GitHub");
61-
NuGetArtifactsFolder = CreateDirectory(artifactsFolder, "NuGet");
62-
ChocolateyArtifactsFolder = CreateDirectory(artifactsFolder, "Chocolatey");
63-
PublishArtifactsFolder = CreateDirectory(artifactsFolder, "Publish", ProjectName);
64-
PublishArchiveFolder = Path.Combine(PublishArtifactsFolder, "..");
65-
66-
PathToReleaseNotes = Path.Combine(GitHubArtifactsFolder, "ReleaseNotes.md");
67-
68-
Version = ReadVersion();
69-
70-
PathToGitHubReleaseAsset = Path.Combine(GitHubArtifactsFolder, $"{ProjectName}.{Version}.zip");
9+
var owner = "filipw";
10+
var projectName = "dotnet-script";
11+
var root = FileUtils.GetScriptFolder();
12+
var solutionFolder = Path.Combine(root,"..","src");
13+
var dotnetScriptProjectFolder = Path.Combine(root, "..", "src", "Dotnet.Script");
14+
var dotnetScriptCoreProjectFolder = Path.Combine(root, "..", "src", "Dotnet.Script.Core");
15+
var dotnetScriptDependencyModelProjectFolder = Path.Combine(root, "..", "src", "Dotnet.Script.DependencyModel");
16+
var dotnetScriptDependencyModelNuGetProjectFolder = Path.Combine(root, "..", "src", "Dotnet.Script.DependencyModel.NuGet");
17+
var testProjectFolder = Path.Combine(root, "..", "src", "Dotnet.Script.Tests");
18+
var testDesktopProjectFolder = Path.Combine(root, "..", "src", "Dotnet.Script.Desktop.Tests");
19+
20+
var artifactsFolder = CreateDirectory(root, "Artifacts");
21+
var gitHubArtifactsFolder = CreateDirectory(artifactsFolder, "GitHub");
22+
var nuGetArtifactsFolder = CreateDirectory(artifactsFolder, "NuGet");
23+
var chocolateyArtifactsFolder = CreateDirectory(artifactsFolder, "Chocolatey");
24+
var publishArtifactsFolder = CreateDirectory(artifactsFolder, "Publish", projectName);
25+
var publishArchiveFolder = Path.Combine(publishArtifactsFolder, "..");
26+
var pathToReleaseNotes = Path.Combine(gitHubArtifactsFolder, "ReleaseNotes.md");
27+
28+
var version = ReadVersion();
29+
30+
var pathToGitHubReleaseAsset = Path.Combine(gitHubArtifactsFolder, $"{projectName}.{version}.zip");
7131

7232
string ReadVersion()
7333
{
74-
var projectFile = XDocument.Load(Directory.GetFiles(DotnetScriptProjectFolder, "*.csproj").Single());
34+
var projectFile = XDocument.Load(Directory.GetFiles(dotnetScriptProjectFolder, "*.csproj").Single());
7535
var versionPrefix = projectFile.Descendants("VersionPrefix").SingleOrDefault()?.Value;
7636
var versionSuffix = projectFile.Descendants("VersionSuffix").SingleOrDefault()?.Value;
7737

0 commit comments

Comments
 (0)