Skip to content

Commit f43d6da

Browse files
committed
Switched to newer way of doing NuGet package restore
1 parent 6f08f23 commit f43d6da

File tree

10 files changed

+6
-157
lines changed

10 files changed

+6
-157
lines changed

.nuget/NuGet.Config

Lines changed: 0 additions & 6 deletions
This file was deleted.

.nuget/NuGet.exe

58.5 KB
Binary file not shown.

.nuget/NuGet.targets

Lines changed: 0 additions & 136 deletions
This file was deleted.

Resource/Build/GitVersion.exe

2.06 MB
Binary file not shown.

Resource/Build/GitVersion.pdb

55.5 KB
Binary file not shown.

Samples/TestStack.BDDfy.Samples/TestStack.BDDfy.Samples.csproj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
<AssemblyName>TestStack.BDDfy.Samples</AssemblyName>
1313
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
15-
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
16-
<RestorePackages>true</RestorePackages>
1715
</PropertyGroup>
1816
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1917
<DebugSymbols>true</DebugSymbols>
@@ -91,7 +89,6 @@
9189
<PostBuildEvent>
9290
</PostBuildEvent>
9391
</PropertyGroup>
94-
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
9592
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
9693
Other similar extension points exist, see Microsoft.Common.targets.
9794
<Target Name="BeforeBuild">

TestStack.BDDfy.Tests/TestStack.BDDfy.Tests.csproj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
<AssemblyName>TestStack.BDDfy.Tests</AssemblyName>
1313
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
15-
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
16-
<RestorePackages>true</RestorePackages>
1715
<TargetFrameworkProfile />
1816
<NuGetPackageImportStamp>265a1279</NuGetPackageImportStamp>
1917
</PropertyGroup>
@@ -191,7 +189,6 @@
191189
<Content Include="TagsTests.TagsAreReportedInTextReport.approved.txt" />
192190
</ItemGroup>
193191
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
194-
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
195192
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
196193
Other similar extension points exist, see Microsoft.Common.targets.
197194
<Target Name="BeforeBuild">

TestStack.BDDfy.build

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,14 @@
3333
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
3434
</PropertyGroup>
3535

36+
<Target Name="RestorePackages">
37+
<Exec Command=".nuget\nuget.exe restore TestStack.BDDfy.sln" />
38+
</Target>
39+
3640
<!--
3741
Solution redirects. Every VS project normally knows how to support these targets
3842
-->
39-
<Target Name="Build">
43+
<Target Name="Build" DependsOnTargets="RestorePackages">
4044
<MSBuild Projects="Samples\TestStack.BDDfy.Samples\TestStack.BDDfy.Samples.csproj" Targets="Build" Properties="Configuration=$(Configuration)$(BuildFramework);DefineConstants=$(BuildConstants);MSBuildTargets=$(BuildTargets);nowarn=1685"/>
4145
<MSBuild Projects="TestStack.BDDfy.Tests\TestStack.BDDfy.Tests.csproj" Targets="Build" Properties="Configuration=$(Configuration)$(BuildFramework);DefineConstants=$(BuildConstants);MSBuildTargets=$(BuildTargets);nowarn=1685"/>
4246
<MSBuild Projects="TestStack.BDDfy\TestStack.BDDfy.csproj" Targets="Build" Properties="Configuration=$(Configuration)$(BuildFramework);DefineConstants=$(BuildConstants);MSBuildTargets=$(BuildTargets);TargetFrameworkVersion=$(TargetFrameworkVersion);TargetFrameworkProfile=$(TargetFrameworkProfile)"/>

TestStack.BDDfy.sln

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestStack.BDDfy.Tests", "Te
2121
EndProject
2222
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{7AD952C1-F525-437B-965F-C1400ADA34F0}"
2323
ProjectSection(SolutionItems) = preProject
24-
.nuget\NuGet.Config = .nuget\NuGet.Config
2524
.nuget\NuGet.exe = .nuget\NuGet.exe
26-
.nuget\NuGet.targets = .nuget\NuGet.targets
2725
.nuget\packages.config = .nuget\packages.config
2826
EndProjectSection
2927
EndProject

TestStack.BDDfy/TestStack.BDDfy.csproj

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<TargetFrameworkProfile />
16-
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
1716
</PropertyGroup>
1817
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1918
<DebugSymbols>true</DebugSymbols>
@@ -215,15 +214,11 @@
215214
<ItemGroup>
216215
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
217216
</ItemGroup>
218-
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" Condition="($(MSBuildTargets) == '') Or ($(MSBuildTargets) == 'CSharp')" />
219-
<Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight\v4.0\Microsoft.Silverlight.CSharp.targets" Condition="$(MSBuildTargets) == 'Silverlight 4.0'" />
220-
<Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight for Phone\$(TargetFrameworkVersion)\Microsoft.Silverlight.WindowsPhone.Overrides.targets" Condition="$(MSBuildTargets) == 'Windows Phone 7'" />
221-
<Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight for Phone\$(TargetFrameworkVersion)\Microsoft.Silverlight.CSharp.targets" Condition="$(MSBuildTargets) == 'Windows Phone 7'" />
217+
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
222218
<PropertyGroup>
223219
<PostBuildEvent>
224220
</PostBuildEvent>
225221
</PropertyGroup>
226-
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
227222
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
228223
Other similar extension points exist, see Microsoft.Common.targets.
229224
<Target Name="BeforeBuild">

0 commit comments

Comments
 (0)