Collision with known MSBuild property ProjectType was causing errors, renamed to EnvironmentProjectType

8 files changed, 18 insertions, 274 deletions

diff --git a/src/ProtocolBuffers/ProtocolBuffers(Silverlight).csproj b/src/ProtocolBuffers/ProtocolBuffers(Silverlight).csproj
deleted file mode 100644
index c539c68f..00000000
--- a/src/ProtocolBuffers/ProtocolBuffers(Silverlight).csproj
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ProductVersion>9.0.30729</ProductVersion>

-    <SchemaVersion>2.0</SchemaVersion>

-    <ProjectGuid>{7E4E681E-5D09-43FB-8D9E-35A454730A85}</ProjectGuid>

-    <OutputType>Library</OutputType>

-    <AppDesignerFolder>Properties</AppDesignerFolder>

-    <RootNamespace>Google.ProtocolBuffers</RootNamespace>

-    <AssemblyName>Google.ProtocolBuffers</AssemblyName>

-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>

-    <FileAlignment>512</FileAlignment>

-    <SignAssembly>true</SignAssembly>

-    <AssemblyOriginatorKeyFile>..\..\keys\Google.ProtocolBuffers.snk</AssemblyOriginatorKeyFile>

-    <OldToolsVersion>3.5</OldToolsVersion>

-    <ProjectTypeGuids>{A1591282-1198-4647-A2B1-27E5FF5F6F3B};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>

-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>

-    <SilverlightApplication>false</SilverlightApplication>

-    <ThrowErrorsInValidation>true</ThrowErrorsInValidation>

-    <ValidateXaml>true</ValidateXaml>

-    <SilverlightVersion Condition=" '$(SilverlightVersion)' == '' ">v2.0</SilverlightVersion>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_Silverlight|AnyCPU' ">

-    <DebugSymbols>true</DebugSymbols>

-    <DebugType>full</DebugType>

-    <Optimize>false</Optimize>

-    <OutputPath>bin\Debug_Silverlight\</OutputPath>

-    <DocumentationFile>$(OutputPath)\$(AssemblyName).xml</DocumentationFile>

-    <NoWarn>1591, 1570, 1571, 1572, 1573, 1574</NoWarn>

-    <DefineConstants>DEBUG;TRACE;SILVERLIGHT</DefineConstants>

-    <ErrorReport>prompt</ErrorReport>

-    <WarningLevel>4</WarningLevel>

-    <NoStdLib>true</NoStdLib>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_Silverlight|AnyCPU' ">

-    <DebugType>pdbonly</DebugType>

-    <Optimize>true</Optimize>

-    <OutputPath>bin\Release_Silverlight\</OutputPath>

-    <DocumentationFile>$(OutputPath)\$(AssemblyName).xml</DocumentationFile>

-    <NoWarn>1591, 1570, 1571, 1572, 1573, 1574</NoWarn>

-    <DefineConstants>TRACE;SILVERLIGHT</DefineConstants>

-    <ErrorReport>prompt</ErrorReport>

-    <WarningLevel>4</WarningLevel>

-    <NoStdLib>true</NoStdLib>

-  </PropertyGroup>

-  <ItemGroup>

-    <Reference Include="mscorlib" />

-    <Reference Include="System" />

-    <Reference Include="System.Xml" />

-  </ItemGroup>

-  <ItemGroup>

-    <Compile Include="AbstractBuilder.cs" />

-    <Compile Include="AbstractBuilderLite.cs" />

-    <Compile Include="AbstractMessage.cs" />

-    <Compile Include="AbstractMessageLite.cs" />

-    <Compile Include="ByteArray.cs" />

-    <Compile Include="ByteString.cs" />

-    <Compile Include="Collections\Enumerables.cs" />

-    <Compile Include="Collections\IPopsicleList.cs" />

-    <Compile Include="Collections\PopsicleList.cs" />

-    <Compile Include="CodedOutputStream.ComputeSize.cs" />

-    <Compile Include="CustomSerialization.cs" />

-    <Compile Include="Delegates.cs" />

-    <Compile Include="CodedInputStream.cs" />

-    <Compile Include="CodedOutputStream.cs" />

-    <Compile Include="Collections\Dictionaries.cs" />

-    <Compile Include="Collections\Lists.cs" />

-    <Compile Include="Collections\ReadOnlyDictionary.cs" />

-    <Compile Include="DescriptorProtos\CSharpOptions.cs" />

-    <Compile Include="DescriptorProtos\DescriptorProtoFile.cs" />

-    <Compile Include="DescriptorProtos\IDescriptorProto.cs" />

-    <Compile Include="DescriptorProtos\PartialClasses.cs" />

-    <Compile Include="Descriptors\DescriptorBase.cs" />

-    <Compile Include="Descriptors\DescriptorPool.cs" />

-    <Compile Include="Descriptors\DescriptorUtil.cs" />

-    <Compile Include="Descriptors\DescriptorValidationException.cs" />

-    <Compile Include="Descriptors\EnumDescriptor.cs" />

-    <Compile Include="Descriptors\EnumValueDescriptor.cs" />

-    <Compile Include="Descriptors\FieldDescriptor.cs" />

-    <Compile Include="Descriptors\FieldMappingAttribute.cs" />

-    <Compile Include="Descriptors\FieldType.cs" />

-    <Compile Include="Descriptors\FileDescriptor.cs" />

-    <Compile Include="Descriptors\IDescriptor.cs" />

-    <Compile Include="Descriptors\IndexedDescriptorBase.cs" />

-    <Compile Include="Descriptors\MappedType.cs" />

-    <Compile Include="Descriptors\MessageDescriptor.cs" />

-    <Compile Include="Descriptors\MethodDescriptor.cs" />

-    <Compile Include="Descriptors\PackageDescriptor.cs" />

-    <Compile Include="Descriptors\ServiceDescriptor.cs" />

-    <Compile Include="DynamicMessage.cs" />

-    <Compile Include="EnumLite.cs" />

-    <Compile Include="ExtendableBuilder.cs" />

-    <Compile Include="ExtendableBuilderLite.cs" />

-    <Compile Include="ExtendableMessage.cs" />

-    <Compile Include="ExtendableMessageLite.cs" />

-    <Compile Include="ExtensionInfo.cs" />

-    <Compile Include="ExtensionRegistry.cs" />

-    <Compile Include="ExtensionRegistryLite.cs" />

-    <Compile Include="FieldAccess\ReflectionUtil.cs" />

-    <Compile Include="FieldAccess\SingleEnumAccessor.cs" />

-    <Compile Include="FieldAccess\SingleMessageAccessor.cs" />

-    <Compile Include="FieldAccess\SinglePrimitiveAccessor.cs" />

-    <Compile Include="FieldAccess\RepeatedPrimitiveAccessor.cs" />

-    <Compile Include="FieldAccess\RepeatedEnumAccessor.cs" />

-    <Compile Include="FieldAccess\IFieldAccessor.cs" />

-    <Compile Include="FieldAccess\FieldAccessorTable.cs" />

-    <Compile Include="FieldAccess\RepeatedMessageAccessor.cs" />

-    <Compile Include="FieldSet.cs" />

-    <Compile Include="GeneratedBuilder.cs" />

-    <Compile Include="GeneratedBuilderLite.cs" />

-    <Compile Include="GeneratedExtensionLite.cs" />

-    <Compile Include="GeneratedMessageLite.cs" />

-    <Compile Include="GeneratedRepeatExtension.cs" />

-    <Compile Include="GeneratedSingleExtension.cs" />

-    <Compile Include="GeneratedMessage.cs" />

-    <Compile Include="IBuilder.cs" />

-    <Compile Include="GeneratedExtensionBase.cs" />

-    <Compile Include="IBuilderLite.cs" />

-    <Compile Include="ICodedInputStream.cs" />

-    <Compile Include="ICodedOutputStream.cs" />

-    <Compile Include="IMessage.cs" />

-    <Compile Include="IMessageLite.cs" />

-    <Compile Include="InvalidProtocolBufferException.cs" />

-    <Compile Include="IRpcChannel.cs" />

-    <Compile Include="IRpcController.cs" />

-    <Compile Include="IRpcDispatch.cs" />

-    <Compile Include="IService.cs" />

-    <Compile Include="MessageStreamIterator.cs" />

-    <Compile Include="MessageStreamWriter.cs" />

-    <Compile Include="MessageUtil.cs" />

-    <Compile Include="NameHelpers.cs" />

-    <Compile Include="Properties\AssemblyInfo.cs" />

-    <Compile Include="RpcUtil.cs" />

-    <Compile Include="SilverlightCompatibility.cs" />

-    <Compile Include="SortedList.cs" />

-    <Compile Include="TextFormat.cs" />

-    <Compile Include="TextGenerator.cs" />

-    <Compile Include="TextTokenizer.cs" />

-    <Compile Include="ThrowHelper.cs" />

-    <Compile Include="UninitializedMessageException.cs" />

-    <Compile Include="UnknownField.cs" />

-    <Compile Include="UnknownFieldSet.cs" />

-    <Compile Include="WireFormat.cs" />

-  </ItemGroup>

-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Silverlight\$(SilverlightVersion)\Microsoft.Silverlight.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">

-  </Target>

-  <Target Name="AfterBuild">

-  </Target>

-  -->

-  <ProjectExtensions>

-    <VisualStudio>

-      <FlavorProperties GUID="{A1591282-1198-4647-A2B1-27E5FF5F6F3B}">

-        <SilverlightProjectProperties />

-      </FlavorProperties>

-    </VisualStudio>

-  </ProjectExtensions>

-</Project>
\ No newline at end of file
diff --git a/src/ProtocolBuffers/ProtocolBuffers.SL20.csproj b/src/ProtocolBuffers/ProtocolBuffers.SL20.csproj
index e3b618f8..10fc8283 100644
--- a/src/ProtocolBuffers/ProtocolBuffers.SL20.csproj
+++ b/src/ProtocolBuffers/ProtocolBuffers.SL20.csproj
@@ -153,7 +153,9 @@
   <ProjectExtensions>

     <VisualStudio>

       <FlavorProperties GUID="{A1591282-1198-4647-A2B1-27E5FF5F6F3B}">

-        <SilverlightProjectProperties />

+        <SilverlightProjectProperties>

+          <StartAction>OfflineApplication</StartAction>

+        </SilverlightProjectProperties>

       </FlavorProperties>

     </VisualStudio>

   </ProjectExtensions>

diff --git a/src/ProtocolBuffers/ProtocolBuffers.SL30.csproj b/src/ProtocolBuffers/ProtocolBuffers.SL30.csproj
index de31a946..4fe571ca 100644
--- a/src/ProtocolBuffers/ProtocolBuffers.SL30.csproj
+++ b/src/ProtocolBuffers/ProtocolBuffers.SL30.csproj
@@ -154,7 +154,9 @@
   <ProjectExtensions>

     <VisualStudio>

       <FlavorProperties GUID="{A1591282-1198-4647-A2B1-27E5FF5F6F3B}">

-        <SilverlightProjectProperties />

+        <SilverlightProjectProperties>

+          <StartAction>OfflineApplication</StartAction>

+        </SilverlightProjectProperties>

       </FlavorProperties>

     </VisualStudio>

   </ProjectExtensions>

diff --git a/src/ProtocolBuffers/ProtocolBuffers.SL40.csproj b/src/ProtocolBuffers/ProtocolBuffers.SL40.csproj
index 3da6d7c6..3664e473 100644
--- a/src/ProtocolBuffers/ProtocolBuffers.SL40.csproj
+++ b/src/ProtocolBuffers/ProtocolBuffers.SL40.csproj
@@ -155,7 +155,9 @@
   <ProjectExtensions>

     <VisualStudio>

       <FlavorProperties GUID="{A1591282-1198-4647-A2B1-27E5FF5F6F3B}">

-        <SilverlightProjectProperties />

+        <SilverlightProjectProperties>

+          <StartAction>OfflineApplication</StartAction>

+        </SilverlightProjectProperties>

       </FlavorProperties>

     </VisualStudio>

   </ProjectExtensions>

diff --git a/src/ProtocolBuffers/ProtocolBuffersLite(Silverlight).csproj b/src/ProtocolBuffers/ProtocolBuffersLite(Silverlight).csproj
deleted file mode 100644
index 7e2dc298..00000000
--- a/src/ProtocolBuffers/ProtocolBuffersLite(Silverlight).csproj
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ProductVersion>9.0.30729</ProductVersion>

-    <SchemaVersion>2.0</SchemaVersion>

-    <ProjectGuid>{2275EE6B-195B-485C-B6F6-CCA01C1B5AE0}</ProjectGuid>

-    <OutputType>Library</OutputType>

-    <AppDesignerFolder>Properties</AppDesignerFolder>

-    <RootNamespace>Google.ProtocolBuffers</RootNamespace>

-    <AssemblyName>Google.ProtocolBuffersLite</AssemblyName>

-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>

-    <FileAlignment>512</FileAlignment>

-    <SignAssembly>true</SignAssembly>

-    <AssemblyOriginatorKeyFile>..\..\keys\Google.ProtocolBuffers.snk</AssemblyOriginatorKeyFile>

-    <OldToolsVersion>3.5</OldToolsVersion>

-    <ProjectTypeGuids>{A1591282-1198-4647-A2B1-27E5FF5F6F3B};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>

-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>

-    <SilverlightApplication>false</SilverlightApplication>

-    <ThrowErrorsInValidation>true</ThrowErrorsInValidation>

-    <ValidateXaml>true</ValidateXaml>

-    <SilverlightVersion Condition=" '$(SilverlightVersion)' == '' ">v2.0</SilverlightVersion>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_Silverlight|AnyCPU' ">

-    <DebugSymbols>true</DebugSymbols>

-    <DebugType>full</DebugType>

-    <Optimize>false</Optimize>

-    <OutputPath>bin\Debug_Silverlight\</OutputPath>

-    <DocumentationFile>$(OutputPath)\$(AssemblyName).xml</DocumentationFile>

-    <NoWarn>1591, 1570, 1571, 1572, 1573, 1574</NoWarn>

-    <DefineConstants>DEBUG;TRACE;SILVERLIGHT;LITE</DefineConstants>

-    <ErrorReport>prompt</ErrorReport>

-    <WarningLevel>4</WarningLevel>

-    <NoStdLib>true</NoStdLib>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_Silverlight|AnyCPU' ">

-    <DebugType>pdbonly</DebugType>

-    <Optimize>true</Optimize>

-    <OutputPath>bin\Release_Silverlight\</OutputPath>

-    <DocumentationFile>$(OutputPath)\$(AssemblyName).xml</DocumentationFile>

-    <NoWarn>1591, 1570, 1571, 1572, 1573, 1574</NoWarn>

-    <DefineConstants>TRACE;SILVERLIGHT;LITE</DefineConstants>

-    <ErrorReport>prompt</ErrorReport>

-    <WarningLevel>4</WarningLevel>

-    <NoStdLib>true</NoStdLib>

-  </PropertyGroup>

-  <ItemGroup>

-    <Reference Include="mscorlib" />

-    <Reference Include="System" />

-    <Reference Include="System.Xml" />

-  </ItemGroup>

-  <ItemGroup>

-    <Compile Include="AbstractBuilderLite.cs" />

-    <Compile Include="AbstractMessageLite.cs" />

-    <Compile Include="ByteArray.cs" />

-    <Compile Include="CodedOutputStream.ComputeSize.cs" />

-    <Compile Include="Collections\Dictionaries.cs" />

-    <Compile Include="Collections\Enumerables.cs" />

-    <Compile Include="Collections\IPopsicleList.cs" />

-    <Compile Include="Collections\Lists.cs" />

-    <Compile Include="Collections\PopsicleList.cs" />

-    <Compile Include="Collections\ReadOnlyDictionary.cs" />

-    <Compile Include="CustomSerialization.cs" />

-    <Compile Include="Descriptors\FieldMappingAttribute.cs" />

-    <Compile Include="Descriptors\FieldType.cs" />

-    <Compile Include="Descriptors\MappedType.cs" />

-    <Compile Include="EnumLite.cs" />

-    <Compile Include="ExtendableBuilderLite.cs" />

-    <Compile Include="ExtendableMessageLite.cs" />

-    <Compile Include="FieldSet.cs" />

-    <Compile Include="GeneratedBuilderLite.cs" />

-    <Compile Include="GeneratedExtensionLite.cs" />

-    <Compile Include="GeneratedMessageLite.cs" />

-    <Compile Include="ICodedInputStream.cs" />

-    <Compile Include="ICodedOutputStream.cs" />

-    <Compile Include="IRpcDispatch.cs" />

-    <Compile Include="Properties\AssemblyInfo.cs" />

-    <Compile Include="ByteString.cs" />

-    <Compile Include="CodedInputStream.cs" />

-    <Compile Include="CodedOutputStream.cs" />

-    <Compile Include="ExtensionRegistryLite.cs" />

-    <Compile Include="IBuilderLite.cs" />

-    <Compile Include="IMessageLite.cs" />

-    <Compile Include="InvalidProtocolBufferException.cs" />

-    <Compile Include="SortedList.cs" />

-    <Compile Include="ThrowHelper.cs" />

-    <Compile Include="UninitializedMessageException.cs" />

-    <Compile Include="WireFormat.cs" />

-  </ItemGroup>

-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Silverlight\$(SilverlightVersion)\Microsoft.Silverlight.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">

-  </Target>

-  <Target Name="AfterBuild">

-  </Target>

-  -->

-  <ProjectExtensions>

-    <VisualStudio>

-      <FlavorProperties GUID="{A1591282-1198-4647-A2B1-27E5FF5F6F3B}">

-        <SilverlightProjectProperties />

-      </FlavorProperties>

-    </VisualStudio>

-  </ProjectExtensions>

-</Project>
\ No newline at end of file
diff --git a/src/ProtocolBuffers/ProtocolBuffersLite.SL20.csproj b/src/ProtocolBuffers/ProtocolBuffersLite.SL20.csproj
index f26ee609..1bbad180 100644
--- a/src/ProtocolBuffers/ProtocolBuffersLite.SL20.csproj
+++ b/src/ProtocolBuffers/ProtocolBuffersLite.SL20.csproj
@@ -98,7 +98,9 @@
   <ProjectExtensions>

     <VisualStudio>

       <FlavorProperties GUID="{A1591282-1198-4647-A2B1-27E5FF5F6F3B}">

-        <SilverlightProjectProperties />

+        <SilverlightProjectProperties>

+          <StartAction>OfflineApplication</StartAction>

+        </SilverlightProjectProperties>

       </FlavorProperties>

     </VisualStudio>

   </ProjectExtensions>

diff --git a/src/ProtocolBuffers/ProtocolBuffersLite.SL30.csproj b/src/ProtocolBuffers/ProtocolBuffersLite.SL30.csproj
index 43029c0a..ab0e809b 100644
--- a/src/ProtocolBuffers/ProtocolBuffersLite.SL30.csproj
+++ b/src/ProtocolBuffers/ProtocolBuffersLite.SL30.csproj
@@ -99,7 +99,9 @@
   <ProjectExtensions>

     <VisualStudio>

       <FlavorProperties GUID="{A1591282-1198-4647-A2B1-27E5FF5F6F3B}">

-        <SilverlightProjectProperties />

+        <SilverlightProjectProperties>

+          <StartAction>OfflineApplication</StartAction>

+        </SilverlightProjectProperties>

       </FlavorProperties>

     </VisualStudio>

   </ProjectExtensions>

diff --git a/src/ProtocolBuffers/ProtocolBuffersLite.SL40.csproj b/src/ProtocolBuffers/ProtocolBuffersLite.SL40.csproj
index 3303c31f..42e5be18 100644
--- a/src/ProtocolBuffers/ProtocolBuffersLite.SL40.csproj
+++ b/src/ProtocolBuffers/ProtocolBuffersLite.SL40.csproj
@@ -100,7 +100,9 @@
   <ProjectExtensions>

     <VisualStudio>

       <FlavorProperties GUID="{A1591282-1198-4647-A2B1-27E5FF5F6F3B}">

-        <SilverlightProjectProperties />

+        <SilverlightProjectProperties>

+          <StartAction>OfflineApplication</StartAction>

+        </SilverlightProjectProperties>

       </FlavorProperties>

     </VisualStudio>

   </ProjectExtensions>