Merge branch 'master' of bitbucket.org:bluetradesys/spark into celoxica

This commit is contained in:
Kevin Darby committed 2017-10-25 16:00:33 -04:00
commit 2e750ef832
1 file changed
+7 -7
+7 -7
View File
@@ -15,11 +15,11 @@
</PropertyGroup>
<PropertyGroup Label="Output">
<BaseOutputPath>$(SparkRoot)\build\$(Configuration)</BaseOutputPath>
<BaseOutputPath>$(SparkRoot)\build\$(Configuration)\$(SolutionName)</BaseOutputPath>
<OutputPath>$(BaseOutputPath)\bin</OutputPath>
<BaseIntermediateOutputPath>$(BaseOutputPath)\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
<IntermediateOutputPath>$(BaseOutputPath)\obj\$(MSBuildProjectName)</IntermediateOutputPath>
<GenDir>$(BaseOutputPath)\gen</GenDir>
<GenDir>$(BaseOutputPath)\gen\$(MSBuildProjectName)</GenDir>
</PropertyGroup>
<Import Project="$(ComputerSpecificConfig)" Condition="Exists($(ComputerSpecificConfig))" />
@@ -44,11 +44,11 @@
<Proto2>
</Proto2>
<Proto3>
<OutBase>$(GenDir)\$(MSBuildProjectName)\%(relativedir)</OutBase>
<OutCS>%(OutBase)\%(FileName).cs</OutCS>
<OutCSClient>%(OutBase)\%(FileName).client.pb.cs</OutCSClient>
<OutCSServer>%(OutBase)\%(FileName).server.pb.cs</OutCSServer>
<OutCSImmutable>%(OutBase)\%(FileName).immutable.pb.cs</OutCSImmutable>
<OutBase>$(IntermediateOutputPath)\gen\%(relativedir)</OutBase>
<OutCS>%(OutBase)%(FileName).cs</OutCS>
<OutCSClient>%(OutBase)%(FileName).client.pb.cs</OutCSClient>
<OutCSServer>%(OutBase)%(FileName).server.pb.cs</OutCSServer>
<OutCSImmutable>%(OutBase)%(FileName).immutable.pb.cs</OutCSImmutable>
<CompileOptions></CompileOptions>
</Proto3>
</ItemDefinitionGroup>