Update MSVC project files for recent changes. Added new projects for libprotobuf-lite and the lite test.

6 files changed, 693 insertions, 9 deletions

diff --git a/vsprojects/libprotobuf-lite.vcproj b/vsprojects/libprotobuf-lite.vcproj
new file mode 100644
index 00000000..7e7b1e66
--- /dev/null
+++ b/vsprojects/libprotobuf-lite.vcproj
@@ -0,0 +1,270 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<VisualStudioProject

+	ProjectType="Visual C++"

+	Version="9.00"

+	Name="libprotobuf-lite"

+	ProjectGUID="{49EA010D-706F-4BE2-A397-77854B72A040}"

+	Keyword="Win32Proj"

+	TargetFrameworkVersion="0"

+	>

+	<Platforms>

+		<Platform

+			Name="Win32"

+		/>

+	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

+	<Configurations>

+		<Configuration

+			Name="Debug|Win32"

+			OutputDirectory="Debug"

+			IntermediateDirectory="Debug"

+			ConfigurationType="4"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				AdditionalOptions="/wd4244 /wd4267 /wd4018 /wd4355 /wd4800 /wd4251 /wd4996 /wd4146 /wd4305"

+				Optimization="0"

+				AdditionalIncludeDirectories="../src;."

+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPROTOBUF_EXPORTS;"

+				MinimalRebuild="true"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				WarningLevel="3"

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="4"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLibrarianTool"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|Win32"

+			OutputDirectory="Release"

+			IntermediateDirectory="Release"

+			ConfigurationType="4"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				AdditionalOptions="/wd4244 /wd4267 /wd4018 /wd4355 /wd4800 /wd4251 /wd4996 /wd4146 /wd4305"

+				AdditionalIncludeDirectories="../src;."

+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPROTOBUF_EXPORTS;"

+				RuntimeLibrary="2"

+				UsePrecompiledHeader="0"

+				WarningLevel="3"

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="3"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLibrarianTool"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+	</Configurations>

+	<References>

+	</References>

+	<Files>

+		<Filter

+			Name="Header Files"

+			Filter="h;hpp;hxx;hm;inl;inc;xsd"

+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

+			>

+			<File

+				RelativePath="..\src\google\protobuf\io\coded_stream.h"

+				>

+			</File>

+			<File

+				RelativePath="..\src\google\protobuf\stubs\common.h"

+				>

+			</File>

+			<File

+				RelativePath=".\config.h"

+				>

+			</File>

+			<File

+				RelativePath="..\src\google\protobuf\extension_set.h"

+				>

+			</File>

+			<File

+				RelativePath="..\src\google\protobuf\generated_message_util.h"

+				>

+			</File>

+			<File

+				RelativePath="..\src\google\protobuf\stubs\hash.h"

+				>

+			</File>

+			<File

+				RelativePath="..\src\google\protobuf\stubs\map-util.h"

+				>

+			</File>

+			<File

+				RelativePath="..\src\google\protobuf\message_lite.h"

+				>

+			</File>

+			<File

+				RelativePath="..\src\google\protobuf\stubs\once.h"

+				>

+			</File>

+			<File

+				RelativePath="..\src\google\protobuf\repeated_field.h"

+				>

+			</File>

+			<File

+				RelativePath="..\src\google\protobuf\stubs\stl_util-inl.h"

+				>

+			</File>

+			<File

+				RelativePath="..\src\google\protobuf\wire_format_lite.h"

+				>

+			</File>

+			<File

+				RelativePath="..\src\google\protobuf\wire_format_lite_inl.h"

+				>

+			</File>

+			<File

+				RelativePath="..\src\google\protobuf\io\zero_copy_stream.h"

+				>

+			</File>

+			<File

+				RelativePath="..\src\google\protobuf\io\zero_copy_stream_impl_lite.h"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="Resource Files"

+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

+			>

+		</Filter>

+		<Filter

+			Name="Source Files"

+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"

+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

+			>

+			<File

+				RelativePath="..\src\google\protobuf\io\coded_stream.cc"

+				>

+			</File>

+			<File

+				RelativePath="..\src\google\protobuf\stubs\common.cc"

+				>

+			</File>

+			<File

+				RelativePath="..\src\google\protobuf\extension_set.cc"

+				>

+			</File>

+			<File

+				RelativePath="..\src\google\protobuf\generated_message_util.cc"

+				>

+			</File>

+			<File

+				RelativePath="..\src\google\protobuf\stubs\hash.cc"

+				>

+			</File>

+			<File

+				RelativePath="..\src\google\protobuf\message_lite.cc"

+				>

+			</File>

+			<File

+				RelativePath="..\src\google\protobuf\stubs\once.cc"

+				>

+			</File>

+			<File

+				RelativePath="..\src\google\protobuf\repeated_field.cc"

+				>

+			</File>

+			<File

+				RelativePath="..\src\google\protobuf\wire_format_lite.cc"

+				>

+			</File>

+			<File

+				RelativePath="..\src\google\protobuf\io\zero_copy_stream.cc"

+				>

+			</File>

+			<File

+				RelativePath="..\src\google\protobuf\io\zero_copy_stream_impl_lite.cc"

+				>

+			</File>

+		</Filter>

+	</Files>

+	<Globals>

+	</Globals>

+</VisualStudioProject>

diff --git a/vsprojects/libprotobuf.vcproj b/vsprojects/libprotobuf.vcproj
index d08bf091..d6258675 100644
--- a/vsprojects/libprotobuf.vcproj
+++ b/vsprojects/libprotobuf.vcproj
@@ -184,6 +184,10 @@
 				>

 			</File>

 			<File

+				RelativePath="..\src\google\protobuf\generated_message_util.h"

+				>

+			</File>

+			<File

 				RelativePath="..\src\google\protobuf\io\gzip_stream.h"

 				>

 			</File>

@@ -204,6 +208,10 @@
 				>

 			</File>

 			<File

+				RelativePath="..\src\google\protobuf\message_lite.h"

+				>

+			</File>

+			<File

 				RelativePath="..\src\google\protobuf\stubs\once.h"

 				>

 			</File>

@@ -256,7 +264,11 @@
 				>

 			</File>

 			<File

-				RelativePath="..\src\google\protobuf\wire_format_inl.h"

+				RelativePath="..\src\google\protobuf\wire_format_lite.h"

+				>

+			</File>

+			<File

+				RelativePath="..\src\google\protobuf\wire_format_lite_inl.h"

 				>

 			</File>

 			<File

@@ -267,6 +279,10 @@
 				RelativePath="..\src\google\protobuf\io\zero_copy_stream_impl.h"

 				>

 			</File>

+			<File

+				RelativePath="..\src\google\protobuf\io\zero_copy_stream_impl_lite.h"

+				>

+			</File>

 		</Filter>

 		<Filter

 			Name="Resource Files"

@@ -308,10 +324,18 @@
 				>

 			</File>

 			<File

+				RelativePath="..\src\google\protobuf\extension_set_heavy.cc"

+				>

+			</File>

+			<File

 				RelativePath="..\src\google\protobuf\generated_message_reflection.cc"

 				>

 			</File>

 			<File

+				RelativePath="..\src\google\protobuf\generated_message_util.cc"

+				>

+			</File>

+			<File

 				RelativePath="..\src\google\protobuf\io\gzip_stream.cc"

 				>

 			</File>

@@ -324,11 +348,11 @@
 				>

 			</File>

 			<File

-				RelativePath="..\src\google\protobuf\stubs\map-util.cc"

+				RelativePath="..\src\google\protobuf\message.cc"

 				>

 			</File>

 			<File

-				RelativePath="..\src\google\protobuf\message.cc"

+				RelativePath="..\src\google\protobuf\message_lite.cc"

 				>

 			</File>

 			<File

@@ -356,10 +380,6 @@
 				>

 			</File>

 			<File

-				RelativePath="..\src\google\protobuf\stubs\stl_util-inl.cc"

-				>

-			</File>

-			<File

 				RelativePath="..\src\google\protobuf\stubs\structurally_valid.cc"

 				>

 			</File>

@@ -388,6 +408,10 @@
 				>

 			</File>

 			<File

+				RelativePath="..\src\google\protobuf\wire_format_lite.cc"

+				>

+			</File>

+			<File

 				RelativePath="..\src\google\protobuf\io\zero_copy_stream.cc"

 				>

 			</File>

@@ -395,6 +419,10 @@
 				RelativePath="..\src\google\protobuf\io\zero_copy_stream_impl.cc"

 				>

 			</File>

+			<File

+				RelativePath="..\src\google\protobuf\io\zero_copy_stream_impl_lite.cc"

+				>

+			</File>

 		</Filter>

 	</Files>

 	<Globals>

diff --git a/vsprojects/lite-test.vcproj b/vsprojects/lite-test.vcproj
new file mode 100644
index 00000000..50153cfb
--- /dev/null
+++ b/vsprojects/lite-test.vcproj
@@ -0,0 +1,273 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<VisualStudioProject

+	ProjectType="Visual C++"

+	Version="9.00"

+	Name="lite-test"

+	ProjectGUID="{12015ACE-42BE-4952-A5A0-44A9A46908E2}"

+	RootNamespace="tests"

+	Keyword="Win32Proj"

+	TargetFrameworkVersion="0"

+	>

+	<Platforms>

+		<Platform

+			Name="Win32"

+		/>

+	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

+	<Configurations>

+		<Configuration

+			Name="Debug|Win32"

+			OutputDirectory="Debug"

+			IntermediateDirectory="Debug"

+			ConfigurationType="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+				Description=""

+				CommandLine=""

+				AdditionalDependencies=""

+				Outputs=""

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				AdditionalOptions="/wd4244 /wd4267 /wd4018 /wd4355 /wd4800 /wd4251 /wd4996 /wd4146 /wd4305"

+				Optimization="0"

+				AdditionalIncludeDirectories="../src;.;../gtest/include"

+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;"

+				MinimalRebuild="true"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				WarningLevel="3"

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="4"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				LinkIncremental="2"

+				GenerateDebugInformation="true"

+				SubSystem="1"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|Win32"

+			OutputDirectory="Release"

+			IntermediateDirectory="Release"

+			ConfigurationType="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+				Description=""

+				CommandLine=""

+				AdditionalDependencies=""

+				Outputs=""

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				AdditionalOptions="/wd4244 /wd4267 /wd4018 /wd4355 /wd4800 /wd4251 /wd4996 /wd4146 /wd4305"

+				AdditionalIncludeDirectories="../src;.;../gtest/include"

+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;"

+				RuntimeLibrary="2"

+				UsePrecompiledHeader="0"

+				WarningLevel="3"

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="3"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				LinkIncremental="2"

+				GenerateDebugInformation="true"

+				SubSystem="1"

+				OptimizeReferences="2"

+				EnableCOMDATFolding="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+	</Configurations>

+	<References>

+	</References>

+	<Files>

+		<Filter

+			Name="Header Files"

+			Filter="h;hpp;hxx;hm;inl;inc;xsd"

+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

+			>

+			<File

+				RelativePath="..\src\google\protobuf\test_util_lite.h"

+				>

+			</File>

+			<File

+				RelativePath=".\google\protobuf\unittest_lite.pb.h"

+				>

+			</File>

+			<File

+				RelativePath=".\google\protobuf\unittest_import_lite.pb.h"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="Resource Files"

+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

+			>

+		</Filter>

+		<Filter

+			Name="Source Files"

+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"

+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

+			>

+			<File

+				RelativePath="..\src\google\protobuf\lite_unittest.cc"

+				>

+			</File>

+			<File

+				RelativePath="..\src\google\protobuf\test_util_lite.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\google\protobuf\unittest_lite.pb.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\google\protobuf\unittest_import_lite.pb.cc"

+				>

+			</File>

+		</Filter>

+		<File

+			RelativePath="..\src\google\protobuf\unittest_lite.proto"

+			>

+			<FileConfiguration

+				Name="Debug|Win32"

+				>

+				<Tool

+					Name="VCCustomBuildTool"

+					Description="Generating unittest_lite.pb.{h,cc}..."

+					CommandLine="Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_lite.proto&#x0D;&#x0A;"

+					Outputs="google\protobuf\unittest_lite.pb.h;google\protobuf\unittest_lite.pb.cc"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release|Win32"

+				>

+				<Tool

+					Name="VCCustomBuildTool"

+					Description="Generating unittest_lite.pb.{h,cc}..."

+					CommandLine="Release\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_lite.proto&#x0D;&#x0A;"

+					Outputs="google\protobuf\unittest_lite.pb.h;google\protobuf\unittest_lite.pb.cc"

+				/>

+			</FileConfiguration>

+		</File>

+		<File

+			RelativePath="..\src\google\protobuf\unittest_import_lite.proto"

+			>

+			<FileConfiguration

+				Name="Debug|Win32"

+				>

+				<Tool

+					Name="VCCustomBuildTool"

+					Description="Generating unittest_import_lite.pb.{h,cc}..."

+					CommandLine="Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_import_lite.proto&#x0D;&#x0A;"

+					Outputs="google\protobuf\unittest_import_lite.pb.h;google\protobuf\unittest_import_lite.pb.cc"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release|Win32"

+				>

+				<Tool

+					Name="VCCustomBuildTool"

+					Description="Generating unittest_import_lite.pb.{h,cc}..."

+					CommandLine="Release\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_import_lite.proto&#x0D;&#x0A;"

+					Outputs="google\protobuf\unittest_import_lite.pb.h;google\protobuf\unittest_import_lite.pb.cc"

+				/>

+			</FileConfiguration>

+		</File>

+	</Files>

+	<Globals>

+	</Globals>

+</VisualStudioProject>

diff --git a/vsprojects/protobuf.sln b/vsprojects/protobuf.sln
index 7b022432..116c68c3 100644
--- a/vsprojects/protobuf.sln
+++ b/vsprojects/protobuf.sln
@@ -27,6 +27,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest", "..\gtest\msvc\gtes
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_main", "..\gtest\msvc\gtest_main.vcproj", "{3AF54C8A-10BF-4332-9147-F68ED9862032}"

 EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libprotobuf-lite", "libprotobuf-lite.vcproj", "{49EA010D-706F-4BE2-A397-77854B72A040}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lite-test", "lite-test.vcproj", "{12015ACE-42BE-4952-A5A0-44A9A46908E2}"

+	ProjectSection(ProjectDependencies) = postProject

+		{49EA010D-706F-4BE2-A397-77854B72A040} = {49EA010D-706F-4BE2-A397-77854B72A040}

+	EndProjectSection

+EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

 		Debug|Win32 = Debug|Win32

@@ -57,6 +64,14 @@ Global
 		{3AF54C8A-10BF-4332-9147-F68ED9862032}.Debug|Win32.Build.0 = Debug|Win32

 		{3AF54C8A-10BF-4332-9147-F68ED9862032}.Release|Win32.ActiveCfg = Release|Win32

 		{3AF54C8A-10BF-4332-9147-F68ED9862032}.Release|Win32.Build.0 = Release|Win32

+		{49EA010D-706F-4BE2-A397-77854B72A040}.Debug|Win32.ActiveCfg = Debug|Win32

+		{49EA010D-706F-4BE2-A397-77854B72A040}.Debug|Win32.Build.0 = Debug|Win32

+		{49EA010D-706F-4BE2-A397-77854B72A040}.Release|Win32.ActiveCfg = Release|Win32

+		{49EA010D-706F-4BE2-A397-77854B72A040}.Release|Win32.Build.0 = Release|Win32

+		{12015ACE-42BE-4952-A5A0-44A9A46908E2}.Debug|Win32.ActiveCfg = Debug|Win32

+		{12015ACE-42BE-4952-A5A0-44A9A46908E2}.Debug|Win32.Build.0 = Debug|Win32

+		{12015ACE-42BE-4952-A5A0-44A9A46908E2}.Release|Win32.ActiveCfg = Release|Win32

+		{12015ACE-42BE-4952-A5A0-44A9A46908E2}.Release|Win32.Build.0 = Release|Win32

 	EndGlobalSection

 	GlobalSection(SolutionProperties) = preSolution

 		HideSolutionNode = FALSE

diff --git a/vsprojects/readme.txt b/vsprojects/readme.txt
index 8a4ac9fc..0d1ea62f 100644
--- a/vsprojects/readme.txt
+++ b/vsprojects/readme.txt
@@ -9,14 +9,16 @@ Compiling and Installing
 1) Open protobuf.sln in Microsoft Visual Studio.
 2) Choose "Debug" or "Release" configuration as desired.*
 3) From the Build menu, choose "Build Solution".  Wait for compiling to finish.
-4) From a command shell, run tests.exe and check that all tests pass.
+4) From a command shell, run tests.exe and lite-test.exe and check that all
+   tests pass.
 5) Run extract_includes.bat to copy all the public headers into a separate
    "include" directory (under the top-level package directory).
 6) Copy the contents of the include directory to wherever you want to put
    headers.
 7) Copy protoc.exe wherever you put build tools (probably somewhere in your
    PATH).
-8) Copy libprotobuf.lib and libprotoc.lib wherever you put libraries.
+8) Copy libprotobuf.lib, libprotobuf-lite.lib, and libprotoc.lib wherever you
+   put libraries.
 
 * To avoid conflicts between the MSVC debug and release runtime libraries, when
   compiling a debug build of your application, you may need to link against a
diff --git a/vsprojects/tests.vcproj b/vsprojects/tests.vcproj
index 4fa4ac07..c64ecca5 100644
--- a/vsprojects/tests.vcproj
+++ b/vsprojects/tests.vcproj
@@ -199,6 +199,14 @@
 				>

 			</File>

 			<File

+				RelativePath=".\google\protobuf\unittest_lite.pb.h"

+				>

+			</File>

+			<File

+				RelativePath=".\google\protobuf\unittest_lite_imports_nonline.pb.h"

+				>

+			</File>

+			<File

 				RelativePath=".\google\protobuf\unittest_custom_options.pb.h"

 				>

 			</File>

@@ -211,6 +219,10 @@
 				>

 			</File>

 			<File

+				RelativePath=".\google\protobuf\unittest_import_lite.pb.h"

+				>

+			</File>

+			<File

 				RelativePath=".\google\protobuf\unittest_mset.pb.h"

 				>

 			</File>

@@ -335,6 +347,14 @@
 				>

 			</File>

 			<File

+				RelativePath=".\google\protobuf\unittest_lite.pb.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\google\protobuf\unittest_lite_imports_nonlite.pb.cc"

+				>

+			</File>

+			<File

 				RelativePath=".\google\protobuf\unittest_custom_options.pb.cc"

 				>

 			</File>

@@ -347,6 +367,10 @@
 				>

 			</File>

 			<File

+				RelativePath=".\google\protobuf\unittest_import_lite.pb.cc"

+				>

+			</File>

+			<File

 				RelativePath=".\google\protobuf\unittest_mset.pb.cc"

 				>

 			</File>

@@ -416,6 +440,54 @@
 			</FileConfiguration>

 		</File>

 		<File

+			RelativePath="..\src\google\protobuf\unittest_lite.proto"

+			>

+			<FileConfiguration

+				Name="Debug|Win32"

+				>

+				<Tool

+					Name="VCCustomBuildTool"

+					Description="Generating unittest_lite.pb.{h,cc}..."

+					CommandLine="Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_lite.proto&#x0D;&#x0A;"

+					Outputs="google\protobuf\unittest_lite.pb.h;google\protobuf\unittest_lite.pb.cc"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release|Win32"

+				>

+				<Tool

+					Name="VCCustomBuildTool"

+					Description="Generating unittest_lite.pb.{h,cc}..."

+					CommandLine="Release\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_lite.proto&#x0D;&#x0A;"

+					Outputs="google\protobuf\unittest_lite.pb.h;google\protobuf\unittest_lite.pb.cc"

+				/>

+			</FileConfiguration>

+		</File>

+		<File

+			RelativePath="..\src\google\protobuf\unittest_lite_imports_nonlite.proto"

+			>

+			<FileConfiguration

+				Name="Debug|Win32"

+				>

+				<Tool

+					Name="VCCustomBuildTool"

+					Description="Generating unittest_lite_imports_nonlite.pb.{h,cc}..."

+					CommandLine="Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_lite_imports_nonlite.proto&#x0D;&#x0A;"

+					Outputs="google\protobuf\unittest_lite_imports_nonlite.pb.h;google\protobuf\unittest_lite_imports_nonlite.pb.cc"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release|Win32"

+				>

+				<Tool

+					Name="VCCustomBuildTool"

+					Description="Generating unittest_lite_imports_nonlite.pb.{h,cc}..."

+					CommandLine="Release\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_lite_imports_nonlite.proto&#x0D;&#x0A;"

+					Outputs="google\protobuf\unittest_lite_imports_nonlite.pb.h;google\protobuf\unittest_lite_imports_nonlite.pb.cc"

+				/>

+			</FileConfiguration>

+		</File>

+		<File

 			RelativePath="..\src\google\protobuf\unittest_custom_options.proto"

 			>

 			<FileConfiguration

@@ -488,6 +560,30 @@
 			</FileConfiguration>

 		</File>

 		<File

+			RelativePath="..\src\google\protobuf\unittest_import_lite.proto"

+			>

+			<FileConfiguration

+				Name="Debug|Win32"

+				>

+				<Tool

+					Name="VCCustomBuildTool"

+					Description="Generating unittest_import_lite.pb.{h,cc}..."

+					CommandLine="Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_import_lite.proto&#x0D;&#x0A;"

+					Outputs="google\protobuf\unittest_import_lite.pb.h;google\protobuf\unittest_import_lite.pb.cc"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release|Win32"

+				>

+				<Tool

+					Name="VCCustomBuildTool"

+					Description="Generating unittest_import_lite.pb.{h,cc}..."

+					CommandLine="Release\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_import_lite.proto&#x0D;&#x0A;"

+					Outputs="google\protobuf\unittest_import_lite.pb.h;google\protobuf\unittest_import_lite.pb.cc"

+				/>

+			</FileConfiguration>

+		</File>

+		<File

 			RelativePath="..\src\google\protobuf\unittest_mset.proto"

 			>

 			<FileConfiguration