diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 0b334d8a5..d467d2629 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -9,7 +9,7 @@ $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) 10.1.2-rtm-180131-0 - 2.7.0-beta3-62529-05 + 2.7.0-beta3-62612-07 $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) 15.5.0-preview-62518-04 @@ -45,7 +45,6 @@ $(MicrosoftNETTestSdkPackageVersion) 0.2.0-beta-000042 0.2.0 - 2.6.0-pre-20171122-1 diff --git a/build/Microsoft.DotNet.Cli.tasks b/build/Microsoft.DotNet.Cli.tasks index 1c846d8b0..901a48f84 100644 --- a/build/Microsoft.DotNet.Cli.tasks +++ b/build/Microsoft.DotNet.Cli.tasks @@ -1,7 +1,6 @@ - diff --git a/build_projects/dotnet-cli-build/AddToDeps.cs b/build_projects/dotnet-cli-build/AddToDeps.cs deleted file mode 100644 index ca02cd474..000000000 --- a/build_projects/dotnet-cli-build/AddToDeps.cs +++ /dev/null @@ -1,67 +0,0 @@ -// Copyright (c) .NET Foundation and contributors. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - -using System.IO; -using System.Linq; - -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; -using Microsoft.Extensions.DependencyModel; - -namespace Microsoft.DotNet.Cli.Build -{ - /// - /// Merges additional .deps.json files into target .deps.json files. - /// - public class AddToDeps : Task - { - /// - /// Paths to target .deps.json files, into which will be merged. - /// These files will be overwritten with the merge result. - /// - [Required] - public string[] TargetDeps { get; set; } - - /// - /// Paths to additional .deps.json files to merge into . - /// - [Required] - public string[] AdditionalDeps { get; set; } - - public override bool Execute() - { - DependencyContext additionalContext = Read(AdditionalDeps.First()); - - foreach (string additionalPath in AdditionalDeps.Skip(1)) - { - additionalContext = additionalContext.Merge(Read(additionalPath)); - } - - foreach (string targetPath in TargetDeps) - { - DependencyContext targetContext = Read(targetPath).Merge(additionalContext); - Write(targetContext, targetPath); - } - - return true; - } - - private static DependencyContext Read(string path) - { - using (FileStream stream = File.Open(path, FileMode.Open, FileAccess.Read, FileShare.Read)) - using (var reader = new DependencyContextJsonReader()) - { - return reader.Read(stream); - } - } - - private static void Write(DependencyContext context, string path) - { - using (FileStream stream = File.Open(path, FileMode.Create, FileAccess.Write, FileShare.Read)) - { - var writer = new DependencyContextWriter(); // unlike reader, writer is not disposable - writer.Write(context, stream); - } - } - } -} \ No newline at end of file diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj index 900d43f55..3879fe674 100644 --- a/src/redist/redist.csproj +++ b/src/redist/redist.csproj @@ -77,13 +77,11 @@ - - @@ -95,12 +93,7 @@ DestinationFile="%(RoslynRuntimeConfigs.Identity)" ReplacementPatterns="$(ReplacementPattern)" ReplacementStrings="$(ReplacementString)" /> - - - + - - - - - $(CliVersionPrefix) - $(CliTargetFramework) - $(MicrosoftNETCoreAppPackageVersion) - $(RoslynDirectory)/bincore - $(CommitCount) - false - false - false - - - - - - - - - - - - - - - - - - \ No newline at end of file