Skip to content

Commit

Permalink
Migrating to the new way to do NuGet package restore
Browse files Browse the repository at this point in the history
  • Loading branch information
agross committed Jun 21, 2014
1 parent c123371 commit a8398c2
Show file tree
Hide file tree
Showing 9 changed files with 14 additions and 78 deletions.
6 changes: 0 additions & 6 deletions .nuget/NuGet.Config

This file was deleted.

Binary file removed .nuget/NuGet.exe
Binary file not shown.
52 changes: 0 additions & 52 deletions .nuget/NuGet.targets

This file was deleted.

12 changes: 4 additions & 8 deletions DuplicateFinder.sln
@@ -1,17 +1,13 @@
Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.30501.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DuplicateFinder.Core", "Source\DuplicateFinder.Core\DuplicateFinder.Core.csproj", "{E4D3B7B8-D50F-4772-89A7-152DA92AAA34}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DuplicateFinder", "Source\DuplicateFinder\DuplicateFinder.csproj", "{CA9DC48A-7334-4CF1-B98D-6C909A980E6C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DuplicateFinder.Core.Integration.Tests", "Source\DuplicateFinder.Core.Integration.Tests\DuplicateFinder.Core.Integration.Tests.csproj", "{C00FFA8F-B5C4-4A2E-92E9-D4AB7E2C2A48}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{93556E51-28B2-4E79-8AF5-0BDAC8E11CB0}"
ProjectSection(SolutionItems) = preProject
.nuget\NuGet.exe = .nuget\NuGet.exe
.nuget\NuGet.targets = .nuget\NuGet.targets
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down
4 changes: 4 additions & 0 deletions rakefile.rb
Expand Up @@ -128,6 +128,8 @@ def configure_env_for(env_key)

desc 'Compiles the application'
task :app => [:clobber, 'generate:version', 'generate:config', 'compile:prepare_release'] do
sh(*%w(tools/NuGet/NuGet.exe restore))

FileList.new("#{configatron.dir.app}/**/*.csproj").each do |project|
MSBuild.compile \
:project => project,
Expand All @@ -142,6 +144,8 @@ def configure_env_for(env_key)

desc 'Compiles tests'
task :tests => [:clobber, 'generate:version', 'generate:config'] do
sh(*%w(tools/NuGet/NuGet.exe restore))

FileList.new("#{configatron.dir.app}/**/*.Tests.csproj").each do |project|
MSBuild.compile \
:project => project,
Expand Down
Expand Up @@ -14,7 +14,6 @@
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
<RestorePackages>true</RestorePackages>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand Down Expand Up @@ -183,12 +182,11 @@
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>
6 changes: 2 additions & 4 deletions source/DuplicateFinder.Core/DuplicateFinder.Core.csproj
Expand Up @@ -14,7 +14,6 @@
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
<RestorePackages>true</RestorePackages>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand Down Expand Up @@ -177,12 +176,11 @@
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>
6 changes: 2 additions & 4 deletions source/DuplicateFinder/DuplicateFinder.csproj
Expand Up @@ -14,7 +14,6 @@
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
<RestorePackages>true</RestorePackages>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<PlatformTarget>AnyCPU</PlatformTarget>
Expand Down Expand Up @@ -56,12 +55,11 @@
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>
Binary file added tools/NuGet/NuGet.exe
Binary file not shown.

0 comments on commit a8398c2

Please sign in to comment.