From 0b55ca324b7152e644328674f99f61ae8f1a2972 Mon Sep 17 00:00:00 2001 From: Krzysztof Wicher Date: Wed, 13 Apr 2016 10:50:07 -0700 Subject: [PATCH] Remove appdepssdk from sdk directory --- scripts/dotnet-cli-build/CompileTargets.cs | 55 ---------------------- tools/appdep/project.json | 15 ------ 2 files changed, 70 deletions(-) delete mode 100644 tools/appdep/project.json diff --git a/scripts/dotnet-cli-build/CompileTargets.cs b/scripts/dotnet-cli-build/CompileTargets.cs index 17056f0f8..b2192c1b4 100644 --- a/scripts/dotnet-cli-build/CompileTargets.cs +++ b/scripts/dotnet-cli-build/CompileTargets.cs @@ -18,7 +18,6 @@ namespace Microsoft.DotNet.Cli.Build public class CompileTargets { 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 string[] BinariesForCoreHost = new[] @@ -533,13 +532,6 @@ namespace Microsoft.DotNet.Cli.Build File.Delete(compilersDeps); File.Delete(compilersRuntimeConfig); - // Copy AppDeps - var result = CopyAppDeps(c, outputDir); - if (!result.Success) - { - return result; - } - // Generate .version file var version = buildVersion.NuGetVersion; var content = $@"{c.BuildContext["CommitHash"]}{Environment.NewLine}{version}{Environment.NewLine}"; @@ -548,53 +540,6 @@ namespace Microsoft.DotNet.Cli.Build 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) { // Check if we need to skip crossgen diff --git a/tools/appdep/project.json b/tools/appdep/project.json deleted file mode 100644 index d0388306d..000000000 --- a/tools/appdep/project.json +++ /dev/null @@ -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" - } - } -}