huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove custom nuget feeds from main project feed config

This commit is contained in:
Nate McMaster 2016-11-01 18:20:21 -07:00
parent 6fd5e2ab52
commit d5c0c29a0c
8 changed files with 38 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NuGet.config
View File

@ -1,8 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<configuration> <configuration>
<packageSources> <packageSources>
<add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
<add key="nugetbuild" value="https://www.myget.org/F/nugetbuild/api/v3/index.json" />
<add key="AspNetCore" value="https://dotnet.myget.org/F/aspnetcore-ci-dev/api/v3/index.json" /> <add key="AspNetCore" value="https://dotnet.myget.org/F/aspnetcore-ci-dev/api/v3/index.json" />
<add key="NuGet" value="https://api.nuget.org/v3/index.json" /> <add key="NuGet" value="https://api.nuget.org/v3/index.json" />
</packageSources> </packageSources>

2
build.ps1
View File

@ -68,6 +68,6 @@ $env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
$dotnetHome = "$buildFolder\.dotnet" $dotnetHome = "$buildFolder\.dotnet"
mkdir $dotnetHome -ErrorAction Ignore | Out-Null mkdir $dotnetHome -ErrorAction Ignore | Out-Null
& .\dotnet-install.ps1 -Version $(Get-Content .\CliToolVersion.txt) -InstallDir $dotnetHome & .\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 &"$buildFile" $args

2
build.sh
View File

@ -47,6 +47,6 @@ export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
dotnetHome="$buildFolder/.dotnet" dotnetHome="$buildFolder/.dotnet"
mkdir -p $dotnetHome mkdir -p $dotnetHome
./dotnet-install.sh --install-dir $dotnetHome --version $(cat CliToolVersion.txt) ./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 "$@" $buildFile -r $repoFolder "$@"

8
test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/TestProjects/AppWithDeps/NuGet.config Normal file
View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<clear />
<add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
<add key="nugetbuild" value="https://www.myget.org/F/nugetbuild/api/v3/index.json" />
</packageSources>
</configuration>

8
test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/TestProjects/Dependency/NuGet.config Normal file
View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<clear />
<add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
<add key="nugetbuild" value="https://www.myget.org/F/nugetbuild/api/v3/index.json" />
</packageSources>
</configuration>

8
test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/TestProjects/GlobbingApp/NuGet.config Normal file
View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<clear />
<add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
<add key="nugetbuild" value="https://www.myget.org/F/nugetbuild/api/v3/index.json" />
</packageSources>
</configuration>

8
test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/TestProjects/NoDepsApp/NuGet.config Normal file
View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<clear />
<add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
<add key="nugetbuild" value="https://www.myget.org/F/nugetbuild/api/v3/index.json" />
</packageSources>
</configuration>

8
test/Microsoft.DotNet.Watcher.Tools.Tests/Utilities/TemporaryDirectory.cs
View File

@ -11,7 +11,7 @@ namespace Microsoft.DotNetWatcher.Tools.Tests
{ {
private List<TemporaryCSharpProject> _projects = new List<TemporaryCSharpProject>(); private List<TemporaryCSharpProject> _projects = new List<TemporaryCSharpProject>();
private List<TemporaryDirectory> _subdirs = new List<TemporaryDirectory>(); private List<TemporaryDirectory> _subdirs = new List<TemporaryDirectory>();
private List<string> _files = new List<string>(); private Dictionary<string, string> _files = new Dictionary<string, string>();
private TemporaryDirectory _parent; private TemporaryDirectory _parent;
public TemporaryDirectory() public TemporaryDirectory()
@ -47,9 +47,9 @@ namespace Microsoft.DotNetWatcher.Tools.Tests
return project; return project;
} }
public TemporaryDirectory WithFile(string name) public TemporaryDirectory WithFile(string name, string contents = "")
{ {
_files.Add(name); _files[name] = contents;
return this; return this;
} }
@ -78,7 +78,7 @@ namespace Microsoft.DotNetWatcher.Tools.Tests
foreach (var file in _files) foreach (var file in _files)
{ {
CreateFile(file, string.Empty); CreateFile(file.Key, file.Value);
} }
} }