diff options
59 files changed, 164 insertions, 1217 deletions
diff --git a/build/RunBenchmarks.bat b/build/RunBenchmarks.bat index 9091b0d1..d0e65010 100644 --- a/build/RunBenchmarks.bat +++ b/build/RunBenchmarks.bat @@ -1,2 +1,2 @@ @echo off
-CMD.exe /Q /C "CD %~dp0 && %WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe /nologo build.csproj /toolsversion:4.0 /t:RunBenchmarks %1 %2 %3 %4 "/p:BuildConfiguration=Release;TargetVersion=2"
+CMD.exe /Q /C "CD %~dp0 && %WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe /nologo build.csproj /toolsversion:4.0 /t:RunBenchmarks %1 %2 %3 %4
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>
diff --git a/lib/CsProjectProjector/CsProjectProjector.exe b/lib/CsProjectProjector/CsProjectProjector.exe Binary files differnew file mode 100644 index 00000000..a038e80b --- /dev/null +++ b/lib/CsProjectProjector/CsProjectProjector.exe diff --git a/src/ProtocolBuffers.Serialization/ProtocolBuffers.Serialization(Silverlight).csproj b/src/ProtocolBuffers.Serialization/ProtocolBuffers.Serialization(Silverlight).csproj deleted file mode 100644 index 5c05adb8..00000000 --- a/src/ProtocolBuffers.Serialization/ProtocolBuffers.Serialization(Silverlight).csproj +++ /dev/null @@ -1,99 +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>{72B69A15-E28E-4738-A779-18D76C87D225}</ProjectGuid>
- <OutputType>Library</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>Google.ProtocolBuffers.Serialization</RootNamespace>
- <AssemblyName>Google.ProtocolBuffers.Serialization</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>
- <PropertyGroup Condition=" '$(TargetFrameworkVersion)' == 'v2.0' ">
- <DefineConstants>NET20;$(DefineConstants)</DefineConstants>
- </PropertyGroup>
- <ItemGroup>
- <Reference Include="mscorlib" />
- <Reference Include="System" />
- <Reference Include="System.Xml" />
- <Reference Include="System.Core" Condition="'$(TargetFrameworkVersion)' != 'v2.0'" />
- </ItemGroup>
- <ItemGroup>
- <Compile Include="Extensions.cs" />
- <Compile Include="Http\FormUrlEncodedReader.cs" />
- <Compile Include="Http\MessageFormatFactory.cs" />
- <Compile Include="Http\MessageFormatOptions.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="AbstractReader.cs" />
- <Compile Include="AbstractTextReader.cs" />
- <Compile Include="AbstractTextWriter.cs" />
- <Compile Include="AbstractWriter.cs" />
- <Compile Include="DictionaryReader.cs" />
- <Compile Include="DictionaryWriter.cs" />
- <Compile Include="JsonFormatReader.cs" />
- <Compile Include="JsonFormatWriter.cs" />
- <Compile Include="JsonTextCursor.cs" />
- <Compile Include="RecursionLimitExceeded.cs" />
- <Compile Include="XmlFormatReader.cs" />
- <Compile Include="XmlFormatWriter.cs" />
- <Compile Include="XmlReaderOptions.cs" />
- <Compile Include="XmlWriterOptions.cs" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\ProtocolBuffers\ProtocolBuffers%28Silverlight%29.csproj">
- <Project>{7E4E681E-5D09-43FB-8D9E-35A454730A85}</Project>
- <Name>ProtocolBuffers%28Silverlight%29</Name>
- </ProjectReference>
- </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.Serialization/ProtocolBuffers.Serialization.SL20.csproj b/src/ProtocolBuffers.Serialization/ProtocolBuffers.Serialization.SL20.csproj index fdce546d..f8c4c097 100644 --- a/src/ProtocolBuffers.Serialization/ProtocolBuffers.Serialization.SL20.csproj +++ b/src/ProtocolBuffers.Serialization/ProtocolBuffers.Serialization.SL20.csproj @@ -91,7 +91,9 @@ <ProjectExtensions>
<VisualStudio>
<FlavorProperties GUID="{A1591282-1198-4647-A2B1-27E5FF5F6F3B}">
- <SilverlightProjectProperties />
+ <SilverlightProjectProperties>
+ <StartAction>OfflineApplication</StartAction>
+ </SilverlightProjectProperties>
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
diff --git a/src/ProtocolBuffers.Serialization/ProtocolBuffers.Serialization.SL30.csproj b/src/ProtocolBuffers.Serialization/ProtocolBuffers.Serialization.SL30.csproj index ab17df64..376c4936 100644 --- a/src/ProtocolBuffers.Serialization/ProtocolBuffers.Serialization.SL30.csproj +++ b/src/ProtocolBuffers.Serialization/ProtocolBuffers.Serialization.SL30.csproj @@ -91,7 +91,9 @@ <ProjectExtensions>
<VisualStudio>
<FlavorProperties GUID="{A1591282-1198-4647-A2B1-27E5FF5F6F3B}">
- <SilverlightProjectProperties />
+ <SilverlightProjectProperties>
+ <StartAction>OfflineApplication</StartAction>
+ </SilverlightProjectProperties>
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
diff --git a/src/ProtocolBuffers.Serialization/ProtocolBuffers.Serialization.SL40.csproj b/src/ProtocolBuffers.Serialization/ProtocolBuffers.Serialization.SL40.csproj index a9243102..dc675c47 100644 --- a/src/ProtocolBuffers.Serialization/ProtocolBuffers.Serialization.SL40.csproj +++ b/src/ProtocolBuffers.Serialization/ProtocolBuffers.Serialization.SL40.csproj @@ -92,7 +92,9 @@ <ProjectExtensions>
<VisualStudio>
<FlavorProperties GUID="{A1591282-1198-4647-A2B1-27E5FF5F6F3B}">
- <SilverlightProjectProperties />
+ <SilverlightProjectProperties>
+ <StartAction>OfflineApplication</StartAction>
+ </SilverlightProjectProperties>
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
diff --git a/src/ProtocolBuffers.Serialization/ProtocolBuffersLite.Serialization(Silverlight).csproj b/src/ProtocolBuffers.Serialization/ProtocolBuffersLite.Serialization(Silverlight).csproj deleted file mode 100644 index 9bbb94fb..00000000 --- a/src/ProtocolBuffers.Serialization/ProtocolBuffersLite.Serialization(Silverlight).csproj +++ /dev/null @@ -1,99 +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>{B6CDC03B-EBBD-4F38-9F84-736EC0948090}</ProjectGuid>
- <OutputType>Library</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>Google.ProtocolBuffers.Serialization</RootNamespace>
- <AssemblyName>Google.ProtocolBuffersLite.Serialization</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>
- <PropertyGroup Condition=" '$(TargetFrameworkVersion)' == 'v2.0' ">
- <DefineConstants>NET20;$(DefineConstants)</DefineConstants>
- </PropertyGroup>
- <ItemGroup>
- <Reference Include="mscorlib" />
- <Reference Include="System" />
- <Reference Include="System.Xml" />
- <Reference Include="System.Core" Condition="'$(TargetFrameworkVersion)' != 'v2.0'" />
- </ItemGroup>
- <ItemGroup>
- <Compile Include="Extensions.cs" />
- <Compile Include="Http\FormUrlEncodedReader.cs" />
- <Compile Include="Http\MessageFormatFactory.cs" />
- <Compile Include="Http\MessageFormatOptions.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="AbstractReader.cs" />
- <Compile Include="AbstractTextReader.cs" />
- <Compile Include="AbstractTextWriter.cs" />
- <Compile Include="AbstractWriter.cs" />
- <Compile Include="DictionaryReader.cs" />
- <Compile Include="DictionaryWriter.cs" />
- <Compile Include="JsonFormatReader.cs" />
- <Compile Include="JsonFormatWriter.cs" />
- <Compile Include="JsonTextCursor.cs" />
- <Compile Include="RecursionLimitExceeded.cs" />
- <Compile Include="XmlFormatReader.cs" />
- <Compile Include="XmlFormatWriter.cs" />
- <Compile Include="XmlReaderOptions.cs" />
- <Compile Include="XmlWriterOptions.cs" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\ProtocolBuffers\ProtocolBuffersLite%28Silverlight%29.csproj">
- <Project>{2275EE6B-195B-485C-B6F6-CCA01C1B5AE0}</Project>
- <Name>ProtocolBuffersLite%28Silverlight%29</Name>
- </ProjectReference>
- </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.Serialization/ProtocolBuffersLite.Serialization.SL20.csproj b/src/ProtocolBuffers.Serialization/ProtocolBuffersLite.Serialization.SL20.csproj index 2afb1f86..9e891070 100644 --- a/src/ProtocolBuffers.Serialization/ProtocolBuffersLite.Serialization.SL20.csproj +++ b/src/ProtocolBuffers.Serialization/ProtocolBuffersLite.Serialization.SL20.csproj @@ -91,7 +91,9 @@ <ProjectExtensions>
<VisualStudio>
<FlavorProperties GUID="{A1591282-1198-4647-A2B1-27E5FF5F6F3B}">
- <SilverlightProjectProperties />
+ <SilverlightProjectProperties>
+ <StartAction>OfflineApplication</StartAction>
+ </SilverlightProjectProperties>
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
diff --git a/src/ProtocolBuffers.Serialization/ProtocolBuffersLite.Serialization.SL30.csproj b/src/ProtocolBuffers.Serialization/ProtocolBuffersLite.Serialization.SL30.csproj index f310685f..6d3ac128 100644 --- a/src/ProtocolBuffers.Serialization/ProtocolBuffersLite.Serialization.SL30.csproj +++ b/src/ProtocolBuffers.Serialization/ProtocolBuffersLite.Serialization.SL30.csproj @@ -91,7 +91,9 @@ <ProjectExtensions>
<VisualStudio>
<FlavorProperties GUID="{A1591282-1198-4647-A2B1-27E5FF5F6F3B}">
- <SilverlightProjectProperties />
+ <SilverlightProjectProperties>
+ <StartAction>OfflineApplication</StartAction>
+ </SilverlightProjectProperties>
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
diff --git a/src/ProtocolBuffers.Serialization/ProtocolBuffersLite.Serialization.SL40.csproj b/src/ProtocolBuffers.Serialization/ProtocolBuffersLite.Serialization.SL40.csproj index 56b3aadb..9b341632 100644 --- a/src/ProtocolBuffers.Serialization/ProtocolBuffersLite.Serialization.SL40.csproj +++ b/src/ProtocolBuffers.Serialization/ProtocolBuffersLite.Serialization.SL40.csproj @@ -92,7 +92,9 @@ <ProjectExtensions>
<VisualStudio>
<FlavorProperties GUID="{A1591282-1198-4647-A2B1-27E5FF5F6F3B}">
- <SilverlightProjectProperties />
+ <SilverlightProjectProperties>
+ <StartAction>OfflineApplication</StartAction>
+ </SilverlightProjectProperties>
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
diff --git a/src/ProtocolBuffers.Test/Properties/OutOfBrowserSettings.xml b/src/ProtocolBuffers.Test/Properties/OutOfBrowserSettings.xml new file mode 100644 index 00000000..634f44bf --- /dev/null +++ b/src/ProtocolBuffers.Test/Properties/OutOfBrowserSettings.xml @@ -0,0 +1,7 @@ +<OutOfBrowserSettings ShortName="ProtocolBuffers.Test" EnableGPUAcceleration="False" ShowInstallMenuItem="False">
+ <OutOfBrowserSettings.Blurb>ProtocolBuffers.Test</OutOfBrowserSettings.Blurb>
+ <OutOfBrowserSettings.WindowSettings>
+ <WindowSettings Title="ProtocolBuffers.Test" />
+ </OutOfBrowserSettings.WindowSettings>
+ <OutOfBrowserSettings.Icons />
+</OutOfBrowserSettings>
\ No newline at end of file diff --git a/src/ProtocolBuffers.Test/ProtocolBuffers.Test(Silverlight).csproj b/src/ProtocolBuffers.Test/ProtocolBuffers.Test(Silverlight).csproj deleted file mode 100644 index 9842dd6a..00000000 --- a/src/ProtocolBuffers.Test/ProtocolBuffers.Test(Silverlight).csproj +++ /dev/null @@ -1,185 +0,0 @@ -<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug_Silverlight</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.30729</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{D6C6BFB0-831A-444A-B0D9-11E3E30DA2C2}</ProjectGuid>
- <ProjectTypeGuids>{A1591282-1198-4647-A2B1-27E5FF5F6F3B};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
- <OutputType>Library</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>Google.ProtocolBuffers</RootNamespace>
- <AssemblyName>Google.ProtocolBuffers.Test</AssemblyName>
- <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
- <SilverlightApplication>true</SilverlightApplication>
- <SupportedCultures>
- </SupportedCultures>
- <XapOutputs>true</XapOutputs>
- <GenerateSilverlightManifest>true</GenerateSilverlightManifest>
- <XapFilename>Google.ProtocolBuffers.Test.xap</XapFilename>
- <SilverlightManifestTemplate>Properties\AppManifest.xml</SilverlightManifestTemplate>
- <SilverlightAppEntry>Google.ProtocolBuffers.App</SilverlightAppEntry>
- <TestPageFileName>TestPage.html</TestPageFileName>
- <CreateTestPage>true</CreateTestPage>
- <ValidateXaml>false</ValidateXaml>
- <ThrowErrorsInValidation>false</ThrowErrorsInValidation>
- <FileUpgradeFlags>
- </FileUpgradeFlags>
- <OldToolsVersion>3.5</OldToolsVersion>
- <UpgradeBackupLocation>
- </UpgradeBackupLocation>
- <PublishUrl>publish\</PublishUrl>
- <Install>true</Install>
- <InstallFrom>Disk</InstallFrom>
- <UpdateEnabled>false</UpdateEnabled>
- <UpdateMode>Foreground</UpdateMode>
- <UpdateInterval>7</UpdateInterval>
- <UpdateIntervalUnits>Days</UpdateIntervalUnits>
- <UpdatePeriodically>false</UpdatePeriodically>
- <UpdateRequired>false</UpdateRequired>
- <MapFileExtensions>true</MapFileExtensions>
- <ApplicationRevision>0</ApplicationRevision>
- <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
- <IsWebBootstrapper>false</IsWebBootstrapper>
- <UseApplicationTrust>false</UseApplicationTrust>
- <BootstrapperEnabled>true</BootstrapperEnabled>
- <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>
- <DefineConstants>DEBUG;TRACE;SILVERLIGHT</DefineConstants>
- <NoStdLib>true</NoStdLib>
- <NoConfig>true</NoConfig>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <NoWarn>3021</NoWarn>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_Silverlight|AnyCPU' ">
- <DebugType>pdbonly</DebugType>
- <Optimize>true</Optimize>
- <OutputPath>bin\Release_Silverlight</OutputPath>
- <DefineConstants>TRACE;SILVERLIGHT</DefineConstants>
- <NoStdLib>true</NoStdLib>
- <NoConfig>true</NoConfig>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <NoWarn>3021</NoWarn>
- </PropertyGroup>
- <ItemGroup>
- <Reference Include="Microsoft.Silverlight.Testing, Version=2.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\lib\Microsoft.Silverlight.Testing\April2010\Microsoft.Silverlight.Testing.dll</HintPath>
- </Reference>
- <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTesting.Silverlight, Version=2.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\lib\Microsoft.Silverlight.Testing\April2010\Microsoft.VisualStudio.QualityTools.UnitTesting.Silverlight.dll</HintPath>
- </Reference>
- <Reference Include="System.Windows" />
- <Reference Include="mscorlib" />
- <Reference Include="system" />
- <Reference Include="System.Core" />
- <Reference Include="System.Xml" />
- <Reference Include="System.Windows.Browser" />
- </ItemGroup>
- <ItemGroup>
- <Compile Include="AbstractMessageTest.cs" />
- <Compile Include="App.xaml.cs">
- <DependentUpon>App.xaml</DependentUpon>
- </Compile>
- <Compile Include="ByteStringTest.cs" />
- <Compile Include="CodedInputStreamTest.cs" />
- <Compile Include="CodedOutputStreamTest.cs" />
- <Compile Include="Collections\PopsicleListTest.cs" />
- <Compile Include="Compatibility\BinaryCompatibilityTests.cs" />
- <Compile Include="Compatibility\CompatibilityTests.cs" />
- <Compile Include="Compatibility\DictionaryCompatibilityTests.cs" />
- <Compile Include="Compatibility\JsonCompatibilityTests.cs" />
- <Compile Include="Compatibility\TestResources.cs" />
- <Compile Include="Compatibility\TextCompatibilityTests.cs" />
- <Compile Include="Compatibility\XmlCompatibilityTests.cs" />
- <Compile Include="CSharpOptionsTest.cs" />
- <Compile Include="DeprecatedMemberTest.cs" />
- <Compile Include="DescriptorsTest.cs" />
- <Compile Include="Descriptors\MessageDescriptorTest.cs" />
- <Compile Include="DynamicMessageTest.cs" />
- <Compile Include="ExtendableMessageTest.cs" />
- <Compile Include="GeneratedBuilderTest.cs" />
- <Compile Include="GeneratedMessageTest.cs" />
- <Compile Include="MessageStreamIteratorTest.cs" />
- <Compile Include="MessageStreamWriterTest.cs" />
- <Compile Include="MessageTest.cs" />
- <Compile Include="MessageUtilTest.cs" />
- <Compile Include="NameHelpersTest.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="ReflectionTester.cs" />
- <Compile Include="ReusableBuilderTest.cs" />
- <Compile Include="SerializableAttribute.cs" />
- <Compile Include="ServiceTest.cs" />
- <Compile Include="TestCornerCases.cs" />
- <Compile Include="TestMimeMessageFormats.cs" />
- <Compile Include="TestProtos\UnitTestCSharpOptionsProtoFile.cs" />
- <Compile Include="TestProtos\UnitTestCustomOptionsProtoFile.cs" />
- <Compile Include="TestProtos\UnitTestEmbedOptimizeForProtoFile.cs" />
- <Compile Include="TestProtos\UnitTestEmptyProtoFile.cs" />
- <Compile Include="TestProtos\UnitTestExtrasIssuesProtoFile.cs" />
- <Compile Include="TestProtos\UnitTestExtrasProtoFile.cs" />
- <Compile Include="TestProtos\UnitTestGenericServices.cs" />
- <Compile Include="TestProtos\UnitTestGoogleSizeProtoFile.cs" />
- <Compile Include="TestProtos\UnitTestGoogleSpeedProtoFile.cs" />
- <Compile Include="TestProtos\UnitTestImportLiteProtoFile.cs" />
- <Compile Include="TestProtos\UnitTestImportProtoFile.cs" />
- <Compile Include="TestProtos\UnitTestMessageSetProtoFile.cs" />
- <Compile Include="TestProtos\UnitTestNoGenericServicesProtoFile.cs" />
- <Compile Include="TestProtos\UnitTestOptimizeForProtoFile.cs" />
- <Compile Include="TestProtos\UnitTestProtoFile.cs" />
- <Compile Include="TestProtos\UnitTestRpcInterop.cs" />
- <Compile Include="TestProtos\UnitTestXmlSerializerTestProtoFile.cs" />
- <Compile Include="TestReaderForUrlEncoded.cs" />
- <Compile Include="TestRpcForMimeTypes.cs" />
- <Compile Include="TestRpcGenerator.cs" />
- <Compile Include="TestUtil.cs" />
- <Compile Include="TestWriterFormatJson.cs" />
- <Compile Include="TestWriterFormatXml.cs" />
- <Compile Include="UnknownFieldSetTest.cs" />
- <Compile Include="WireFormatTest.cs" />
- </ItemGroup>
- <ItemGroup>
- <ApplicationDefinition Include="App.xaml">
- <Generator>MSBuild:Compile</Generator>
- <SubType>Designer</SubType>
- </ApplicationDefinition>
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Compatibility\google_message1.dat" />
- <EmbeddedResource Include="Compatibility\google_message2.dat" />
- <None Include="Properties\AppManifest.xml" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\ProtocolBuffers.Serialization\ProtocolBuffers.Serialization%28Silverlight%29.csproj">
- <Project>{72B69A15-E28E-4738-A779-18D76C87D225}</Project>
- <Name>ProtocolBuffers.Serialization%28Silverlight%29</Name>
- </ProjectReference>
- <ProjectReference Include="..\ProtocolBuffers\ProtocolBuffers%28Silverlight%29.csproj">
- <Project>{7E4E681E-5D09-43FB-8D9E-35A454730A85}</Project>
- <Name>ProtocolBuffers%28Silverlight%29</Name>
- </ProjectReference>
- </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.Test/ProtocolBuffers.Test.CF20.csproj b/src/ProtocolBuffers.Test/ProtocolBuffers.Test.CF20.csproj index a83f52fd..9ac3eafc 100644 --- a/src/ProtocolBuffers.Test/ProtocolBuffers.Test.CF20.csproj +++ b/src/ProtocolBuffers.Test/ProtocolBuffers.Test.CF20.csproj @@ -2,7 +2,7 @@ <PropertyGroup>
<EnvironmentFlavor>COMPACT_FRAMEWORK</EnvironmentFlavor>
<EnvironmentTemplate>CF20</EnvironmentTemplate>
- <ProjectType>TEST</ProjectType>
+ <EnvironmentProjectType>TEST</EnvironmentProjectType>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
diff --git a/src/ProtocolBuffers.Test/ProtocolBuffers.Test.CF35.csproj b/src/ProtocolBuffers.Test/ProtocolBuffers.Test.CF35.csproj index 06392057..0c6344ed 100644 --- a/src/ProtocolBuffers.Test/ProtocolBuffers.Test.CF35.csproj +++ b/src/ProtocolBuffers.Test/ProtocolBuffers.Test.CF35.csproj @@ -2,7 +2,7 @@ <PropertyGroup>
<EnvironmentFlavor>COMPACT_FRAMEWORK</EnvironmentFlavor>
<EnvironmentTemplate>CF35</EnvironmentTemplate>
- <ProjectType>TEST</ProjectType>
+ <EnvironmentProjectType>TEST</EnvironmentProjectType>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
diff --git a/src/ProtocolBuffers.Test/ProtocolBuffers.Test.NET20.csproj b/src/ProtocolBuffers.Test/ProtocolBuffers.Test.NET20.csproj index 996b9e6b..f0453fa1 100644 --- a/src/ProtocolBuffers.Test/ProtocolBuffers.Test.NET20.csproj +++ b/src/ProtocolBuffers.Test/ProtocolBuffers.Test.NET20.csproj @@ -2,7 +2,7 @@ <PropertyGroup>
<EnvironmentFlavor>CLIENTPROFILE</EnvironmentFlavor>
<EnvironmentTemplate>NET20</EnvironmentTemplate>
- <ProjectType>TEST</ProjectType>
+ <EnvironmentProjectType>TEST</EnvironmentProjectType>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
diff --git a/src/ProtocolBuffers.Test/ProtocolBuffers.Test.NET35.csproj b/src/ProtocolBuffers.Test/ProtocolBuffers.Test.NET35.csproj index 4e3f2dbf..33630b44 100644 --- a/src/ProtocolBuffers.Test/ProtocolBuffers.Test.NET35.csproj +++ b/src/ProtocolBuffers.Test/ProtocolBuffers.Test.NET35.csproj @@ -2,7 +2,7 @@ <PropertyGroup>
<EnvironmentFlavor>CLIENTPROFILE</EnvironmentFlavor>
<EnvironmentTemplate>NET35</EnvironmentTemplate>
- <ProjectType>TEST</ProjectType>
+ <EnvironmentProjectType>TEST</EnvironmentProjectType>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
diff --git a/src/ProtocolBuffers.Test/ProtocolBuffers.Test.NET40.csproj b/src/ProtocolBuffers.Test/ProtocolBuffers.Test.NET40.csproj index 60c48fef..74ea7211 100644 --- a/src/ProtocolBuffers.Test/ProtocolBuffers.Test.NET40.csproj +++ b/src/ProtocolBuffers.Test/ProtocolBuffers.Test.NET40.csproj @@ -2,7 +2,7 @@ <PropertyGroup>
<EnvironmentFlavor>CLIENTPROFILE</EnvironmentFlavor>
<EnvironmentTemplate>NET40</EnvironmentTemplate>
- <ProjectType>TEST</ProjectType>
+ <EnvironmentProjectType>TEST</EnvironmentProjectType>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
diff --git a/src/ProtocolBuffers.Test/ProtocolBuffers.Test.PL40.csproj b/src/ProtocolBuffers.Test/ProtocolBuffers.Test.PL40.csproj index 43329b6b..018cf9d6 100644 --- a/src/ProtocolBuffers.Test/ProtocolBuffers.Test.PL40.csproj +++ b/src/ProtocolBuffers.Test/ProtocolBuffers.Test.PL40.csproj @@ -2,7 +2,7 @@ <PropertyGroup>
<EnvironmentFlavor>PORTABLE_LIBRARY</EnvironmentFlavor>
<EnvironmentTemplate>PL40</EnvironmentTemplate>
- <ProjectType>TEST</ProjectType>
+ <EnvironmentProjectType>TEST</EnvironmentProjectType>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
@@ -31,6 +31,8 @@ <TestPageFileName>TestPage.html</TestPageFileName>
<CreateTestPage>true</CreateTestPage>
<SilverlightVersion>v4.0</SilverlightVersion>
+ <OutOfBrowserSettingsFile>Properties\OutOfBrowserSettings.xml</OutOfBrowserSettingsFile>
+ <EnableOutOfBrowser>true</EnableOutOfBrowser>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -150,6 +152,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>
diff --git a/src/ProtocolBuffers.Test/ProtocolBuffers.Test.SL20.csproj b/src/ProtocolBuffers.Test/ProtocolBuffers.Test.SL20.csproj index cd942962..e54fa25c 100644 --- a/src/ProtocolBuffers.Test/ProtocolBuffers.Test.SL20.csproj +++ b/src/ProtocolBuffers.Test/ProtocolBuffers.Test.SL20.csproj @@ -2,7 +2,7 @@ <PropertyGroup>
<EnvironmentFlavor>SILVERLIGHT</EnvironmentFlavor>
<EnvironmentTemplate>SL20</EnvironmentTemplate>
- <ProjectType>TEST</ProjectType>
+ <EnvironmentProjectType>TEST</EnvironmentProjectType>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
@@ -29,6 +29,8 @@ <TestPageFileName>TestPage.html</TestPageFileName>
<CreateTestPage>true</CreateTestPage>
<SilverlightVersion>v2.0</SilverlightVersion>
+ <OutOfBrowserSettingsFile>Properties\OutOfBrowserSettings.xml</OutOfBrowserSettingsFile>
+ <EnableOutOfBrowser>true</EnableOutOfBrowser>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -149,6 +151,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>
@@ -189,7 +192,9 @@ <ProjectExtensions>
<VisualStudio>
<FlavorProperties GUID="{A1591282-1198-4647-A2B1-27E5FF5F6F3B}">
- <SilverlightProjectProperties />
+ <SilverlightProjectProperties>
+ <StartAction>OfflineApplication</StartAction>
+ </SilverlightProjectProperties>
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
diff --git a/src/ProtocolBuffers.Test/ProtocolBuffers.Test.SL30.Working.csproj b/src/ProtocolBuffers.Test/ProtocolBuffers.Test.SL30.Working.csproj deleted file mode 100644 index e6c566a3..00000000 --- a/src/ProtocolBuffers.Test/ProtocolBuffers.Test.SL30.Working.csproj +++ /dev/null @@ -1,214 +0,0 @@ -<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <EnvironmentFlavor>SILVERLIGHT</EnvironmentFlavor>
- <EnvironmentTemplate>SL30</EnvironmentTemplate>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.30729</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{DD01ED24-3750-4567-9A23-1DB676A15610}</ProjectGuid>
- <OutputType>Library</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>Google.ProtocolBuffers</RootNamespace>
- <AssemblyName>Google.ProtocolBuffers.Test</AssemblyName>
- <TargetFrameworkVersion>v3.5</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>
- <SilverlightApplication>false</SilverlightApplication>
- <ValidateXaml>false</ValidateXaml>
- <ThrowErrorsInValidation>false</ThrowErrorsInValidation>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(EnvironmentFlavor)' != 'CLIENTPROFILE' ">
- <SilverlightApplication>true</SilverlightApplication>
- <XapOutputs>true</XapOutputs>
- <GenerateSilverlightManifest>true</GenerateSilverlightManifest>
- <XapFilename>$(AssemblyName).xap</XapFilename>
- <SilverlightManifestTemplate>Properties\AppManifest.xml</SilverlightManifestTemplate>
- <SilverlightAppEntry>$(RootNamespace).App</SilverlightAppEntry>
- <TestPageFileName>TestPage.html</TestPageFileName>
- <CreateTestPage>true</CreateTestPage>
- <SilverlightVersion>$(TargetFrameworkVersion)</SilverlightVersion>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>bin\SL30\Debug</OutputPath>
- <IntermediateOutputPath>obj\SL30\Debug\</IntermediateOutputPath>
- <DefineConstants>DEBUG;TRACE;$(EnvironmentFlavor);$(EnvironmentTemplate);NOSERIALIZABLE;NOSORTEDLIST</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
- <NoStdLib>true</NoStdLib>
- <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
- <NoConfig>true</NoConfig>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>pdbonly</DebugType>
- <Optimize>true</Optimize>
- <OutputPath>bin\SL30\Release</OutputPath>
- <IntermediateOutputPath>obj\SL30\Release\</IntermediateOutputPath>
- <DefineConstants>TRACE;$(EnvironmentFlavor);$(EnvironmentTemplate);NOSERIALIZABLE;NOSORTEDLIST</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
- <NoStdLib>true</NoStdLib>
- <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
- <NoConfig>true</NoConfig>
- </PropertyGroup>
- <ItemGroup>
- <Reference Include="mscorlib" />
- <Reference Include="System" />
- <Reference Include="System.Xml" />
- <Reference Include="System.Core" />
- <Reference Include="System.Windows" />
- <Reference Include="System.Windows.Browser" />
- </ItemGroup>
- <ItemGroup Condition=" '$(EnvironmentFlavor)' == 'CLIENTPROFILE' ">
- <Reference Include="nunit.framework">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\lib\NUnit\lib\nunit.framework.dll</HintPath>
- </Reference>
- </ItemGroup>
- <ItemGroup Condition=" '$(EnvironmentFlavor)' != 'CLIENTPROFILE' ">
- <Reference Include="Microsoft.Silverlight.Testing, Version=2.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\lib\Microsoft.Silverlight.Testing\April2010\Microsoft.Silverlight.Testing.dll</HintPath>
- </Reference>
- <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTesting.Silverlight, Version=2.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\lib\Microsoft.Silverlight.Testing\April2010\Microsoft.VisualStudio.QualityTools.UnitTesting.Silverlight.dll</HintPath>
- </Reference>
- </ItemGroup>
- <ItemGroup Condition=" '$(EnvironmentFlavor)' != 'CLIENTPROFILE' ">
- <Compile Include="App.xaml.cs">
- <DependentUpon>App.xaml</DependentUpon>
- </Compile>
- <ApplicationDefinition Include="App.xaml">
- <Generator>MSBuild:Compile</Generator>
- <SubType>Designer</SubType>
- </ApplicationDefinition>
- <None Include="Properties\AppManifest.xml" />
- </ItemGroup>
- <ItemGroup>
- <Compile Include="..\..\lib\NUnit-config\Microsoft.VisualStudio.TestTools.cs">
- <Link>Microsoft.VisualStudio.TestTools.cs</Link>
- </Compile>
- <Compile Include="AbstractMessageTest.cs" />
- <Compile Include="ByteStringTest.cs" />
- <Compile Include="CodedInputStreamTest.cs" />
- <Compile Include="CodedOutputStreamTest.cs" />
- <Compile Include="Collections\PopsicleListTest.cs" />
- <Compile Include="Compatibility\BinaryCompatibilityTests.cs" />
- <Compile Include="Compatibility\CompatibilityTests.cs" />
- <Compile Include="Compatibility\DictionaryCompatibilityTests.cs" />
- <Compile Include="Compatibility\JsonCompatibilityTests.cs" />
- <Compile Include="Compatibility\TestResources.cs" />
- <Compile Include="Compatibility\TextCompatibilityTests.cs" />
- <Compile Include="Compatibility\XmlCompatibilityTests.cs" />
- <Compile Include="SerializableAttribute.cs" />
- <Compile Include="TestProtos\UnitTestExtrasProtoFile.cs" />
- <Compile Include="TestResources.cs" />
- <Compile Include="TestRpcForMimeTypes.cs" />
- <Compile Include="TestReaderForUrlEncoded.cs" />
- <Compile Include="CSharpOptionsTest.cs" />
- <Compile Include="DeprecatedMemberTest.cs" />
- <Compile Include="DescriptorsTest.cs" />
- <Compile Include="Descriptors\MessageDescriptorTest.cs" />
- <Compile Include="DynamicMessageTest.cs" />
- <Compile Include="ExtendableMessageTest.cs" />
- <Compile Include="GeneratedBuilderTest.cs" />
- <Compile Include="GeneratedMessageTest.cs" />
- <Compile Include="IssuesTest.cs" />
- <Compile Include="MessageStreamIteratorTest.cs" />
- <Compile Include="MessageStreamWriterTest.cs" />
- <Compile Include="MessageTest.cs" />
- <Compile Include="MessageUtilTest.cs" />
- <Compile Include="NameHelpersTest.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="ReflectionTester.cs" />
- <Compile Include="ReusableBuilderTest.cs" />
- <Compile Include="SerializableTest.cs" />
- <Compile Include="ServiceTest.cs" />
- <Compile Include="TestCornerCases.cs" />
- <Compile Include="TestMimeMessageFormats.cs" />
- <Compile Include="TestProtos\UnitTestCSharpOptionsProtoFile.cs" />
- <Compile Include="TestProtos\UnitTestCustomOptionsProtoFile.cs" />
- <Compile Include="TestProtos\UnitTestEmbedOptimizeForProtoFile.cs" />
- <Compile Include="TestProtos\UnitTestEmptyProtoFile.cs" />
- <Compile Include="TestProtos\UnitTestExtrasIssuesProtoFile.cs" />
- <Compile Include="TestProtos\UnitTestGenericServices.cs" />
- <Compile Include="TestProtos\UnitTestGoogleSizeProtoFile.cs" />
- <Compile Include="TestProtos\UnitTestGoogleSpeedProtoFile.cs" />
- <Compile Include="TestProtos\UnitTestImportLiteProtoFile.cs" />
- <Compile Include="TestProtos\UnitTestImportProtoFile.cs" />
- <Compile Include="TestProtos\UnitTestMessageSetProtoFile.cs" />
- <Compile Include="TestProtos\UnitTestNoGenericServicesProtoFile.cs" />
- <Compile Include="TestProtos\UnitTestOptimizeForProtoFile.cs" />
- <Compile Include="TestProtos\UnitTestProtoFile.cs" />
- <Compile Include="TestProtos\UnitTestRpcInterop.cs" />
- <Compile Include="TestProtos\UnitTestXmlSerializerTestProtoFile.cs" />
- <Compile Include="TestRpcGenerator.cs" />
- <Compile Include="TestUtil.cs" />
- <Compile Include="TestWriterFormatJson.cs" />
- <Compile Include="TestWriterFormatXml.cs" />
- <Compile Include="TextFormatTest.cs" />
- <Compile Include="UnknownFieldSetTest.cs" />
- <Compile Include="WireFormatTest.cs" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\ProtocolBuffers.Serialization\ProtocolBuffers.Serialization.SL30.csproj">
- <Project>{231391AF-449C-4a39-986C-AD7F270F4750}</Project>
- <Name>ProtocolBuffers.Serialization</Name>
- </ProjectReference>
- <ProjectReference Include="..\ProtocolBuffers\ProtocolBuffers.SL30.csproj">
- <Project>{6908BDCE-D925-43F3-94AC-A531E6DF2591}</Project>
- <Name>ProtocolBuffers</Name>
- </ProjectReference>
- </ItemGroup>
- <ItemGroup>
- <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
- <Install>false</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
- <Visible>False</Visible>
- <ProductName>Windows Installer 3.1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Compatibility\google_message1.dat" />
- <EmbeddedResource Include="Compatibility\google_message2.dat" />
- </ItemGroup>
- <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Silverlight\v3.0\Microsoft.Silverlight.CSharp.targets" />
- <ProjectExtensions>
- <VisualStudio>
- <FlavorProperties GUID="{A1591282-1198-4647-A2B1-27E5FF5F6F3B}">
- <SilverlightProjectProperties />
- </FlavorProperties>
- </VisualStudio>
- </ProjectExtensions>
- <!-- 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>
- -->
- <PropertyGroup>
- <StartAction>Program</StartAction>
- <StartProgram>$(ProjectDir)..\..\lib\NUnit\tools\nunit-console.exe</StartProgram>
- <StartArguments>/nologo /noshadow /labels /wait $(AssemblyName).dll</StartArguments>
- <StartWorkingDirectory>$(ProjectDir)$(OutputPath)</StartWorkingDirectory>
- </PropertyGroup>
-</Project>
\ No newline at end of file diff --git a/src/ProtocolBuffers.Test/ProtocolBuffers.Test.SL30.csproj b/src/ProtocolBuffers.Test/ProtocolBuffers.Test.SL30.csproj index d8796423..76f6b1a2 100644 --- a/src/ProtocolBuffers.Test/ProtocolBuffers.Test.SL30.csproj +++ b/src/ProtocolBuffers.Test/ProtocolBuffers.Test.SL30.csproj @@ -2,7 +2,7 @@ <PropertyGroup>
<EnvironmentFlavor>SILVERLIGHT</EnvironmentFlavor>
<EnvironmentTemplate>SL30</EnvironmentTemplate>
- <ProjectType>TEST</ProjectType>
+ <EnvironmentProjectType>TEST</EnvironmentProjectType>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
@@ -29,6 +29,8 @@ <TestPageFileName>TestPage.html</TestPageFileName>
<CreateTestPage>true</CreateTestPage>
<SilverlightVersion>v3.5</SilverlightVersion>
+ <OutOfBrowserSettingsFile>Properties\OutOfBrowserSettings.xml</OutOfBrowserSettingsFile>
+ <EnableOutOfBrowser>true</EnableOutOfBrowser>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -150,6 +152,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>
@@ -190,7 +193,9 @@ <ProjectExtensions>
<VisualStudio>
<FlavorProperties GUID="{A1591282-1198-4647-A2B1-27E5FF5F6F3B}">
- <SilverlightProjectProperties />
+ <SilverlightProjectProperties>
+ <StartAction>OfflineApplication</StartAction>
+ </SilverlightProjectProperties>
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
diff --git a/src/ProtocolBuffers.Test/ProtocolBuffers.Test.SL40.csproj b/src/ProtocolBuffers.Test/ProtocolBuffers.Test.SL40.csproj index df153fc1..ade3dc35 100644 --- a/src/ProtocolBuffers.Test/ProtocolBuffers.Test.SL40.csproj +++ b/src/ProtocolBuffers.Test/ProtocolBuffers.Test.SL40.csproj @@ -2,7 +2,7 @@ <PropertyGroup>
<EnvironmentFlavor>SILVERLIGHT</EnvironmentFlavor>
<EnvironmentTemplate>SL40</EnvironmentTemplate>
- <ProjectType>TEST</ProjectType>
+ <EnvironmentProjectType>TEST</EnvironmentProjectType>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
@@ -29,6 +29,8 @@ <SilverlightAppEntry>Google.ProtocolBuffers.App</SilverlightAppEntry>
<TestPageFileName>TestPage.html</TestPageFileName>
<CreateTestPage>true</CreateTestPage>
+ <OutOfBrowserSettingsFile>Properties\OutOfBrowserSettings.xml</OutOfBrowserSettingsFile>
+ <EnableOutOfBrowser>true</EnableOutOfBrowser>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -150,6 +152,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>
@@ -190,7 +193,9 @@ <ProjectExtensions>
<VisualStudio>
<FlavorProperties GUID="{A1591282-1198-4647-A2B1-27E5FF5F6F3B}">
- <SilverlightProjectProperties />
+ <SilverlightProjectProperties>
+ <StartAction>OfflineApplication</StartAction>
+ </SilverlightProjectProperties>
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
diff --git a/src/ProtocolBuffers.Test/ProtocolBuffers.Test.csproj b/src/ProtocolBuffers.Test/ProtocolBuffers.Test.csproj index ae7e22c5..267fedc0 100644 --- a/src/ProtocolBuffers.Test/ProtocolBuffers.Test.csproj +++ b/src/ProtocolBuffers.Test/ProtocolBuffers.Test.csproj @@ -3,7 +3,7 @@ <PropertyGroup>
<EnvironmentFlavor>CLIENTPROFILE</EnvironmentFlavor>
<EnvironmentTemplate>NET35</EnvironmentTemplate>
- <ProjectType>TEST</ProjectType>
+ <EnvironmentProjectType>TEST</EnvironmentProjectType>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
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>
diff --git a/src/ProtocolBuffersLite.Test/Properties/OutOfBrowserSettings.xml b/src/ProtocolBuffersLite.Test/Properties/OutOfBrowserSettings.xml new file mode 100644 index 00000000..634f44bf --- /dev/null +++ b/src/ProtocolBuffersLite.Test/Properties/OutOfBrowserSettings.xml @@ -0,0 +1,7 @@ +<OutOfBrowserSettings ShortName="ProtocolBuffers.Test" EnableGPUAcceleration="False" ShowInstallMenuItem="False">
+ <OutOfBrowserSettings.Blurb>ProtocolBuffers.Test</OutOfBrowserSettings.Blurb>
+ <OutOfBrowserSettings.WindowSettings>
+ <WindowSettings Title="ProtocolBuffers.Test" />
+ </OutOfBrowserSettings.WindowSettings>
+ <OutOfBrowserSettings.Icons />
+</OutOfBrowserSettings>
\ No newline at end of file diff --git a/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test(Silverlight).csproj b/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test(Silverlight).csproj deleted file mode 100644 index b852f233..00000000 --- a/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test(Silverlight).csproj +++ /dev/null @@ -1,147 +0,0 @@ -<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug_Silverlight</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.30729</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{C56950B0-9F97-4250-8945-4B3C2D441FEA}</ProjectGuid>
- <ProjectTypeGuids>{A1591282-1198-4647-A2B1-27E5FF5F6F3B};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
- <OutputType>Library</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>Google.ProtocolBuffers</RootNamespace>
- <AssemblyName>Google.ProtocolBuffersLite.Test</AssemblyName>
- <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
- <SilverlightApplication>true</SilverlightApplication>
- <SupportedCultures>
- </SupportedCultures>
- <XapOutputs>true</XapOutputs>
- <GenerateSilverlightManifest>true</GenerateSilverlightManifest>
- <XapFilename>Google.ProtocolBuffersLite.Test.xap</XapFilename>
- <SilverlightManifestTemplate>Properties\AppManifest.xml</SilverlightManifestTemplate>
- <SilverlightAppEntry>Google.ProtocolBuffers.App</SilverlightAppEntry>
- <TestPageFileName>TestPage.html</TestPageFileName>
- <CreateTestPage>true</CreateTestPage>
- <ValidateXaml>false</ValidateXaml>
- <ThrowErrorsInValidation>false</ThrowErrorsInValidation>
- <FileUpgradeFlags>
- </FileUpgradeFlags>
- <OldToolsVersion>3.5</OldToolsVersion>
- <UpgradeBackupLocation>
- </UpgradeBackupLocation>
- <PublishUrl>publish\</PublishUrl>
- <Install>true</Install>
- <InstallFrom>Disk</InstallFrom>
- <UpdateEnabled>false</UpdateEnabled>
- <UpdateMode>Foreground</UpdateMode>
- <UpdateInterval>7</UpdateInterval>
- <UpdateIntervalUnits>Days</UpdateIntervalUnits>
- <UpdatePeriodically>false</UpdatePeriodically>
- <UpdateRequired>false</UpdateRequired>
- <MapFileExtensions>true</MapFileExtensions>
- <ApplicationRevision>0</ApplicationRevision>
- <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
- <IsWebBootstrapper>false</IsWebBootstrapper>
- <UseApplicationTrust>false</UseApplicationTrust>
- <BootstrapperEnabled>true</BootstrapperEnabled>
- <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>
- <DefineConstants>DEBUG;TRACE;SILVERLIGHT</DefineConstants>
- <NoStdLib>true</NoStdLib>
- <NoConfig>true</NoConfig>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <NoWarn>3021</NoWarn>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_Silverlight|AnyCPU' ">
- <DebugType>pdbonly</DebugType>
- <Optimize>true</Optimize>
- <OutputPath>bin\Release_Silverlight</OutputPath>
- <DefineConstants>TRACE;SILVERLIGHT</DefineConstants>
- <NoStdLib>true</NoStdLib>
- <NoConfig>true</NoConfig>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <NoWarn>3021</NoWarn>
- </PropertyGroup>
- <ItemGroup>
- <Reference Include="Microsoft.Silverlight.Testing, Version=2.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\lib\Microsoft.Silverlight.Testing\April2010\Microsoft.Silverlight.Testing.dll</HintPath>
- </Reference>
- <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTesting.Silverlight, Version=2.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\lib\Microsoft.Silverlight.Testing\April2010\Microsoft.VisualStudio.QualityTools.UnitTesting.Silverlight.dll</HintPath>
- </Reference>
- <Reference Include="System.Windows" />
- <Reference Include="mscorlib" />
- <Reference Include="system" />
- <Reference Include="System.Core" />
- <Reference Include="System.Xml" />
- <Reference Include="System.Windows.Browser" />
- </ItemGroup>
- <ItemGroup>
- <Compile Include="..\ProtocolBuffers.Test\Properties\AssemblyInfo.cs">
- <Link>Properties\AssemblyInfo.cs</Link>
- </Compile>
- <Compile Include="..\ProtocolBuffers.Test\TestRpcForMimeTypes.cs">
- <Link>TestRpcForMimeTypes.cs</Link>
- </Compile>
- <Compile Include="..\ProtocolBuffers.Test\TestRpcGenerator.cs">
- <Link>TestRpcGenerator.cs</Link>
- </Compile>
- <Compile Include="App.xaml.cs">
- <DependentUpon>App.xaml</DependentUpon>
- </Compile>
- <Compile Include="AbstractBuilderLiteTest.cs" />
- <Compile Include="AbstractMessageLiteTest.cs" />
- <Compile Include="ExtendableBuilderLiteTest.cs" />
- <Compile Include="ExtendableMessageLiteTest.cs" />
- <Compile Include="LiteTest.cs" />
- <Compile Include="SerializableAttribute.cs" />
- <Compile Include="TestLiteByApi.cs" />
- <Compile Include="TestProtos\UnitTestExtrasLiteProtoFile.cs" />
- <Compile Include="TestProtos\UnitTestImportLiteProtoFile.cs" />
- <Compile Include="TestProtos\UnitTestLiteProtoFile.cs" />
- <Compile Include="TestUtil.cs" />
- <Compile Include="TestProtos\UnitTestRpcInteropLite.cs" />
- </ItemGroup>
- <ItemGroup>
- <ApplicationDefinition Include="App.xaml">
- <Generator>MSBuild:Compile</Generator>
- <SubType>Designer</SubType>
- </ApplicationDefinition>
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\ProtocolBuffers.Serialization\ProtocolBuffersLite.Serialization%28Silverlight%29.csproj">
- <Project>{B6CDC03B-EBBD-4F38-9F84-736EC0948090}</Project>
- <Name>ProtocolBuffersLite.Serialization%28Silverlight%29</Name>
- </ProjectReference>
- <ProjectReference Include="..\ProtocolBuffers\ProtocolBuffersLite%28Silverlight%29.csproj">
- <Project>{2275EE6B-195B-485C-B6F6-CCA01C1B5AE0}</Project>
- <Name>ProtocolBuffersLite%28Silverlight%29</Name>
- </ProjectReference>
- </ItemGroup>
- <ItemGroup>
- <None Include="Properties\AppManifest.xml" />
- </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/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.CF20.csproj b/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.CF20.csproj index 6fb006b3..abb9f616 100644 --- a/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.CF20.csproj +++ b/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.CF20.csproj @@ -2,7 +2,7 @@ <PropertyGroup>
<EnvironmentFlavor>COMPACT_FRAMEWORK</EnvironmentFlavor>
<EnvironmentTemplate>CF20</EnvironmentTemplate>
- <ProjectType>TEST</ProjectType>
+ <EnvironmentProjectType>TEST</EnvironmentProjectType>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
diff --git a/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.CF35.csproj b/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.CF35.csproj index f067af09..74edad11 100644 --- a/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.CF35.csproj +++ b/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.CF35.csproj @@ -2,7 +2,7 @@ <PropertyGroup>
<EnvironmentFlavor>COMPACT_FRAMEWORK</EnvironmentFlavor>
<EnvironmentTemplate>CF35</EnvironmentTemplate>
- <ProjectType>TEST</ProjectType>
+ <EnvironmentProjectType>TEST</EnvironmentProjectType>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
diff --git a/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.NET20.csproj b/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.NET20.csproj index 9182d881..59f9375f 100644 --- a/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.NET20.csproj +++ b/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.NET20.csproj @@ -2,7 +2,7 @@ <PropertyGroup>
<EnvironmentFlavor>CLIENTPROFILE</EnvironmentFlavor>
<EnvironmentTemplate>NET20</EnvironmentTemplate>
- <ProjectType>TEST</ProjectType>
+ <EnvironmentProjectType>TEST</EnvironmentProjectType>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
diff --git a/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.NET35.csproj b/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.NET35.csproj index 18530768..e4ebfe1b 100644 --- a/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.NET35.csproj +++ b/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.NET35.csproj @@ -2,7 +2,7 @@ <PropertyGroup>
<EnvironmentFlavor>CLIENTPROFILE</EnvironmentFlavor>
<EnvironmentTemplate>NET35</EnvironmentTemplate>
- <ProjectType>TEST</ProjectType>
+ <EnvironmentProjectType>TEST</EnvironmentProjectType>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
diff --git a/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.NET40.csproj b/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.NET40.csproj index 70b38967..d02ac774 100644 --- a/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.NET40.csproj +++ b/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.NET40.csproj @@ -2,7 +2,7 @@ <PropertyGroup>
<EnvironmentFlavor>CLIENTPROFILE</EnvironmentFlavor>
<EnvironmentTemplate>NET40</EnvironmentTemplate>
- <ProjectType>TEST</ProjectType>
+ <EnvironmentProjectType>TEST</EnvironmentProjectType>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
diff --git a/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.PL40.csproj b/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.PL40.csproj index b2ccdcb1..b645a01e 100644 --- a/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.PL40.csproj +++ b/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.PL40.csproj @@ -2,7 +2,7 @@ <PropertyGroup>
<EnvironmentFlavor>PORTABLE_LIBRARY</EnvironmentFlavor>
<EnvironmentTemplate>PL40</EnvironmentTemplate>
- <ProjectType>TEST</ProjectType>
+ <EnvironmentProjectType>TEST</EnvironmentProjectType>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
@@ -31,6 +31,8 @@ <TestPageFileName>TestPage.html</TestPageFileName>
<CreateTestPage>true</CreateTestPage>
<SilverlightVersion>v4.0</SilverlightVersion>
+ <OutOfBrowserSettingsFile>Properties\OutOfBrowserSettings.xml</OutOfBrowserSettingsFile>
+ <EnableOutOfBrowser>true</EnableOutOfBrowser>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -113,6 +115,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>
diff --git a/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.SL20.csproj b/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.SL20.csproj index c60ee169..b4ad946f 100644 --- a/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.SL20.csproj +++ b/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.SL20.csproj @@ -2,7 +2,7 @@ <PropertyGroup>
<EnvironmentFlavor>SILVERLIGHT</EnvironmentFlavor>
<EnvironmentTemplate>SL20</EnvironmentTemplate>
- <ProjectType>TEST</ProjectType>
+ <EnvironmentProjectType>TEST</EnvironmentProjectType>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
@@ -29,6 +29,8 @@ <TestPageFileName>TestPage.html</TestPageFileName>
<CreateTestPage>true</CreateTestPage>
<SilverlightVersion>v2.0</SilverlightVersion>
+ <OutOfBrowserSettingsFile>Properties\OutOfBrowserSettings.xml</OutOfBrowserSettingsFile>
+ <EnableOutOfBrowser>true</EnableOutOfBrowser>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -112,6 +114,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>
@@ -132,7 +135,9 @@ <ProjectExtensions>
<VisualStudio>
<FlavorProperties GUID="{A1591282-1198-4647-A2B1-27E5FF5F6F3B}">
- <SilverlightProjectProperties />
+ <SilverlightProjectProperties>
+ <StartAction>OfflineApplication</StartAction>
+ </SilverlightProjectProperties>
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
diff --git a/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.SL30.csproj b/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.SL30.csproj index 28f1e4f6..b5870ede 100644 --- a/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.SL30.csproj +++ b/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.SL30.csproj @@ -2,7 +2,7 @@ <PropertyGroup>
<EnvironmentFlavor>SILVERLIGHT</EnvironmentFlavor>
<EnvironmentTemplate>SL30</EnvironmentTemplate>
- <ProjectType>TEST</ProjectType>
+ <EnvironmentProjectType>TEST</EnvironmentProjectType>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
@@ -29,6 +29,8 @@ <TestPageFileName>TestPage.html</TestPageFileName>
<CreateTestPage>true</CreateTestPage>
<SilverlightVersion>v3.5</SilverlightVersion>
+ <OutOfBrowserSettingsFile>Properties\OutOfBrowserSettings.xml</OutOfBrowserSettingsFile>
+ <EnableOutOfBrowser>true</EnableOutOfBrowser>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -113,6 +115,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>
@@ -133,7 +136,9 @@ <ProjectExtensions>
<VisualStudio>
<FlavorProperties GUID="{A1591282-1198-4647-A2B1-27E5FF5F6F3B}">
- <SilverlightProjectProperties />
+ <SilverlightProjectProperties>
+ <StartAction>OfflineApplication</StartAction>
+ </SilverlightProjectProperties>
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
diff --git a/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.SL40.csproj b/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.SL40.csproj index f79b8a32..ef1543ec 100644 --- a/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.SL40.csproj +++ b/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.SL40.csproj @@ -2,7 +2,7 @@ <PropertyGroup>
<EnvironmentFlavor>SILVERLIGHT</EnvironmentFlavor>
<EnvironmentTemplate>SL40</EnvironmentTemplate>
- <ProjectType>TEST</ProjectType>
+ <EnvironmentProjectType>TEST</EnvironmentProjectType>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
@@ -29,6 +29,8 @@ <SilverlightAppEntry>Google.ProtocolBuffers.App</SilverlightAppEntry>
<TestPageFileName>TestPage.html</TestPageFileName>
<CreateTestPage>true</CreateTestPage>
+ <OutOfBrowserSettingsFile>Properties\OutOfBrowserSettings.xml</OutOfBrowserSettingsFile>
+ <EnableOutOfBrowser>true</EnableOutOfBrowser>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -113,6 +115,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>
@@ -133,7 +136,9 @@ <ProjectExtensions>
<VisualStudio>
<FlavorProperties GUID="{A1591282-1198-4647-A2B1-27E5FF5F6F3B}">
- <SilverlightProjectProperties />
+ <SilverlightProjectProperties>
+ <StartAction>OfflineApplication</StartAction>
+ </SilverlightProjectProperties>
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
diff --git a/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.csproj b/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.csproj index 73630e3f..451aaf8b 100644 --- a/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.csproj +++ b/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.csproj @@ -3,7 +3,7 @@ <PropertyGroup>
<EnvironmentFlavor>CLIENTPROFILE</EnvironmentFlavor>
<EnvironmentTemplate>NET35</EnvironmentTemplate>
- <ProjectType>TEST</ProjectType>
+ <EnvironmentProjectType>TEST</EnvironmentProjectType>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
diff --git a/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test(Silverlight).csproj b/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test(Silverlight).csproj deleted file mode 100644 index 424ee70f..00000000 --- a/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test(Silverlight).csproj +++ /dev/null @@ -1,142 +0,0 @@ -<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug_Silverlight</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.30729</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{63B8D05E-4581-4B92-B8D5-77E702535C7F}</ProjectGuid>
- <ProjectTypeGuids>{A1591282-1198-4647-A2B1-27E5FF5F6F3B};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
- <OutputType>Library</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>Google.ProtocolBuffers</RootNamespace>
- <AssemblyName>Google.ProtocolBuffersLiteMixed.Test</AssemblyName>
- <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
- <SilverlightApplication>true</SilverlightApplication>
- <SupportedCultures>
- </SupportedCultures>
- <XapOutputs>true</XapOutputs>
- <GenerateSilverlightManifest>true</GenerateSilverlightManifest>
- <XapFilename>Google.ProtocolBuffersLiteMixed.Test.xap</XapFilename>
- <SilverlightManifestTemplate>Properties\AppManifest.xml</SilverlightManifestTemplate>
- <SilverlightAppEntry>Google.ProtocolBuffers.App</SilverlightAppEntry>
- <TestPageFileName>TestPage.html</TestPageFileName>
- <CreateTestPage>true</CreateTestPage>
- <ValidateXaml>false</ValidateXaml>
- <ThrowErrorsInValidation>false</ThrowErrorsInValidation>
- <FileUpgradeFlags>
- </FileUpgradeFlags>
- <OldToolsVersion>3.5</OldToolsVersion>
- <UpgradeBackupLocation>
- </UpgradeBackupLocation>
- <PublishUrl>publish\</PublishUrl>
- <Install>true</Install>
- <InstallFrom>Disk</InstallFrom>
- <UpdateEnabled>false</UpdateEnabled>
- <UpdateMode>Foreground</UpdateMode>
- <UpdateInterval>7</UpdateInterval>
- <UpdateIntervalUnits>Days</UpdateIntervalUnits>
- <UpdatePeriodically>false</UpdatePeriodically>
- <UpdateRequired>false</UpdateRequired>
- <MapFileExtensions>true</MapFileExtensions>
- <ApplicationRevision>0</ApplicationRevision>
- <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
- <IsWebBootstrapper>false</IsWebBootstrapper>
- <UseApplicationTrust>false</UseApplicationTrust>
- <BootstrapperEnabled>true</BootstrapperEnabled>
- <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>
- <DefineConstants>DEBUG;TRACE;SILVERLIGHT</DefineConstants>
- <NoStdLib>true</NoStdLib>
- <NoConfig>true</NoConfig>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <NoWarn>3021</NoWarn>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_Silverlight|AnyCPU' ">
- <DebugType>pdbonly</DebugType>
- <Optimize>true</Optimize>
- <OutputPath>bin\Release_Silverlight</OutputPath>
- <DefineConstants>TRACE;SILVERLIGHT</DefineConstants>
- <NoStdLib>true</NoStdLib>
- <NoConfig>true</NoConfig>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <NoWarn>3021</NoWarn>
- </PropertyGroup>
- <ItemGroup>
- <Reference Include="Microsoft.Silverlight.Testing, Version=2.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\lib\Microsoft.Silverlight.Testing\April2010\Microsoft.Silverlight.Testing.dll</HintPath>
- </Reference>
- <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTesting.Silverlight, Version=2.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\lib\Microsoft.Silverlight.Testing\April2010\Microsoft.VisualStudio.QualityTools.UnitTesting.Silverlight.dll</HintPath>
- </Reference>
- <Reference Include="System.Windows" />
- <Reference Include="mscorlib" />
- <Reference Include="system" />
- <Reference Include="System.Core" />
- <Reference Include="System.Xml" />
- <Reference Include="System.Windows.Browser" />
- </ItemGroup>
- <ItemGroup>
- <Compile Include="..\ProtocolBuffers.Test\Properties\AssemblyInfo.cs">
- <Link>Properties\AssemblyInfo.cs</Link>
- </Compile>
- <Compile Include="App.xaml.cs">
- <DependentUpon>App.xaml</DependentUpon>
- </Compile>
- <Compile Include="AbstractBuilderLiteTest.cs" />
- <Compile Include="AbstractMessageLiteTest.cs" />
- <Compile Include="ExtendableBuilderLiteTest.cs" />
- <Compile Include="ExtendableMessageLiteTest.cs" />
- <Compile Include="InteropLiteTest.cs" />
- <Compile Include="LiteTest.cs" />
- <Compile Include="MissingFieldAndExtensionTest.cs" />
- <Compile Include="SerializableAttribute.cs" />
- <Compile Include="TestLiteByApi.cs" />
- <Compile Include="TestProtos\UnitTestExtrasFullProtoFile.cs" />
- <Compile Include="TestProtos\UnitTestExtrasLiteProtoFile.cs" />
- <Compile Include="TestProtos\UnitTestImportLiteProtoFile.cs" />
- <Compile Include="TestProtos\UnitTestImportProtoFile.cs" />
- <Compile Include="TestProtos\UnitTestLiteImportNonLiteProtoFile.cs" />
- <Compile Include="TestProtos\UnitTestLiteProtoFile.cs" />
- <Compile Include="TestProtos\UnitTestProtoFile.cs" />
- <Compile Include="TestUtil.cs" />
- </ItemGroup>
- <ItemGroup>
- <ApplicationDefinition Include="App.xaml">
- <Generator>MSBuild:Compile</Generator>
- <SubType>Designer</SubType>
- </ApplicationDefinition>
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\ProtocolBuffers\ProtocolBuffers%28Silverlight%29.csproj">
- <Project>{7E4E681E-5D09-43FB-8D9E-35A454730A85}</Project>
- <Name>ProtocolBuffers%28Silverlight%29</Name>
- </ProjectReference>
- </ItemGroup>
- <ItemGroup>
- <None Include="Properties\AppManifest.xml" />
- </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/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.CF20.csproj b/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.CF20.csproj index 2de036a3..0ed3b36d 100644 --- a/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.CF20.csproj +++ b/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.CF20.csproj @@ -2,7 +2,7 @@ <PropertyGroup>
<EnvironmentFlavor>COMPACT_FRAMEWORK</EnvironmentFlavor>
<EnvironmentTemplate>CF20</EnvironmentTemplate>
- <ProjectType>TEST</ProjectType>
+ <EnvironmentProjectType>TEST</EnvironmentProjectType>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
diff --git a/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.CF35.csproj b/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.CF35.csproj index 819c63ca..50d4e643 100644 --- a/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.CF35.csproj +++ b/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.CF35.csproj @@ -2,7 +2,7 @@ <PropertyGroup>
<EnvironmentFlavor>COMPACT_FRAMEWORK</EnvironmentFlavor>
<EnvironmentTemplate>CF35</EnvironmentTemplate>
- <ProjectType>TEST</ProjectType>
+ <EnvironmentProjectType>TEST</EnvironmentProjectType>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
diff --git a/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.NET20.csproj b/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.NET20.csproj index 1d13f267..80593a4d 100644 --- a/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.NET20.csproj +++ b/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.NET20.csproj @@ -2,7 +2,7 @@ <PropertyGroup>
<EnvironmentFlavor>CLIENTPROFILE</EnvironmentFlavor>
<EnvironmentTemplate>NET20</EnvironmentTemplate>
- <ProjectType>TEST</ProjectType>
+ <EnvironmentProjectType>TEST</EnvironmentProjectType>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
diff --git a/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.NET35.csproj b/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.NET35.csproj index 8e773aad..e8b6d095 100644 --- a/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.NET35.csproj +++ b/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.NET35.csproj @@ -2,7 +2,7 @@ <PropertyGroup>
<EnvironmentFlavor>CLIENTPROFILE</EnvironmentFlavor>
<EnvironmentTemplate>NET35</EnvironmentTemplate>
- <ProjectType>TEST</ProjectType>
+ <EnvironmentProjectType>TEST</EnvironmentProjectType>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
diff --git a/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.NET40.csproj b/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.NET40.csproj index a937c2fb..16ffefd6 100644 --- a/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.NET40.csproj +++ b/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.NET40.csproj @@ -2,7 +2,7 @@ <PropertyGroup>
<EnvironmentFlavor>CLIENTPROFILE</EnvironmentFlavor>
<EnvironmentTemplate>NET40</EnvironmentTemplate>
- <ProjectType>TEST</ProjectType>
+ <EnvironmentProjectType>TEST</EnvironmentProjectType>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
diff --git a/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.PL40.csproj b/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.PL40.csproj index 732e5309..3d1a77b5 100644 --- a/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.PL40.csproj +++ b/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.PL40.csproj @@ -2,7 +2,7 @@ <PropertyGroup>
<EnvironmentFlavor>PORTABLE_LIBRARY</EnvironmentFlavor>
<EnvironmentTemplate>PL40</EnvironmentTemplate>
- <ProjectType>TEST</ProjectType>
+ <EnvironmentProjectType>TEST</EnvironmentProjectType>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
@@ -31,6 +31,8 @@ <TestPageFileName>TestPage.html</TestPageFileName>
<CreateTestPage>true</CreateTestPage>
<SilverlightVersion>v4.0</SilverlightVersion>
+ <OutOfBrowserSettingsFile>Properties\OutOfBrowserSettings.xml</OutOfBrowserSettingsFile>
+ <EnableOutOfBrowser>true</EnableOutOfBrowser>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -111,6 +113,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>
diff --git a/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.SL20.csproj b/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.SL20.csproj index 5d0b2d96..22b2c272 100644 --- a/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.SL20.csproj +++ b/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.SL20.csproj @@ -2,7 +2,7 @@ <PropertyGroup>
<EnvironmentFlavor>SILVERLIGHT</EnvironmentFlavor>
<EnvironmentTemplate>SL20</EnvironmentTemplate>
- <ProjectType>TEST</ProjectType>
+ <EnvironmentProjectType>TEST</EnvironmentProjectType>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
@@ -29,6 +29,8 @@ <TestPageFileName>TestPage.html</TestPageFileName>
<CreateTestPage>true</CreateTestPage>
<SilverlightVersion>v2.0</SilverlightVersion>
+ <OutOfBrowserSettingsFile>Properties\OutOfBrowserSettings.xml</OutOfBrowserSettingsFile>
+ <EnableOutOfBrowser>true</EnableOutOfBrowser>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -110,6 +112,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>
@@ -125,7 +128,9 @@ <ProjectExtensions>
<VisualStudio>
<FlavorProperties GUID="{A1591282-1198-4647-A2B1-27E5FF5F6F3B}">
- <SilverlightProjectProperties />
+ <SilverlightProjectProperties>
+ <StartAction>OfflineApplication</StartAction>
+ </SilverlightProjectProperties>
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
diff --git a/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.SL30.csproj b/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.SL30.csproj index 4c78d4c4..3627b765 100644 --- a/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.SL30.csproj +++ b/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.SL30.csproj @@ -2,7 +2,7 @@ <PropertyGroup>
<EnvironmentFlavor>SILVERLIGHT</EnvironmentFlavor>
<EnvironmentTemplate>SL30</EnvironmentTemplate>
- <ProjectType>TEST</ProjectType>
+ <EnvironmentProjectType>TEST</EnvironmentProjectType>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
@@ -29,6 +29,8 @@ <TestPageFileName>TestPage.html</TestPageFileName>
<CreateTestPage>true</CreateTestPage>
<SilverlightVersion>v3.5</SilverlightVersion>
+ <OutOfBrowserSettingsFile>Properties\OutOfBrowserSettings.xml</OutOfBrowserSettingsFile>
+ <EnableOutOfBrowser>true</EnableOutOfBrowser>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -111,6 +113,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>
@@ -126,7 +129,9 @@ <ProjectExtensions>
<VisualStudio>
<FlavorProperties GUID="{A1591282-1198-4647-A2B1-27E5FF5F6F3B}">
- <SilverlightProjectProperties />
+ <SilverlightProjectProperties>
+ <StartAction>OfflineApplication</StartAction>
+ </SilverlightProjectProperties>
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
diff --git a/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.SL40.csproj b/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.SL40.csproj index bb2d37f0..a98c4d38 100644 --- a/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.SL40.csproj +++ b/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.SL40.csproj @@ -2,7 +2,7 @@ <PropertyGroup>
<EnvironmentFlavor>SILVERLIGHT</EnvironmentFlavor>
<EnvironmentTemplate>SL40</EnvironmentTemplate>
- <ProjectType>TEST</ProjectType>
+ <EnvironmentProjectType>TEST</EnvironmentProjectType>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
@@ -29,6 +29,8 @@ <SilverlightAppEntry>Google.ProtocolBuffers.App</SilverlightAppEntry>
<TestPageFileName>TestPage.html</TestPageFileName>
<CreateTestPage>true</CreateTestPage>
+ <OutOfBrowserSettingsFile>Properties\OutOfBrowserSettings.xml</OutOfBrowserSettingsFile>
+ <EnableOutOfBrowser>true</EnableOutOfBrowser>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -111,6 +113,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>
@@ -126,7 +129,9 @@ <ProjectExtensions>
<VisualStudio>
<FlavorProperties GUID="{A1591282-1198-4647-A2B1-27E5FF5F6F3B}">
- <SilverlightProjectProperties />
+ <SilverlightProjectProperties>
+ <StartAction>OfflineApplication</StartAction>
+ </SilverlightProjectProperties>
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
diff --git a/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.csproj b/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.csproj index e6480b13..7abd0abc 100644 --- a/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.csproj +++ b/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.csproj @@ -3,7 +3,7 @@ <PropertyGroup>
<EnvironmentFlavor>CLIENTPROFILE</EnvironmentFlavor>
<EnvironmentTemplate>NET35</EnvironmentTemplate>
- <ProjectType>TEST</ProjectType>
+ <EnvironmentProjectType>TEST</EnvironmentProjectType>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
|