BasicMiddleware 289 B

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