Fix up the merge so it gets past Prepare and Compile.

2017-02-08 12:26:04 -06:00 · 2017-02-08 12:26:04 -06:00 · 56d391caad
commit 56d391caad
parent b0a5d53ed5
218 changed files with 0 additions and 71957 deletions
--- a/build_projects/dotnet-cli-build/GenerateNuGetPackagesArchiveVersion.cs
+++ b/build_projects/dotnet-cli-build/GenerateNuGetPackagesArchiveVersion.cs
@ -21,9 +21,6 @@ namespace Microsoft.DotNet.Cli.Build
        [Required]
        public string ToolPath { get; set; }

-        [Required]
-        public string SharedFrameworkVersion { get; set; }
-
        [Output]
        public String Version { get; set; }