From b6ce10df7bbd6d82ea03d4b8555b67d34f90b300 Mon Sep 17 00:00:00 2001
From: Dale Ragan <dale.ragan@sinesignal.com>
Date: Wed, 25 Aug 2010 20:42:49 -0400
Subject: [PATCH 1/3] For now we are going to remove the dependency on
 Winterdom.IO.FileMap, since this isn't our default way of packing a file and
 there isn't any reason to invest in developing a cross-platform replacement.
 We're leaving the rest of the logic in place in case we decide to invest in
 this in the future.  This was never tested thoroughly and caused tests to
 fail when it did run.

---
 GitSharp.Core/GitSharp.Core.csproj | 15 ++++------
 GitSharp.Core/PackFile.cs          | 44 ++++++------------------------
 2 files changed, 14 insertions(+), 45 deletions(-)

diff --git a/GitSharp.Core/GitSharp.Core.csproj b/GitSharp.Core/GitSharp.Core.csproj
index 627353ca..9e2a895f 100644
--- a/GitSharp.Core/GitSharp.Core.csproj
+++ b/GitSharp.Core/GitSharp.Core.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -35,23 +35,19 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="ICSharpCode.SharpZipLib, Version=0.85.4.369, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\lib\ICSharpCode.SharpZipLib.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Core">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
     </Reference>
-    <Reference Include="Tamir.SharpSSH, Version=1.1.1.13, Culture=neutral">
+    <Reference Include="ICSharpCode.SharpZipLib, Version=0.85.4.369, Culture=neutral, PublicKeyToken=null">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\lib\Tamir.SharpSSH.dll</HintPath>
+      <HintPath>..\lib\ICSharpCode.SharpZipLib.dll</HintPath>
     </Reference>
-    <Reference Include="Winterdom.IO.FileMap, Version=2.0.2.0, Culture=neutral, PublicKeyToken=4982617362e1edb5, processorArchitecture=MSIL">
+    <Reference Include="Tamir.SharpSSH, Version=1.1.1.13, Culture=neutral, PublicKeyToken=null">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\lib\Winterdom.IO.FileMap.dll</HintPath>
+      <HintPath>..\lib\Tamir.SharpSSH.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -411,6 +407,7 @@
     <Compile Include="Util\RefMap.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- 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/GitSharp.Core/PackFile.cs b/GitSharp.Core/PackFile.cs
index 882b5114..8fbd0492 100644
--- a/GitSharp.Core/PackFile.cs
+++ b/GitSharp.Core/PackFile.cs
@@ -46,7 +46,6 @@
 using System.Linq;
 using GitSharp.Core.Exceptions;
 using GitSharp.Core.Util;
-using Winterdom.IO.FileMap;
 
 namespace GitSharp.Core
 {
@@ -470,43 +469,16 @@ internal ByteArrayWindow Read(long pos, int size)
 			IO.ReadFully(_fd, pos, buf, 0, size);
 			return new ByteArrayWindow(this, pos, buf);
 		}
-
+		
+		// Note: For now we are going to remove the dependency on Winterdom.IO.FileMap, 
+		// since this isn't our default way of packing a file and there isn't any 
+		// reason to invest in developing a cross-platform replacement.  We're leaving 
+		// the rest of the logic in place in case we decide to invest in 
+		// this in the future.  This was never tested thoroughly and caused 
+		// tests to fail when it did run.
 		internal ByteWindow MemoryMappedByteWindow(long pos, int size)
 		{
-		    if (Length < pos + size)
-		    {
-		        size = (int) (Length - pos);
-		    }
-
-		    Stream map;
-
-		    using (var _fdMap = MemoryMappedFile.Create(File.FullName, MapProtection.PageReadOnly))
-            {
-                try
-		        {
-		            map = _fdMap.MapView(MapAccess.FileMapRead, pos, size);
-		                // was: map = _fd.map(MapMode.READ_ONLY, pos, size);
-		        }
-		        catch (IOException)
-		        {
-		            // The most likely reason this failed is the process has run out
-		            // of virtual memory. We need to discard quickly, and try to
-		            // force the GC to finalize and release any existing mappings.
-		            //
-		            GC.Collect();
-		            GC.WaitForPendingFinalizers();
-		            map = _fdMap.MapView(MapAccess.FileMapRead, pos, size);
-		        }
-
-		        byte[] mapArray = map != null ? map.toArray() : new byte[0];
-
-		        if (mapArray.Length > 0)
-		        {
-		            return new ByteArrayWindow(this, pos, mapArray);
-		        }
-		    }
-
-        	return new ByteBufferWindow(this, pos, map);
+		    throw new NotImplementedException();
 		}
 
 		private void OnOpenPack()

From 12aaf544bf7465f99f516a146ec2bb534ff21f90 Mon Sep 17 00:00:00 2001
From: Dale Ragan <dale.ragan@sinesignal.com>
Date: Wed, 25 Aug 2010 21:22:55 -0400
Subject: [PATCH 2/3] Removed the extra Microsoft.CSharp.targets that
 MonoDevelop adds when it edits a project that was created with VS2008. 
 VS2008 is when Microsoft changed the path variable from MSBuildBinPath to
 MSBuildToolsPath and MonoDevelop still uses MSBuildBinPath.

---
 GitSharp.Core/GitSharp.Core.csproj | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/GitSharp.Core/GitSharp.Core.csproj b/GitSharp.Core/GitSharp.Core.csproj
index 9e2a895f..b67deda5 100644
--- a/GitSharp.Core/GitSharp.Core.csproj
+++ b/GitSharp.Core/GitSharp.Core.csproj
@@ -407,7 +407,6 @@
     <Compile Include="Util\RefMap.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- 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">
@@ -435,4 +434,4 @@
     </MonoDevelop>
     <VisualStudio />
   </ProjectExtensions>
-</Project>
\ No newline at end of file
+</Project>

From fed9535519a1a918ed6734001b7f5c3a83dd8a10 Mon Sep 17 00:00:00 2001
From: henon <meinrad.recheis@gmail.com>
Date: Tue, 31 Aug 2010 22:00:53 +0200
Subject: [PATCH 3/3] removed VersionAssemblyInfo.cs from GitSharp.Core.csproj
 ...

Compiling from the solution files generates a non-versioned assembly for simplicity of build setup. Compiling from the nant build script generates properly versioned assemblies.
---
 GitSharp.Core/GitSharp.Core.csproj | 1 -
 1 file changed, 1 deletion(-)

diff --git a/GitSharp.Core/GitSharp.Core.csproj b/GitSharp.Core/GitSharp.Core.csproj
index 08f058e0..d6ff4e9c 100644
--- a/GitSharp.Core/GitSharp.Core.csproj
+++ b/GitSharp.Core/GitSharp.Core.csproj
@@ -369,7 +369,6 @@
     <Compile Include="Util\RawCharSequence.cs" />
     <Compile Include="Util\RawSubstringPattern.cs" />
     <Compile Include="Util\TemporaryBuffer.cs" />
-    <Compile Include="VersionAssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="CachedObjectDirectory.cs" />