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

Install SharedHost before building shared framework

Browse source
This commit is contained in:
Piotr Puszkiewicz 2016-03-18 00:43:45 -07:00 committed by Bryan Thornbury
parent fc01ea60eb
commit 63585087f8
2 changed files with 38 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packaging/sharedframework/debian/dotnet-sharedframework-debian_config.json
View file

@ -3,7 +3,7 @@
"maintainer_email": "dotnetcore@microsoft.com", "maintainer_email": "dotnetcore@microsoft.com",
"package_name": "%SHARED_FRAMEWORK_DEBIAN_PACKAGE_NAME%", "package_name": "%SHARED_FRAMEWORK_DEBIAN_PACKAGE_NAME%",
"install_root": "/usr/share/dotnet", "install_root": "/usr/share/dotnet/shared/%SHARED_FRAMEWORK_NUGET_NAME%/%SHARED_FRAMEWORK_NUGET_VERSION%",
"short_description": ".NET Core Shared Framework %SHARED_FRAMEWORK_NUGET_NAME% %SHARED_FRAMEWORK_NUGET_VERSION%", "short_description": ".NET Core Shared Framework %SHARED_FRAMEWORK_NUGET_NAME% %SHARED_FRAMEWORK_NUGET_VERSION%",
"long_description": ".NET Core is a cross-platform implementation of .NET Framework, a modern, modular platform\n for building diverse kinds of applications, from command-line applications to microservices and \n modern websites.\n This package contains a runtime and framework which can be used by .NET Core applications.", "long_description": ".NET Core is a cross-platform implementation of .NET Framework, a modern, modular platform\n for building diverse kinds of applications, from command-line applications to microservices and \n modern websites.\n This package contains a runtime and framework which can be used by .NET Core applications.",

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

@ -21,7 +21,7 @@ namespace Microsoft.DotNet.Cli.Build
return c.Success(); return c.Success();
} }
[Target] [Target(nameof(InstallSharedFramework))]
[BuildPlatforms(BuildPlatform.Ubuntu)] [BuildPlatforms(BuildPlatform.Ubuntu)]
public static BuildTargetResult GenerateSdkDeb(BuildTargetContext c) public static BuildTargetResult GenerateSdkDeb(BuildTargetContext c)
{ {
@ -72,7 +72,7 @@ namespace Microsoft.DotNet.Cli.Build
return c.Success(); return c.Success();
} }
[Target] [Target(nameof(InstallSharedHost))]
[BuildPlatforms(BuildPlatform.Ubuntu)] [BuildPlatforms(BuildPlatform.Ubuntu)]
public static BuildTargetResult GenerateSharedFrameworkDeb(BuildTargetContext c) public static BuildTargetResult GenerateSharedFrameworkDeb(BuildTargetContext c)
{ {
@ -99,7 +99,7 @@ namespace Microsoft.DotNet.Cli.Build
return c.Success(); return c.Success();
} }
[Target(nameof(InstallPackages), [Target(nameof(InstallSDK),
nameof(RunE2ETest), nameof(RunE2ETest),
nameof(RemovePackages))] nameof(RemovePackages))]
[BuildPlatforms(BuildPlatform.Ubuntu)] [BuildPlatforms(BuildPlatform.Ubuntu)]
@ -109,22 +109,25 @@ namespace Microsoft.DotNet.Cli.Build
} }
[Target] [Target]
[BuildPlatforms(BuildPlatform.Ubuntu)] public static BuildTargetResult InstallSharedHost(BuildTargetContext c)
public static BuildTargetResult InstallPackages(BuildTargetContext c)
{ {
IEnumerable<string> orderedPackageFiles = new List<string>() InstallPackage(c.BuildContext.Get<string>("SharedHostInstallerFile"));
{
c.BuildContext.Get<string>("SharedHostInstallerFile"),
c.BuildContext.Get<string>("SharedFrameworkInstallerFile"),
c.BuildContext.Get<string>("SdkInstallerFile")
};
foreach(var fileName in orderedPackageFiles) return c.Success();
{ }
Cmd("sudo", "dpkg", "-i", fileName)
.Execute() [Target]
.EnsureSuccessful(); public static BuildTargetResult InstallSharedFramework(BuildTargetContext c)
} {
InstallPackage(c.BuildContext.Get<string>("SharedFrameworkInstallerFile"));
return c.Success();
}
[Target]
public static BuildTargetResult InstallSDK(BuildTargetContext c)
{
InstallPackage(c.BuildContext.Get<string>("SdkInstallerFile"));
return c.Success(); return c.Success();
} }
@ -152,21 +155,33 @@ namespace Microsoft.DotNet.Cli.Build
[BuildPlatforms(BuildPlatform.Ubuntu)] [BuildPlatforms(BuildPlatform.Ubuntu)]
public static BuildTargetResult RemovePackages(BuildTargetContext c) public static BuildTargetResult RemovePackages(BuildTargetContext c)
{ {
IEnumerable<string> orderedPackageFiles = new List<string>() IEnumerable<string> orderedPackageNames = new List<string>()
{ {
Monikers.GetDebianPackageName(c), Monikers.GetDebianPackageName(c),
Monikers.GetDebianSharedFrameworkPackageName(c), Monikers.GetDebianSharedFrameworkPackageName(c),
Monikers.GetDebianSharedHostPackageName(c) Monikers.GetDebianSharedHostPackageName(c)
}; };
foreach(var packageFile in orderedPackageFiles) foreach(var packageName in orderedPackageNames)
{ {
Cmd("sudo", "dpkg", "-r", packageFile) RemovePackage(packageName);
.Execute()
.EnsureSuccessful();
} }
return c.Success(); return c.Success();
} }
private static void InstallPackage(string packagePath)
{
Cmd("sudo", "dpkg", "-i", packagePath)
.Execute()
.EnsureSuccessful();
}
private static void RemovePackage(string packageName)
{
Cmd("sudo", "dpkg", "-r", packageName)
.Execute()
.EnsureSuccessful();
}
} }
} }