Fix up packages.

z-targz · Mar 13, 2016 · 2de0216 · 2de0216
1 parent b7e7cd6
commit 2de0216
Show file tree

Hide file tree

Showing 32 changed files with 12 additions and 144 deletions.
diff --git a/Tests/Cosmos.Compiler.Tests/Cosmos.Compiler.Tests.csproj b/Tests/Cosmos.Compiler.Tests/Cosmos.Compiler.Tests.csproj
@@ -73,17 +73,8 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="ApprovalTests, Version=3.0.0.0, Culture=neutral, PublicKeyToken=11bd7d124fc62e0f, processorArchitecture=MSIL">
-      <HintPath>..\..\source\packages\ApprovalTests.3.0.10\lib\net40\ApprovalTests.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="ApprovalUtilities, Version=3.0.0.0, Culture=neutral, PublicKeyToken=11bd7d124fc62e0f, processorArchitecture=MSIL">
-      <HintPath>..\..\source\packages\ApprovalUtilities.3.0.10\lib\net45\ApprovalUtilities.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="ApprovalUtilities.Net45, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\source\packages\ApprovalUtilities.3.0.10\lib\net45\ApprovalUtilities.Net45.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="ApprovalTests">
+      <HintPath>..\..\Resources\Dependencies\ApprovalTests.3.0.10\ApprovalTests.dll</HintPath>
     </Reference>
     <Reference Include="System" />
   </ItemGroup>
@@ -139,7 +130,6 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
-    <None Include="packages.config" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">

diff --git a/Tests/Cosmos.Compiler.Tests/packages.config b/Tests/Cosmos.Compiler.Tests/packages.config
diff --git a/Tests/Cosmos.Compiler.TestsBase/Cosmos.Compiler.TestsBase.csproj b/Tests/Cosmos.Compiler.TestsBase/Cosmos.Compiler.TestsBase.csproj
@@ -69,16 +69,8 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="ApprovalTests, Version=3.0.0.0, Culture=neutral, PublicKeyToken=11bd7d124fc62e0f, processorArchitecture=MSIL">
-      <HintPath>..\..\source\packages\ApprovalTests.3.0.10\lib\net40\ApprovalTests.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="ApprovalUtilities, Version=3.0.0.0, Culture=neutral, PublicKeyToken=11bd7d124fc62e0f, processorArchitecture=MSIL">
-      <HintPath>..\..\source\packages\ApprovalUtilities.3.0.10\lib\net45\ApprovalUtilities.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="ApprovalUtilities.Net45, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\source\packages\ApprovalUtilities.3.0.10\lib\net45\ApprovalUtilities.Net45.dll</HintPath>
-      <Private>True</Private>
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\Resources\Dependencies\ApprovalTests.3.0.10\ApprovalTests.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Build.Framework" />
     <Reference Include="System" />
@@ -109,7 +101,6 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
-    <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

diff --git a/Tests/Cosmos.Compiler.TestsBase/packages.config b/Tests/Cosmos.Compiler.TestsBase/packages.config
diff --git a/Users/Matthijs/DebugCompiler/DebugCompiler.csproj b/Users/Matthijs/DebugCompiler/DebugCompiler.csproj
@@ -80,32 +80,12 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\..\source\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\..\source\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.SqlServer.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="nunit.framework">
       <HintPath>..\..\..\Resources\Dependencies\NUnit\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Data.SQLite, Version=1.0.99.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=x86">
-      <HintPath>..\..\..\source\packages\System.Data.SQLite.x86.1.0.99.0\lib\net451\System.Data.SQLite.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Data.SQLite.EF6, Version=1.0.99.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
-      <HintPath>..\..\..\source\packages\System.Data.SQLite.EF6.1.0.99.0\lib\net451\System.Data.SQLite.EF6.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Data.SQLite.Linq, Version=1.0.99.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
-      <HintPath>..\..\..\source\packages\System.Data.SQLite.Linq.1.0.99.0\lib\net451\System.Data.SQLite.Linq.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System.Data" />
@@ -120,7 +100,6 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\source\Cosmos.Build.Common\Cosmos.Build.Common.csproj">

diff --git a/Users/Matthijs/DebugCompiler/app.config b/Users/Matthijs/DebugCompiler/app.config
@@ -2,7 +2,7 @@
 <configuration>
   <configSections>
     <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
-    <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
+
   </configSections>
   <startup>
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
@@ -26,12 +26,5 @@
       <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
     </providers>
   </entityFramework>
-  <system.data>
-    <DbProviderFactories>
-      <remove invariant="System.Data.SQLite.EF6" />
-      <add name="SQLite Data Provider (Entity Framework 6)" invariant="System.Data.SQLite.EF6" description=".NET Framework Data Provider for SQLite (Entity Framework 6)" type="System.Data.SQLite.EF6.SQLiteProviderFactory, System.Data.SQLite.EF6" />
-      <remove invariant="System.Data.SQLite" />
-      <add name="SQLite Data Provider" invariant="System.Data.SQLite" description=".NET Framework Data Provider for SQLite" type="System.Data.SQLite.SQLiteFactory, System.Data.SQLite" />
-    </DbProviderFactories>
-  </system.data>
+
 </configuration>
diff --git a/Users/Matthijs/DebugCompiler/packages.config b/Users/Matthijs/DebugCompiler/packages.config
diff --git a/source/Cosmos.Build.MSBuild/App.config b/source/Cosmos.Build.MSBuild/App.config
@@ -2,7 +2,7 @@
 <configuration>
   <configSections>
     <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
-    <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
+
   </configSections>
   <entityFramework>
     <defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework" />
@@ -23,12 +23,5 @@
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-  <system.data>
-    <DbProviderFactories>
-      <remove invariant="System.Data.SQLite.EF6" />
-      <add name="SQLite Data Provider (Entity Framework 6)" invariant="System.Data.SQLite.EF6" description=".NET Framework Data Provider for SQLite (Entity Framework 6)" type="System.Data.SQLite.EF6.SQLiteProviderFactory, System.Data.SQLite.EF6" />
-      <remove invariant="System.Data.SQLite" />
-      <add name="SQLite Data Provider" invariant="System.Data.SQLite" description=".NET Framework Data Provider for SQLite" type="System.Data.SQLite.SQLiteFactory, System.Data.SQLite" />
-    </DbProviderFactories>
-  </system.data>
+
 </configuration>
diff --git a/source/Cosmos.Build.MSBuild/Cosmos.Build.MSBuild.csproj b/source/Cosmos.Build.MSBuild/Cosmos.Build.MSBuild.csproj
@@ -43,14 +43,6 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.SqlServer.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="Microsoft.Build.Framework" />
     <Reference Include="Microsoft.Build.Utilities.v4.0" />
     <Reference Include="System" />
@@ -60,18 +52,6 @@
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
     </Reference>
     <Reference Include="System.Data" />
-    <Reference Include="System.Data.SQLite, Version=1.0.99.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=x86">
-      <HintPath>..\packages\System.Data.SQLite.x86.1.0.99.0\lib\net451\System.Data.SQLite.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Data.SQLite.EF6, Version=1.0.99.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Data.SQLite.EF6.1.0.99.0\lib\net451\System.Data.SQLite.EF6.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Data.SQLite.Linq, Version=1.0.99.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Data.SQLite.Linq.1.0.99.0\lib\net451\System.Data.SQLite.Linq.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
@@ -119,7 +99,6 @@
     <None Include="Cosmos.targets">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="..\XSharp.Compiler\.editorconfig.txt">

diff --git a/source/Cosmos.Build.MSBuild/packages.config b/source/Cosmos.Build.MSBuild/packages.config
diff --git a/source/Cosmos.IL2CPU/Cosmos.IL2CPU.csproj b/source/Cosmos.IL2CPU/Cosmos.IL2CPU.csproj
@@ -86,20 +86,12 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Mono.Cecil, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
-      <HintPath>..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Mono.Cecil.Mdb, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
-      <HintPath>..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.Mdb.dll</HintPath>
-      <Private>True</Private>
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\Resources\Dependencies\Mono.Cecil.0.9.6.1\Mono.Cecil.dll</HintPath>
     </Reference>
     <Reference Include="Mono.Cecil.Pdb, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
-      <HintPath>..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.Pdb.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Mono.Cecil.Rocks, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
-      <HintPath>..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.Rocks.dll</HintPath>
-      <Private>True</Private>
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\Resources\Dependencies\Mono.Cecil.0.9.6.1\Mono.Cecil.Pdb.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
@@ -412,9 +404,6 @@
     <None Include=".editorconfig" />
     <None Include="App.config" />
     <None Include="Cosmos.snk" />
-    <None Include="packages.config">
-      <SubType>Designer</SubType>
-    </None>
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

diff --git a/source/Cosmos.IL2CPU/packages.config b/source/Cosmos.IL2CPU/packages.config
diff --git a/source/Cosmos.System.Tests/Cosmos.System.Tests.csproj b/source/Cosmos.System.Tests/Cosmos.System.Tests.csproj
@@ -79,18 +79,6 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="ApprovalTests, Version=3.0.0.0, Culture=neutral, PublicKeyToken=11bd7d124fc62e0f, processorArchitecture=MSIL">
-      <HintPath>..\packages\ApprovalTests.3.0.10\lib\net40\ApprovalTests.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="ApprovalUtilities, Version=3.0.0.0, Culture=neutral, PublicKeyToken=11bd7d124fc62e0f, processorArchitecture=MSIL">
-      <HintPath>..\packages\ApprovalUtilities.3.0.10\lib\net45\ApprovalUtilities.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="ApprovalUtilities.Net45, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ApprovalUtilities.3.0.10\lib\net45\ApprovalUtilities.Net45.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System" />
   </ItemGroup>
   <Choose>
@@ -114,7 +102,6 @@
     <None Include="..\Cosmos.snk">
       <Link>Cosmos.snk</Link>
     </None>
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Cosmos.HAL\Cosmos.HAL.csproj">

diff --git a/source/Cosmos.System.Tests/packages.config b/source/Cosmos.System.Tests/packages.config
diff --git a/source/packages/Mono.Cecil.0.9.6.1/Mono.Cecil.0.9.6.1.nupkg b/source/packages/Mono.Cecil.0.9.6.1/Mono.Cecil.0.9.6.1.nupkg
diff --git a/source/packages/Mono.Cecil.0.9.6.1/lib/net20/Mono.Cecil.Mdb.dll b/source/packages/Mono.Cecil.0.9.6.1/lib/net20/Mono.Cecil.Mdb.dll
diff --git a/source/packages/Mono.Cecil.0.9.6.1/lib/net20/Mono.Cecil.Pdb.dll b/source/packages/Mono.Cecil.0.9.6.1/lib/net20/Mono.Cecil.Pdb.dll
diff --git a/source/packages/Mono.Cecil.0.9.6.1/lib/net20/Mono.Cecil.dll b/source/packages/Mono.Cecil.0.9.6.1/lib/net20/Mono.Cecil.dll
diff --git a/source/packages/Mono.Cecil.0.9.6.1/lib/net35/Mono.Cecil.Mdb.dll b/source/packages/Mono.Cecil.0.9.6.1/lib/net35/Mono.Cecil.Mdb.dll
diff --git a/source/packages/Mono.Cecil.0.9.6.1/lib/net35/Mono.Cecil.Pdb.dll b/source/packages/Mono.Cecil.0.9.6.1/lib/net35/Mono.Cecil.Pdb.dll
diff --git a/source/packages/Mono.Cecil.0.9.6.1/lib/net35/Mono.Cecil.Rocks.dll b/source/packages/Mono.Cecil.0.9.6.1/lib/net35/Mono.Cecil.Rocks.dll
diff --git a/source/packages/Mono.Cecil.0.9.6.1/lib/net35/Mono.Cecil.dll b/source/packages/Mono.Cecil.0.9.6.1/lib/net35/Mono.Cecil.dll
diff --git a/source/packages/Mono.Cecil.0.9.6.1/lib/net40/Mono.Cecil.Mdb.dll b/source/packages/Mono.Cecil.0.9.6.1/lib/net40/Mono.Cecil.Mdb.dll
diff --git a/source/packages/Mono.Cecil.0.9.6.1/lib/net40/Mono.Cecil.Pdb.dll b/source/packages/Mono.Cecil.0.9.6.1/lib/net40/Mono.Cecil.Pdb.dll
diff --git a/source/packages/Mono.Cecil.0.9.6.1/lib/net40/Mono.Cecil.Rocks.dll b/source/packages/Mono.Cecil.0.9.6.1/lib/net40/Mono.Cecil.Rocks.dll
diff --git a/source/packages/Mono.Cecil.0.9.6.1/lib/net40/Mono.Cecil.dll b/source/packages/Mono.Cecil.0.9.6.1/lib/net40/Mono.Cecil.dll
diff --git a/source/packages/Mono.Cecil.0.9.6.1/lib/net45/Mono.Cecil.Mdb.dll b/source/packages/Mono.Cecil.0.9.6.1/lib/net45/Mono.Cecil.Mdb.dll
diff --git a/source/packages/Mono.Cecil.0.9.6.1/lib/net45/Mono.Cecil.Pdb.dll b/source/packages/Mono.Cecil.0.9.6.1/lib/net45/Mono.Cecil.Pdb.dll
diff --git a/source/packages/Mono.Cecil.0.9.6.1/lib/net45/Mono.Cecil.Rocks.dll b/source/packages/Mono.Cecil.0.9.6.1/lib/net45/Mono.Cecil.Rocks.dll
diff --git a/source/packages/Mono.Cecil.0.9.6.1/lib/net45/Mono.Cecil.dll b/source/packages/Mono.Cecil.0.9.6.1/lib/net45/Mono.Cecil.dll
diff --git a/source/packages/Mono.Cecil.0.9.6.1/lib/sl5/Mono.Cecil.Rocks.dll b/source/packages/Mono.Cecil.0.9.6.1/lib/sl5/Mono.Cecil.Rocks.dll
diff --git a/source/packages/Mono.Cecil.0.9.6.1/lib/sl5/Mono.Cecil.dll b/source/packages/Mono.Cecil.0.9.6.1/lib/sl5/Mono.Cecil.dll