KestrelHttpServer 765 B

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061
  1. commit 2d69698cfa5b051c5bf0f06ef10645c79214596d
  2. Author: Nate McMaster <[email protected]>
  3. Date: Mon Nov 20 16:05:56 2017 -0800
  4. Use MSBuild to set NuGet feeds instead of NuGet.config (#2176)
  5. diff --git a/Directory.Build.props b/Directory.Build.props
  6. index ebebe73c9cd..877639ff433 100644
  7. --- a/Directory.Build.props
  8. +++ b/Directory.Build.props
  9. @@ -1,10 +1,11 @@
  10. -<Project>
  11. +<Project>
  12. <Import
  13. Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), AspNetCoreSettings.props))\AspNetCoreSettings.props"
  14. Condition=" '$(CI)' != 'true' AND '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), AspNetCoreSettings.props))' != '' " />
  15. <Import Project="version.props" />
  16. <Import Project="build\dependencies.props" />
  17. + <Import Project="build\sources.props" />
  18. <PropertyGroup>
  19. <Product>Microsoft ASP.NET Core</Product>
  20. diff --git a/NuGet.config b/NuGet.config
  21. index 9d49a5334e8..e32bddfd514 100644
  22. --- a/NuGet.config
  23. +++ b/NuGet.config
  24. @@ -2,9 +2,6 @@
  25. <configuration>
  26. <packageSources>
  27. <clear />
  28. - <add key="AspNetCore" value="https://dotnet.myget.org/F/aspnetcore-ci-dev/api/v3/index.json" />
  29. - <add key="AspNetCoreTools" value="https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json" />
  30. - <add key="roslyn" value="https://dotnet.myget.org/F/roslyn/api/v3/index.json" />
  31. - <add key="NuGet" value="https://api.nuget.org/v3/index.json" />
  32. + <!-- Restore sources should be defined in build/sources.props. -->
  33. </packageSources>
  34. </configuration>
  35. diff --git a/build/sources.props b/build/sources.props
  36. new file mode 100644
  37. index 00000000000..e6a1c2b3581
  38. --- /dev/null
  39. +++ b/build/sources.props
  40. @@ -0,0 +1,17 @@
  41. +<Project>
  42. + <Import Project="$(DotNetRestoreSourcePropsPath)" Condition="'$(DotNetRestoreSourcePropsPath)' != ''"/>
  43. +
  44. + <PropertyGroup Label="RestoreSources">
  45. + <RestoreSources>$(DotNetRestoreSources)</RestoreSources>
  46. + <RestoreSources Condition="'$(DotNetBuildOffline)' != 'true' AND '$(AspNetUniverseBuildOffline)' != 'true' ">
  47. + $(RestoreSources);
  48. + https://dotnet.myget.org/F/aspnetcore-ci-dev/api/v3/index.json;
  49. + https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json;
  50. + https://dotnet.myget.org/F/roslyn/api/v3/index.json;
  51. + </RestoreSources>
  52. + <RestoreSources Condition="'$(DotNetBuildOffline)' != 'true'">
  53. + $(RestoreSources);
  54. + https://api.nuget.org/v3/index.json;
  55. + </RestoreSources>
  56. + </PropertyGroup>
  57. +</Project>