Fixes to package generation, and convert all tabs to spaces in MSBuild files.

1 files changed, 98 insertions, 98 deletions

diff --git a/build/build.csproj b/build/build.csproj
index ad8d4c87..a3f342e6 100644
--- a/build/build.csproj
+++ b/build/build.csproj
@@ -1,102 +1,102 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
-	<PropertyGroup>
-		<ProjectName>Protocol Buffers</ProjectName>
+  <PropertyGroup>
+    <ProjectName>Protocol Buffers</ProjectName>
     <BuildConfiguration Condition=" '$(BuildConfiguration)' == '' ">Error</BuildConfiguration>
     <BuildTools Condition=" '$(BuildTools)' == '' ">4.0</BuildTools>
     <ForcedFrameworkVersion Condition=" '$(BuildTools)' == '3.5' ">TargetFrameworkVersion=v2.0;</ForcedFrameworkVersion>
 
     <!--Directory Paths-->
     <ProjectDirectory>$(MSBuildProjectDirectory)\..</ProjectDirectory>
-		<SourceDirectory>$(ProjectDirectory)\src</SourceDirectory>
-		<LibDirectory>$(ProjectDirectory)\lib</LibDirectory>
-		<ProtosDirectory>$(ProjectDirectory)\protos</ProtosDirectory>
-		<BenchmarkProtosDirectory>$(ProjectDirectory)\benchmarks</BenchmarkProtosDirectory>
-		<BuildTempDirectory>$(ProjectDirectory)\build_temp\$(BuildConfiguration)</BuildTempDirectory>
-		<BuildOutputDirectory>$(ProjectDirectory)\build_output\$(BuildConfiguration)</BuildOutputDirectory>
+    <SourceDirectory>$(ProjectDirectory)\src</SourceDirectory>
+    <LibDirectory>$(ProjectDirectory)\lib</LibDirectory>
+    <ProtosDirectory>$(ProjectDirectory)\protos</ProtosDirectory>
+    <BenchmarkProtosDirectory>$(ProjectDirectory)\benchmarks</BenchmarkProtosDirectory>
+    <BuildTempDirectory>$(ProjectDirectory)\build_temp\$(BuildConfiguration)</BuildTempDirectory>
+    <BuildOutputDirectory>$(ProjectDirectory)\build_output\$(BuildConfiguration)</BuildOutputDirectory>
 
     <PackageName Condition=" '$(PackageName)' == '' ">$(BuildConfiguration)</PackageName>
     
-		<!--File Paths-->
+    <!--File Paths-->
     <SolutionFile Condition=" '$(BuildTools)' == '4.0' ">$(SourceDirectory)\ProtocolBuffers.sln</SolutionFile>
     <SolutionFile Condition=" '$(BuildTools)' == '3.5' ">$(SourceDirectory)\ProtocolBuffers2008.sln</SolutionFile>
 
     <!--Tool Paths-->
-		<ProtocExePath>$(LibDirectory)\protoc.exe</ProtocExePath>
-		<ProtogenExePath>$(SourceDirectory)\ProtoGen\bin\$(BuildConfiguration)\protogen.exe</ProtogenExePath>
-		<ProtoBenchExePath>$(BuildTempDirectory)\ProtoBench.exe</ProtoBenchExePath>
-		<NUnitExePath>$(LibDirectory)\NUnit 2.2.8.0\nunit-console.exe</NUnitExePath>
-		<ZipExePath>$(LibDirectory)\7-Zip 9.20\7za.exe</ZipExePath>
-	</PropertyGroup>
+    <ProtocExePath>$(LibDirectory)\protoc.exe</ProtocExePath>
+    <ProtogenExePath>$(SourceDirectory)\ProtoGen\bin\$(BuildConfiguration)\protogen.exe</ProtogenExePath>
+    <ProtoBenchExePath>$(BuildTempDirectory)\ProtoBench.exe</ProtoBenchExePath>
+    <NUnitExePath>$(LibDirectory)\NUnit 2.2.8.0\nunit-console.exe</NUnitExePath>
+    <ZipExePath>$(LibDirectory)\7-Zip 9.20\7za.exe</ZipExePath>
+  </PropertyGroup>
 
-	<Import Project="Common.targets"/>
+  <Import Project="Common.targets"/>
 
-	<ItemGroup>
-		<WorkingDirectories Include="$(BuildTempDirectory)" />
-		<WorkingDirectories Include="$(BuildOutputDirectory)" />
+  <ItemGroup>
+    <WorkingDirectories Include="$(BuildTempDirectory)" />
+    <WorkingDirectories Include="$(BuildOutputDirectory)" />
 
-		<Protos Include="$(ProtosDirectory)\extest\unittest_extras_full.proto" />
-		<Protos Include="$(ProtosDirectory)\extest\unittest_extras_lite.proto" />
-		<Protos Include="$(ProtosDirectory)\google\protobuf\descriptor.proto" />
-		<Protos Include="$(ProtosDirectory)\google\protobuf\csharp_options.proto" />
-		<Protos Include="$(ProtosDirectory)\google\protobuf\unittest.proto" />
-		<Protos Include="$(ProtosDirectory)\google\protobuf\unittest_csharp_options.proto" />
-		<Protos Include="$(ProtosDirectory)\google\protobuf\unittest_custom_options.proto" />
-		<Protos Include="$(ProtosDirectory)\google\protobuf\unittest_embed_optimize_for.proto" />
-		<Protos Include="$(ProtosDirectory)\google\protobuf\unittest_empty.proto" />
-  	<Protos Include="$(ProtosDirectory)\google\protobuf\unittest_import.proto" />
-  	<Protos Include="$(ProtosDirectory)\google\protobuf\unittest_import_lite.proto" />
+    <Protos Include="$(ProtosDirectory)\extest\unittest_extras_full.proto" />
+    <Protos Include="$(ProtosDirectory)\extest\unittest_extras_lite.proto" />
+    <Protos Include="$(ProtosDirectory)\google\protobuf\descriptor.proto" />
+    <Protos Include="$(ProtosDirectory)\google\protobuf\csharp_options.proto" />
+    <Protos Include="$(ProtosDirectory)\google\protobuf\unittest.proto" />
+    <Protos Include="$(ProtosDirectory)\google\protobuf\unittest_csharp_options.proto" />
+    <Protos Include="$(ProtosDirectory)\google\protobuf\unittest_custom_options.proto" />
+    <Protos Include="$(ProtosDirectory)\google\protobuf\unittest_embed_optimize_for.proto" />
+    <Protos Include="$(ProtosDirectory)\google\protobuf\unittest_empty.proto" />
+    <Protos Include="$(ProtosDirectory)\google\protobuf\unittest_import.proto" />
+    <Protos Include="$(ProtosDirectory)\google\protobuf\unittest_import_lite.proto" />
     <Protos Include="$(ProtosDirectory)\google\protobuf\unittest_lite.proto" />
     <Protos Include="$(ProtosDirectory)\google\protobuf\unittest_lite_imports_nonlite.proto" />
-		<Protos Include="$(ProtosDirectory)\google\protobuf\unittest_mset.proto" />
-		<Protos Include="$(ProtosDirectory)\google\protobuf\unittest_no_generic_services.proto" />
-		<Protos Include="$(ProtosDirectory)\google\protobuf\unittest_optimize_for.proto" />
-		<Protos Include="$(ProtosDirectory)\tutorial\addressbook.proto" />
+    <Protos Include="$(ProtosDirectory)\google\protobuf\unittest_mset.proto" />
+    <Protos Include="$(ProtosDirectory)\google\protobuf\unittest_no_generic_services.proto" />
+    <Protos Include="$(ProtosDirectory)\google\protobuf\unittest_optimize_for.proto" />
+    <Protos Include="$(ProtosDirectory)\tutorial\addressbook.proto" />
 
         <!-- Main protos -->
-		<GeneratedSource Include="$(BuildTempDirectory)\CSharpOptions.cs">
-			<TargetDirectory>$(SourceDirectory)\ProtocolBuffers\DescriptorProtos</TargetDirectory>
-		</GeneratedSource>
-		<GeneratedSource Include="$(BuildTempDirectory)\DescriptorProtoFile.cs">
-			<TargetDirectory>$(SourceDirectory)\ProtocolBuffers\DescriptorProtos</TargetDirectory>
-		</GeneratedSource>
+    <GeneratedSource Include="$(BuildTempDirectory)\CSharpOptions.cs">
+      <TargetDirectory>$(SourceDirectory)\ProtocolBuffers\DescriptorProtos</TargetDirectory>
+    </GeneratedSource>
+    <GeneratedSource Include="$(BuildTempDirectory)\DescriptorProtoFile.cs">
+      <TargetDirectory>$(SourceDirectory)\ProtocolBuffers\DescriptorProtos</TargetDirectory>
+    </GeneratedSource>
         
         <!-- Address book sample -->
-		<GeneratedSource Include="$(BuildTempDirectory)\AddressBookProtos.cs">
-			<TargetDirectory>$(SourceDirectory)\AddressBook</TargetDirectory>
-		</GeneratedSource>
+    <GeneratedSource Include="$(BuildTempDirectory)\AddressBookProtos.cs">
+      <TargetDirectory>$(SourceDirectory)\AddressBook</TargetDirectory>
+    </GeneratedSource>
     <!-- Unit test -->
-		<GeneratedSource Include="$(BuildTempDirectory)\UnitTestCSharpOptionsProtoFile.cs">
-			<TargetDirectory>$(SourceDirectory)\ProtocolBuffers.Test\TestProtos</TargetDirectory>
-		</GeneratedSource>
-		<GeneratedSource Include="$(BuildTempDirectory)\UnitTestCustomOptionsProtoFile.cs">
-			<TargetDirectory>$(SourceDirectory)\ProtocolBuffers.Test\TestProtos</TargetDirectory>
-		</GeneratedSource>
-		<GeneratedSource Include="$(BuildTempDirectory)\UnitTestEmbedOptimizeForProtoFile.cs">
-			<TargetDirectory>$(SourceDirectory)\ProtocolBuffers.Test\TestProtos</TargetDirectory>
-		</GeneratedSource>
-		<GeneratedSource Include="$(BuildTempDirectory)\UnitTestEmptyProtoFile.cs">
-			<TargetDirectory>$(SourceDirectory)\ProtocolBuffers.Test\TestProtos</TargetDirectory>
-		</GeneratedSource>
-		<GeneratedSource Include="$(BuildTempDirectory)\UnitTestImportLiteProtoFile.cs">
-			<TargetDirectory>$(SourceDirectory)\ProtocolBuffers.Test\TestProtos</TargetDirectory>
-		</GeneratedSource>	
-		<GeneratedSource Include="$(BuildTempDirectory)\UnitTestImportProtoFile.cs">
-			<TargetDirectory>$(SourceDirectory)\ProtocolBuffers.Test\TestProtos</TargetDirectory>
-		</GeneratedSource>
-		<GeneratedSource Include="$(BuildTempDirectory)\UnitTestMessageSetProtoFile.cs">
-			<TargetDirectory>$(SourceDirectory)\ProtocolBuffers.Test\TestProtos</TargetDirectory>
-		</GeneratedSource>
-		<GeneratedSource Include="$(BuildTempDirectory)\UnitTestNoGenericServicesProtoFile.cs">
-			<TargetDirectory>$(SourceDirectory)\ProtocolBuffers.Test\TestProtos</TargetDirectory>
-		</GeneratedSource>
-		<GeneratedSource Include="$(BuildTempDirectory)\UnitTestOptimizeForProtoFile.cs">
-			<TargetDirectory>$(SourceDirectory)\ProtocolBuffers.Test\TestProtos</TargetDirectory>
-		</GeneratedSource>
-		<GeneratedSource Include="$(BuildTempDirectory)\UnitTestProtoFile.cs">
-			<TargetDirectory>$(SourceDirectory)\ProtocolBuffers.Test\TestProtos</TargetDirectory>
-		</GeneratedSource>
+    <GeneratedSource Include="$(BuildTempDirectory)\UnitTestCSharpOptionsProtoFile.cs">
+      <TargetDirectory>$(SourceDirectory)\ProtocolBuffers.Test\TestProtos</TargetDirectory>
+    </GeneratedSource>
+    <GeneratedSource Include="$(BuildTempDirectory)\UnitTestCustomOptionsProtoFile.cs">
+      <TargetDirectory>$(SourceDirectory)\ProtocolBuffers.Test\TestProtos</TargetDirectory>
+    </GeneratedSource>
+    <GeneratedSource Include="$(BuildTempDirectory)\UnitTestEmbedOptimizeForProtoFile.cs">
+      <TargetDirectory>$(SourceDirectory)\ProtocolBuffers.Test\TestProtos</TargetDirectory>
+    </GeneratedSource>
+    <GeneratedSource Include="$(BuildTempDirectory)\UnitTestEmptyProtoFile.cs">
+      <TargetDirectory>$(SourceDirectory)\ProtocolBuffers.Test\TestProtos</TargetDirectory>
+    </GeneratedSource>
+    <GeneratedSource Include="$(BuildTempDirectory)\UnitTestImportLiteProtoFile.cs">
+      <TargetDirectory>$(SourceDirectory)\ProtocolBuffers.Test\TestProtos</TargetDirectory>
+    </GeneratedSource>  
+    <GeneratedSource Include="$(BuildTempDirectory)\UnitTestImportProtoFile.cs">
+      <TargetDirectory>$(SourceDirectory)\ProtocolBuffers.Test\TestProtos</TargetDirectory>
+    </GeneratedSource>
+    <GeneratedSource Include="$(BuildTempDirectory)\UnitTestMessageSetProtoFile.cs">
+      <TargetDirectory>$(SourceDirectory)\ProtocolBuffers.Test\TestProtos</TargetDirectory>
+    </GeneratedSource>
+    <GeneratedSource Include="$(BuildTempDirectory)\UnitTestNoGenericServicesProtoFile.cs">
+      <TargetDirectory>$(SourceDirectory)\ProtocolBuffers.Test\TestProtos</TargetDirectory>
+    </GeneratedSource>
+    <GeneratedSource Include="$(BuildTempDirectory)\UnitTestOptimizeForProtoFile.cs">
+      <TargetDirectory>$(SourceDirectory)\ProtocolBuffers.Test\TestProtos</TargetDirectory>
+    </GeneratedSource>
+    <GeneratedSource Include="$(BuildTempDirectory)\UnitTestProtoFile.cs">
+      <TargetDirectory>$(SourceDirectory)\ProtocolBuffers.Test\TestProtos</TargetDirectory>
+    </GeneratedSource>
     <!-- Lite unit test -->
     <GeneratedSource Include="$(BuildTempDirectory)\UnitTestExtrasFullProtoFile.cs">
       <TargetDirectory>$(SourceDirectory)\ProtocolBuffersLite.Test\TestProtos</TargetDirectory>
@@ -116,29 +116,29 @@
     <GeneratedSource Include="$(BuildTempDirectory)\UnitTestProtoFile.cs">
       <TargetDirectory>$(SourceDirectory)\ProtocolBuffersLite.Test\TestProtos</TargetDirectory>
     </GeneratedSource>
-	
-		<TestContainer Include="$(SourceDirectory)\ProtocolBuffers.Test\bin\$(BuildConfiguration)\Google.ProtocolBuffers.Test.dll" />
-		<TestContainer Include="$(SourceDirectory)\ProtocolBuffersLite.Test\bin\$(BuildConfiguration)\Google.ProtocolBuffersLite.Test.dll" />
-		<TestContainer Include="$(SourceDirectory)\ProtocolBuffersLite.Test\bin\$(BuildConfiguration)\Google.ProtocolBuffersMixedLite.Test.dll" />
-		<TestContainer Include="$(SourceDirectory)\ProtoGen.Test\bin\$(BuildConfiguration)\Google.ProtocolBuffers.ProtoGen.Test.dll" />
+  
+    <TestContainer Include="$(SourceDirectory)\ProtocolBuffers.Test\bin\$(BuildConfiguration)\Google.ProtocolBuffers.Test.dll" />
+    <TestContainer Include="$(SourceDirectory)\ProtocolBuffersLite.Test\bin\$(BuildConfiguration)\Google.ProtocolBuffersLite.Test.dll" />
+    <TestContainer Include="$(SourceDirectory)\ProtocolBuffersLite.Test\bin\$(BuildConfiguration)\Google.ProtocolBuffersMixedLite.Test.dll" />
+    <TestContainer Include="$(SourceDirectory)\ProtoGen.Test\bin\$(BuildConfiguration)\Google.ProtocolBuffers.ProtoGen.Test.dll" />
 
-		<DynamicPackageItem Include="$(SourceDirectory)\ProtocolBuffers\bin\$(BuildConfiguration)\Google.ProtocolBuffers.*" />
-		<DynamicPackageItem Include="$(SourceDirectory)\ProtocolBuffers\bin\$(BuildConfiguration)\Google.ProtocolBuffersLite.*" />
-		<DynamicPackageItem Include="$(SourceDirectory)\ProtoGen\bin\$(BuildConfiguration)\ProtoGen.*" />
-		<DynamicPackageItem Include="$(SourceDirectory)\ProtoMunge\bin\$(BuildConfiguration)\ProtoMunge.*" />
-		<DynamicPackageItem Include="$(SourceDirectory)\ProtoDump\bin\$(BuildConfiguration)\ProtoDump.*" />
-		<DynamicPackageItem Include="$(SourceDirectory)\ProtoBench\bin\$(BuildConfiguration)\ProtoBench.*" />
+    <DynamicPackageItem Include="$(SourceDirectory)\ProtocolBuffers\bin\$(BuildConfiguration)\Google.ProtocolBuffers.*" />
+    <DynamicPackageItem Include="$(SourceDirectory)\ProtocolBuffers\bin\$(BuildConfiguration)\Google.ProtocolBuffersLite.*" />
+    <DynamicPackageItem Include="$(SourceDirectory)\ProtoGen\bin\$(BuildConfiguration)\ProtoGen.*" />
+    <DynamicPackageItem Include="$(SourceDirectory)\ProtoMunge\bin\$(BuildConfiguration)\ProtoMunge.*" />
+    <DynamicPackageItem Include="$(SourceDirectory)\ProtoDump\bin\$(BuildConfiguration)\ProtoDump.*" />
+    <DynamicPackageItem Include="$(SourceDirectory)\ProtoBench\bin\$(BuildConfiguration)\ProtoBench.*" />
 
-		<StaticPackageItem Include="$(ProjectDirectory)\readme.txt" />
-		<StaticPackageItem Include="$(ProjectDirectory)\license.txt" />
-		<StaticPackageItem Include="$(ProjectDirectory)\protos\**\*.*">
-			<TargetDirectory>\protos</TargetDirectory>
-		</StaticPackageItem>
-		<StaticPackageItem Include="$(LibDirectory)\Protoc*">
-			<TargetDirectory>\Protoc</TargetDirectory>
-		</StaticPackageItem>
-		
-	</ItemGroup>
+    <StaticPackageItem Include="$(ProjectDirectory)\readme.txt" />
+    <StaticPackageItem Include="$(ProjectDirectory)\license.txt" />
+    <StaticPackageItem Include="$(ProjectDirectory)\protos\**\*.*">
+      <TargetDirectory>\protos</TargetDirectory>
+    </StaticPackageItem>
+    <StaticPackageItem Include="$(LibDirectory)\Protoc*">
+      <TargetDirectory>\Protoc</TargetDirectory>
+    </StaticPackageItem>
+    
+  </ItemGroup>
 
   <!-- targets -->
   <Target Name="Clean" DependsOnTargets="_Clean" />
@@ -146,9 +146,9 @@
   <Target Name="Test" DependsOnTargets="_RunTests" />
   <Target Name="Rebuild" DependsOnTargets="Clean;Build" />
   <Target Name="BuildPackage" DependsOnTargets="PrepareOutputDirectory;PreparePackageComponent;GeneratePackage" />
-	<Target Name="PrepareOutputDirectory" DependsOnTargets="_CleanOutputDirectory" />
-	<Target Name="PreparePackageComponent" DependsOnTargets="_PreparePackageComponent" />
-	<Target Name="GeneratePackage" DependsOnTargets="_GeneratePackage" />
-	<Target Name="RunBenchmarks" DependsOnTargets="_RunBenchmarks" />
+  <Target Name="PrepareOutputDirectory" DependsOnTargets="_CleanOutputDirectory" />
+  <Target Name="PreparePackageComponent" DependsOnTargets="_PreparePackageComponent" />
+  <Target Name="GeneratePackage" DependsOnTargets="_GeneratePackage" />
+  <Target Name="RunBenchmarks" DependsOnTargets="_RunBenchmarks" />
   
 </Project>