Skip to content

Commit d0db0ef

Browse files
committed
Update NuGet configuration to use separate config files for each project
1 parent 6d950df commit d0db0ef

6 files changed

Lines changed: 26 additions & 6 deletions

File tree

src/.nuget/NuGet.exe

43.5 KB
Binary file not shown.

src/.nuget/NuGet.targets

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,29 @@
2828
<PropertyGroup Condition=" '$(OS)' == 'Windows_NT'">
2929
<!-- Windows specific commands -->
3030
<NuGetToolsPath>$([System.IO.Path]::Combine($(SolutionDir), ".nuget"))</NuGetToolsPath>
31-
<PackagesConfig>$([System.IO.Path]::Combine($(ProjectDir), "packages.config"))</PackagesConfig>
3231
</PropertyGroup>
3332

3433
<PropertyGroup Condition=" '$(OS)' != 'Windows_NT'">
3534
<!-- We need to launch nuget.exe with the mono command if we're not on windows -->
3635
<NuGetToolsPath>$(SolutionDir).nuget</NuGetToolsPath>
37-
<PackagesConfig>packages.config</PackagesConfig>
3836
</PropertyGroup>
37+
38+
<PropertyGroup>
39+
<PackagesProjectConfig>packages.$(MSBuildProjectName.Replace(' ', '_')).config</PackagesProjectConfig>
40+
</PropertyGroup>
41+
42+
<Choose>
43+
<When Condition="Exists('$(PackagesProjectConfig)')">
44+
<PropertyGroup>
45+
<PackagesConfig>$(PackagesProjectConfig)</PackagesConfig>
46+
</PropertyGroup>
47+
</When>
48+
<When Condition="Exists('packages.config')">
49+
<PropertyGroup>
50+
<PackagesConfig>packages.config</PackagesConfig>
51+
</PropertyGroup>
52+
</When>
53+
</Choose>
3954

4055
<PropertyGroup>
4156
<!-- NuGet command -->

src/corelib/corelib.v3.5.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -635,7 +635,7 @@
635635
<Link>openstacknetsdk.snk</Link>
636636
</None>
637637
<None Include="corelib.nuspec" />
638-
<None Include="packages.config" />
638+
<None Include="packages.corelib.v3.5.config" />
639639
</ItemGroup>
640640
<ItemGroup>
641641
<None Include="Icons\openstack_net_logo.png" />

src/corelib/corelib.v4.0.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -625,7 +625,7 @@
625625
<Link>openstacknetsdk.snk</Link>
626626
</None>
627627
<None Include="corelib.nuspec" />
628-
<None Include="packages.config" />
628+
<None Include="packages.corelib.v4.0.config" />
629629
</ItemGroup>
630630
<ItemGroup>
631631
<None Include="Icons\openstack_net_logo.png" />
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Newtonsoft.Json" version="5.0.6" targetFramework="net40" />
4-
<package id="SimpleRESTServices" version="1.3.0.1" targetFramework="net40" />
3+
<package id="Newtonsoft.Json" version="5.0.6" targetFramework="net35" />
4+
<package id="SimpleRESTServices" version="1.3.0.1" targetFramework="net35" />
55
<package id="TaskParallelLibrary" version="1.0.2856.0" targetFramework="net35" />
66
</packages>
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="Newtonsoft.Json" version="5.0.6" targetFramework="net40" />
4+
<package id="SimpleRESTServices" version="1.3.0.1" targetFramework="net40" />
5+
</packages>

0 commit comments

Comments
 (0)