Adjusted dproj

Author: hunsche

ragna.dproj

@@ -1,4 +1,4 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
         <ProjectGuid>{D9E8CA95-FBB1-42EA-A7B4-909AC5ACFADD}</ProjectGuid>
         <MainSource>ragna.dpk</MainSource>
@@ -53,11 +53,7 @@
         <DCC_CBuilderOutput>All</DCC_CBuilderOutput>
         <RuntimeOnlyPackage>true</RuntimeOnlyPackage>
         <SanitizedProjectName>ragna</SanitizedProjectName>
-<<<<<<< HEAD
-        <DCC_UnitSearchPath>C:\Users\hunsc\projects\hashload\ragna\modules\DataSetConverter4Delphi\src\;C:\Users\hunsc\projects\hashload\ragna\modules\DataSetConverter4Delphi\unittest\;$(DCC_UnitSearchPath);modules\.dcp;modules\.dcu;modules;modules\DataSetConverter4Delphi\src;modules\DataSetConverter4Delphi\unittest</DCC_UnitSearchPath>
-=======
         <DCC_UnitSearchPath>C:\Users\hunsc\projects\hashload\ragna\modules\DataSetConverter4Delphi\src\;C:\Users\hunsc\projects\hashload\ragna\modules\DataSetConverter4Delphi\unittest\;modules\.dcp;modules\.dcu;modules;modules\DataSetConverter4Delphi\src;modules\DataSetConverter4Delphi\unittest;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
->>>>>>> 420c31a36258cc2d5becf10ec15c933d883b4c50
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base_Android)'!=''">
         <DCC_CBuilderOutput>None</DCC_CBuilderOutput>
@@ -93,16 +89,16 @@
         <DelphiCompile Include="$(MainSource)">
             <MainSource>MainSource</MainSource>
         </DelphiCompile>
-        <DCCReference Include="rtl.dcp"></DCCReference>
-        <DCCReference Include="dbrtl.dcp"></DCCReference>
-        <DCCReference Include="FireDAC.dcp"></DCCReference>
-        <DCCReference Include="FireDACCommonDriver.dcp"></DCCReference>
-        <DCCReference Include="FireDACCommon.dcp"></DCCReference>
-        <DCCReference Include="src\Ragna.Criteria.pas"></DCCReference>
-        <DCCReference Include="src\Ragna.Impl.pas"></DCCReference>
-        <DCCReference Include="src\Ragna.Intf.pas"></DCCReference>
-        <DCCReference Include="src\Ragna.pas"></DCCReference>
-        <DCCReference Include="src\Ragna.State.pas"></DCCReference>
+        <DCCReference Include="rtl.dcp"/>
+        <DCCReference Include="dbrtl.dcp"/>
+        <DCCReference Include="FireDAC.dcp"/>
+        <DCCReference Include="FireDACCommonDriver.dcp"/>
+        <DCCReference Include="FireDACCommon.dcp"/>
+        <DCCReference Include="src\Ragna.Criteria.pas"/>
+        <DCCReference Include="src\Ragna.Impl.pas"/>
+        <DCCReference Include="src\Ragna.Intf.pas"/>
+        <DCCReference Include="src\Ragna.pas"/>
+        <DCCReference Include="src\Ragna.State.pas"/>
         <BuildConfiguration Include="Release">
             <Key>Cfg_2</Key>
             <CfgParent>Base</CfgParent>
@@ -466,9 +462,9 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
-                <DeployClass Name="ProjectiOSDeviceResourceRules"></DeployClass>
-                <DeployClass Name="ProjectiOSEntitlements"></DeployClass>
-                <DeployClass Name="ProjectiOSInfoPList"></DeployClass>
+                <DeployClass Name="ProjectiOSDeviceResourceRules"/>
+                <DeployClass Name="ProjectiOSEntitlements"/>
+                <DeployClass Name="ProjectiOSInfoPList"/>
                 <DeployClass Name="ProjectiOSResource">
                     <Platform Name="iOSDevice32">
                         <Operation>1</Operation>
@@ -480,14 +476,9 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
-<<<<<<< HEAD
-                <DeployClass Name="ProjectOSXEntitlements"></DeployClass>
-                <DeployClass Name="ProjectOSXInfoPList"></DeployClass>
-=======
                 <DeployClass Name="ProjectOSXDebug"/>
                 <DeployClass Name="ProjectOSXEntitlements"/>
                 <DeployClass Name="ProjectOSXInfoPList"/>
->>>>>>> 420c31a36258cc2d5becf10ec15c933d883b4c50
                 <DeployClass Name="ProjectOSXResource">
                     <Platform Name="OSX32">
                         <RemoteDir>Contents\Resources</RemoteDir>
@@ -553,16 +544,6 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
-<<<<<<< HEAD
-                <ProjectRoot Platform="iOSDevice64" Name="$(PROJECTNAME).app"></ProjectRoot>
-                <ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"></ProjectRoot>
-                <ProjectRoot Platform="iOSDevice32" Name="$(PROJECTNAME).app"></ProjectRoot>
-                <ProjectRoot Platform="Linux64" Name="$(PROJECTNAME)"></ProjectRoot>
-                <ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"></ProjectRoot>
-                <ProjectRoot Platform="OSX32" Name="$(PROJECTNAME)"></ProjectRoot>
-                <ProjectRoot Platform="Android" Name="$(PROJECTNAME)"></ProjectRoot>
-                <ProjectRoot Platform="iOSSimulator" Name="$(PROJECTNAME).app"></ProjectRoot>
-=======
                 <ProjectRoot Platform="iOSDevice64" Name="$(PROJECTNAME).app"/>
                 <ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
                 <ProjectRoot Platform="iOSDevice32" Name="$(PROJECTNAME).app"/>
@@ -572,7 +553,6 @@
                 <ProjectRoot Platform="Android" Name="$(PROJECTNAME)"/>
                 <ProjectRoot Platform="OSX64" Name="$(PROJECTNAME)"/>
                 <ProjectRoot Platform="iOSSimulator" Name="$(PROJECTNAME).app"/>
->>>>>>> 420c31a36258cc2d5becf10ec15c933d883b4c50
             </Deployment>
             <Platforms>
                 <Platform value="Android">False</Platform>
@@ -583,7 +563,7 @@
         </BorlandProject>
         <ProjectFileVersion>12</ProjectFileVersion>
     </ProjectExtensions>
-    <Import Project="$(BDS)\Bin\CodeGear.Delphi.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')"></Import>
-    <Import Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj" Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')"></Import>
-    <Import Project="$(MSBuildProjectName).deployproj" Condition="Exists('$(MSBuildProjectName).deployproj')"></Import>
-</Project>
+    <Import Project="$(BDS)\Bin\CodeGear.Delphi.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')"/>
+    <Import Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj" Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')"/>
+    <Import Project="$(MSBuildProjectName).deployproj" Condition="Exists('$(MSBuildProjectName).deployproj')"/>
+</Project>