Updated projects, use the nuget package for Jaddie.Database 1.0.2, pr…

…oject reference removed. Fixes WCELL-32 #resolve #comment Fixes applied for Jaddie.Database reference -- Use nuget now Added .nuget folder to solution
NecroSharper · Jun 1, 2014 · 45f24c9 · 45f24c9
1 parent b453938
commit 45f24c9
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 26 deletions.
diff --git a/Services/WCell.AuthServer/WCell.AuthServer.csproj b/Services/WCell.AuthServer/WCell.AuthServer.csproj
@@ -125,6 +125,10 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\packages\Iesi.Collections.3.2.0.4000\lib\Net35\Iesi.Collections.dll</HintPath>
     </Reference>
+    <Reference Include="Jaddie.Database, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\packages\Jaddie.Database.1.0.2\lib\net40\Jaddie.Database.dll</HintPath>
+    </Reference>
     <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\Libraries\Binaries\Log4Net\log4net.dll</HintPath>
@@ -224,10 +228,6 @@
       <Name>WCell.Intercommunication</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\Utilities\Jaddie.Database\Jaddie.Database.csproj">
-      <Project>{719075d8-2017-4c6b-af9c-56fa7be9762c}</Project>
-      <Name>Jaddie.Database</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\Utilities\WCell.Util\WCell.Util.csproj">
       <Project>{F753AF28-A251-4C12-9335-07E8236184F2}</Project>
       <Name>WCell.Util</Name>

diff --git a/Services/WCell.AuthServer/packages.config b/Services/WCell.AuthServer/packages.config
@@ -2,6 +2,6 @@
 <packages>
   <package id="FluentNHibernate" version="1.4.0.0" targetFramework="net40" />
   <package id="Iesi.Collections" version="3.2.0.4000" targetFramework="net40" />
-  <package id="Jaddie.Database" version="1.0.1" targetFramework="net40" />
+  <package id="Jaddie.Database" version="1.0.2" targetFramework="net40" />
   <package id="NHibernate" version="3.3.3.4001" targetFramework="net40" />
 </packages>
diff --git a/Services/WCell.RealmServer/WCell.RealmServer.csproj b/Services/WCell.RealmServer/WCell.RealmServer.csproj
@@ -26,6 +26,8 @@
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <SignAssembly>false</SignAssembly>
     <TargetFrameworkProfile />
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -129,19 +131,27 @@
   <ItemGroup>
     <Reference Include="FluentNHibernate, Version=1.4.0.0, Culture=neutral, PublicKeyToken=8aa435e3cb308880, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\Jaddie.Database\packages\FluentNHibernate.1.4.0.0\lib\net35\FluentNHibernate.dll</HintPath>
+      <HintPath>..\..\packages\FluentNHibernate.1.4.0.0\lib\net35\FluentNHibernate.dll</HintPath>
     </Reference>
     <Reference Include="ICSharpCode.SharpZipLib, Version=0.85.5.452, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\Libraries\Binaries\Release\ICSharpCode\ICSharpCode.SharpZipLib.dll</HintPath>
     </Reference>
+    <Reference Include="Iesi.Collections, Version=1.0.1.0, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\packages\Iesi.Collections.3.2.0.4000\lib\Net35\Iesi.Collections.dll</HintPath>
+    </Reference>
+    <Reference Include="Jaddie.Database, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\packages\Jaddie.Database.1.0.2\lib\net40\Jaddie.Database.dll</HintPath>
+    </Reference>
     <Reference Include="MySql.Data, Version=6.0.4.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\Libraries\Binaries\Release\MySql\MySql.Data.dll</HintPath>
     </Reference>
     <Reference Include="NHibernate, Version=3.3.1.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\Jaddie.Database\packages\NHibernate.3.3.3.4001\lib\Net35\NHibernate.dll</HintPath>
+      <HintPath>..\..\packages\NHibernate.3.3.1.4000\lib\Net35\NHibernate.dll</HintPath>
     </Reference>
     <Reference Include="ParallelExtensionsExtras, Version=1.2.0.0, Culture=neutral, PublicKeyToken=e46dcf2234ff274d, processorArchitecture=MSIL">
       <HintPath>..\..\Libraries\Binaries\ParallelExtensionsExtras\ParallelExtensionsExtras.dll</HintPath>
@@ -499,10 +509,6 @@
       <Name>WCell.Intercommunication</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\Utilities\Jaddie.Database\Jaddie.Database.csproj">
-      <Project>{719075d8-2017-4c6b-af9c-56fa7be9762c}</Project>
-      <Name>Jaddie.Database</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\Utilities\WCell.PacketAnalyzer\WCell.PacketAnalyzer.csproj">
       <Project>{65B2B094-13BB-4685-95AD-402FC9A4473A}</Project>
       <Name>WCell.PacketAnalyzer</Name>
@@ -1443,7 +1449,17 @@
   <ItemGroup>
     <Content Include="Content\Lang\Commands\English.xml" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
+  </Target>
   <!-- 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">

diff --git a/Services/WCell.RealmServer/packages.config b/Services/WCell.RealmServer/packages.config
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="FluentNHibernate" version="1.4.0.0" targetFramework="net40" />
+  <package id="Iesi.Collections" version="3.2.0.4000" targetFramework="net40" />
+  <package id="Jaddie.Database" version="1.0.2" targetFramework="net40" />
+  <package id="NHibernate" version="3.3.1.4000" targetFramework="net40" />
+</packages>
diff --git a/WCell.sln b/WCell.sln
@@ -176,7 +176,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Packets", "Packets", "{D18C
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WCell.Database", "Core\WCell.Database\WCell.Database.csproj", "{359D2064-8F94-4C6D-BEAD-5F0D28CB2939}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Jaddie.Database", "Utilities\Jaddie.Database\Jaddie.Database.csproj", "{719075D8-2017-4C6B-AF9C-56FA7BE9762C}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{F0B47A6A-96EA-4DF2-A022-3CE6A84A2985}"
+	ProjectSection(SolutionItems) = preProject
+		.nuget\NuGet.Config = .nuget\NuGet.Config
+		.nuget\NuGet.exe = .nuget\NuGet.exe
+		.nuget\NuGet.targets = .nuget\NuGet.targets
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -441,17 +446,6 @@ Global
 		{359D2064-8F94-4C6D-BEAD-5F0D28CB2939}.Release|Itanium.ActiveCfg = Release|Any CPU
 		{359D2064-8F94-4C6D-BEAD-5F0D28CB2939}.Release|x64.ActiveCfg = Release|Any CPU
 		{359D2064-8F94-4C6D-BEAD-5F0D28CB2939}.Release|x86.ActiveCfg = Release|Any CPU
-		{719075D8-2017-4C6B-AF9C-56FA7BE9762C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{719075D8-2017-4C6B-AF9C-56FA7BE9762C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{719075D8-2017-4C6B-AF9C-56FA7BE9762C}.Debug|Itanium.ActiveCfg = Debug|Any CPU
-		{719075D8-2017-4C6B-AF9C-56FA7BE9762C}.Debug|x64.ActiveCfg = Debug|x64
-		{719075D8-2017-4C6B-AF9C-56FA7BE9762C}.Debug|x64.Build.0 = Debug|x64
-		{719075D8-2017-4C6B-AF9C-56FA7BE9762C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{719075D8-2017-4C6B-AF9C-56FA7BE9762C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{719075D8-2017-4C6B-AF9C-56FA7BE9762C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{719075D8-2017-4C6B-AF9C-56FA7BE9762C}.Release|Itanium.ActiveCfg = Release|Any CPU
-		{719075D8-2017-4C6B-AF9C-56FA7BE9762C}.Release|x64.ActiveCfg = Release|Any CPU
-		{719075D8-2017-4C6B-AF9C-56FA7BE9762C}.Release|x86.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -473,7 +467,6 @@ Global
 		{359D2064-8F94-4C6D-BEAD-5F0D28CB2939} = {372CB0F3-1BA6-4157-8CCB-E10D0912AD02}
 		{38846B91-92C5-4ED0-A77C-5480FA06EDBE} = {A5244776-5B87-4499-A1BA-4CC318FDAAE0}
 		{F753AF28-A251-4C12-9335-07E8236184F2} = {E858B607-246D-4056-A56E-A27312A4FDEE}
-		{719075D8-2017-4C6B-AF9C-56FA7BE9762C} = {E858B607-246D-4056-A56E-A27312A4FDEE}
 		{009B84F0-3E1E-4674-9318-7B6BECF748E1} = {352C7D18-D5CA-41EA-815F-65DECA33D17E}
 		{22AD2989-C47E-499D-B4EB-72A2D43EF5B7} = {352C7D18-D5CA-41EA-815F-65DECA33D17E}
 		{D18CDB4B-0134-41C0-AE6F-DEE59586F470} = {352C7D18-D5CA-41EA-815F-65DECA33D17E}
@@ -482,9 +475,9 @@ Global
 		{B6E8E045-B27D-47A8-A2F1-94B7BB351A80} = {009B84F0-3E1E-4674-9318-7B6BECF748E1}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		UnLocked = True
-		Locked = False
 		ISWCFSolution = True
+		Locked = False
+		UnLocked = True
 	EndGlobalSection
 	GlobalSection(TextTemplating) = postSolution
 		TextTemplating = 1