diff --git a/scripts/dotnet-cli-build/CompileTargets.cs b/scripts/dotnet-cli-build/CompileTargets.cs index 2382d68ab..6675b8cbf 100644 --- a/scripts/dotnet-cli-build/CompileTargets.cs +++ b/scripts/dotnet-cli-build/CompileTargets.cs @@ -265,7 +265,6 @@ namespace Microsoft.DotNet.Cli.Build // Rename the .deps file var destinationDeps = Path.Combine(SharedFrameworkNameAndVersionRoot, $"{SharedFrameworkName}.deps.json"); - File.Move(Path.Combine(SharedFrameworkNameAndVersionRoot, "framework.deps"), Path.Combine(SharedFrameworkNameAndVersionRoot, $"{SharedFrameworkName}.deps")); File.Move(Path.Combine(SharedFrameworkNameAndVersionRoot, "framework.deps.json"), destinationDeps); // Generate RID fallback graph diff --git a/src/Microsoft.DotNet.Compiler.Common/Executable.cs b/src/Microsoft.DotNet.Compiler.Common/Executable.cs index 004081b93..ac922459d 100644 --- a/src/Microsoft.DotNet.Compiler.Common/Executable.cs +++ b/src/Microsoft.DotNet.Compiler.Common/Executable.cs @@ -201,11 +201,6 @@ namespace Microsoft.Dotnet.Cli.Compiler.Common { Directory.CreateDirectory(_runtimeOutputPath); - var depsFilePath = Path.Combine(_runtimeOutputPath, _compilerOptions.OutputName + FileNameSuffixes.Deps); - File.WriteAllLines(depsFilePath, exporter - .GetDependencies(LibraryType.Package) - .SelectMany(GenerateLines)); - var includeCompile = _compilerOptions.PreserveCompilationContext == true; var exports = exporter.GetAllExports().ToArray(); @@ -253,25 +248,5 @@ namespace Microsoft.Dotnet.Cli.Compiler.Common appConfig.Save(stream); } } - - private static IEnumerable GenerateLines(LibraryExport export) - { - return GenerateLines(export, export.RuntimeAssemblyGroups.GetDefaultAssets(), "runtime") - .Union(GenerateLines(export, export.NativeLibraryGroups.GetDefaultAssets(), "native")); - } - - private static IEnumerable GenerateLines(LibraryExport export, IEnumerable items, string type) - { - return items.Select(i => DepsFormatter.EscapeRow(new[] - { - export.Library.Identity.Type.Value, - export.Library.Identity.Name, - export.Library.Identity.Version.ToNormalizedString(), - export.Library.Hash, - type, - i.Name, - i.RelativePath - })); - } } } diff --git a/src/Microsoft.DotNet.ProjectModel/FileNameSuffixes.cs b/src/Microsoft.DotNet.ProjectModel/FileNameSuffixes.cs index 09399b100..404a25744 100644 --- a/src/Microsoft.DotNet.ProjectModel/FileNameSuffixes.cs +++ b/src/Microsoft.DotNet.ProjectModel/FileNameSuffixes.cs @@ -5,7 +5,6 @@ namespace Microsoft.DotNet.ProjectModel { public static class FileNameSuffixes { - public const string Deps = ".deps"; public const string DepsJson = ".deps.json"; public const string RuntimeConfigJson = ".runtimeconfig.json"; public const string RuntimeConfigDevJson = ".runtimeconfig.dev.json"; diff --git a/src/Microsoft.DotNet.ProjectModel/RuntimeOutputFiles.cs b/src/Microsoft.DotNet.ProjectModel/RuntimeOutputFiles.cs index 0d1dab480..82b65e3be 100644 --- a/src/Microsoft.DotNet.ProjectModel/RuntimeOutputFiles.cs +++ b/src/Microsoft.DotNet.ProjectModel/RuntimeOutputFiles.cs @@ -44,14 +44,6 @@ namespace Microsoft.DotNet.ProjectModel } } - public string Deps - { - get - { - return Path.ChangeExtension(Assembly, FileNameSuffixes.Deps); - } - } - public string DepsJson { get @@ -84,7 +76,6 @@ namespace Microsoft.DotNet.ProjectModel { if (!Framework.IsDesktop()) { - yield return Deps; yield return DepsJson; yield return RuntimeConfigJson; } diff --git a/src/dotnet/commands/dotnet-publish/PublishCommand.cs b/src/dotnet/commands/dotnet-publish/PublishCommand.cs index 5e91a6dce..9fb175ed7 100644 --- a/src/dotnet/commands/dotnet-publish/PublishCommand.cs +++ b/src/dotnet/commands/dotnet-publish/PublishCommand.cs @@ -183,7 +183,6 @@ namespace Microsoft.DotNet.Tools.Publish var buildOutputPaths = context.GetOutputPaths(configuration, buildBasePath); PublishFiles( new[] { - buildOutputPaths.RuntimeFiles.Deps, buildOutputPaths.RuntimeFiles.DepsJson, buildOutputPaths.RuntimeFiles.RuntimeConfigJson }, diff --git a/test/dotnet-build.Tests/BuildOutputTests.cs b/test/dotnet-build.Tests/BuildOutputTests.cs index dae4de553..4d219c3b8 100644 --- a/test/dotnet-build.Tests/BuildOutputTests.cs +++ b/test/dotnet-build.Tests/BuildOutputTests.cs @@ -26,7 +26,6 @@ namespace Microsoft.DotNet.Tools.Builder.Tests "TestApp" + FileNameSuffixes.DotNet.DynamicLib, "TestApp" + FileNameSuffixes.DotNet.ProgramDatabase, "TestApp" + FileNameSuffixes.CurrentPlatform.Exe, - "TestApp" + FileNameSuffixes.Deps, "TestApp" + FileNameSuffixes.DepsJson, "TestLibrary" + FileNameSuffixes.DotNet.DynamicLib, "TestLibrary" + FileNameSuffixes.DotNet.ProgramDatabase diff --git a/test/dotnet-build.Tests/BuildPortableTests.cs b/test/dotnet-build.Tests/BuildPortableTests.cs index 01ada2965..8653978f4 100644 --- a/test/dotnet-build.Tests/BuildPortableTests.cs +++ b/test/dotnet-build.Tests/BuildPortableTests.cs @@ -7,15 +7,7 @@ namespace Microsoft.DotNet.Tools.Builder.Tests { public class BuildPortableTests : TestBase { - [Fact] - public void BuildingAPortableProjectProducesDepsFile() - { - var testInstance = TestAssetsManager.CreateTestInstance("PortableTests").WithLockFiles(); - - var netstandardappOutput = Build(testInstance); - - netstandardappOutput.Should().Exist().And.HaveFile("PortableApp.deps"); - } + [Fact] public void BuildingAPortableProjectProducesDepsJsonFile() diff --git a/test/dotnet-compile.Tests/CompilerTests.cs b/test/dotnet-compile.Tests/CompilerTests.cs index 79afaa837..3151c0230 100644 --- a/test/dotnet-compile.Tests/CompilerTests.cs +++ b/test/dotnet-compile.Tests/CompilerTests.cs @@ -202,7 +202,7 @@ namespace Microsoft.DotNet.Tools.Compiler.Tests new DirectoryInfo(outputDir).Should().HaveFiles( new [] { "MyApp.dll", "MyApp" + buildCommand.GetExecutableExtension(), - "MyApp.runtimeconfig.json", "MyApp.deps", "MyApp.deps.json" }); + "MyApp.runtimeconfig.json", "MyApp.deps.json" }); } private void CopyProjectToTempDir(string projectDir, TempDirectory tempDir) diff --git a/test/dotnet-publish.Tests/PublishPortableTests.cs b/test/dotnet-publish.Tests/PublishPortableTests.cs index 8f11fd470..8a551e6ca 100644 --- a/test/dotnet-publish.Tests/PublishPortableTests.cs +++ b/test/dotnet-publish.Tests/PublishPortableTests.cs @@ -29,7 +29,6 @@ namespace Microsoft.DotNet.Tools.Publish.Tests publishDir.Should().HaveFiles(new[] { "PortableAppWithNative.dll", - "PortableAppWithNative.deps", "PortableAppWithNative.deps.json" }); @@ -66,7 +65,6 @@ namespace Microsoft.DotNet.Tools.Publish.Tests publishDir.Should().HaveFiles(new[] { "PortableAppWithIntentionalManagedDowngrade.dll", - "PortableAppWithIntentionalManagedDowngrade.deps", "PortableAppWithIntentionalManagedDowngrade.deps.json", "System.Linq.dll" }); diff --git a/test/dotnet-publish.Tests/PublishTests.cs b/test/dotnet-publish.Tests/PublishTests.cs index 2a55c899d..7aa760807 100644 --- a/test/dotnet-publish.Tests/PublishTests.cs +++ b/test/dotnet-publish.Tests/PublishTests.cs @@ -125,7 +125,6 @@ namespace Microsoft.DotNet.Tools.Publish.Tests publishCommand.GetOutputDirectory().Should().HaveFile("TestLibraryLesser.dll"); publishCommand.GetOutputDirectory().Should().HaveFile("TestLibraryLesser.pdb"); publishCommand.GetOutputDirectory().Should().HaveFile("TestLibraryLesser.dll.config"); - publishCommand.GetOutputDirectory().Should().NotHaveFile("TestLibraryLesser.deps"); publishCommand.GetOutputDirectory().Should().NotHaveFile("TestLibraryLesser.deps.json"); // dependencies should also be copied @@ -138,7 +137,6 @@ namespace Microsoft.DotNet.Tools.Publish.Tests publishCommand.GetOutputDirectory().Should().HaveFile("TestLibraryLesser.dll"); publishCommand.GetOutputDirectory().Should().HaveFile("TestLibraryLesser.pdb"); publishCommand.GetOutputDirectory().Should().NotHaveFile("TestLibraryLesser.dll.config"); - publishCommand.GetOutputDirectory().Should().HaveFile("TestLibraryLesser.deps"); publishCommand.GetOutputDirectory().Should().HaveFile("TestLibraryLesser.deps.json"); // dependencies should also be copied