Remove fnbt external and add NuGet package back.

NiclasOlofsson · Apr 13, 2015 · 83f744e · 83f744e
1 parent 5126c15
commit 83f744e
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 41 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "external/fNbt"]
-	path = external/fNbt
-	url = https://github.com/NiclasOlofsson/fNbt

diff --git a/external/fNbt b/external/fNbt
diff --git a/src/MiNET/MiNET.Client/MiNET.Client.csproj b/src/MiNET/MiNET.Client/MiNET.Client.csproj
@@ -34,6 +34,10 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="fNbt, Version=0.6.3.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\fNbt.0.6.3\lib\net35-client\fNbt.dll</HintPath>
+    </Reference>
     <Reference Include="log4net">
       <HintPath>..\packages\log4net.2.0.3\lib\net40-full\log4net.dll</HintPath>
     </Reference>
@@ -55,10 +59,6 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\external\fNbt\fNbt\fNbt.csproj">
-      <Project>{4488498D-976D-4DA3-BF72-109531AF0488}</Project>
-      <Name>fNbt</Name>
-    </ProjectReference>
     <ProjectReference Include="..\MiNET\MiNET.csproj">
       <Project>{B7049BF1-2DB0-435D-9791-09AB61018685}</Project>
       <Name>MiNET</Name>

diff --git a/src/MiNET/MiNET.Client/packages.config b/src/MiNET/MiNET.Client/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="fNbt" version="0.6.2.0" targetFramework="net45" />
+  <package id="fNbt" version="0.6.3" targetFramework="net45" />
   <package id="log4net" version="2.0.3" targetFramework="net45" />
 </packages>
diff --git a/src/MiNET/MiNET.ServiceKiller/Emulator.cs b/src/MiNET/MiNET.ServiceKiller/Emulator.cs
@@ -44,8 +44,8 @@ private void EmulateClient(object state)
 				string username = (string) state;
 				Console.WriteLine("Client {0} connecting...", username);
 
-				//var client = new MiNetClient(new IPEndPoint(IPAddress.Loopback, 19132));
-				var client = new MiNetClient(new IPEndPoint(IPAddress.Parse("65.52.75.30"), 19132));
+				var client = new MiNetClient(new IPEndPoint(IPAddress.Loopback, 19132));
+				//var client = new MiNetClient(new IPEndPoint(IPAddress.Parse("65.52.75.30"), 19132));
 
 				client.StartClient();
 

diff --git a/src/MiNET/MiNET.Test/MiNET.Test.csproj b/src/MiNET/MiNET.Test/MiNET.Test.csproj
@@ -40,6 +40,10 @@
     <Reference Include="Deedle">
       <HintPath>..\packages\Deedle.1.0.7\lib\net40\Deedle.dll</HintPath>
     </Reference>
+    <Reference Include="fNbt, Version=0.6.3.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\fNbt.0.6.3\lib\net35-client\fNbt.dll</HintPath>
+    </Reference>
     <Reference Include="Moq, Version=4.2.1502.911, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Moq.4.2.1502.0911\lib\net40\Moq.dll</HintPath>
@@ -68,10 +72,6 @@
     <Compile Include="MinetServerTest.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\external\fNbt\fNbt\fNbt.csproj">
-      <Project>{4488498D-976D-4DA3-BF72-109531AF0488}</Project>
-      <Name>fNbt</Name>
-    </ProjectReference>
     <ProjectReference Include="..\MiNET\MiNET.csproj">
       <Project>{B7049BF1-2DB0-435D-9791-09AB61018685}</Project>
       <Name>MiNET</Name>

diff --git a/src/MiNET/MiNET.Test/packages.config b/src/MiNET/MiNET.Test/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Deedle" version="1.0.7" targetFramework="net45" />
-  <package id="fNbt" version="0.6.2.0" targetFramework="net45" />
+  <package id="fNbt" version="0.6.3" targetFramework="net45" />
   <package id="Moq" version="4.2.1502.0911" targetFramework="net45" />
   <package id="NUnit" version="2.6.4" targetFramework="net45" />
 </packages>
diff --git a/src/MiNET/MiNET.sln b/src/MiNET/MiNET.sln
@@ -34,8 +34,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestPlugin", "TestPlugin\Te
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MiNET.Client", "MiNET.Client\MiNET.Client.csproj", "{2BFFD5A4-DAC0-47D3-946F-1A8EE2ACCB46}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "fNbt", "..\..\external\fNbt\fNbt\fNbt.csproj", "{4488498D-976D-4DA3-BF72-109531AF0488}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -108,27 +106,10 @@ Global
 		{2BFFD5A4-DAC0-47D3-946F-1A8EE2ACCB46}.Release|ARM.ActiveCfg = Release|Any CPU
 		{2BFFD5A4-DAC0-47D3-946F-1A8EE2ACCB46}.Release|x64.ActiveCfg = Release|Any CPU
 		{2BFFD5A4-DAC0-47D3-946F-1A8EE2ACCB46}.Release|x86.ActiveCfg = Release|Any CPU
-		{4488498D-976D-4DA3-BF72-109531AF0488}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4488498D-976D-4DA3-BF72-109531AF0488}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4488498D-976D-4DA3-BF72-109531AF0488}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{4488498D-976D-4DA3-BF72-109531AF0488}.Debug|x64.ActiveCfg = Debug|x64
-		{4488498D-976D-4DA3-BF72-109531AF0488}.Debug|x64.Build.0 = Debug|x64
-		{4488498D-976D-4DA3-BF72-109531AF0488}.Debug|x86.ActiveCfg = Debug|x86
-		{4488498D-976D-4DA3-BF72-109531AF0488}.Debug|x86.Build.0 = Debug|x86
-		{4488498D-976D-4DA3-BF72-109531AF0488}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4488498D-976D-4DA3-BF72-109531AF0488}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4488498D-976D-4DA3-BF72-109531AF0488}.Release|ARM.ActiveCfg = Release|Any CPU
-		{4488498D-976D-4DA3-BF72-109531AF0488}.Release|x64.ActiveCfg = Release|x64
-		{4488498D-976D-4DA3-BF72-109531AF0488}.Release|x64.Build.0 = Release|x64
-		{4488498D-976D-4DA3-BF72-109531AF0488}.Release|x86.ActiveCfg = Release|x86
-		{4488498D-976D-4DA3-BF72-109531AF0488}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{4488498D-976D-4DA3-BF72-109531AF0488} = {F6653226-F844-4287-B966-DB9FA32A81FD}
-	EndGlobalSection
 	GlobalSection(MonoDevelopProperties) = preSolution
 		StartupItem = MiNET.Service\MiNET.Service.csproj
 		Policies = $0

diff --git a/src/MiNET/MiNET/MiNET.csproj b/src/MiNET/MiNET/MiNET.csproj
@@ -35,6 +35,10 @@
     <Reference Include="Deedle">
       <HintPath>..\packages\Deedle.1.0.7\lib\net40\Deedle.dll</HintPath>
     </Reference>
+    <Reference Include="fNbt, Version=0.6.3.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\fNbt.0.6.3\lib\net35-client\fNbt.dll</HintPath>
+    </Reference>
     <Reference Include="LibNoise">
       <HintPath>..\packages\LibNoise.0.2\lib\NET45\LibNoise.dll</HintPath>
     </Reference>
@@ -279,12 +283,6 @@
   <ItemGroup>
     <WCFMetadata Include="Service References\" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\external\fNbt\fNbt\fNbt.csproj">
-      <Project>{4488498d-976d-4da3-bf72-109531af0488}</Project>
-      <Name>fNbt</Name>
-    </ProjectReference>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

diff --git a/src/MiNET/MiNET/packages.config b/src/MiNET/MiNET/packages.config
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Deedle" version="1.0.7" targetFramework="net45" />
+  <package id="fNbt" version="0.6.3" targetFramework="net45" />
   <package id="LibNoise" version="0.2" targetFramework="net45" />
   <package id="log4net" version="2.0.3" targetFramework="net45" />
   <package id="Microsoft.AspNet.Identity.Core" version="2.2.0" targetFramework="net45" />