Name Consistency

McNeight · McNeight · commit 38a032dd4c75 · 2016-03-31T19:10:12.000-07:00
* Changed filenames using SharpZLib to use SharpZipLib
* Updated references to those files
* Changed comments using SharpZipLibrary to use SharpZipLib
diff --git a/ICSharpCode.SharpZipLib.cmbx b/ICSharpCode.SharpZipLib.cmbx
@@ -1,7 +1,7 @@
 <Combine fileversion="1.0" name="SharpZipLib" description="">
   <StartMode startupentry="ICSharpCode.SharpZipLib" single="True" />
   <Entries>
-    <Entry filename=".\src\ICSharpCode.SharpZLib.prjx" />
+    <Entry filename=".\src\ICSharpCode.SharpZipLib.prjx" />
   </Entries>
   <Configurations active="Debug">
     <Configuration name="Release" />
diff --git a/ICSharpCode.SharpZipLib.sln b/ICSharpCode.SharpZipLib.sln
@@ -4,7 +4,7 @@ Microsoft Visual Studio Solution File, Format Version 9.00
 # SharpDevelop 2.2.1.2660
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpZipLibTests", "tests\SharpZipLibTests.csproj", "{4F9BF21E-A7FC-4005-A1C7-A17108F7010D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpZLib", "src\ICSharpCode.SharpZLib.csproj", "{0E7413FF-EB9E-4714-ACF2-BE3A6A7B2FFD}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpZipLib", "src\ICSharpCode.SharpZipLib.csproj", "{0E7413FF-EB9E-4714-ACF2-BE3A6A7B2FFD}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/ICSharpCode.SharpZipLib2005.sln b/ICSharpCode.SharpZipLib2005.sln
@@ -4,7 +4,7 @@ Microsoft Visual Studio Solution File, Format Version 9.00
 # SharpDevelop 2.2.1.2660
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpZipLibTests", "tests\SharpZipLibTests.csproj", "{4F9BF21E-A7FC-4005-A1C7-A17108F7010D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpZLib", "src\ICSharpCode.SharpZLib.csproj", "{0E7413FF-EB9E-4714-ACF2-BE3A6A7B2FFD}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpZipLib", "src\ICSharpCode.SharpZipLib.csproj", "{0E7413FF-EB9E-4714-ACF2-BE3A6A7B2FFD}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/ICSharpCode.SharpZipLib2008.sln b/ICSharpCode.SharpZipLib2008.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual Studio 2008
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpZipLibTests", "tests\SharpZipLibTests.csproj", "{4F9BF21E-A7FC-4005-A1C7-A17108F7010D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpZLib", "src\ICSharpCode.SharpZLib.csproj", "{0E7413FF-EB9E-4714-ACF2-BE3A6A7B2FFD}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpZipLib", "src\ICSharpCode.SharpZipLib.csproj", "{0E7413FF-EB9E-4714-ACF2-BE3A6A7B2FFD}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/SharpZipAll.sln b/SharpZipAll.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual Studio 2008
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpZipLibTests", "tests\SharpZipLibTests.csproj", "{4F9BF21E-A7FC-4005-A1C7-A17108F7010D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpZLib", "src\ICSharpCode.SharpZLib.csproj", "{0E7413FF-EB9E-4714-ACF2-BE3A6A7B2FFD}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpZipLib", "src\ICSharpCode.SharpZipLib.csproj", "{0E7413FF-EB9E-4714-ACF2-BE3A6A7B2FFD}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "sz", "samples\cs\sz\sz.csproj", "{CE0CEA62-CC91-4D17-BC57-A5FCACCA6A1F}"
 EndProject
diff --git a/SharpZipAll2005.sln b/SharpZipAll2005.sln
@@ -1,7 +1,7 @@
 ﻿
 Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual Studio 2005
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpZLib", "src\ICSharpCode.SharpZLib.csproj", "{0E7413FF-EB9E-4714-ACF2-BE3A6A7B2FFD}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpZipLib", "src\ICSharpCode.SharpZipLib.csproj", "{0E7413FF-EB9E-4714-ACF2-BE3A6A7B2FFD}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "zf", "samples\cs\zf\zf.csproj", "{90E83588-261C-45A3-964F-4B707357D437}"
 EndProject
diff --git a/SharpZipAll2008.sln b/SharpZipAll2008.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual Studio 2008
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpZipLibTests", "tests\SharpZipLibTests.csproj", "{4F9BF21E-A7FC-4005-A1C7-A17108F7010D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpZLib", "src\ICSharpCode.SharpZLib.csproj", "{0E7413FF-EB9E-4714-ACF2-BE3A6A7B2FFD}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpZipLib", "src\ICSharpCode.SharpZipLib.csproj", "{0E7413FF-EB9E-4714-ACF2-BE3A6A7B2FFD}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "sz", "samples\cs\sz\sz.csproj", "{CE0CEA62-CC91-4D17-BC57-A5FCACCA6A1F}"
 EndProject
diff --git a/SharpZipLib.build b/SharpZipLib.build
diff --git a/mkDistribution.bat b/mkDistribution.bat
@@ -7,16 +7,16 @@ if exist current (
 mkdir current
 
 REM mkdir current\netcf-10
-REM nant -t:netcf-1.0 -D:build.output.dir=current\netcf-10 -buildfile:sharpZLib.build build
+REM nant -t:netcf-1.0 -D:build.output.dir=current\netcf-10 -buildfile:SharpZipLib.build build
 
 mkdir current\netcf-20
-nant -t:netcf-2.0 -D:build.output.dir=current\netcf-20 -buildfile:sharpZLib.build build
+nant -t:netcf-2.0 -D:build.output.dir=current\netcf-20 -buildfile:SharpZipLib.build build
 
 mkdir current\net-11
-nant -t:net-1.1 -D:build.output.dir=current\net-11 -buildfile:sharpZLib.build build
+nant -t:net-1.1 -D:build.output.dir=current\net-11 -buildfile:SharpZipLib.build build
 
 mkdir current\net-20
-nant -t:net-2.0 -D:build.output.dir=current\net-20 -buildfile:sharpZLib.build build
+nant -t:net-2.0 -D:build.output.dir=current\net-20 -buildfile:SharpZipLib.build build
 
 @rem Version 1.8 of Sandcastle Help File Builder no longer includes the Console.exe, use the GUI instead
 "c:\Program Files\EWSoftware\Sandcastle Help File Builder\SandcastleBuilderConsole.exe" .\SharpZipLib.shfb
diff --git a/samples/cs/CreateZipFile/Main.cs b/samples/cs/CreateZipFile/Main.cs
@@ -1,4 +1,4 @@
-// SharpZipLibrary samples
+// SharpZipLib samples
 // Copyright (c) 2007, AlphaSierraPapa
 // All rights reserved.
 //
diff --git a/samples/cs/FastZip/FastZip.cmbx b/samples/cs/FastZip/FastZip.cmbx
@@ -5,7 +5,7 @@
   </StartMode>
   <Entries>
     <Entry filename=".\FastZip.prjx" />
-    <Entry filename="..\..\..\ICSharpCode.SharpZLib.cmbx" />
+    <Entry filename="..\..\..\ICSharpCode.SharpZipLib.cmbx" />
   </Entries>
   <Configurations active="Debug">
     <Configuration name="Release">
diff --git a/samples/cs/FastZip/FastZip.sln b/samples/cs/FastZip/FastZip.sln
@@ -4,7 +4,7 @@ Microsoft Visual Studio Solution File, Format Version 9.00
 # SharpDevelop 2.2.0.2595
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FastZip", "FastZip.csproj", "{61BE8DBC-149A-4564-B891-9EEA4A09ED12}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpZipLib", "..\..\..\src\ICSharpCode.SharpZLib.csproj", "{0E7413FF-EB9E-4714-ACF2-BE3A6A7B2FFD}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpZipLib", "..\..\..\src\ICSharpCode.SharpZipLib.csproj", "{0E7413FF-EB9E-4714-ACF2-BE3A6A7B2FFD}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/cs/FastZip/Main.cs b/samples/cs/FastZip/Main.cs
@@ -1,4 +1,4 @@
-// SharpZipLibrary samples
+// SharpZipLib samples
 // Copyright (c) 2007, AlphaSierraPapa
 // All rights reserved.
 //
diff --git a/samples/cs/minibzip2/Main.cs b/samples/cs/minibzip2/Main.cs
@@ -1,4 +1,4 @@
-// SharpZipLibrary samples
+// SharpZipLib samples
 // Copyright (c) 2007, AlphaSierraPapa
 // All rights reserved.
 //
diff --git a/samples/cs/minigzip/Main.cs b/samples/cs/minigzip/Main.cs
@@ -1,4 +1,4 @@
-// SharpZipLibrary samples
+// SharpZipLib samples
 // Copyright (c) 2007, AlphaSierraPapa
 // All rights reserved.
 //
diff --git a/samples/cs/sz/sz.cs b/samples/cs/sz/sz.cs
@@ -1,4 +1,4 @@
-// SharpZipLibrary samples
+// SharpZipLib samples
 //
 // $Id$
 // $URL$
diff --git a/samples/cs/tar/Main.cs b/samples/cs/tar/Main.cs
@@ -1,4 +1,4 @@
-// SharpZipLibrary samples
+// SharpZipLib samples
 // Copyright (c) 2007, AlphaSierraPapa
 // All rights reserved.
 //
diff --git a/samples/cs/tar/Tar.csproj b/samples/cs/tar/Tar.csproj
@@ -41,9 +41,9 @@
     <Compile Include="Main.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\ICSharpCode.SharpZLib.csproj">
+    <ProjectReference Include="..\..\..\src\ICSharpCode.SharpZipLib.csproj">
       <Project>{0E7413FF-EB9E-4714-ACF2-BE3A6A7B2FFD}</Project>
-      <Name>ICSharpCode.SharpZLib</Name>
+      <Name>ICSharpCode.SharpZipLib</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
diff --git a/samples/cs/unzipfile/UnZipFile.cs b/samples/cs/unzipfile/UnZipFile.cs
@@ -1,4 +1,4 @@
-// SharpZipLibrary samples
+// SharpZipLib samples
 // Copyright (c) 2007, AlphaSierraPapa
 // All rights reserved.
 //
diff --git a/samples/cs/zipfiletest/ZipFileTest.cs b/samples/cs/zipfiletest/ZipFileTest.cs
@@ -1,4 +1,4 @@
-// SharpZipLibrary samples
+// SharpZipLib samples
 // Copyright (c) 2007, AlphaSierraPapa
 // All rights reserved.
 //
diff --git a/samples/vb/CreateZipFile/AssemblyInfo.vb b/samples/vb/CreateZipFile/AssemblyInfo.vb
@@ -8,7 +8,7 @@ Imports System.Runtime.CompilerServices
 ' you compile.
 
 <assembly: AssemblyTitle("CreateZipFile")>
-<assembly: AssemblyDescription("SharpZipLibrary Sample")>
+<assembly: AssemblyDescription("SharpZipLib Sample")>
 <assembly: AssemblyConfiguration("")>
 <assembly: AssemblyCompany("ICSharpCode.NET")>
 <assembly: AssemblyProduct("")>
diff --git a/samples/vb/CreateZipFile/MainForm.vb b/samples/vb/CreateZipFile/MainForm.vb
@@ -1,4 +1,4 @@
-' SharpZipLibrary samples
+' SharpZipLib samples
 ' Copyright (c) 2007, AlphaSierraPapa
 ' All rights reserved.
 '
diff --git a/samples/vb/minibzip2/Main.vb b/samples/vb/minibzip2/Main.vb
@@ -1,4 +1,4 @@
-' SharpZipLibrary samples
+' SharpZipLib samples
 ' Copyright (c) 2007, AlphaSierraPapa
 ' All rights reserved.
 '
diff --git a/samples/vb/viewzipfile/Main.vb b/samples/vb/viewzipfile/Main.vb
@@ -1,4 +1,4 @@
-' SharpZipLibrary samples
+' SharpZipLib samples
 ' Copyright (c) 2007, AlphaSierraPapa
 ' All rights reserved.
 '
diff --git a/src/AssemblyInfo.cs b/src/AssemblyInfo.cs
@@ -60,7 +60,7 @@
 #elif (MONO_2_0)
 [assembly: AssemblyTitle("SharpZipLib for Mono 2.0")]
 #else
-[assembly: AssemblyTitle("SharpZipLibrary unlabelled version")]
+[assembly: AssemblyTitle("SharpZipLib unlabelled version")]
 #endif
 
 [assembly: AssemblyDescription("A free C# compression library")]
diff --git a/src/ICSharpCode.SharpZipLib.csproj b/src/ICSharpCode.SharpZipLib.csproj
diff --git a/src/ICSharpCode.SharpZipLib.prjx b/src/ICSharpCode.SharpZipLib.prjx
diff --git a/src/SharpZipBaseException.cs b/src/SharpZipBaseException.cs
@@ -42,7 +42,7 @@
 namespace ICSharpCode.SharpZipLib
 {
 	/// <summary>
-	/// SharpZipBaseException is the base exception class for the SharpZipLibrary.
+	/// SharpZipBaseException is the base exception class for SharpZipLib.
 	/// All library exceptions are derived from this.
 	/// </summary>
 	/// <remarks>NOTE: Not all exceptions thrown will be derived from this class.
diff --git a/tests/SharpZipLibTests.csproj b/tests/SharpZipLibTests.csproj
@@ -56,9 +56,9 @@
     <Compile Include="Base\InflaterDeflaterTests.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\src\ICSharpCode.SharpZLib.csproj">
+    <ProjectReference Include="..\src\ICSharpCode.SharpZipLib.csproj">
       <Project>{18D20629-913A-4474-B2D1-643290E14ED7}</Project>
-      <Name>ICSharpCode.SharpZLib</Name>
+      <Name>ICSharpCode.SharpZipLib</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// SharpZipLibrary samples`
	`1`	`+// SharpZipLib samples`
`2`	`2`	`// Copyright (c) 2007, AlphaSierraPapa`
`3`	`3`	`// All rights reserved.`
`4`	`4`	`//`