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

Merge pull request #2471 from krwq/fix_2446

Browse source 
Remove appdepssdk from sdk directory
This commit is contained in:
Piotr Puszkiewicz 2016-04-13 16:32:29 -07:00
commit 3f7cd8853a
2 changed files with 0 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -18,7 +18,6 @@ namespace Microsoft.DotNet.Cli.Build
public class CompileTargets public class CompileTargets
{ {
public static readonly string CoreCLRVersion = "1.0.2-rc2-24008"; public static readonly string CoreCLRVersion = "1.0.2-rc2-24008";
public static readonly string AppDepSdkVersion = "1.0.6-prerelease-00003";
public static readonly bool IsWinx86 = CurrentPlatform.IsWindows && CurrentArchitecture.Isx86; public static readonly bool IsWinx86 = CurrentPlatform.IsWindows && CurrentArchitecture.Isx86;
public static readonly string[] BinariesForCoreHost = new[] public static readonly string[] BinariesForCoreHost = new[]
@ -533,13 +532,6 @@ namespace Microsoft.DotNet.Cli.Build
File.Delete(compilersDeps); File.Delete(compilersDeps);
File.Delete(compilersRuntimeConfig); File.Delete(compilersRuntimeConfig);
// Copy AppDeps
var result = CopyAppDeps(c, outputDir);
if (!result.Success)
{
return result;
}
// Generate .version file // Generate .version file
var version = buildVersion.NuGetVersion; var version = buildVersion.NuGetVersion;
var content = $@"{c.BuildContext["CommitHash"]}{Environment.NewLine}{version}{Environment.NewLine}"; var content = $@"{c.BuildContext["CommitHash"]}{Environment.NewLine}{version}{Environment.NewLine}";
@ -548,53 +540,6 @@ namespace Microsoft.DotNet.Cli.Build
return c.Success(); return c.Success();
} }
private static BuildTargetResult CopyAppDeps(BuildTargetContext c, string outputDir)
{
var appDepOutputDir = Path.Combine(outputDir, "appdepsdk");
Rmdir(appDepOutputDir);
Mkdirp(appDepOutputDir);
// Find toolchain package
string packageId;
if (CurrentPlatform.IsWindows)
{
if (CurrentArchitecture.Isx86)
{
// https://github.com/dotnet/cli/issues/1550
c.Warn("Native compilation is not yet working on Windows x86");
return c.Success();
}
packageId = "toolchain.win7-x64.Microsoft.DotNet.AppDep";
}
else if (CurrentPlatform.IsUbuntu)
{
packageId = "toolchain.ubuntu.14.04-x64.Microsoft.DotNet.AppDep";
}
else if (CurrentPlatform.IsCentOS || CurrentPlatform.IsRHEL || CurrentPlatform.IsDebian)
{
c.Warn($"Native compilation is not yet working on {CurrentPlatform.Current}");
return c.Success();
}
else if (CurrentPlatform.IsOSX)
{
packageId = "toolchain.osx.10.10-x64.Microsoft.DotNet.AppDep";
}
else
{
return c.Failed("Unsupported OS Platform");
}
var appDepPath = Path.Combine(
Dirs.NuGetPackages,
packageId,
AppDepSdkVersion);
CopyRecursive(appDepPath, appDepOutputDir, overwrite: true);
return c.Success();
}
public static BuildTargetResult CrossgenSharedFx(BuildTargetContext c, string pathToAssemblies) public static BuildTargetResult CrossgenSharedFx(BuildTargetContext c, string pathToAssemblies)
{ {
// Check if we need to skip crossgen // Check if we need to skip crossgen

15
tools/appdep/project.json
View file

@ -1,15 +0,0 @@
{
"version": "1.0.0-*",
"compilationOptions": {
"emitEntryPoint": true
},
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24008",
"Microsoft.DotNet.AppDep": "1.0.6-prerelease-00003"
},
"frameworks": {
"netstandardapp1.5": {
"imports": "dnxcore50"
}
}
}