| 12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061 |
- commit 2d69698cfa5b051c5bf0f06ef10645c79214596d
- Author: Nate McMaster <[email protected]>
- Date: Mon Nov 20 16:05:56 2017 -0800
- Use MSBuild to set NuGet feeds instead of NuGet.config (#2176)
- diff --git a/Directory.Build.props b/Directory.Build.props
- index ebebe73c9cd..877639ff433 100644
- --- a/Directory.Build.props
- +++ b/Directory.Build.props
- @@ -1,10 +1,11 @@
- -<Project>
- +<Project>
- <Import
- Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), AspNetCoreSettings.props))\AspNetCoreSettings.props"
- Condition=" '$(CI)' != 'true' AND '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), AspNetCoreSettings.props))' != '' " />
-
- <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 9d49a5334e8..e32bddfd514 100644
- --- a/NuGet.config
- +++ b/NuGet.config
- @@ -2,9 +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="roslyn" value="https://dotnet.myget.org/F/roslyn/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..e6a1c2b3581
- --- /dev/null
- +++ b/build/sources.props
- @@ -0,0 +1,17 @@
- +<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;
- + https://dotnet.myget.org/F/roslyn/api/v3/index.json;
- + </RestoreSources>
- + <RestoreSources Condition="'$(DotNetBuildOffline)' != 'true'">
- + $(RestoreSources);
- + https://api.nuget.org/v3/index.json;
- + </RestoreSources>
- + </PropertyGroup>
- +</Project>
|