From afc7a07d285e08d905c58dd5978441c155b2f296 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Tue, 19 Dec 2017 10:25:40 +0200
Subject: MERGE.

---
 .../Tango.CodeGeneration/Tango.CodeGeneration.csproj              | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'Software/Visual_Studio/Tango.CodeGeneration/Tango.CodeGeneration.csproj')

diff --git a/Software/Visual_Studio/Tango.CodeGeneration/Tango.CodeGeneration.csproj b/Software/Visual_Studio/Tango.CodeGeneration/Tango.CodeGeneration.csproj
index e2cc941e7..1c491813a 100644
--- a/Software/Visual_Studio/Tango.CodeGeneration/Tango.CodeGeneration.csproj
+++ b/Software/Visual_Studio/Tango.CodeGeneration/Tango.CodeGeneration.csproj
@@ -64,8 +64,11 @@
     <Compile Include="CodeFile.cs" />
     <Compile Include="CodeObject.cs" />
     <Compile Include="DpProperty.cs" />
+    <Compile Include="EntityCodeFileJava.cs" />
     <Compile Include="EntityCodeFile.cs" />
     <Compile Include="EnumerationField.cs" />
+    <Compile Include="TangoDAOJavaFile.cs" />
+    <Compile Include="EnumerationFileJava.cs" />
     <Compile Include="EnumerationFile.cs" />
     <Compile Include="Helper.cs" />
     <Compile Include="ICodeObject.cs" />
@@ -73,6 +76,7 @@
     <Compile Include="CodeObjectModifier.cs" />
     <Compile Include="MethodModifier.cs" />
     <Compile Include="Namespace.cs" />
+    <Compile Include="ObservablesAdapterFile.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Property.cs" />
   </ItemGroup>
@@ -96,6 +100,10 @@
     <EmbeddedResource Include="Templates\Namespace.cshtml" />
     <EmbeddedResource Include="Templates\EntityCodeFile.cshtml" />
     <EmbeddedResource Include="Templates\EnumerationFile.cshtml" />
+    <EmbeddedResource Include="Templates\ObservablesAdapterFile.cshtml" />
+    <EmbeddedResource Include="Templates\EntityCodeFileJava.cshtml" />
+    <EmbeddedResource Include="Templates\EnumerationFileJava.cshtml" />
+    <EmbeddedResource Include="Templates\TangoDAOJavaFile.cshtml" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-- 
cgit v1.3.1