Skip to content

Commit 8aad022

Browse files
csharptestrogerk
csharptest
authored and
rogerk
committed
Collision with known MSBuild property ProjectType was causing errors, renamed to EnvironmentProjectType
1 parent 83f65a4 commit 8aad022

File tree

59 files changed

+164
-1217
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+164
-1217
lines changed

‎build/RunBenchmarks.bat

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
@echo off
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 "/p:BuildConfiguration=Release;TargetVersion=2"
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

‎csproj_templates/PL40.csproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,17 @@
2222
<ItemGroup>
2323
<Reference Include="System.Core" />
2424
</ItemGroup>
25-
<Import cs:Precondition=" '$(ProjectType)' != 'TEST' "
25+
<Import cs:Precondition=" '$(EnvironmentProjectType)' != 'TEST' "
2626
Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
2727
<!-- Portable Library will be tested as silverlight -->
28-
<PropertyGroup cs:Precondition=" '$(ProjectType)' == 'TEST' ">
28+
<PropertyGroup cs:Precondition=" '$(EnvironmentProjectType)' == 'TEST' ">
2929
<ProjectTypeGuids>{A1591282-1198-4647-A2B1-27E5FF5F6F3B};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
3030
<ValidateXaml>false</ValidateXaml>
3131
<ThrowErrorsInValidation>false</ThrowErrorsInValidation>
3232
<TargetFrameworkProfile />
3333
</PropertyGroup>
34-
<cs:Import Project="SLTest.targets" cs:Precondition=" '$(ProjectType)' == 'TEST' " />
35-
<Import cs:Precondition=" '$(ProjectType)' == 'TEST' "
34+
<cs:Import Project="SLTest.targets" cs:Precondition=" '$(EnvironmentProjectType)' == 'TEST' " />
35+
<Import cs:Precondition=" '$(EnvironmentProjectType)' == 'TEST' "
3636
Project="$(MSBuildExtensionsPath32)\Microsoft\Silverlight\$(SilverlightVersion)\Microsoft.Silverlight.CSharp.targets" />
3737
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
3838
Other similar extension points exist, see Microsoft.Common.targets.
@@ -41,7 +41,7 @@
4141
<Target Name="AfterBuild">
4242
</Target>
4343
-->
44-
<ProjectExtensions cs:Precondition=" '$(ProjectType)' == 'TEST' ">
44+
<ProjectExtensions cs:Precondition=" '$(EnvironmentProjectType)' == 'TEST' ">
4545
<VisualStudio>
4646
<FlavorProperties GUID="{A1591282-1198-4647-A2B1-27E5FF5F6F3B}">
4747
<SilverlightProjectProperties />

‎csproj_templates/SL20.csproj

+4-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<NoConfig>true</NoConfig>
2424
</PropertyGroup>
2525
<!-- Preprocess include of silverlight testing -->
26-
<cs:Import Project="SLTest.targets" cs:Precondition=" '$(ProjectType)' == 'TEST' " />
26+
<cs:Import Project="SLTest.targets" cs:Precondition=" '$(EnvironmentProjectType)' == 'TEST' " />
2727
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Silverlight\v2.0\Microsoft.Silverlight.CSharp.targets" />
2828
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
2929
Other similar extension points exist, see Microsoft.Common.targets.
@@ -35,7 +35,9 @@
3535
<ProjectExtensions>
3636
<VisualStudio>
3737
<FlavorProperties GUID="{A1591282-1198-4647-A2B1-27E5FF5F6F3B}">
38-
<SilverlightProjectProperties />
38+
<SilverlightProjectProperties>
39+
<StartAction>OfflineApplication</StartAction>
40+
</SilverlightProjectProperties>
3941
</FlavorProperties>
4042
</VisualStudio>
4143
</ProjectExtensions>

‎csproj_templates/SL30.csproj

+4-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<Reference Include="System.Core" />
2727
</ItemGroup>
2828
<!-- Preprocess include of silverlight testing -->
29-
<cs:Import Project="SLTest.targets" cs:Precondition=" '$(ProjectType)' == 'TEST' " />
29+
<cs:Import Project="SLTest.targets" cs:Precondition=" '$(EnvironmentProjectType)' == 'TEST' " />
3030
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Silverlight\v3.0\Microsoft.Silverlight.CSharp.targets" />
3131
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
3232
Other similar extension points exist, see Microsoft.Common.targets.
@@ -38,7 +38,9 @@
3838
<ProjectExtensions>
3939
<VisualStudio>
4040
<FlavorProperties GUID="{A1591282-1198-4647-A2B1-27E5FF5F6F3B}">
41-
<SilverlightProjectProperties />
41+
<SilverlightProjectProperties>
42+
<StartAction>OfflineApplication</StartAction>
43+
</SilverlightProjectProperties>
4244
</FlavorProperties>
4345
</VisualStudio>
4446
</ProjectExtensions>

‎csproj_templates/SL40.csproj

+4-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<Reference Include="System.Core" />
2828
</ItemGroup>
2929
<!-- Preprocess include of silverlight testing -->
30-
<cs:Import Project="SLTest.targets" cs:Precondition=" '$(ProjectType)' == 'TEST' " />
30+
<cs:Import Project="SLTest.targets" cs:Precondition=" '$(EnvironmentProjectType)' == 'TEST' " />
3131
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Silverlight\$(SilverlightVersion)\Microsoft.Silverlight.CSharp.targets" />
3232
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
3333
Other similar extension points exist, see Microsoft.Common.targets.
@@ -39,7 +39,9 @@
3939
<ProjectExtensions>
4040
<VisualStudio>
4141
<FlavorProperties GUID="{A1591282-1198-4647-A2B1-27E5FF5F6F3B}">
42-
<SilverlightProjectProperties />
42+
<SilverlightProjectProperties>
43+
<StartAction>OfflineApplication</StartAction>
44+
</SilverlightProjectProperties>
4345
</FlavorProperties>
4446
</VisualStudio>
4547
</ProjectExtensions>

‎csproj_templates/SLTest.targets

+3
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
<TestPageFileName>TestPage.html</TestPageFileName>
1313
<CreateTestPage>true</CreateTestPage>
1414
<SilverlightVersion>$(TargetFrameworkVersion)</SilverlightVersion>
15+
<OutOfBrowserSettingsFile>Properties\OutOfBrowserSettings.xml</OutOfBrowserSettingsFile>
16+
<EnableOutOfBrowser>true</EnableOutOfBrowser>
1517
</PropertyGroup>
1618
<ItemGroup>
1719
<Reference Include="System.Windows" />
@@ -22,6 +24,7 @@
2224
<DependentUpon>App.xaml</DependentUpon>
2325
</Compile>
2426
<None Include="Properties\AppManifest.xml" />
27+
<None Include="Properties\OutOfBrowserSettings.xml" />
2528
<ApplicationDefinition Include="App.xaml">
2629
<Generator>MSBuild:Compile</Generator>
2730
<SubType>Designer</SubType>

‎lib/CsProjectProjector/CsProjectProjector.exe

19.5 KB
Binary file not shown.

‎src/ProtocolBuffers.Serialization/ProtocolBuffers.Serialization(Silverlight).csproj

-99
This file was deleted.

‎src/ProtocolBuffers.Serialization/ProtocolBuffers.Serialization.SL20.csproj

+3-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,9 @@
9191
<ProjectExtensions>
9292
<VisualStudio>
9393
<FlavorProperties GUID="{A1591282-1198-4647-A2B1-27E5FF5F6F3B}">
94-
<SilverlightProjectProperties />
94+
<SilverlightProjectProperties>
95+
<StartAction>OfflineApplication</StartAction>
96+
</SilverlightProjectProperties>
9597
</FlavorProperties>
9698
</VisualStudio>
9799
</ProjectExtensions>

‎src/ProtocolBuffers.Serialization/ProtocolBuffers.Serialization.SL30.csproj

+3-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,9 @@
9191
<ProjectExtensions>
9292
<VisualStudio>
9393
<FlavorProperties GUID="{A1591282-1198-4647-A2B1-27E5FF5F6F3B}">
94-
<SilverlightProjectProperties />
94+
<SilverlightProjectProperties>
95+
<StartAction>OfflineApplication</StartAction>
96+
</SilverlightProjectProperties>
9597
</FlavorProperties>
9698
</VisualStudio>
9799
</ProjectExtensions>

‎src/ProtocolBuffers.Serialization/ProtocolBuffers.Serialization.SL40.csproj

+3-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,9 @@
9292
<ProjectExtensions>
9393
<VisualStudio>
9494
<FlavorProperties GUID="{A1591282-1198-4647-A2B1-27E5FF5F6F3B}">
95-
<SilverlightProjectProperties />
95+
<SilverlightProjectProperties>
96+
<StartAction>OfflineApplication</StartAction>
97+
</SilverlightProjectProperties>
9698
</FlavorProperties>
9799
</VisualStudio>
98100
</ProjectExtensions>

‎src/ProtocolBuffers.Serialization/ProtocolBuffersLite.Serialization(Silverlight).csproj

-99
This file was deleted.

‎src/ProtocolBuffers.Serialization/ProtocolBuffersLite.Serialization.SL20.csproj

+3-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,9 @@
9191
<ProjectExtensions>
9292
<VisualStudio>
9393
<FlavorProperties GUID="{A1591282-1198-4647-A2B1-27E5FF5F6F3B}">
94-
<SilverlightProjectProperties />
94+
<SilverlightProjectProperties>
95+
<StartAction>OfflineApplication</StartAction>
96+
</SilverlightProjectProperties>
9597
</FlavorProperties>
9698
</VisualStudio>
9799
</ProjectExtensions>

‎src/ProtocolBuffers.Serialization/ProtocolBuffersLite.Serialization.SL30.csproj

+3-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,9 @@
9191
<ProjectExtensions>
9292
<VisualStudio>
9393
<FlavorProperties GUID="{A1591282-1198-4647-A2B1-27E5FF5F6F3B}">
94-
<SilverlightProjectProperties />
94+
<SilverlightProjectProperties>
95+
<StartAction>OfflineApplication</StartAction>
96+
</SilverlightProjectProperties>
9597
</FlavorProperties>
9698
</VisualStudio>
9799
</ProjectExtensions>

‎src/ProtocolBuffers.Serialization/ProtocolBuffersLite.Serialization.SL40.csproj

+3-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,9 @@
9292
<ProjectExtensions>
9393
<VisualStudio>
9494
<FlavorProperties GUID="{A1591282-1198-4647-A2B1-27E5FF5F6F3B}">
95-
<SilverlightProjectProperties />
95+
<SilverlightProjectProperties>
96+
<StartAction>OfflineApplication</StartAction>
97+
</SilverlightProjectProperties>
9698
</FlavorProperties>
9799
</VisualStudio>
98100
</ProjectExtensions>

‎src/ProtocolBuffers.Test/Properties/OutOfBrowserSettings.xml

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<OutOfBrowserSettings ShortName="ProtocolBuffers.Test" EnableGPUAcceleration="False" ShowInstallMenuItem="False">
2+
<OutOfBrowserSettings.Blurb>ProtocolBuffers.Test</OutOfBrowserSettings.Blurb>
3+
<OutOfBrowserSettings.WindowSettings>
4+
<WindowSettings Title="ProtocolBuffers.Test" />
5+
</OutOfBrowserSettings.WindowSettings>
6+
<OutOfBrowserSettings.Icons />
7+
</OutOfBrowserSettings>

0 commit comments

Comments
 (0)