From ba482638d63e837788d2d1b1197b822075ee5762 Mon Sep 17 00:00:00 2001
From: Waldi Ravens <wr86420@gmail.com>
Date: Sat, 29 Aug 2015 15:41:26 +0200
Subject: [PATCH] Move packages.config ==> packages/packages.config

---
 appveyor.yml                       | 2 +-
 src/.nuget/NuGet.targets           | 6 +++---
 src/SubtitleEdit.csproj            | 2 +-
 src/SubtitleEdit.sln               | 3 ---
 src/{ => packages}/packages.config | 0
 5 files changed, 5 insertions(+), 8 deletions(-)
 rename src/{ => packages}/packages.config (100%)

diff --git a/appveyor.yml b/appveyor.yml
index 825ecd1fc..5a888cdfc 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -15,7 +15,7 @@ test_script:
   - vstest.console /logger:Appveyor /Settings:"%APPVEYOR_BUILD_FOLDER%\src\Local.testsettings" "%APPVEYOR_BUILD_FOLDER%\src\Test\bin\%CONFIGURATION%\Test.dll"
 
 cache:
-  - 'src\packages -> src\packages.config'       # preserve the "src\packages" directory
+  - 'src\packages -> src\packages\packages.config'       # preserve the "src\packages" directory
 
 matrix:
   fast_finish: true
diff --git a/src/.nuget/NuGet.targets b/src/.nuget/NuGet.targets
index 55c01f269..43980ca19 100644
--- a/src/.nuget/NuGet.targets
+++ b/src/.nuget/NuGet.targets
@@ -41,10 +41,10 @@
     </PropertyGroup>
 
     <PropertyGroup>
-      <PackagesConfig Condition="Exists('$(MSBuildProjectDirectory)\packages.config')">$(MSBuildProjectDirectory)\packages.config</PackagesConfig>
-      <PackagesConfig Condition="Exists('$(PackagesProjectConfig)')">$(PackagesProjectConfig)</PackagesConfig>
+        <PackagesConfig Condition="Exists('$(MSBuildProjectDirectory)\packages\packages.config')">$(MSBuildProjectDirectory)\packages\packages.config</PackagesConfig>
+        <PackagesConfig Condition="Exists('$(PackagesProjectConfig)')">$(PackagesProjectConfig)</PackagesConfig>
     </PropertyGroup>
-    
+
     <PropertyGroup>
         <!-- NuGet command -->
         <NuGetExePath Condition=" '$(NuGetExePath)' == '' ">$(NuGetToolsPath)\NuGet.exe</NuGetExePath>
diff --git a/src/SubtitleEdit.csproj b/src/SubtitleEdit.csproj
index d18c3bee0..fa276577c 100644
--- a/src/SubtitleEdit.csproj
+++ b/src/SubtitleEdit.csproj
@@ -1243,7 +1243,7 @@
       <DependentUpon>SyncPointsSync.cs</DependentUpon>
     </EmbeddedResource>
     <None Include="app.config" />
-    <None Include="packages.config" />
+    <None Include="packages\packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
diff --git a/src/SubtitleEdit.sln b/src/SubtitleEdit.sln
index 92b23fd7e..959bde6a4 100644
--- a/src/SubtitleEdit.sln
+++ b/src/SubtitleEdit.sln
@@ -22,9 +22,6 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UpdateLanguageFiles", "UpdateLanguageFiles\UpdateLanguageFiles.csproj", "{36BCA2A7-EE6B-45FD-AF90-D3F76A84DA76}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{E5F70420-EF49-403E-851F-700953769937}"
-	ProjectSection(SolutionItems) = preProject
-		.nuget\packages.config = .nuget\packages.config
-	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibSE", "..\libse\LibSE.csproj", "{3E3CB28F-3A7B-430F-9EB3-0D6C1E53B753}"
 EndProject
diff --git a/src/packages.config b/src/packages/packages.config
similarity index 100%
rename from src/packages.config
rename to src/packages/packages.config