JavaScriptServices 289 B

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