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

Sync build_projects/shared-build-targets-utils with Core-Setup

Browse source
This commit is contained in:
Bryan Thornbury 2016-05-27 13:24:39 -07:00
parent c1bbdbf1ea
commit f31472764f
11 changed files with 60 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

6
build_projects/shared-build-targets-utils/DependencyVersions.cs
View file

@ -8,11 +8,5 @@ namespace Microsoft.DotNet.Cli.Build
public class DependencyVersions
{
public static readonly string CoreCLRVersion = "1.0.2-rc3-24127-00";
public static readonly string SharedFrameworkVersion = "1.0.0-rc3-004324";
public static readonly string SharedHostVersion = "1.0.1-rc3-004324-00";
public static readonly string SharedFrameworkChannel = "preview";
public static readonly string SharedHostChannel = "preview";
}
}

4
build_projects/shared-build-targets-utils/Utils/Dirs.cs
View file

@ -8,6 +8,8 @@ namespace Microsoft.DotNet.Cli.Build
public static class Dirs
{
public static readonly string RepoRoot = Directory.GetCurrentDirectory();
public static readonly string DebPackagingConfig = Path.Combine(Dirs.RepoRoot, "packaging", "deb");
public static readonly string Output = Path.Combine(
RepoRoot,
"artifacts",
@ -27,8 +29,6 @@ namespace Microsoft.DotNet.Cli.Build
public static readonly string CorehostLocked = Path.Combine(Output, "corehost", "locked");
public static readonly string CorehostLocalPackages = Path.Combine(Output, "corehost");
public static readonly string CorehostDummyPackages = Path.Combine(Output, "corehostdummypackages");
public static readonly string CoreSetupDownload = Path.Combine(Intermediate, "coreSetupDownload", DependencyVersions.SharedFrameworkVersion);
public static readonly string SharedFrameworkPublish = Path.Combine(Intermediate, "sharedFrameworkPublish");
public static readonly string TestOutput = Path.Combine(Output, "tests");
public static readonly string TestArtifacts = Path.Combine(TestOutput, "artifacts");

4
build_projects/shared-build-targets-utils/Utils/Monikers.cs
View file

@ -68,10 +68,8 @@ namespace Microsoft.DotNet.Cli.Build
return $"{packagePrefix}-dev-{nugetVersion}";
}
public static string GetDebianSharedFrameworkPackageName(BuildTargetContext c)
public static string GetDebianSharedFrameworkPackageName(string sharedFrameworkNugetVersion)
{
var sharedFrameworkNugetVersion = DependencyVersions.SharedFrameworkVersion;
return $"dotnet-sharedframework-{SharedFrameworkName}-{sharedFrameworkNugetVersion}".ToLower();
}