diff --git a/NuGet.config b/NuGet.config index 3957d769d2..0fd623ffdd 100644 --- a/NuGet.config +++ b/NuGet.config @@ -1,8 +1,6 @@  - - diff --git a/build.ps1 b/build.ps1 index 441eef967c..2ca2a1b31c 100644 --- a/build.ps1 +++ b/build.ps1 @@ -68,6 +68,6 @@ $env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 $dotnetHome = "$buildFolder\.dotnet" mkdir $dotnetHome -ErrorAction Ignore | Out-Null & .\dotnet-install.ps1 -Version $(Get-Content .\CliToolVersion.txt) -InstallDir $dotnetHome -& .\dotnet-install.ps1 -Version 1.1.0 -Channel release/1.1.0 -SharedRuntime -InstallDir $dotnetHome +& .\dotnet-install.ps1 -Version 1.1.0-preview1-001100-00 -Channel release/1.1.0 -SharedRuntime -InstallDir $dotnetHome &"$buildFile" $args \ No newline at end of file diff --git a/build.sh b/build.sh index cdfdace2ba..32e70da1a4 100755 --- a/build.sh +++ b/build.sh @@ -47,6 +47,6 @@ export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 dotnetHome="$buildFolder/.dotnet" mkdir -p $dotnetHome ./dotnet-install.sh --install-dir $dotnetHome --version $(cat CliToolVersion.txt) -./dotnet-install.sh --install-dir $dotnetHome --version 1.1.0 --channel release/1.1.0 --shared-runtime +./dotnet-install.sh --install-dir $dotnetHome --version 1.1.0-preview1-001100-00 --channel release/1.1.0 --shared-runtime $buildFile -r $repoFolder "$@" \ No newline at end of file diff --git a/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/TestProjects/AppWithDeps/NuGet.config b/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/TestProjects/AppWithDeps/NuGet.config new file mode 100644 index 0000000000..d8093c7fa9 --- /dev/null +++ b/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/TestProjects/AppWithDeps/NuGet.config @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/TestProjects/Dependency/NuGet.config b/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/TestProjects/Dependency/NuGet.config new file mode 100644 index 0000000000..d8093c7fa9 --- /dev/null +++ b/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/TestProjects/Dependency/NuGet.config @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/TestProjects/GlobbingApp/NuGet.config b/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/TestProjects/GlobbingApp/NuGet.config new file mode 100644 index 0000000000..d8093c7fa9 --- /dev/null +++ b/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/TestProjects/GlobbingApp/NuGet.config @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/TestProjects/NoDepsApp/NuGet.config b/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/TestProjects/NoDepsApp/NuGet.config new file mode 100644 index 0000000000..d8093c7fa9 --- /dev/null +++ b/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/TestProjects/NoDepsApp/NuGet.config @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/test/Microsoft.DotNet.Watcher.Tools.Tests/Utilities/TemporaryDirectory.cs b/test/Microsoft.DotNet.Watcher.Tools.Tests/Utilities/TemporaryDirectory.cs index ee90092e22..3ec8d6bbee 100644 --- a/test/Microsoft.DotNet.Watcher.Tools.Tests/Utilities/TemporaryDirectory.cs +++ b/test/Microsoft.DotNet.Watcher.Tools.Tests/Utilities/TemporaryDirectory.cs @@ -11,7 +11,7 @@ namespace Microsoft.DotNetWatcher.Tools.Tests { private List _projects = new List(); private List _subdirs = new List(); - private List _files = new List(); + private Dictionary _files = new Dictionary(); private TemporaryDirectory _parent; public TemporaryDirectory() @@ -47,9 +47,9 @@ namespace Microsoft.DotNetWatcher.Tools.Tests return project; } - public TemporaryDirectory WithFile(string name) + public TemporaryDirectory WithFile(string name, string contents = "") { - _files.Add(name); + _files[name] = contents; return this; } @@ -78,7 +78,7 @@ namespace Microsoft.DotNetWatcher.Tools.Tests foreach (var file in _files) { - CreateFile(file, string.Empty); + CreateFile(file.Key, file.Value); } }