Skip to content
This repository was archived by the owner on Dec 14, 2018. It is now read-only.

Commit bf7c9e0

Browse files
author
Nate McMaster
committed
Use MSBuild to set NuGet feeds instead of NuGet.config
1 parent fb142f0 commit bf7c9e0

File tree

5 files changed

+18
-6
lines changed

5 files changed

+18
-6
lines changed

Directory.Build.targets

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<Project>
2+
<Import Project="build\sources.props" />
23
<Import Project="build\dependencies.props" />
34
<Import Project="build\dependencies.targets" />
45
<Import Project="build\dependencies.g.targets" Condition="Exists('build\dependencies.g.targets') AND '$(DesignTimeBuild)' != 'true'" />

NuGet.config

+1-4
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
<configuration>
33
<packageSources>
44
<clear />
5-
<add key="AspNetCorePatch" value="https://dotnet.myget.org/F/aspnet-2-0-2-october2017-patch/api/v3/index.json" />
6-
<add key="AspNetCore" value="https://dotnet.myget.org/F/aspnetcore-master/api/v3/index.json" />
7-
<add key="AspNetCoreTools" value="https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json" />
8-
<add key="NuGet" value="https://api.nuget.org/v3/index.json" />
5+
<!-- Restore sources should be defined in build/sources.props. -->
96
</packageSources>
107
</configuration>

build/dependencies.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
<BenchmarkDotNetVersion>0.10.3</BenchmarkDotNetVersion>
55
<CoreFxVersion>4.4.0</CoreFxVersion>
66
<DiagnosticSourceVersion>4.4.1</DiagnosticSourceVersion>
7-
<DependencyModelVersion>2.0.0</DependencyModelVersion>
87
<FSharpCoreVersion>4.2.1</FSharpCoreVersion>
98
<FSharpNetSdkVersion>1.0.5</FSharpNetSdkVersion>
109
<InternalAspNetCoreSdkVersion>2.0.1-rtm-15400</InternalAspNetCoreSdkVersion>
1110
<JsonNetBsonVersion>1.0.1</JsonNetBsonVersion>
11+
<MicrosoftExtensionsDependencyModelPackageVersion>2.0.2-servicing-25728-02</MicrosoftExtensionsDependencyModelPackageVersion>
1212
<MoqVersion>4.7.49</MoqVersion>
1313
<NETStandardImplicitPackageVersion>2.0.0</NETStandardImplicitPackageVersion>
1414
<NETStandardLibraryNETFrameworkVersion>2.0.0</NETStandardLibraryNETFrameworkVersion>

build/sources.props

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<Project>
2+
<Import Project="$(DotNetRestoreSourcePropsPath)" Condition="'$(DotNetRestoreSourcePropsPath)' != ''"/>
3+
4+
<PropertyGroup>
5+
<RestoreSources>$(DotNetRestoreSources)</RestoreSources>
6+
<RestoreSources Condition="'$(DotNetBuildOffline)' != 'true'">
7+
$(RestoreSources);
8+
https://dotnet.myget.org/F/aspnet-2-0-2-october2017-patch/api/v3/index.json;
9+
https://dotnet.myget.org/F/aspnetcore-master/api/v3/index.json;
10+
https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json;
11+
https://api.nuget.org/v3/index.json;
12+
</RestoreSources>
13+
</PropertyGroup>
14+
</Project>

src/Microsoft.AspNetCore.Mvc.Core/Microsoft.AspNetCore.Mvc.Core.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Microsoft.AspNetCore.Mvc.RouteAttribute</Description>
3030
<PackageReference Include="Microsoft.AspNetCore.ResponseCaching.Abstractions" Version="$(AspNetCoreVersion)" />
3131
<PackageReference Include="Microsoft.AspNetCore.Routing" Version="$(AspNetCoreVersion)" />
3232
<PackageReference Include="Microsoft.Extensions.ClosedGenericMatcher.Sources" Version="$(AspNetCoreVersion)" PrivateAssets="All" />
33-
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="$(DependencyModelVersion)" />
33+
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionsDependencyModelPackageVersion)" />
3434
<PackageReference Include="Microsoft.Extensions.FileProviders.Abstractions" Version="$(AspNetCoreVersion)" />
3535
<PackageReference Include="Microsoft.Extensions.HashCodeCombiner.Sources" Version="$(AspNetCoreVersion)" PrivateAssets="All" />
3636
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="$(AspNetCoreVersion)" />

0 commit comments

Comments
 (0)