mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

integrate @krwq 's moniker/compile version changes

Browse source 
unset the hardcoded channel

fix version badge version

fix a capitalization

fix the archives

Update filenames of zip files to have the correct versions

move version gen
This commit is contained in:
Bryan Thornbury 2016-03-23 17:13:58 -07:00
parent f596b8ddce
commit 71b78a9c68
4 changed files with 27 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/dotnet-cli-build/CompileTargets.cs
View file

@ -375,7 +375,7 @@ namespace Microsoft.DotNet.Cli.Build
} }
// Generate .version file // Generate .version file
var version = buildVersion.SimpleVersion; var version = buildVersion.NuGetVersion;
var content = $@"{c.BuildContext["CommitHash"]}{Environment.NewLine}{version}{Environment.NewLine}"; var content = $@"{c.BuildContext["CommitHash"]}{Environment.NewLine}{version}{Environment.NewLine}";
File.WriteAllText(Path.Combine(outputDir, ".version"), content); File.WriteAllText(Path.Combine(outputDir, ".version"), content);

23
scripts/dotnet-cli-build/PrepareTargets.cs
View file

@ -47,7 +47,6 @@ namespace Microsoft.DotNet.Cli.Build
c.BuildContext["Configuration"] = configEnv; c.BuildContext["Configuration"] = configEnv;
c.BuildContext["Channel"] = Environment.GetEnvironmentVariable("CHANNEL"); c.BuildContext["Channel"] = Environment.GetEnvironmentVariable("CHANNEL");
c.BuildContext["SharedFrameworkNugetVersion"] = GetVersionFromProjectJson(Path.Combine(Dirs.RepoRoot, "src", "sharedframework", "framework", "project.json"));
c.Info($"Building {c.BuildContext["Configuration"]} to: {Dirs.Output}"); c.Info($"Building {c.BuildContext["Configuration"]} to: {Dirs.Output}");
c.Info("Build Environment:"); c.Info("Build Environment:");
@ -83,6 +82,7 @@ namespace Microsoft.DotNet.Cli.Build
}; };
c.BuildContext["BuildVersion"] = buildVersion; c.BuildContext["BuildVersion"] = buildVersion;
c.BuildContext["CommitHash"] = commitHash; c.BuildContext["CommitHash"] = commitHash;
c.BuildContext["SharedFrameworkNugetVersion"] = GetVersionFromProjectJson(Path.Combine(Dirs.RepoRoot, "src", "sharedframework", "framework", "project.json"));
c.Info($"Building Version: {buildVersion.SimpleVersion} (NuGet Packages: {buildVersion.NuGetVersion})"); c.Info($"Building Version: {buildVersion.SimpleVersion} (NuGet Packages: {buildVersion.NuGetVersion})");
c.Info($"From Commit: {commitHash}"); c.Info($"From Commit: {commitHash}");
@ -122,11 +122,14 @@ namespace Microsoft.DotNet.Cli.Build
var versionBadgeName = $"{CurrentPlatform.Current}_{CurrentArchitecture.Current}_{config}_version_badge.svg"; var versionBadgeName = $"{CurrentPlatform.Current}_{CurrentArchitecture.Current}_{config}_version_badge.svg";
c.BuildContext["VersionBadge"] = Path.Combine(Dirs.Output, versionBadgeName); c.BuildContext["VersionBadge"] = Path.Combine(Dirs.Output, versionBadgeName);
AddInstallerArtifactToContext(c, "dotnet-sdk", "Sdk"); var cliVersion = c.BuildContext.Get<BuildVersion>("BuildVersion").NuGetVersion;
AddInstallerArtifactToContext(c, "dotnet-host", "SharedHost"); var sharedFrameworkVersion = c.BuildContext.Get<string>("SharedFrameworkNugetVersion");
AddInstallerArtifactToContext(c, "dotnet-sharedframework", "SharedFramework");
AddInstallerArtifactToContext(c, "dotnet-dev", "CombinedFrameworkSDKHost"); AddInstallerArtifactToContext(c, "dotnet-sdk", "Sdk", cliVersion);
AddInstallerArtifactToContext(c, "dotnet", "CombinedFrameworkHost"); AddInstallerArtifactToContext(c, "dotnet-host", "SharedHost", cliVersion);
AddInstallerArtifactToContext(c, "dotnet-sharedframework", "SharedFramework", sharedFrameworkVersion);
AddInstallerArtifactToContext(c, "dotnet-dev", "CombinedFrameworkSDKHost", cliVersion);
AddInstallerArtifactToContext(c, "dotnet", "CombinedFrameworkHost", sharedFrameworkVersion);
return c.Success(); return c.Success();
} }
@ -370,9 +373,13 @@ cmake is required to build the native host 'corehost'";
return dict; return dict;
} }
private static void AddInstallerArtifactToContext(BuildTargetContext c, string artifactPrefix, string contextPrefix) private static void AddInstallerArtifactToContext(
BuildTargetContext c,
string artifactPrefix,
string contextPrefix,
string version)
{ {
var productName = Monikers.GetProductMoniker(c, artifactPrefix); var productName = Monikers.GetProductMoniker(c, artifactPrefix, version);
var extension = CurrentPlatform.IsWindows ? ".zip" : ".tar.gz"; var extension = CurrentPlatform.IsWindows ? ".zip" : ".tar.gz";
c.BuildContext[contextPrefix + "CompressedFile"] = Path.Combine(Dirs.Packages, productName + extension); c.BuildContext[contextPrefix + "CompressedFile"] = Path.Combine(Dirs.Packages, productName + extension);

20
scripts/dotnet-cli-build/PublishTargets.cs
View file

@ -30,8 +30,8 @@ namespace Microsoft.DotNet.Cli.Build
AzurePublisherTool = new AzurePublisher(); AzurePublisherTool = new AzurePublisher();
DebRepoPublisherTool = new DebRepoPublisher(Dirs.Packages); DebRepoPublisherTool = new DebRepoPublisher(Dirs.Packages);
CliVersion = c.BuildContext.Get<BuildVersion>("BuildCliVersion").SimpleVersion; CliVersion = c.BuildContext.Get<BuildVersion>("BuildVersion").SimpleVersion;
CliNuGetVersion = c.BuildContext.Get<BuildVersion>("BuildCliVersion").NuGetVersion; CliNuGetVersion = c.BuildContext.Get<BuildVersion>("BuildVersion").NuGetVersion;
SharedFrameworkNugetVersion = c.BuildContext.Get<string>("SharedFrameworkNugetVersion"); SharedFrameworkNugetVersion = c.BuildContext.Get<string>("SharedFrameworkNugetVersion");
Channel = c.BuildContext.Get<string>("Channel"); Channel = c.BuildContext.Get<string>("Channel");
@ -82,12 +82,12 @@ namespace Microsoft.DotNet.Cli.Build
[Target] [Target]
public static BuildTargetResult PublishCliVersionBadge(BuildTargetContext c) public static BuildTargetResult PublishCliVersionBadge(BuildTargetContext c)
{ {
var CliversionBadge = c.BuildContext.Get<string>("CliVersionBadge"); var versionBadge = c.BuildContext.Get<string>("VersionBadge");
var latestCliVersionBadgeBlob = $"{Channel}/Binaries/Latest/{Path.GetFileName(CliversionBadge)}"; var latestVersionBadgeBlob = $"{Channel}/Binaries/Latest/{Path.GetFileName(versionBadge)}";
var CliversionBadgeBlob = $"{Channel}/Binaries/{CliVersion}/{Path.GetFileName(CliversionBadge)}"; var versionBadgeBlob = $"{Channel}/Binaries/{CliNuGetVersion}/{Path.GetFileName(versionBadge)}";
AzurePublisherTool.PublishFile(CliversionBadgeBlob, CliversionBadge); AzurePublisherTool.PublishFile(versionBadgeBlob, versionBadge);
AzurePublisherTool.PublishFile(latestCliVersionBadgeBlob, CliversionBadge); AzurePublisherTool.PublishFile(latestVersionBadgeBlob, versionBadge);
return c.Success(); return c.Success();
} }
@ -120,7 +120,7 @@ namespace Microsoft.DotNet.Cli.Build
public static BuildTargetResult PublishSdkInstallerFileToAzure(BuildTargetContext c) public static BuildTargetResult PublishSdkInstallerFileToAzure(BuildTargetContext c)
{ {
var version = CliNuGetVersion; var version = CliNuGetVersion;
var installerFile = c.BuildContext.Get<string>("SDKInstallerFile"); var installerFile = c.BuildContext.Get<string>("SdkInstallerFile");
AzurePublisherTool.PublishInstallerFileAndLatest(installerFile, Channel, version); AzurePublisherTool.PublishInstallerFileAndLatest(installerFile, Channel, version);
@ -157,7 +157,7 @@ namespace Microsoft.DotNet.Cli.Build
var version = CliNuGetVersion; var version = CliNuGetVersion;
var archiveFile = c.BuildContext.Get<string>("CombinedFrameworkSDKHostCompressedFile"); var archiveFile = c.BuildContext.Get<string>("CombinedFrameworkSDKHostCompressedFile");
AzurePublisherTool.PublishInstallerFileAndLatest(archiveFile, Channel, version); AzurePublisherTool.PublishArchiveAndLatest(archiveFile, Channel, version);
return c.Success(); return c.Success();
} }
@ -168,7 +168,7 @@ namespace Microsoft.DotNet.Cli.Build
var version = SharedFrameworkNugetVersion; var version = SharedFrameworkNugetVersion;
var archiveFile = c.BuildContext.Get<string>("CombinedFrameworkHostCompressedFile"); var archiveFile = c.BuildContext.Get<string>("CombinedFrameworkHostCompressedFile");
AzurePublisherTool.PublishInstallerFileAndLatest(archiveFile, Channel, version); AzurePublisherTool.PublishArchiveAndLatest(archiveFile, Channel, version);
return c.Success(); return c.Success();
} }

3
scripts/dotnet-cli-build/Utils/Monikers.cs
View file

@ -10,11 +10,10 @@ namespace Microsoft.DotNet.Cli.Build
{ {
public const string SharedFrameworkName = "Microsoft.NETCore.App"; public const string SharedFrameworkName = "Microsoft.NETCore.App";
public static string GetProductMoniker(BuildTargetContext c, string artifactPrefix) public static string GetProductMoniker(BuildTargetContext c, string artifactPrefix, string version)
{ {
string osname = GetOSShortName(); string osname = GetOSShortName();
var arch = CurrentArchitecture.Current.ToString(); var arch = CurrentArchitecture.Current.ToString();
var version = c.BuildContext.Get<BuildVersion>("BuildVersion").SimpleVersion;
return $"{artifactPrefix}-{osname}-{arch}.{version}"; return $"{artifactPrefix}-{osname}-{arch}.{version}";
} }