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

Merge pull request #2877 from dotnet/piotrpMSFT/brandingUpdate

Browse source 
RC2 Branding Update
This commit is contained in:
Piotr Puszkiewicz 2016-05-06 10:15:56 -07:00
commit 8c902a1954
43 changed files with 224 additions and 186 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
TestAssets/DesktopTestProjects/DesktopAppWhichCallsDotnet/project.json
View file

@ -1,7 +1,7 @@
{
"version": "1.0.0-*",
"dependencies": {
"Microsoft.DotNet.Cli.Utils": "1.0.0-*"
"Microsoft.DotNet.Cli.Utils": { "target": "project" }
},
"compilationOptions": {
"emitEntryPoint": true

4
TestAssets/TestPackages/dotnet-dependency-context-test/project.json
View file

@ -1,5 +1,5 @@
{
"version": "1.0.0-*",
"version": "1.0.0-preview1-*",
"compilationOptions": {
"emitEntryPoint": true
},
@ -8,7 +8,7 @@
"type": "platform",
"version": "1.0.0-rc2-*"
},
"Microsoft.Extensions.DependencyModel": "1.0.0-*"
"Microsoft.Extensions.DependencyModel": { "target": "project" }
},
"frameworks": {
"netcoreapp1.0": {

8
TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json
View file

@ -1,5 +1,5 @@
{
"version": "1.0.0-*",
"version": "1.0.0-preview1-*",
"compilationOptions": {
"emitEntryPoint": true
},
@ -12,9 +12,9 @@
"type": "platform",
"version": "1.0.0-rc2-*"
},
"Microsoft.DotNet.Cli.Utils": "1.0.0-*",
"Microsoft.DotNet.ProjectModel": "1.0.0-*",
"Microsoft.DotNet.Compiler.Common": "1.0.0-*"
"Microsoft.DotNet.Cli.Utils": { "target": "project" },
"Microsoft.DotNet.ProjectModel": { "target": "project" },
"Microsoft.DotNet.Compiler.Common": { "target": "project" }
},
"frameworks": {
"netcoreapp1.0": {

4
TestAssets/TestPackages/dotnet-desktop-and-portable/project.json
View file

@ -1,5 +1,5 @@
{
"version": "1.0.0-*",
"version": "1.0.0-preview1-*",
"compilationOptions": {
"emitEntryPoint": true
},
@ -10,7 +10,7 @@
"type": "platform",
"version": "1.0.0-rc2-*"
}
},
}
},
"net451": {}
}

2
TestAssets/TestPackages/dotnet-desktop-binding-redirects/project.json
View file

@ -1,5 +1,5 @@
{
"version": "1.0.0-*",
"version": "1.0.0-preview1-*",
"compilationOptions": {
"emitEntryPoint": true
},

3
TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json
View file

@ -2,8 +2,7 @@
"version": "1.0.0-*",
"dependencies": {
"Microsoft.Extensions.DependencyModel": {
"target": "project",
"version": "1.0.0-*"
"target": "project"
}
},
"frameworks": {

2
branchinfo.txt
View file

@ -4,5 +4,5 @@
MAJOR_VERSION=1
MINOR_VERSION=0
PATCH_VERSION=0
RELEASE_SUFFIX=rc2
RELEASE_SUFFIX=preview1
CHANNEL=beta

2
packaging/osx/clisdk/Distribution-Template
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?>
<installer-gui-script minSpecVersion="1">
<title>{CLISdkBrandName} {CLISdkNugetVersion}</title>
<title>{CLISdkBrandName} (x64)</title>
<license file="eula.rtf" mime-type="application/rtf" />
<background file="dotnetbackground.png" mime-type="image/png"/>
<options customize="never" require-scripts="false" />

2
packaging/osx/sharedframework/shared-framework-distribution-template.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?>
<installer-gui-script minSpecVersion="1">
<title>{SharedFxBrandName} ({SharedFrameworkNugetName} {SharedFrameworkNugetVersion})</title>
<title>{SharedFxBrandName} (x64)</title>
<license file="eula.rtf" mime-type="application/rtf" />
<background file="dotnetbackground.png" mime-type="image/png"/>
<options customize="never" require-scripts="false" />

5
packaging/windows/clisdk/registrykeys.wxs
View file

@ -8,6 +8,11 @@
<RegistryValue Action="write" Name="$(var.NugetVersion)" Type="integer" Value="1" KeyPath="yes"/>
</RegistryKey>
</Component>
<Component Id="SetupRegistry_x86_RC2_Compat_Key" Directory="TARGETDIR" Win64="no">
<RegistryKey Root="HKLM" Key="SOFTWARE\dotnet\Setup\InstalledVersions\$(var.Platform)\sdk">
<RegistryValue Action="write" Name="1.0.0-preview1" Type="integer" Value="1" KeyPath="yes"/>
</RegistryKey>
</Component>
</ComponentGroup>
</Fragment>
</Wix>

2
packaging/windows/clisdk/variables.wxi
View file

@ -7,7 +7,7 @@
<?define Dotnet_DisplayVersion = "$(var.DisplayVersion)" ?>
<?define Dotnet_BuildVersion = "$(var.BuildVersion)" ?>
<?define Manufacturer = "Microsoft Corporation" ?>
<?define ProductName = "$(var.ProductMoniker) ($(var.NugetVersion) $(sys.BUILDARCH))" ?>
<?define ProductName = "$(var.ProductMoniker) ($(sys.BUILDARCH))" ?>
<?define ProductLanguage = "1033" ?>
<?define ProductVersion = "$(var.Dotnet_ProductVersion)" ?>
<?define ProductFamily = "dotnet" ?>

8
packaging/windows/host/generatemsi.ps1
View file

@ -6,8 +6,8 @@ param(
[Parameter(Mandatory=$true)][string]$DotnetHostMSIOutput,
[Parameter(Mandatory=$true)][string]$WixRoot,
[Parameter(Mandatory=$true)][string]$ProductMoniker,
[Parameter(Mandatory=$true)][string]$DotnetMSIVersion,
[Parameter(Mandatory=$true)][string]$DotnetCLINugetVersion,
[Parameter(Mandatory=$true)][string]$SharedHostMSIVersion,
[Parameter(Mandatory=$true)][string]$SharedHostNugetVersion,
[Parameter(Mandatory=$true)][string]$Architecture,
[Parameter(Mandatory=$true)][string]$WixObjRoot
)
@ -29,8 +29,8 @@ function RunCandle
-dHostSrc="$SharedHostPublishRoot" `
-dMicrosoftEula="$RepoRoot\packaging\osx\clisdk\resources\en.lproj\eula.rtf" `
-dProductMoniker="$ProductMoniker" `
-dBuildVersion="$DotnetMSIVersion" `
-dNugetVersion="$DotnetCLINugetVersion" `
-dBuildVersion="$SharedHostMSIVersion" `
-dNugetVersion="$SharedHostNugetVersion" `
-arch $Architecture `
"$AuthWsxRoot\host.wxs" `
"$AuthWsxRoot\provider.wxs" `

2
packaging/windows/host/variables.wxi
View file

@ -7,7 +7,7 @@
<?define Dotnet_ProductVersion = "$(var.BuildVersion)" ?>
<?define Dotnet_BuildVersion = "$(var.BuildVersion)" ?>
<?define Manufacturer = "Microsoft Corporation" ?>
<?define ProductName = "$(var.ProductMoniker) ($(var.NugetVersion) $(sys.BUILDARCH))" ?>
<?define ProductName = "$(var.ProductMoniker) ($(sys.BUILDARCH))" ?>
<?define ProductLanguage = "1033" ?>
<?define ProductVersion = "$(var.Dotnet_ProductVersion)" ?>
<?define LCID = "$(var.ProductLanguage)"?>

5
packaging/windows/sharedframework/registrykeys.wxs
View file

@ -8,6 +8,11 @@
<RegistryValue Action="write" Name="$(var.FrameworkDisplayVersion)" Type="integer" Value="1" KeyPath="yes"/>
</RegistryKey>
</Component>
<Component Id="SetupRegistry_x86_RC2_Compat_Key" Directory="TARGETDIR" Win64="no">
<RegistryKey Root="HKLM" Key="SOFTWARE\dotnet\Setup\InstalledVersions\$(var.Platform)\sharedfx\$(var.FrameworkName)">
<RegistryValue Action="write" Name="1.0.0-rc2" Type="integer" Value="1" KeyPath="yes"/>
</RegistryKey>
</Component>
</ComponentGroup>
</Fragment>
</Wix>

2
packaging/windows/sharedframework/variables.wxi
View file

@ -5,7 +5,7 @@
<?define Servicing_Key_SPIndex = "0" ?>
<?define Servicing_Key_SPName = "Beta" ?>
<?define Manufacturer = "Microsoft Corporation" ?>
<?define ProductName = "$(var.ProductMoniker) ($(var.FrameworkName) $(var.FrameworkDisplayVersion) $(sys.BUILDARCH))" ?>
<?define ProductName = "$(var.ProductMoniker) ($(sys.BUILDARCH))" ?>
<?define ProductLanguage = "1033" ?>
<?define ProductVersion = "$(var.BuildVersion)" ?>
<?define LCID = "$(var.ProductLanguage)"?>

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

@ -81,10 +81,10 @@ namespace Microsoft.DotNet.Cli.Build
[Target]
public static BuildTargetResult GenerateStubHostPackages(BuildTargetContext c)
{
var buildVersion = c.BuildContext.Get<BuildVersion>("BuildVersion");
var hostVersion = c.BuildContext.Get<HostVersion>("HostVersion");
var currentRid = HostPackagePlatformRid;
PrepareDummyRuntimeNuGetPackage(DotNetCli.Stage0);
foreach (var hostPackage in buildVersion.LatestHostPackages)
foreach (var hostPackage in hostVersion.LatestHostPackages)
{
foreach (var rid in HostPackageSupportedRids.Values.Distinct())
{
@ -105,8 +105,8 @@ namespace Microsoft.DotNet.Cli.Build
[Target(nameof(PrepareTargets.Init))]
public static BuildTargetResult RestoreLockedCoreHost(BuildTargetContext c)
{
var buildVersion = c.BuildContext.Get<BuildVersion>("BuildVersion");
var lockedHostFxrVersion = buildVersion.LockedHostFxrVersion;
var hostVersion = c.BuildContext.Get<HostVersion>("HostVersion");
var lockedHostFxrVersion = hostVersion.LockedHostFxrVersion;
var currentRid = HostPackagePlatformRid;
string projectJson = $@"{{
""dependencies"": {{
@ -149,7 +149,7 @@ namespace Microsoft.DotNet.Cli.Build
[Target(nameof(PrepareTargets.Init))]
public static BuildTargetResult CompileCoreHost(BuildTargetContext c)
{
var buildVersion = c.BuildContext.Get<BuildVersion>("BuildVersion");
var hostVersion = c.BuildContext.Get<HostVersion>("HostVersion");
// Generate build files
var cmakeOut = Path.Combine(Dirs.CorehostLatest, "cmake");
@ -173,7 +173,7 @@ namespace Microsoft.DotNet.Cli.Build
var ridMacro = $"-DCLI_CMAKE_RUNTIME_ID:STRING={rid}";
var arch = IsWinx86 ? "x86" : "x64";
var baseSupportedRid = $"win7-{arch}";
var cmakeHostPolicyVer = $"-DCLI_CMAKE_HOST_POLICY_VER:STRING={buildVersion.LatestHostPolicyVersion}";
var cmakeHostPolicyVer = $"-DCLI_CMAKE_HOST_POLICY_VER:STRING={hostVersion.LatestHostPolicyVersion}";
var cmakeBaseRid = $"-DCLI_CMAKE_PKG_RID:STRING={baseSupportedRid}";
var cmakeCommitHash = $"-DCLI_CMAKE_COMMIT_HASH:STRING={commitHash}";
@ -215,7 +215,7 @@ namespace Microsoft.DotNet.Cli.Build
"--arch",
"x64",
"--policyver",
buildVersion.LatestHostPolicyVersion,
hostVersion.LatestHostPolicyVersion,
"--rid",
rid,
"--commithash",
@ -233,10 +233,10 @@ namespace Microsoft.DotNet.Cli.Build
public static BuildTargetResult PackagePkgProjects(BuildTargetContext c)
{
var arch = IsWinx86 ? "x86" : "x64";
var buildVersion = c.BuildContext.Get<BuildVersion>("BuildVersion");
var version = buildVersion.NuGetVersion;
var content = $@"{c.BuildContext["CommitHash"]}{Environment.NewLine}{version}{Environment.NewLine}";
var hostVersion = c.BuildContext.Get<HostVersion>("HostVersion");
var hostNugetversion = hostVersion.LatestHostVersion;
var content = $@"{c.BuildContext["CommitHash"]}{Environment.NewLine}{hostNugetversion}{Environment.NewLine}";
var pkgDir = Path.Combine(c.BuildContext.BuildDirectory, "pkg");
File.WriteAllText(Path.Combine(pkgDir, "version.txt"), content);
@ -246,11 +246,11 @@ namespace Microsoft.DotNet.Cli.Build
// Workaround to arg escaping adding backslashes for arguments to .cmd scripts.
.Environment("__WorkaroundCliCoreHostBuildArch", arch)
.Environment("__WorkaroundCliCoreHostBinDir", Dirs.CorehostLatest)
.Environment("__WorkaroundCliCoreHostPolicyVer", buildVersion.LatestHostPolicyVersionNoSuffix)
.Environment("__WorkaroundCliCoreHostFxrVer", buildVersion.LatestHostFxrVersionNoSuffix)
.Environment("__WorkaroundCliCoreHostVer", buildVersion.LatestHostVersionNoSuffix)
.Environment("__WorkaroundCliCoreHostBuildMajor", buildVersion.LatestHostBuildMajor)
.Environment("__WorkaroundCliCoreHostVersionTag", buildVersion.LatestHostPrerelease)
.Environment("__WorkaroundCliCoreHostPolicyVer", hostVersion.LatestHostPolicyVersionNoSuffix)
.Environment("__WorkaroundCliCoreHostFxrVer", hostVersion.LatestHostFxrVersionNoSuffix)
.Environment("__WorkaroundCliCoreHostVer", hostVersion.LatestHostVersionNoSuffix)
.Environment("__WorkaroundCliCoreHostBuildMajor", hostVersion.LatestHostBuildMajor)
.Environment("__WorkaroundCliCoreHostVersionTag", hostVersion.LatestHostPrerelease)
.ForwardStdOut()
.ForwardStdErr()
.Execute()
@ -264,15 +264,15 @@ namespace Microsoft.DotNet.Cli.Build
"--hostbindir",
Dirs.CorehostLatest,
"--policyver",
buildVersion.LatestHostPolicyVersionNoSuffix,
hostVersion.LatestHostPolicyVersionNoSuffix,
"--fxrver",
buildVersion.LatestHostFxrVersionNoSuffix,
hostVersion.LatestHostFxrVersionNoSuffix,
"--hostver",
buildVersion.LatestHostVersionNoSuffix,
hostVersion.LatestHostVersionNoSuffix,
"--build",
buildVersion.LatestHostBuildMajor,
hostVersion.LatestHostBuildMajor,
"--vertag",
buildVersion.LatestHostPrerelease);
hostVersion.LatestHostPrerelease);
}
foreach (var file in Directory.GetFiles(Path.Combine(pkgDir, "bin", "packages"), "*.nupkg"))
{
@ -281,7 +281,7 @@ namespace Microsoft.DotNet.Cli.Build
Console.WriteLine($"Copying package {fileName} to artifacts directory {Dirs.CorehostLocalPackages}.");
}
foreach (var item in buildVersion.LatestHostPackages)
foreach (var item in hostVersion.LatestHostPackages)
{
var fileFilter = $"runtime.{HostPackagePlatformRid}.{item.Key}.{item.Value}.nupkg";
if (Directory.GetFiles(Dirs.CorehostLocalPackages, fileFilter).Length == 0)
@ -619,8 +619,6 @@ namespace Microsoft.DotNet.Cli.Build
foreach (var project in ProjectsToPublish)
{
// TODO: Use the flag once we get a full build round tripped
// --version-suffix buildVesion.VersionSuffix
dotnet.Publish(
"--native-subdirectory",
"--output",

4
scripts/dotnet-cli-build/DebTargets.cs
View file

@ -65,7 +65,7 @@ namespace Microsoft.DotNet.Cli.Build
public static BuildTargetResult GenerateSharedHostDeb(BuildTargetContext c)
{
var packageName = Monikers.GetDebianSharedHostPackageName(c);
var version = c.BuildContext.Get<BuildVersion>("BuildVersion").NuGetVersion;
var version = c.BuildContext.Get<HostVersion>("HostVersion").LockedHostVersion;
var inputRoot = c.BuildContext.Get<string>("SharedHostPublishRoot");
var debFile = c.BuildContext.Get<string>("SharedHostInstallerFile");
var objRoot = Path.Combine(Dirs.Output, "obj", "debian", "sharedhost");
@ -79,7 +79,7 @@ namespace Microsoft.DotNet.Cli.Build
Directory.CreateDirectory(objRoot);
Cmd(Path.Combine(Dirs.RepoRoot, "scripts", "package", "package-sharedhost-debian.sh"),
"--input", inputRoot, "--output", debFile, "-b", Monikers.SharedFxBrandName,
"--input", inputRoot, "--output", debFile, "-b", Monikers.SharedHostBrandName,
"--obj-root", objRoot, "--version", version, "-m", manPagesDir)
.Execute()
.EnsureSuccessful();

5
scripts/dotnet-cli-build/MsiTargets.cs
View file

@ -138,6 +138,9 @@ namespace Microsoft.DotNet.Cli.Build
[BuildPlatforms(BuildPlatform.Windows)]
public static BuildTargetResult GenerateDotnetSharedHostMsi(BuildTargetContext c)
{
var hostVersion = c.BuildContext.Get<HostVersion>("HostVersion");
var hostMsiVersion = hostVersion.GenerateMsiVersion();
var hostNugetVersion = hostVersion.LockedHostVersion;
var inputDir = c.BuildContext.Get<string>("SharedHostPublishRoot");
var wixObjRoot = Path.Combine(Dirs.Output, "obj", "wix", "sharedhost");
var sharedHostBrandName = $"'{Monikers.SharedHostBrandName}'";
@ -150,7 +153,7 @@ namespace Microsoft.DotNet.Cli.Build
Cmd("powershell", "-NoProfile", "-NoLogo",
Path.Combine(Dirs.RepoRoot, "packaging", "windows", "host", "generatemsi.ps1"),
inputDir, SharedHostMsi, WixRoot, sharedHostBrandName, MsiVersion, CliNugetVersion, Arch, wixObjRoot)
inputDir, SharedHostMsi, WixRoot, sharedHostBrandName, hostMsiVersion, hostNugetVersion, Arch, wixObjRoot)
.Execute()
.EnsureSuccessful();
return c.Success();

12
scripts/dotnet-cli-build/PackageTargets.cs
View file

@ -13,16 +13,16 @@ namespace Microsoft.DotNet.Cli.Build
{
public static readonly string[] ProjectsToPack = new string[]
{
"dotnet-compile-fsc",
"Microsoft.DotNet.Cli.Utils",
"Microsoft.DotNet.Compiler.Common",
"Microsoft.DotNet.Files",
"Microsoft.DotNet.InternalAbstractions",
"Microsoft.DotNet.ProjectModel",
"Microsoft.DotNet.ProjectModel.Loader",
"Microsoft.DotNet.ProjectModel.Workspaces",
"Microsoft.DotNet.InternalAbstractions",
"Microsoft.Extensions.DependencyModel",
"Microsoft.Extensions.Testing.Abstractions",
"Microsoft.DotNet.Compiler.Common",
"Microsoft.DotNet.Files",
"dotnet-compile-fsc"
"Microsoft.Extensions.Testing.Abstractions"
};
[Target(nameof(PackageTargets.CopyCLISDKLayout),
@ -214,7 +214,7 @@ namespace Microsoft.DotNet.Cli.Build
[Target]
public static BuildTargetResult GenerateNugetPackages(BuildTargetContext c)
{
var versionSuffix = c.BuildContext.Get<BuildVersion>("BuildVersion").VersionSuffix;
var versionSuffix = c.BuildContext.Get<BuildVersion>("BuildVersion").CommitCountString;
var configuration = c.BuildContext.Get<string>("Configuration");
var env = GetCommonEnvVars(c);

5
scripts/dotnet-cli-build/PkgTargets.cs
View file

@ -28,8 +28,7 @@ namespace Microsoft.DotNet.Cli.Build
PkgsIntermediateDir = Path.Combine(Dirs.Packages, "intermediate");
Directory.CreateDirectory(PkgsIntermediateDir);
var hostVersion = c.BuildContext.Get<BuildVersion>("BuildVersion").ProductionVersion;
SharedHostComponentId = $"com.microsoft.dotnet.sharedhost.{hostVersion}.component.osx.x64";
SharedHostComponentId = $"com.microsoft.dotnet.sharedhost.component.osx.x64";
string sharedFrameworkNugetName = Monikers.SharedFrameworkName;
SharedFrameworkNugetVersion = c.BuildContext.Get<string>("SharedFrameworkNugetVersion");
@ -171,7 +170,7 @@ namespace Microsoft.DotNet.Cli.Build
[BuildPlatforms(BuildPlatform.OSX)]
public static BuildTargetResult GenerateSharedHostPkg(BuildTargetContext c)
{
string version = c.BuildContext.Get<BuildVersion>("BuildVersion").NuGetVersion;
string version = c.BuildContext.Get<HostVersion>("HostVersion").LockedHostVersion;
string outFilePath = Path.Combine(PkgsIntermediateDir, SharedHostComponentId + ".pkg");
string installLocation = "/usr/local/share/dotnet";
string scriptsLocation = Path.Combine(Dirs.RepoRoot, "packaging", "osx", "sharedhost", "scripts");

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

@ -78,7 +78,14 @@ namespace Microsoft.DotNet.Cli.Build
ReleaseSuffix = branchInfo["RELEASE_SUFFIX"],
CommitCount = commitCount
};
var hostVersion = new HostVersion()
{
CommitCount = commitCount
};
c.BuildContext["BuildVersion"] = buildVersion;
c.BuildContext["HostVersion"] = hostVersion;
c.BuildContext["CommitHash"] = commitHash;
c.BuildContext["SharedFrameworkNugetVersion"] = buildVersion.NetCoreAppVersion;
@ -143,9 +150,10 @@ namespace Microsoft.DotNet.Cli.Build
var cliVersion = c.BuildContext.Get<BuildVersion>("BuildVersion").NuGetVersion;
var sharedFrameworkVersion = c.BuildContext.Get<string>("SharedFrameworkNugetVersion");
var hostVersion = c.BuildContext.Get<HostVersion>("HostVersion").LockedHostVersion;
AddInstallerArtifactToContext(c, "dotnet-sdk", "Sdk", cliVersion);
AddInstallerArtifactToContext(c, "dotnet-host", "SharedHost", cliVersion);
AddInstallerArtifactToContext(c, "dotnet-host", "SharedHost", hostVersion);
AddInstallerArtifactToContext(c, "dotnet-sharedframework", "SharedFramework", sharedFrameworkVersion);
AddInstallerArtifactToContext(c, "dotnet-dev", "CombinedFrameworkSDKHost", cliVersion);
AddInstallerArtifactToContext(c, "dotnet", "CombinedFrameworkHost", sharedFrameworkVersion);

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

@ -26,6 +26,8 @@ namespace Microsoft.DotNet.Cli.Build
private static string SharedFrameworkNugetVersion { get; set; }
private static string SharedHostNugetVersion { get; set; }
[Target]
public static BuildTargetResult InitPublish(BuildTargetContext c)
{
@ -35,6 +37,7 @@ namespace Microsoft.DotNet.Cli.Build
CliVersion = c.BuildContext.Get<BuildVersion>("BuildVersion").SimpleVersion;
CliNuGetVersion = c.BuildContext.Get<BuildVersion>("BuildVersion").NuGetVersion;
SharedFrameworkNugetVersion = c.BuildContext.Get<string>("SharedFrameworkNugetVersion");
SharedHostNugetVersion = c.BuildContext.Get<HostVersion>("HostVersion").LockedHostVersion;
Channel = c.BuildContext.Get<string>("Channel");
return c.Success();
@ -86,15 +89,18 @@ namespace Microsoft.DotNet.Cli.Build
{
// Copy the latest CLI bits
CopyBlobs($"{Channel}/Binaries/{CliNuGetVersion}/", targetContainer);
// Copy the shared framework
CopyBlobs($"{Channel}/Binaries/{SharedFrameworkNugetVersion}/", targetContainer);
// Copy the latest installer files
CopyBlobs($"{Channel}/Installers/{CliNuGetVersion}/", $"{Channel}/Installers/Latest/");
// Copy the shared framework installers
CopyBlobs($"{Channel}/Installers/{SharedFrameworkNugetVersion}/", $"{Channel}/Installers/Latest/");
// Copy the shared framework
CopyBlobs($"{Channel}/Binaries/{SharedFrameworkNugetVersion}/", targetContainer);
// Copy the shared host installers
CopyBlobs($"{Channel}/Installers/{SharedHostNugetVersion}/", $"{Channel}/Installers/Latest/");
// Generate the CLI and SDK Version text files
List<string> versionFiles = new List<string>() { "win.x86.version", "win.x64.version", "ubuntu.x64.version", "rhel.x64.version", "osx.x64.version", "debian.x64.version", "centos.x64.version" };
@ -122,7 +128,8 @@ namespace Microsoft.DotNet.Cli.Build
string source = blob.Replace("/dotnet/", "");
string targetName = Path.GetFileName(blob)
.Replace(CliNuGetVersion, "latest")
.Replace(SharedFrameworkNugetVersion, "latest");
.Replace(SharedFrameworkNugetVersion, "latest")
.Replace(SharedHostNugetVersion, "latest");
string target = $"{destinationFolder}{targetName}";
AzurePublisherTool.CopyBlob(source, target);
}
@ -130,7 +137,7 @@ namespace Microsoft.DotNet.Cli.Build
private static bool CheckIfAllBuildsHavePublished()
{
Dictionary<string, bool> badges = new Dictionary<string, bool>()
Dictionary<string, bool> badges = new Dictionary<string, bool>()
{
{ "Windows_x86", false },
{ "Windows_x64", false },
@ -232,7 +239,7 @@ namespace Microsoft.DotNet.Cli.Build
[BuildPlatforms(BuildPlatform.Ubuntu, BuildPlatform.Windows)]
public static BuildTargetResult PublishSharedHostInstallerFileToAzure(BuildTargetContext c)
{
var version = CliNuGetVersion;
var version = SharedHostNugetVersion;
var installerFile = c.BuildContext.Get<string>("SharedHostInstallerFile");
if (CurrentPlatform.Current == BuildPlatform.Windows)
@ -377,7 +384,7 @@ namespace Microsoft.DotNet.Cli.Build
[BuildPlatforms(BuildPlatform.Ubuntu)]
public static BuildTargetResult PublishSharedHostDebToDebianRepo(BuildTargetContext c)
{
var version = CliNuGetVersion;
var version = SharedHostNugetVersion;
var packageName = Monikers.GetDebianSharedHostPackageName(c);
var installerFile = c.BuildContext.Get<string>("SharedHostInstallerFile");

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

@ -162,7 +162,7 @@ namespace Microsoft.DotNet.Cli.Build
var versionSuffix = testPackageProject.VersionSuffix;
if (versionSuffix.Equals(s_testPackageBuildVersionSuffix))
{
versionSuffix = c.BuildContext.Get<BuildVersion>("BuildVersion").VersionSuffix;
versionSuffix = c.BuildContext.Get<BuildVersion>("BuildVersion").CommitCountString;
}
var fullPath = Path.Combine(c.BuildContext.BuildDirectory, relativePath.Replace('/', Path.DirectorySeparatorChar));

72
scripts/dotnet-cli-build/Utils/BuildVersion.cs
View file

@ -2,82 +2,12 @@
namespace Microsoft.DotNet.Cli.Build
{
public class BuildVersion
public class BuildVersion : Version
{
public int Major { get; set; }
public int Minor { get; set; }
public int Patch { get; set; }
public int CommitCount { get; set; }
public string CommitCountString => CommitCount.ToString("000000");
public string ReleaseSuffix { get; set; }
public string SimpleVersion => $"{Major}.{Minor}.{Patch}.{CommitCountString}";
public string VersionSuffix => $"{ReleaseSuffix}-{CommitCountString}";
public string NuGetVersion => $"{Major}.{Minor}.{Patch}-{VersionSuffix}";
public string NetCoreAppVersion => $"{Major}.{Minor}.{Patch}-rc2-3{CommitCountString}";
public string ProductionVersion => $"{Major}.{Minor}.{Patch}";
// ------------------------------------------HOST-VERSIONING-------------------------------------------
//
// Host versions are independent of CLI versions. Moreover, these version numbers
// are baked into the binary and is used to look up a serviced binary replacement.
//
//
// Latest hosts for production of nupkgs.
//
// Version constants without suffix
public string LatestHostVersionNoSuffix => "1.0.1";
public string LatestHostFxrVersionNoSuffix => "1.0.1";
public string LatestHostPolicyVersionNoSuffix => "1.0.1";
public string LatestHostPrerelease => "rc2";
public string LatestHostBuildMajor => $"{CommitCountString}";
public string LatestHostSuffix => $"{LatestHostPrerelease}-{LatestHostBuildMajor}-00";
// Full versions and package information.
private string LatestHostVersion => $"{LatestHostVersionNoSuffix}-{LatestHostSuffix}";
private string LatestHostFxrVersion => $"{LatestHostFxrVersionNoSuffix}-{LatestHostSuffix}";
public string LatestHostPolicyVersion => $"{LatestHostPolicyVersionNoSuffix}-{LatestHostSuffix}";
public Dictionary<string, string> LatestHostPackages => new Dictionary<string, string>()
{
{ "Microsoft.NETCore.DotNetHost", LatestHostVersion },
{ "Microsoft.NETCore.DotNetHostResolver", LatestHostFxrVersion },
{ "Microsoft.NETCore.DotNetHostPolicy", LatestHostPolicyVersion }
};
//
// Locked muxer for consumption in CLI.
//
public bool IsLocked = false; // Set this variable to toggle muxer locking.
public string LockedHostFxrVersion => IsLocked ? "1.0.1-rc2-002468-00" : LatestHostFxrVersion;
//
// -----------------------------------------END-OF-HOST-VERSIONING-------------------------------------
public string GenerateMsiVersion()
{
// MSI versioning
// Encode the CLI version to fit into the MSI versioning scheme - https://msdn.microsoft.com/en-us/library/windows/desktop/aa370859(v=vs.85).aspx
// MSI versions are 3 part
// major.minor.build
// Size(bits) of each part 8 8 16
// So we have 32 bits to encode the CLI version
// Starting with most significant bit this how the CLI version is going to be encoded as MSI Version
// CLI major -> 6 bits
// CLI minor -> 6 bits
// CLI patch -> 6 bits
// CLI commitcount -> 14 bits
var major = Major << 26;
var minor = Minor << 20;
var patch = Patch << 14;
var msiVersionNumber = major | minor | patch | CommitCount;
var msiMajor = (msiVersionNumber >> 24) & 0xFF;
var msiMinor = (msiVersionNumber >> 16) & 0xFF;
var msiBuild = msiVersionNumber & 0xFFFF;
return $"{msiMajor}.{msiMinor}.{msiBuild}";
}
}
}

47
scripts/dotnet-cli-build/Utils/HostVersion.cs Normal file
View file

@ -0,0 +1,47 @@
using System.Collections.Generic;
namespace Microsoft.DotNet.Cli.Build
{
public class HostVersion : Version
{
// ------------------------------------------HOST-VERSIONING-------------------------------------------
//
// Host versions are independent of CLI versions. Moreover, these version numbers
// are baked into the binary and is used to look up a serviced binary replacement.
//
//
// Latest hosts for production of nupkgs.
//
// Version constants without suffix
public override int Major => 1;
public override int Minor => 0;
public override int Patch => 1;
public override string ReleaseSuffix => "rc2";
public string LatestHostVersionNoSuffix => $"{Major}.{Minor}.{Patch}";
public string LatestHostFxrVersionNoSuffix => $"{Major}.{Minor}.{Patch}";
public string LatestHostPolicyVersionNoSuffix => $"{Major}.{Minor}.{Patch}";
public string LatestHostPrerelease => ReleaseSuffix;
public string LatestHostBuildMajor => $"{CommitCountString}";
public string LatestHostSuffix => $"{ReleaseSuffix}-{LatestHostBuildMajor}-00";
// Full versions and package information.
public string LatestHostVersion => $"{LatestHostVersionNoSuffix}-{LatestHostSuffix}";
public string LatestHostFxrVersion => $"{LatestHostFxrVersionNoSuffix}-{LatestHostSuffix}";
public string LatestHostPolicyVersion => $"{LatestHostPolicyVersionNoSuffix}-{LatestHostSuffix}";
public Dictionary<string, string> LatestHostPackages => new Dictionary<string, string>()
{
{ "Microsoft.NETCore.DotNetHost", LatestHostVersion },
{ "Microsoft.NETCore.DotNetHostResolver", LatestHostFxrVersion },
{ "Microsoft.NETCore.DotNetHostPolicy", LatestHostPolicyVersion }
};
//
// Locked muxer for consumption in CLI.
//
public bool IsLocked = false; // Set this variable to toggle muxer locking.
public string LockedHostFxrVersion => IsLocked ? "1.0.1-rc2-002468-00" : LatestHostFxrVersion;
public string LockedHostVersion => IsLocked ? "1.0.1-rc2-002468-00" : LatestHostVersion;
}
}

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

@ -9,9 +9,9 @@ namespace Microsoft.DotNet.Cli.Build
public class Monikers
{
public const string SharedFrameworkName = "Microsoft.NETCore.App";
public const string CLISdkBrandName = "Microsoft .NET Core SDK";
public const string SharedFxBrandName = "Microsoft .NET Core";
public const string SharedHostBrandName = "Microsoft .NET Core Host";
public const string CLISdkBrandName = "Microsoft .NET Core 1.0.0 RC2 - SDK Preview 1";
public const string SharedFxBrandName = "Microsoft .NET Core 1.0.0 RC2 - Runtime";
public const string SharedHostBrandName = "Microsoft .NET Core 1.0.0 RC2 - Host";
public static string GetProductMoniker(BuildTargetContext c, string artifactPrefix, string version)
{
@ -32,6 +32,7 @@ namespace Microsoft.DotNet.Cli.Build
case "beta":
case "rc1":
case "rc2":
case "preview1":
case "rtm":
packageName = "dotnet";
break;
@ -56,6 +57,7 @@ namespace Microsoft.DotNet.Cli.Build
case "beta":
case "rc1":
case "rc2":
case "preview1":
case "rtm":
packagePrefix = "dotnet";
break;
@ -75,8 +77,6 @@ namespace Microsoft.DotNet.Cli.Build
public static string GetDebianSharedHostPackageName(BuildTargetContext c)
{
var sharedFrameworkNugetVersion = c.BuildContext.Get<string>("SharedFrameworkNugetVersion");
return $"dotnet-host".ToLower();
}

39
scripts/dotnet-cli-build/Utils/Version.cs Normal file
View file

@ -0,0 +1,39 @@
using System.Collections.Generic;
namespace Microsoft.DotNet.Cli.Build
{
public abstract class Version
{
public virtual int Major { get; set; }
public virtual int Minor { get; set; }
public virtual int Patch { get; set; }
public virtual int CommitCount { get; set; }
public virtual string CommitCountString => CommitCount.ToString("000000");
public virtual string ReleaseSuffix { get; set; }
public string GenerateMsiVersion()
{
// MSI versioning
// Encode the CLI version to fit into the MSI versioning scheme - https://msdn.microsoft.com/en-us/library/windows/desktop/aa370859(v=vs.85).aspx
// MSI versions are 3 part
// major.minor.build
// Size(bits) of each part 8 8 16
// So we have 32 bits to encode the CLI version
// Starting with most significant bit this how the CLI version is going to be encoded as MSI Version
// CLI major -> 6 bits
// CLI minor -> 6 bits
// CLI patch -> 6 bits
// CLI commitcount -> 14 bits
var major = Major << 26;
var minor = Minor << 20;
var patch = Patch << 14;
var msiVersionNumber = major | minor | patch | CommitCount;
var msiMajor = (msiVersionNumber >> 24) & 0xFF;
var msiMinor = (msiVersionNumber >> 16) & 0xFF;
var msiBuild = msiVersionNumber & 0xFFFF;
return $"{msiMajor}.{msiMinor}.{msiBuild}";
}
}
}

4
src/Microsoft.DotNet.Cli.Utils/project.json
View file

@ -1,11 +1,11 @@
{
"version": "1.0.0-*",
"version": "1.0.0-preview1-*",
"compilationOptions": {
"keyFile": "../../tools/Key.snk",
"warningsAsErrors": true
},
"dependencies": {
"Microsoft.DotNet.ProjectModel": "1.0.0-*",
"Microsoft.DotNet.ProjectModel": { "target": "project" },
"NuGet.Versioning": "3.5.0-beta",
"NuGet.Packaging": "3.5.0-beta",
"NuGet.Frameworks": "3.5.0-beta",

8
src/Microsoft.DotNet.Compiler.Common/project.json
View file

@ -1,13 +1,13 @@
{
"version": "1.0.0-*",
"version": "1.0.0-preview1-*",
"compilationOptions": {
"keyFile": "../../tools/Key.snk"
},
"dependencies": {
"Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160429-01",
"Microsoft.DotNet.ProjectModel": "1.0.0-*",
"Microsoft.DotNet.Cli.Utils": "1.0.0-*",
"Microsoft.DotNet.Files": "1.0.0-*"
"Microsoft.DotNet.ProjectModel": { "target": "project" },
"Microsoft.DotNet.Cli.Utils": { "target": "project" },
"Microsoft.DotNet.Files": { "target": "project" }
},
"frameworks": {
"net451": {

6
src/Microsoft.DotNet.Files/project.json
View file

@ -1,12 +1,12 @@
{
"version": "1.0.0-*",
"version": "1.0.0-preview1-*",
"compilationOptions": {
"keyFile": "../../tools/Key.snk"
},
"description": "Abstraction to interact with the file system and file paths.",
"dependencies": {
"Microsoft.DotNet.Cli.Utils": "1.0.0-*",
"Microsoft.DotNet.ProjectModel": "1.0.0-*",
"Microsoft.DotNet.Cli.Utils": { "target": "project" },
"Microsoft.DotNet.ProjectModel": { "target": "project" },
"System.Linq.Expressions": "4.0.11-rc2-24027"
},
"frameworks": {

2
src/Microsoft.DotNet.InternalAbstractions/project.json
View file

@ -1,6 +1,6 @@
{
"description": "Abstractions for making code that uses file system and environment testable.",
"version": "1.0.0-*",
"version": "1.0.0-rc2-*",
"repository": {
"type": "git",
"url": "git://github.com/dotnet/cli"

4
src/Microsoft.DotNet.ProjectModel.Loader/project.json
View file

@ -1,10 +1,10 @@
{
"version": "1.0.0-*",
"version": "1.0.0-preview1-*",
"compilationOptions": {
"keyFile": "../../tools/Key.snk"
},
"dependencies": {
"Microsoft.DotNet.ProjectModel": "1.0.0-*",
"Microsoft.DotNet.ProjectModel": { "target": "project" },
"System.Runtime.Loader": "4.0.0-rc2-24027"
},
"frameworks": {

6
src/Microsoft.DotNet.ProjectModel.Workspaces/project.json
View file

@ -1,11 +1,11 @@
{
"version": "1.0.0-*",
"version": "1.0.0-preview1-*",
"compilationOptions": {
"keyFile": "../../tools/Key.snk"
},
"dependencies": {
"Microsoft.DotNet.ProjectModel": "1.0.0-*",
"Microsoft.DotNet.Compiler.Common": "1.0.0-*",
"Microsoft.DotNet.ProjectModel": { "target": "project" },
"Microsoft.DotNet.Compiler.Common": { "target": "project" },
"Microsoft.CodeAnalysis.CSharp.Workspaces": "1.3.0-beta1-20160429-01"
},
"frameworks": {

4
src/Microsoft.DotNet.ProjectModel/project.json
View file

@ -1,11 +1,11 @@
{
"version": "1.0.0-*",
"version": "1.0.0-rc2-*",
"compilationOptions": {
"keyFile": "../../tools/Key.snk"
},
"description": "Types to model a .NET Project",
"dependencies": {
"Microsoft.Extensions.DependencyModel": "1.0.0-*",
"Microsoft.Extensions.DependencyModel": { "target": "project" },
"Newtonsoft.Json": "7.0.1",
"NuGet.Packaging": "3.5.0-beta",
"NuGet.RuntimeModel": "3.5.0-beta",

4
src/Microsoft.DotNet.TestFramework/project.json
View file

@ -1,5 +1,5 @@
{
"version": "1.0.0-*",
"version": "1.0.0-preview1-*",
"description": "Microsoft.DotNet.TestFramework Class Library",
"tags": [
""
@ -10,7 +10,7 @@
"projectUrl": "",
"licenseUrl": "",
"dependencies": {
"Microsoft.DotNet.Cli.Utils": "1.0.0-*"
"Microsoft.DotNet.Cli.Utils": { "target": "project" }
},
"frameworks": {
"netstandard1.5": {

5
src/Microsoft.Extensions.DependencyModel/project.json
View file

@ -1,6 +1,6 @@
{
"description": "Abstractions for reading `.deps` files.",
"version": "1.0.0-*",
"version": "1.0.0-rc2-*",
"repository": {
"type": "git",
"url": "git://github.com/dotnet/cli"
@ -11,8 +11,7 @@
},
"dependencies": {
"Microsoft.DotNet.InternalAbstractions": {
"target": "project",
"version": "1.0.0-*"
"target": "project"
},
"Newtonsoft.Json": "7.0.1"
},

4
src/Microsoft.Extensions.Testing.Abstractions/project.json
View file

@ -1,6 +1,6 @@
{
"description": "Abstractions for test runners to communicate to a tool, such as Visual Studio.",
"version": "1.0.0-*",
"version": "1.0.0-preview1-*",
"repository": {
"type": "git",
"url": "git://github.com/dotnet/cli"
@ -12,7 +12,7 @@
},
"dependencies": {
"Newtonsoft.Json": "7.0.1",
"Microsoft.DotNet.ProjectModel": "1.0.0-*",
"Microsoft.DotNet.ProjectModel": { "target": "project" },
"Microsoft.DiaSymReader": "1.0.6",
"Microsoft.DiaSymReader.Native": "1.3.3"
},

8
src/dotnet-compile-fsc/project.json
View file

@ -1,5 +1,5 @@
{
"version": "1.0.0-*",
"version": "1.0.0-preview1-*",
"compilationOptions": {
"emitEntryPoint": true
},
@ -11,9 +11,9 @@
],
"dependencies": {
"Microsoft.FSharp.Compiler.netcore": "1.0.0-alpha-160318",
"Microsoft.DotNet.ProjectModel": "1.0.0-*",
"Microsoft.DotNet.Compiler.Common": "1.0.0-*",
"Microsoft.DotNet.Cli.Utils": "1.0.0-*",
"Microsoft.DotNet.ProjectModel": { "target": "project" },
"Microsoft.DotNet.Compiler.Common": { "target": "project" },
"Microsoft.DotNet.Cli.Utils": { "target": "project" },
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc2-*"

10
src/dotnet/project.json
View file

@ -1,5 +1,5 @@
{
"version": "1.0.0-*",
"version": "1.0.0-preview1-*",
"compilationOptions": {
"emitEntryPoint": true
},
@ -25,10 +25,10 @@
"System.Text.Encoding.CodePages": "4.0.1-rc2-24027",
"System.Diagnostics.FileVersionInfo": "4.0.0-rc2-24027",
"Microsoft.ApplicationInsights": "2.0.0",
"Microsoft.DotNet.ProjectModel": "1.0.0-*",
"Microsoft.DotNet.Compiler.Common": "1.0.0-*",
"Microsoft.DotNet.Cli.Utils": "1.0.0-*",
"Microsoft.Extensions.Testing.Abstractions": "1.0.0-*",
"Microsoft.DotNet.ProjectModel": { "target": "project" },
"Microsoft.DotNet.Compiler.Common": { "target": "project" },
"Microsoft.DotNet.Cli.Utils": { "target": "project" },
"Microsoft.Extensions.Testing.Abstractions": { "target": "project" },
"Microsoft.NETCore.ConsoleHost": "1.0.0-rc2-24027",
"Microsoft.NETCore.TestHost": "1.0.0-rc2-24027",
"Microsoft.NETCore.App": {

9
test/Microsoft.DotNet.Tools.Tests.Utilities/project.json
View file

@ -8,12 +8,11 @@
"FluentAssertions": "4.0.0",
"xunit": "2.1.0",
"dotnet-test-xunit": "1.0.0-rc2-173361-36",
"Microsoft.DotNet.TestFramework": "1.0.0-*",
"Microsoft.DotNet.Cli.Utils": "1.0.0-*",
"Microsoft.DotNet.ProjectModel": "1.0.0-*",
"Microsoft.DotNet.TestFramework": { "target": "project" },
"Microsoft.DotNet.Cli.Utils": { "target": "project" },
"Microsoft.DotNet.ProjectModel": { "target": "project" },
"Microsoft.DotNet.InternalAbstractions": {
"target": "project",
"version": "1.0.0-*"
"target": "project"
}
},
"frameworks": {

2
test/dotnet-publish.Tests/project.json
View file

@ -6,7 +6,7 @@
"version": "1.0.0-rc2-*"
},
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",
"Microsoft.DotNet.TestFramework": "1.0.0-*",
"Microsoft.DotNet.TestFramework": { "target": "project" },
"Microsoft.DotNet.Tools.Tests.Utilities": {
"target": "project"
},

4
tools/MultiProjectValidator/project.json
View file

@ -6,8 +6,8 @@
},
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24027",
"Microsoft.DotNet.ProjectModel": "1.0.0-*",
"Microsoft.DotNet.Cli.Utils": "1.0.0-*"
"Microsoft.DotNet.ProjectModel": { "target": "project" },
"Microsoft.DotNet.Cli.Utils": { "target": "project" }
},
"frameworks": {
"netstandardapp1.5": {

4
tools/RuntimeGraphGenerator/project.json
View file

@ -8,8 +8,8 @@
"NuGet.Versioning": "3.5.0-beta",
"System.CommandLine": "0.1.0-e160119-1",
"System.Runtime.Serialization.Json": "4.0.2-rc2-24027",
"Microsoft.DotNet.ProjectModel": "1.0.0-*",
"Microsoft.DotNet.Cli.Utils": "1.0.0-*",
"Microsoft.DotNet.ProjectModel": { "target": "project" },
"Microsoft.DotNet.Cli.Utils": { "target": "project" },
"Microsoft.NETCore.ConsoleHost": "1.0.0-rc2-24027",
"NETStandard.Library": "1.5.0-rc2-24027"
},