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

5 files changed, 20 insertions, 11 deletions

diff --git a/csproj_templates/PL40.csproj b/csproj_templates/PL40.csproj
index fa3b098e..2618a79f 100644
--- a/csproj_templates/PL40.csproj
+++ b/csproj_templates/PL40.csproj
@@ -22,17 +22,17 @@
   <ItemGroup>

     <Reference Include="System.Core" />

   </ItemGroup>

-  <Import cs:Precondition=" '$(ProjectType)' != 'TEST' "

+  <Import cs:Precondition=" '$(EnvironmentProjectType)' != 'TEST' "

           Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />

   <!-- Portable Library will be tested as silverlight -->

-  <PropertyGroup cs:Precondition=" '$(ProjectType)' == 'TEST' ">

+  <PropertyGroup cs:Precondition=" '$(EnvironmentProjectType)' == 'TEST' ">

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

     <ValidateXaml>false</ValidateXaml>

     <ThrowErrorsInValidation>false</ThrowErrorsInValidation>

     <TargetFrameworkProfile />

   </PropertyGroup>

-  <cs:Import Project="SLTest.targets" cs:Precondition=" '$(ProjectType)' == 'TEST' " />

-  <Import cs:Precondition=" '$(ProjectType)' == 'TEST' "

+  <cs:Import Project="SLTest.targets" cs:Precondition=" '$(EnvironmentProjectType)' == 'TEST' " />

+  <Import cs:Precondition=" '$(EnvironmentProjectType)' == 'TEST' "

           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.

@@ -41,7 +41,7 @@
   <Target Name="AfterBuild">

   </Target>

   -->

-  <ProjectExtensions cs:Precondition=" '$(ProjectType)' == 'TEST' ">

+  <ProjectExtensions cs:Precondition=" '$(EnvironmentProjectType)' == 'TEST' ">

     <VisualStudio>

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

         <SilverlightProjectProperties />

diff --git a/csproj_templates/SL20.csproj b/csproj_templates/SL20.csproj
index ba6f20d3..0abb104b 100644
--- a/csproj_templates/SL20.csproj
+++ b/csproj_templates/SL20.csproj
@@ -23,7 +23,7 @@
     <NoConfig>true</NoConfig>

   </PropertyGroup>

   <!-- Preprocess include of silverlight testing -->

-  <cs:Import Project="SLTest.targets" cs:Precondition=" '$(ProjectType)' == 'TEST' " />

+  <cs:Import Project="SLTest.targets" cs:Precondition=" '$(EnvironmentProjectType)' == 'TEST' " />

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

@@ -35,7 +35,9 @@
   <ProjectExtensions>

     <VisualStudio>

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

-        <SilverlightProjectProperties />

+        <SilverlightProjectProperties>

+          <StartAction>OfflineApplication</StartAction>

+        </SilverlightProjectProperties>

       </FlavorProperties>

     </VisualStudio>

   </ProjectExtensions>

diff --git a/csproj_templates/SL30.csproj b/csproj_templates/SL30.csproj
index 32f9088c..82ea9a8e 100644
--- a/csproj_templates/SL30.csproj
+++ b/csproj_templates/SL30.csproj
@@ -26,7 +26,7 @@
     <Reference Include="System.Core" />

   </ItemGroup>

   <!-- Preprocess include of silverlight testing -->

-  <cs:Import Project="SLTest.targets" cs:Precondition=" '$(ProjectType)' == 'TEST' " />

+  <cs:Import Project="SLTest.targets" cs:Precondition=" '$(EnvironmentProjectType)' == 'TEST' " />

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

@@ -38,7 +38,9 @@
   <ProjectExtensions>

     <VisualStudio>

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

-        <SilverlightProjectProperties />

+        <SilverlightProjectProperties>

+          <StartAction>OfflineApplication</StartAction>

+        </SilverlightProjectProperties>

       </FlavorProperties>

     </VisualStudio>

   </ProjectExtensions>

diff --git a/csproj_templates/SL40.csproj b/csproj_templates/SL40.csproj
index 08569ff3..8a38e3d2 100644
--- a/csproj_templates/SL40.csproj
+++ b/csproj_templates/SL40.csproj
@@ -27,7 +27,7 @@
     <Reference Include="System.Core" />

   </ItemGroup>

   <!-- Preprocess include of silverlight testing -->

-  <cs:Import Project="SLTest.targets" cs:Precondition=" '$(ProjectType)' == 'TEST' " />

+  <cs:Import Project="SLTest.targets" cs:Precondition=" '$(EnvironmentProjectType)' == 'TEST' " />

   <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.

@@ -39,7 +39,9 @@
   <ProjectExtensions>

     <VisualStudio>

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

-        <SilverlightProjectProperties />

+        <SilverlightProjectProperties>

+          <StartAction>OfflineApplication</StartAction>

+        </SilverlightProjectProperties>

       </FlavorProperties>

     </VisualStudio>

   </ProjectExtensions>

diff --git a/csproj_templates/SLTest.targets b/csproj_templates/SLTest.targets
index 49fb104f..29da2399 100644
--- a/csproj_templates/SLTest.targets
+++ b/csproj_templates/SLTest.targets
@@ -12,6 +12,8 @@
     <TestPageFileName>TestPage.html</TestPageFileName>

     <CreateTestPage>true</CreateTestPage>

     <SilverlightVersion>$(TargetFrameworkVersion)</SilverlightVersion>

+    <OutOfBrowserSettingsFile>Properties\OutOfBrowserSettings.xml</OutOfBrowserSettingsFile>

+    <EnableOutOfBrowser>true</EnableOutOfBrowser>

   </PropertyGroup>

   <ItemGroup>

     <Reference Include="System.Windows" />

@@ -22,6 +24,7 @@
       <DependentUpon>App.xaml</DependentUpon>

     </Compile>

     <None Include="Properties\AppManifest.xml" />

+    <None Include="Properties\OutOfBrowserSettings.xml" />

     <ApplicationDefinition Include="App.xaml">

       <Generator>MSBuild:Compile</Generator>

       <SubType>Designer</SubType>