| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566 |
- commit 145f645bcf578c1cf9861b03b68844d2b9019297
- Author: Nate McMaster <[email protected]>
- Date: Mon Nov 20 15:22:19 2017 -0800
- Use MSBuild to set NuGet feeds instead of NuGet.config (#1506)
- diff --git a/Directory.Build.props b/Directory.Build.props
- index 229bc63ba1c..9747c06c99f 100644
- --- a/Directory.Build.props
- +++ b/Directory.Build.props
- @@ -5,6 +5,7 @@
-
- <Import Project="version.props" />
- <Import Project="build\dependencies.props" />
- + <Import Project="build\sources.props" />
-
- <PropertyGroup>
- <Product>Microsoft ASP.NET Core</Product>
- diff --git a/NuGet.config b/NuGet.config
- index 4e8a1f6de15..e32bddfd514 100644
- --- a/NuGet.config
- +++ b/NuGet.config
- @@ -2,8 +2,6 @@
- <configuration>
- <packageSources>
- <clear />
- - <add key="AspNetCore" value="https://dotnet.myget.org/F/aspnetcore-ci-dev/api/v3/index.json" />
- - <add key="AspNetCoreTools" value="https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json" />
- - <add key="NuGet" value="https://api.nuget.org/v3/index.json" />
- + <!-- Restore sources should be defined in build/sources.props. -->
- </packageSources>
- </configuration>
- diff --git a/build/sources.props b/build/sources.props
- new file mode 100644
- index 00000000000..c03f3ddb606
- --- /dev/null
- +++ b/build/sources.props
- @@ -0,0 +1,16 @@
- +<Project>
- + <Import Project="$(DotNetRestoreSourcePropsPath)" Condition="'$(DotNetRestoreSourcePropsPath)' != ''"/>
- +
- + <PropertyGroup Label="RestoreSources">
- + <RestoreSources>$(DotNetRestoreSources)</RestoreSources>
- + <RestoreSources Condition="'$(DotNetBuildOffline)' != 'true' AND '$(AspNetUniverseBuildOffline)' != 'true' ">
- + $(RestoreSources);
- + https://dotnet.myget.org/F/aspnetcore-ci-dev/api/v3/index.json;
- + https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json;
- + </RestoreSources>
- + <RestoreSources Condition="'$(DotNetBuildOffline)' != 'true'">
- + $(RestoreSources);
- + https://api.nuget.org/v3/index.json;
- + </RestoreSources>
- + </PropertyGroup>
- +</Project>
- diff --git a/src/Microsoft.AspNetCore.Identity.Service.Specification.Tests/NuGet.config b/src/Microsoft.AspNetCore.Identity.Service.Specification.Tests/NuGet.config
- deleted file mode 100644
- index 7be9c71eca9..00000000000
- --- a/src/Microsoft.AspNetCore.Identity.Service.Specification.Tests/NuGet.config
- +++ /dev/null
- @@ -1,6 +0,0 @@
- -<?xml version="1.0" encoding="utf-8"?>
- -<configuration>
- - <packageSources>
- - <add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
- - </packageSources>
- -</configuration>
|