From 7054992254e701a22db049e665d208b8a0d7e8e0 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Thu, 3 Nov 2016 12:15:04 -0700 Subject: [PATCH 01/12] Bump tools versions to 1.1.0 --- src/Microsoft.DotNet.Watcher.Tools/README.md | 6 ++---- src/Microsoft.DotNet.Watcher.Tools/project.json | 4 ++-- .../project.json | 4 ++-- src/Microsoft.Extensions.SecretManager.Tools/README.md | 2 +- src/Microsoft.Extensions.SecretManager.Tools/project.json | 4 ++-- .../project.json | 6 +++--- test/Microsoft.DotNet.Watcher.Tools.Tests/project.json | 6 +++--- .../project.json | 6 +++--- tools/NuGetPackager/project.json | 2 +- 9 files changed, 19 insertions(+), 21 deletions(-) diff --git a/src/Microsoft.DotNet.Watcher.Tools/README.md b/src/Microsoft.DotNet.Watcher.Tools/README.md index 7a21544e70..ce9b600099 100644 --- a/src/Microsoft.DotNet.Watcher.Tools/README.md +++ b/src/Microsoft.DotNet.Watcher.Tools/README.md @@ -6,13 +6,11 @@ dotnet-watch Add `Microsoft.DotNet.Watcher.Tools` to the `tools` section of your `project.json` file. -Use the version "1.0.0-preview2-final" if you are using .NET Core 1.0.0 and use "1.0.0-preview3-final" if you are using .NET Core 1.1.0. - -``` +```js { ... "tools": { - "Microsoft.DotNet.Watcher.Tools": "1.0.0-preview2-final" //"1.0.0-preview3-final" for .NET Core 1.1.0 + "Microsoft.DotNet.Watcher.Tools": "1.0.0-preview4-final" // "1.1.0-preview4-final" for .NET Core 1.1.0 } ... } diff --git a/src/Microsoft.DotNet.Watcher.Tools/project.json b/src/Microsoft.DotNet.Watcher.Tools/project.json index e54d7b3774..1f1fc0cf34 100644 --- a/src/Microsoft.DotNet.Watcher.Tools/project.json +++ b/src/Microsoft.DotNet.Watcher.Tools/project.json @@ -1,5 +1,5 @@ { - "version": "1.0.0-*", + "version": "1.1.0-*", "description": "Command line tool to watch for source file changes during development and restart the dotnet command.", "packOptions": { "tags": [ @@ -24,7 +24,7 @@ }, "Microsoft.NETCore.App": { "type": "platform", - "version": "1.1.0-*" + "version": "1.1.0" } }, "frameworks": { diff --git a/src/Microsoft.Extensions.Caching.SqlConfig.Tools/project.json b/src/Microsoft.Extensions.Caching.SqlConfig.Tools/project.json index b860143998..59a43e6049 100644 --- a/src/Microsoft.Extensions.Caching.SqlConfig.Tools/project.json +++ b/src/Microsoft.Extensions.Caching.SqlConfig.Tools/project.json @@ -1,5 +1,5 @@ { - "version": "1.0.0-*", + "version": "1.1.0-*", "buildOptions": { "outputName": "dotnet-sql-cache", "emitEntryPoint": true, @@ -23,7 +23,7 @@ "Microsoft.Extensions.Logging": "1.1.0-*", "Microsoft.Extensions.Logging.Console": "1.1.0-*", "Microsoft.NETCore.App": { - "version": "1.1.0-*", + "version": "1.1.0", "type": "platform" }, "System.Data.SqlClient": "4.3.0-*" diff --git a/src/Microsoft.Extensions.SecretManager.Tools/README.md b/src/Microsoft.Extensions.SecretManager.Tools/README.md index 088485fd7a..4d70d9280f 100644 --- a/src/Microsoft.Extensions.SecretManager.Tools/README.md +++ b/src/Microsoft.Extensions.SecretManager.Tools/README.md @@ -11,7 +11,7 @@ Add `Microsoft.Extensions.SecretManager.Tools` to the `tools` section of your `p { .. "tools": { - "Microsoft.Extensions.SecretManager.Tools": "1.0.0-*" + "Microsoft.Extensions.SecretManager.Tools": "1.0.0-preview4-final" // "1.1.0-preview4-final" for .NET Core 1.1.0 } ... } diff --git a/src/Microsoft.Extensions.SecretManager.Tools/project.json b/src/Microsoft.Extensions.SecretManager.Tools/project.json index 77d376be2d..03c1b8e582 100644 --- a/src/Microsoft.Extensions.SecretManager.Tools/project.json +++ b/src/Microsoft.Extensions.SecretManager.Tools/project.json @@ -1,5 +1,5 @@ { - "version": "1.0.0-*", + "version": "1.1.0-*", "buildOptions": { "outputName": "dotnet-user-secrets", "emitEntryPoint": true, @@ -23,7 +23,7 @@ "Microsoft.Extensions.Configuration.UserSecrets": "1.1.0-*", "Microsoft.Extensions.Logging": "1.1.0-*", "Microsoft.NETCore.App": { - "version": "1.1.0-*", + "version": "1.1.0", "type": "platform" }, "Newtonsoft.Json": "9.0.1", diff --git a/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/project.json b/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/project.json index ecaa2d4046..863b8e1819 100644 --- a/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/project.json +++ b/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/project.json @@ -12,7 +12,7 @@ "dependencies": { "dotnet-test-xunit": "2.2.0-*", "Microsoft.AspNetCore.Testing": "1.1.0-*", - "Microsoft.DotNet.Watcher.Tools": "1.0.0-*", + "Microsoft.DotNet.Watcher.Tools": "1.1.0-*", "Microsoft.Extensions.Process.Sources": { "type": "build", "version": "1.1.0-*" @@ -20,11 +20,11 @@ "xunit": "2.2.0-*" }, "frameworks": { - "netcoreapp1.0": { + "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.1.0-*" + "version": "1.1.0" } } } diff --git a/test/Microsoft.DotNet.Watcher.Tools.Tests/project.json b/test/Microsoft.DotNet.Watcher.Tools.Tests/project.json index a084f633f2..d94aba9a22 100644 --- a/test/Microsoft.DotNet.Watcher.Tools.Tests/project.json +++ b/test/Microsoft.DotNet.Watcher.Tools.Tests/project.json @@ -5,14 +5,14 @@ }, "dependencies": { "dotnet-test-xunit": "2.2.0-*", - "Microsoft.DotNet.Watcher.Tools": "1.0.0-*", + "Microsoft.DotNet.Watcher.Tools": "1.1.0-*", "xunit": "2.2.0-*" }, "frameworks": { - "netcoreapp1.0": { + "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { - "version": "1.1.0-*", + "version": "1.1.0", "type": "platform" } } diff --git a/test/Microsoft.Extensions.SecretManager.Tools.Tests/project.json b/test/Microsoft.Extensions.SecretManager.Tools.Tests/project.json index 537709e5c8..13397c8da3 100644 --- a/test/Microsoft.Extensions.SecretManager.Tools.Tests/project.json +++ b/test/Microsoft.Extensions.SecretManager.Tools.Tests/project.json @@ -5,15 +5,15 @@ }, "dependencies": { "dotnet-test-xunit": "2.2.0-*", - "Microsoft.Extensions.SecretManager.Tools": "1.0.0-*", + "Microsoft.Extensions.SecretManager.Tools": "1.1.0-*", "xunit": "2.2.0-*" }, "testRunner": "xunit", "frameworks": { - "netcoreapp1.0": { + "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { - "version": "1.1.0-*", + "version": "1.1.0", "type": "platform" } } diff --git a/tools/NuGetPackager/project.json b/tools/NuGetPackager/project.json index f42b3d92d0..cef67ac8f0 100644 --- a/tools/NuGetPackager/project.json +++ b/tools/NuGetPackager/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.1.0-*" + "version": "1.1.0" }, "Microsoft.DotNet.ProjectModel": "1.0.0-*", "Microsoft.DotNet.Cli.Utils": "1.0.0-*", From 42d8ccbc47e00803def90e2f34e193263e764011 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Thu, 3 Nov 2016 17:54:09 -0700 Subject: [PATCH 02/12] dotnet-watch: add extended help to clarify usage (#218) --- .../CommandLineOptions.cs | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/src/Microsoft.DotNet.Watcher.Tools/CommandLineOptions.cs b/src/Microsoft.DotNet.Watcher.Tools/CommandLineOptions.cs index dfd27756bd..61064652aa 100644 --- a/src/Microsoft.DotNet.Watcher.Tools/CommandLineOptions.cs +++ b/src/Microsoft.DotNet.Watcher.Tools/CommandLineOptions.cs @@ -26,7 +26,25 @@ namespace Microsoft.DotNet.Watcher FullName = "Microsoft DotNet File Watcher", Out = stdout, Error = stderr, - AllowArgumentSeparator = true + AllowArgumentSeparator = true, + ExtendedHelpText = @" +Remarks: + The special option '--' is used to delimit the end of the options and + the beginning of arguments that will be passed to the child dotnet process. + Its use is optional. When the special option '--' is not used, + dotnet-watch will use the first unrecognized argument as the beginning + of all arguments passed into the child dotnet process. + + For example: dotnet watch -- --verbose run + + Even though '--verbose' is an option dotnet-watch supports, the use of '--' + indicates that '--verbose' should be treated instead as an argument for + dotnet-run. + +Examples: + dotnet watch run + dotnet watch test +" }; app.HelpOption("-?|-h|--help"); From 8dc7ac8623de221b6acb7282052dcba9b32ec21a Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Fri, 4 Nov 2016 13:34:19 -0700 Subject: [PATCH 03/12] Add DOTNET_USE_POLLING_FILE_WATCHER to help output --- src/Microsoft.DotNet.Watcher.Tools/CommandLineOptions.cs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/Microsoft.DotNet.Watcher.Tools/CommandLineOptions.cs b/src/Microsoft.DotNet.Watcher.Tools/CommandLineOptions.cs index 61064652aa..ab120038c5 100644 --- a/src/Microsoft.DotNet.Watcher.Tools/CommandLineOptions.cs +++ b/src/Microsoft.DotNet.Watcher.Tools/CommandLineOptions.cs @@ -28,6 +28,13 @@ namespace Microsoft.DotNet.Watcher Error = stderr, AllowArgumentSeparator = true, ExtendedHelpText = @" +Environment variables: + + DOTNET_USE_POLLING_FILE_WATCHER + When set to '1' or 'true', dotnet-watch will poll the file system for + changes. This is required for some file systems, such as network shares, + Docker mounted volumes, and other virtual file systems. + Remarks: The special option '--' is used to delimit the end of the options and the beginning of arguments that will be passed to the child dotnet process. From 0b0abe054c9533e7486f1db9e26ede4e5d49880f Mon Sep 17 00:00:00 2001 From: Pranav K Date: Wed, 9 Nov 2016 11:30:11 -0800 Subject: [PATCH 04/12] Branching for 1.1.0 --- NuGet.config | 4 ++-- build.ps1 | 2 +- build.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0fd623ffdd..ad973186eb 100644 --- a/NuGet.config +++ b/NuGet.config @@ -1,7 +1,7 @@ - + - + diff --git a/build.ps1 b/build.ps1 index 8f2f99691a..24ca167cf6 100644 --- a/build.ps1 +++ b/build.ps1 @@ -33,7 +33,7 @@ cd $PSScriptRoot $repoFolder = $PSScriptRoot $env:REPO_FOLDER = $repoFolder -$koreBuildZip="https://github.com/aspnet/KoreBuild/archive/dev.zip" +$koreBuildZip="https://github.com/aspnet/KoreBuild/archive/rel/1.1.0.zip" if ($env:KOREBUILD_ZIP) { $koreBuildZip=$env:KOREBUILD_ZIP diff --git a/build.sh b/build.sh index f4208100eb..fea9ac64ad 100755 --- a/build.sh +++ b/build.sh @@ -2,7 +2,7 @@ repoFolder="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" cd $repoFolder -koreBuildZip="https://github.com/aspnet/KoreBuild/archive/dev.zip" +koreBuildZip="https://github.com/aspnet/KoreBuild/archive/rel/1.1.0.zip" if [ ! -z $KOREBUILD_ZIP ]; then koreBuildZip=$KOREBUILD_ZIP fi From 3461bf92c6206eb9e8af1b20e4e0f7576fa49cf8 Mon Sep 17 00:00:00 2001 From: Pranav K Date: Wed, 9 Nov 2016 15:06:21 -0800 Subject: [PATCH 05/12] Update versions --- src/Microsoft.DotNet.Watcher.Tools/project.json | 10 +++++----- .../project.json | 8 ++++---- .../project.json | 8 ++++---- test/Microsoft.DotNet.Watcher.Tools.Tests/project.json | 2 +- .../project.json | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/Microsoft.DotNet.Watcher.Tools/project.json b/src/Microsoft.DotNet.Watcher.Tools/project.json index 1f1fc0cf34..87cd228303 100644 --- a/src/Microsoft.DotNet.Watcher.Tools/project.json +++ b/src/Microsoft.DotNet.Watcher.Tools/project.json @@ -1,5 +1,5 @@ { - "version": "1.1.0-*", + "version": "1.2.0-*", "description": "Command line tool to watch for source file changes during development and restart the dotnet command.", "packOptions": { "tags": [ @@ -15,12 +15,12 @@ }, "dependencies": { "Microsoft.DotNet.Cli.Utils": "1.0.0-*", - "Microsoft.Extensions.CommandLineUtils": "1.1.0-*", - "Microsoft.Extensions.Logging": "1.1.0-*", - "Microsoft.Extensions.Logging.Console": "1.1.0-*", + "Microsoft.Extensions.CommandLineUtils": "1.2.0-*", + "Microsoft.Extensions.Logging": "1.2.0-*", + "Microsoft.Extensions.Logging.Console": "1.2.0-*", "Microsoft.Extensions.Process.Sources": { "type": "build", - "version": "1.1.0-*" + "version": "1.2.0-*" }, "Microsoft.NETCore.App": { "type": "platform", diff --git a/src/Microsoft.Extensions.Caching.SqlConfig.Tools/project.json b/src/Microsoft.Extensions.Caching.SqlConfig.Tools/project.json index 59a43e6049..34d531cfaa 100644 --- a/src/Microsoft.Extensions.Caching.SqlConfig.Tools/project.json +++ b/src/Microsoft.Extensions.Caching.SqlConfig.Tools/project.json @@ -1,5 +1,5 @@ { - "version": "1.1.0-*", + "version": "1.2.0-*", "buildOptions": { "outputName": "dotnet-sql-cache", "emitEntryPoint": true, @@ -19,9 +19,9 @@ ] }, "dependencies": { - "Microsoft.Extensions.CommandLineUtils": "1.1.0-*", - "Microsoft.Extensions.Logging": "1.1.0-*", - "Microsoft.Extensions.Logging.Console": "1.1.0-*", + "Microsoft.Extensions.CommandLineUtils": "1.2.0-*", + "Microsoft.Extensions.Logging": "1.2.0-*", + "Microsoft.Extensions.Logging.Console": "1.2.0-*", "Microsoft.NETCore.App": { "version": "1.1.0", "type": "platform" diff --git a/src/Microsoft.Extensions.SecretManager.Tools/project.json b/src/Microsoft.Extensions.SecretManager.Tools/project.json index 03c1b8e582..09c0bc0bc1 100644 --- a/src/Microsoft.Extensions.SecretManager.Tools/project.json +++ b/src/Microsoft.Extensions.SecretManager.Tools/project.json @@ -1,5 +1,5 @@ { - "version": "1.1.0-*", + "version": "1.2.0-*", "buildOptions": { "outputName": "dotnet-user-secrets", "emitEntryPoint": true, @@ -19,9 +19,9 @@ ] }, "dependencies": { - "Microsoft.Extensions.CommandLineUtils": "1.1.0-*", - "Microsoft.Extensions.Configuration.UserSecrets": "1.1.0-*", - "Microsoft.Extensions.Logging": "1.1.0-*", + "Microsoft.Extensions.CommandLineUtils": "1.2.0-*", + "Microsoft.Extensions.Configuration.UserSecrets": "1.2.0-*", + "Microsoft.Extensions.Logging": "1.2.0-*", "Microsoft.NETCore.App": { "version": "1.1.0", "type": "platform" diff --git a/test/Microsoft.DotNet.Watcher.Tools.Tests/project.json b/test/Microsoft.DotNet.Watcher.Tools.Tests/project.json index d94aba9a22..c5d2134078 100644 --- a/test/Microsoft.DotNet.Watcher.Tools.Tests/project.json +++ b/test/Microsoft.DotNet.Watcher.Tools.Tests/project.json @@ -5,7 +5,7 @@ }, "dependencies": { "dotnet-test-xunit": "2.2.0-*", - "Microsoft.DotNet.Watcher.Tools": "1.1.0-*", + "Microsoft.DotNet.Watcher.Tools": "1.2.0-*", "xunit": "2.2.0-*" }, "frameworks": { diff --git a/test/Microsoft.Extensions.SecretManager.Tools.Tests/project.json b/test/Microsoft.Extensions.SecretManager.Tools.Tests/project.json index 13397c8da3..bcfe3a83c2 100644 --- a/test/Microsoft.Extensions.SecretManager.Tools.Tests/project.json +++ b/test/Microsoft.Extensions.SecretManager.Tools.Tests/project.json @@ -5,7 +5,7 @@ }, "dependencies": { "dotnet-test-xunit": "2.2.0-*", - "Microsoft.Extensions.SecretManager.Tools": "1.1.0-*", + "Microsoft.Extensions.SecretManager.Tools": "1.2.0-*", "xunit": "2.2.0-*" }, "testRunner": "xunit", From 009609319e88c94e582b15f14fb5dff6767835d6 Mon Sep 17 00:00:00 2001 From: Pranav K Date: Thu, 10 Nov 2016 08:34:13 -0800 Subject: [PATCH 06/12] Fixing dependency versions --- .../project.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/project.json b/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/project.json index 863b8e1819..08b52f4060 100644 --- a/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/project.json +++ b/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/project.json @@ -11,11 +11,11 @@ }, "dependencies": { "dotnet-test-xunit": "2.2.0-*", - "Microsoft.AspNetCore.Testing": "1.1.0-*", - "Microsoft.DotNet.Watcher.Tools": "1.1.0-*", + "Microsoft.AspNetCore.Testing": "1.2.0-*", + "Microsoft.DotNet.Watcher.Tools": "1.2.0-*", "Microsoft.Extensions.Process.Sources": { "type": "build", - "version": "1.1.0-*" + "version": "1.2.0-*" }, "xunit": "2.2.0-*" }, From ae48d75e72a4a41c6c257482caf874c351e90a19 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Wed, 16 Nov 2016 11:13:34 -0800 Subject: [PATCH 07/12] Pin versions of dotnet packages --- src/Microsoft.DotNet.Watcher.Tools/project.json | 2 +- tools/NuGetPackager/project.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Microsoft.DotNet.Watcher.Tools/project.json b/src/Microsoft.DotNet.Watcher.Tools/project.json index 87cd228303..103eb90c0e 100644 --- a/src/Microsoft.DotNet.Watcher.Tools/project.json +++ b/src/Microsoft.DotNet.Watcher.Tools/project.json @@ -14,7 +14,7 @@ "keyFile": "../../tools/Key.snk" }, "dependencies": { - "Microsoft.DotNet.Cli.Utils": "1.0.0-*", + "Microsoft.DotNet.Cli.Utils": "1.0.0-preview2-1-003177", "Microsoft.Extensions.CommandLineUtils": "1.2.0-*", "Microsoft.Extensions.Logging": "1.2.0-*", "Microsoft.Extensions.Logging.Console": "1.2.0-*", diff --git a/tools/NuGetPackager/project.json b/tools/NuGetPackager/project.json index cef67ac8f0..2c858bd4ac 100644 --- a/tools/NuGetPackager/project.json +++ b/tools/NuGetPackager/project.json @@ -8,8 +8,8 @@ "type": "platform", "version": "1.1.0" }, - "Microsoft.DotNet.ProjectModel": "1.0.0-*", - "Microsoft.DotNet.Cli.Utils": "1.0.0-*", + "Microsoft.DotNet.ProjectModel": "1.0.0-rc3-1-003177", + "Microsoft.DotNet.Cli.Utils": "1.0.0-preview2-1-003177", "Microsoft.Extensions.CommandLineUtils": "1.1.0-*" }, From 40f042dc495f2ee4bbfbedfe0a9eb596ad5f30fd Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Fri, 18 Nov 2016 10:57:03 -0800 Subject: [PATCH 08/12] Clean tmp folder after unzipping KoreBuild --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index f4208100eb..4fd7ede788 100755 --- a/build.sh +++ b/build.sh @@ -38,7 +38,7 @@ if test ! -d $buildFolder; then chmod +x $buildFile # Cleanup - if test ! -d $tempFolder; then + if test -d $tempFolder; then rm -rf $tempFolder fi fi From e5c4e96705ed93aa923896c085d034f843f1baf4 Mon Sep 17 00:00:00 2001 From: "N. Taylor Mullen" Date: Wed, 23 Nov 2016 15:57:49 -0800 Subject: [PATCH 09/12] Pin global.json SDK to 1.0.0-preview2-1-003177. --- global.json | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/global.json b/global.json index 1920b5a762..67e54ff84b 100644 --- a/global.json +++ b/global.json @@ -1,3 +1,9 @@ { - "projects": [ "src", "test"] -} + "projects": [ + "src", + "test" + ], + "sdk": { + "version": "1.0.0-preview2-1-003177" + } +} \ No newline at end of file From f63006dc1a48a3db939f356204a4d6e50eb7e590 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Mon, 28 Nov 2016 16:39:14 -0800 Subject: [PATCH 10/12] Pack with NuGet 3.5.0 RTM --- tools/NuGetPackager/PackCommand.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/NuGetPackager/PackCommand.cs b/tools/NuGetPackager/PackCommand.cs index 687d0e0d64..264fb4af11 100644 --- a/tools/NuGetPackager/PackCommand.cs +++ b/tools/NuGetPackager/PackCommand.cs @@ -36,7 +36,7 @@ namespace NuGetPackager props += $";dep_{++idx}={depVersion}"; } - var buildCommand = Command.CreateDotNet("build", + var buildCommand = Command.CreateDotNet("build", new[] { project.ProjectFile.ProjectFilePath, "--configuration", config }, configuration: config); @@ -129,15 +129,15 @@ namespace NuGetPackager return Environment.GetEnvironmentVariable("KOREBUILD_NUGET_EXE"); } - var nugetPath = Path.Combine(_baseDir, ".build", "nuget.3.5.0-rc1.exe"); + var nugetPath = Path.Combine(_baseDir, ".build", "nuget.3.5.0.exe"); if (File.Exists(nugetPath)) { return nugetPath; } - Console.WriteLine("log : Downloading nuget.exe 3.5.0-rc1".Bold().Black()); - - var response = await new HttpClient().GetAsync("https://dist.nuget.org/win-x86-commandline/v3.5.0-rc1/NuGet.exe"); + Console.WriteLine("log : Downloading nuget.exe 3.5.0".Bold().Black()); + + var response = await new HttpClient().GetAsync("https://dist.nuget.org/win-x86-commandline/v3.5.0/NuGet.exe"); using (var file = new FileStream(nugetPath, FileMode.CreateNew)) { response.EnsureSuccessStatusCode(); From 00fc430658cb734338e87f6daf1edeaed8bbefe8 Mon Sep 17 00:00:00 2001 From: "N. Taylor Mullen" Date: Thu, 8 Dec 2016 10:02:26 -0800 Subject: [PATCH 11/12] Update .travis.yml osx image to xcode7.3. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a040cef874..94c466e49f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,7 @@ mono: os: - linux - osx -osx_image: xcode7.1 +osx_image: xcode7.3 branches: only: - master From c8b37f47d0f95f7fde490c45eafcfefa08d8210f Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Wed, 14 Dec 2016 16:34:19 -0800 Subject: [PATCH 12/12] Pin functional tests to preview2 of dotnet-cli --- .../Scenario/ProjectToolScenario.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/Scenario/ProjectToolScenario.cs b/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/Scenario/ProjectToolScenario.cs index c0c2ce0016..783f806aec 100644 --- a/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/Scenario/ProjectToolScenario.cs +++ b/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/Scenario/ProjectToolScenario.cs @@ -82,7 +82,7 @@ namespace Microsoft.DotNet.Watcher.Tools.FunctionalTests private void CreateTestDirectory() { Directory.CreateDirectory(WorkFolder); - File.WriteAllText(Path.Combine(WorkFolder, "global.json"), "{}"); + File.WriteAllText(Path.Combine(WorkFolder, "global.json"), "{\"sdk\": {\"version\":\"1.0.0-preview2-1-003177\"} }"); var nugetConfigFilePath = FindNugetConfig(); @@ -92,7 +92,7 @@ namespace Microsoft.DotNet.Watcher.Tools.FunctionalTests public Process ExecuteDotnetWatch(IEnumerable arguments, string workDir, IDictionary environmentVariables = null) { - // this launches a new .NET Core process using the runtime of the current test app + // this launches a new .NET Core process using the runtime of the current test app // and the version of dotnet-watch that this test app is compiled against var thisAssembly = Path.GetFileNameWithoutExtension(GetType().GetTypeInfo().Assembly.Location); var args = new List();