From 5d85223f2b92b64ce1827f757fc128f21fead977 Mon Sep 17 00:00:00 2001 From: "Ashish Jain (NUGET)" Date: Thu, 1 Jun 2017 17:55:51 -0700 Subject: [PATCH 1/9] Updated NuGet version for VS 15.3 preview3 release --- build/Microsoft.DotNet.Cli.DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Microsoft.DotNet.Cli.DependencyVersions.props b/build/Microsoft.DotNet.Cli.DependencyVersions.props index bed91539b..31347d2ed 100644 --- a/build/Microsoft.DotNet.Cli.DependencyVersions.props +++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props @@ -5,7 +5,7 @@ 15.3.0-preview-000246-05 2.0.0-rc5-61427-04 1.1.0-alpha-20170525-2 - 4.3.0-preview2-4082 + 4.3.0-preview2-4095 1.0.0-alpha-20170516-2-509 15.0.0 1.0.0-beta1-20170202-111 From 718b049ae95fd4f85cf595cb6491dbe3150ae65c Mon Sep 17 00:00:00 2001 From: Livar Date: Thu, 1 Jun 2017 21:31:14 -0700 Subject: [PATCH 2/9] Fixing test failure. NuGet changed how they display the error message. --- .../GivenDotnetMSBuildBuildsProjects.cs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/test/dotnet-msbuild.Tests/GivenDotnetMSBuildBuildsProjects.cs b/test/dotnet-msbuild.Tests/GivenDotnetMSBuildBuildsProjects.cs index 117f34bae..2199060cd 100644 --- a/test/dotnet-msbuild.Tests/GivenDotnetMSBuildBuildsProjects.cs +++ b/test/dotnet-msbuild.Tests/GivenDotnetMSBuildBuildsProjects.cs @@ -109,11 +109,7 @@ namespace Microsoft.DotNet.Cli.MSBuild.Tests result.Should().Fail(); - result.StdOut.Should() - .ContainVisuallySameFragment( -@"Feeds used: - /usr/local/bin - https://api.nuget.org/v3/index.json"); + result.StdOut.Should().ContainVisuallySameFragment(@"source(s): /usr/local/bin, nuget.org"); } [Fact] From 808ff7c6dbec232062f8f835a0061e0b99443cd9 Mon Sep 17 00:00:00 2001 From: Nikolche Kolev Date: Fri, 2 Jun 2017 17:04:57 -0700 Subject: [PATCH 3/9] Add restore force option --- .../commands/dotnet-restore/LocalizableStrings.cs | 3 +++ src/dotnet/commands/dotnet-restore/Program.cs | 10 ++++++++++ 2 files changed, 13 insertions(+) diff --git a/src/dotnet/commands/dotnet-restore/LocalizableStrings.cs b/src/dotnet/commands/dotnet-restore/LocalizableStrings.cs index ac3d8b115..c06b6b6b3 100644 --- a/src/dotnet/commands/dotnet-restore/LocalizableStrings.cs +++ b/src/dotnet/commands/dotnet-restore/LocalizableStrings.cs @@ -33,5 +33,8 @@ public const string CmdIgnoreFailedSourcesOptionDescription = "Treat package source failures as warnings."; public const string CmdNoDependenciesOptionDescription = "Set this flag to ignore project to project references and only restore the root project"; + + public const string CmdForceRestoreOptionDescription = "Set this flag to force all dependencies to be resolved even if the last restore was successful. This is equivalent to deleting project.assets.json."; + } } diff --git a/src/dotnet/commands/dotnet-restore/Program.cs b/src/dotnet/commands/dotnet-restore/Program.cs index fca6f25b8..53e138fb8 100644 --- a/src/dotnet/commands/dotnet-restore/Program.cs +++ b/src/dotnet/commands/dotnet-restore/Program.cs @@ -69,6 +69,11 @@ namespace Microsoft.DotNet.Tools.Restore "--no-dependencies", LocalizableStrings.CmdNoDependenciesOptionDescription, CommandOptionType.NoValue); + + var forceOption = cmd.Option( + $"-f|--force", + LocalizableStrings.CmdForceRestoreOptionDescription, + CommandOptionType.NoValue); CommandOption verbosityOption = MSBuildForwardingApp.AddVerbosityOption(cmd); @@ -120,6 +125,11 @@ namespace Microsoft.DotNet.Tools.Restore { msbuildArgs.Add($"/p:RestoreRecursive=false"); } + + if(forceOption.HasValue()) + { + msbuildArgs.Add($"/p:RestoreForce=true"); + } if (verbosityOption.HasValue()) { From 2ef5470bb0b489b6849e89902135394eaf958be2 Mon Sep 17 00:00:00 2001 From: Justin Emgarten Date: Wed, 7 Jun 2017 01:47:24 -0700 Subject: [PATCH 4/9] Updating NuGet to 4.3.0-preview3-4146 --- build/Microsoft.DotNet.Cli.DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Microsoft.DotNet.Cli.DependencyVersions.props b/build/Microsoft.DotNet.Cli.DependencyVersions.props index 31347d2ed..140b26274 100644 --- a/build/Microsoft.DotNet.Cli.DependencyVersions.props +++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props @@ -5,7 +5,7 @@ 15.3.0-preview-000246-05 2.0.0-rc5-61427-04 1.1.0-alpha-20170525-2 - 4.3.0-preview2-4095 + 4.3.0-preview3-4146 1.0.0-alpha-20170516-2-509 15.0.0 1.0.0-beta1-20170202-111 From 8b18eb2bd17c826cc5e6b994638110fd34764b7b Mon Sep 17 00:00:00 2001 From: Rainer Sigwald Date: Wed, 7 Jun 2017 14:13:58 -0500 Subject: [PATCH 5/9] MSBuild 15.3.378 --- build/Microsoft.DotNet.Cli.DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Microsoft.DotNet.Cli.DependencyVersions.props b/build/Microsoft.DotNet.Cli.DependencyVersions.props index 140b26274..661765df5 100644 --- a/build/Microsoft.DotNet.Cli.DependencyVersions.props +++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props @@ -2,7 +2,7 @@ 1.1.2 - 15.3.0-preview-000246-05 + 15.3.0-preview-000378-01 2.0.0-rc5-61427-04 1.1.0-alpha-20170525-2 4.3.0-preview3-4146 From 3fcad733b39963a73913539891be9d207f2d7b69 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Wed, 7 Jun 2017 17:33:01 -0700 Subject: [PATCH 6/9] Updating the 1.1.0 branding to preview1, from rc4, which we inherited from 1.0 when we branched. And updating the SDK version. --- branchinfo.txt | 2 +- build/Microsoft.DotNet.Cli.DependencyVersions.props | 2 +- packaging/windows/clisdk/registrykeys.wxs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/branchinfo.txt b/branchinfo.txt index d138bff9b..890a7e809 100644 --- a/branchinfo.txt +++ b/branchinfo.txt @@ -4,6 +4,6 @@ MAJOR_VERSION=1 MINOR_VERSION=1 PATCH_VERSION=0 -RELEASE_SUFFIX=rc4 +RELEASE_SUFFIX=preview1 CHANNEL=rel-1.1.0 BRANCH_NAME=rel/1.1.0 diff --git a/build/Microsoft.DotNet.Cli.DependencyVersions.props b/build/Microsoft.DotNet.Cli.DependencyVersions.props index 140b26274..16cce027f 100644 --- a/build/Microsoft.DotNet.Cli.DependencyVersions.props +++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props @@ -4,7 +4,7 @@ 1.1.2 15.3.0-preview-000246-05 2.0.0-rc5-61427-04 - 1.1.0-alpha-20170525-2 + 1.1.0-alpha-20170607-4 4.3.0-preview3-4146 1.0.0-alpha-20170516-2-509 15.0.0 diff --git a/packaging/windows/clisdk/registrykeys.wxs b/packaging/windows/clisdk/registrykeys.wxs index 9db1d2115..0510d67f0 100644 --- a/packaging/windows/clisdk/registrykeys.wxs +++ b/packaging/windows/clisdk/registrykeys.wxs @@ -10,7 +10,7 @@ - + From 49ebc73ffca106b7d660bbe43201ac281ade6e0e Mon Sep 17 00:00:00 2001 From: Ankit Mishra Date: Fri, 9 Jun 2017 12:39:10 -0700 Subject: [PATCH 7/9] Changing NuGet version to Preview3-4154 --- build/Microsoft.DotNet.Cli.DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Microsoft.DotNet.Cli.DependencyVersions.props b/build/Microsoft.DotNet.Cli.DependencyVersions.props index d05be95cd..4b29ad70d 100644 --- a/build/Microsoft.DotNet.Cli.DependencyVersions.props +++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props @@ -5,7 +5,7 @@ 15.3.0-preview-000378-01 2.0.0-rc5-61427-04 1.1.0-alpha-20170607-4 - 4.3.0-preview3-4146 + 4.3.0-preview3-4154 1.0.0-alpha-20170516-2-509 15.0.0 1.0.0-beta1-20170202-111 From 00c5872009154f3508e3a63be2834d9e380830e1 Mon Sep 17 00:00:00 2001 From: Livar Date: Fri, 9 Jun 2017 15:33:57 -0700 Subject: [PATCH 8/9] Updating MSBuild to 15.3.0-preview-000384-01 --- build/Microsoft.DotNet.Cli.DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Microsoft.DotNet.Cli.DependencyVersions.props b/build/Microsoft.DotNet.Cli.DependencyVersions.props index 4b29ad70d..679027f5b 100644 --- a/build/Microsoft.DotNet.Cli.DependencyVersions.props +++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props @@ -2,7 +2,7 @@ 1.1.2 - 15.3.0-preview-000378-01 + 15.3.0-preview-000384-01 2.0.0-rc5-61427-04 1.1.0-alpha-20170607-4 4.3.0-preview3-4154 From d1d5743cc7cdd5f0dbb1f4497033c3211d7978d9 Mon Sep 17 00:00:00 2001 From: Livar Date: Sun, 11 Jun 2017 00:11:13 -0700 Subject: [PATCH 9/9] Another update to MSBuild. To 15.3.0-preview-000385-01. --- build/Microsoft.DotNet.Cli.DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Microsoft.DotNet.Cli.DependencyVersions.props b/build/Microsoft.DotNet.Cli.DependencyVersions.props index 679027f5b..037e01639 100644 --- a/build/Microsoft.DotNet.Cli.DependencyVersions.props +++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props @@ -2,7 +2,7 @@ 1.1.2 - 15.3.0-preview-000384-01 + 15.3.0-preview-000385-01 2.0.0-rc5-61427-04 1.1.0-alpha-20170607-4 4.3.0-preview3-4154