From cbc80e71fac7d2896ac496b0fbf22051c0cdcff7 Mon Sep 17 00:00:00 2001
From: Avi Levkovich <avi@twine-s.com>
Date: Mon, 17 Feb 2020 17:00:29 +0200
Subject: merge

---
 .../Web/Tango.MachineService/Tango.MachineService.csproj           | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'Software/Visual_Studio/Web/Tango.MachineService/Tango.MachineService.csproj')

diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Tango.MachineService.csproj b/Software/Visual_Studio/Web/Tango.MachineService/Tango.MachineService.csproj
index e916f01e6..a05fee42f 100644
--- a/Software/Visual_Studio/Web/Tango.MachineService/Tango.MachineService.csproj
+++ b/Software/Visual_Studio/Web/Tango.MachineService/Tango.MachineService.csproj
@@ -306,6 +306,7 @@
     <Compile Include="App_Start\FilterConfig.cs" />
     <Compile Include="Controllers\DownloadsController.cs" />
     <Compile Include="Controllers\AccountController.cs" />
+    <Compile Include="Controllers\FSEController.cs" />
     <Compile Include="Filters\JwtTokenFilter.cs" />
     <Compile Include="Hubs\ExternalBridgeHub.cs" />
     <Compile Include="MachineServiceConfig.cs" />
@@ -372,6 +373,10 @@
     <Content Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\FSE\Tango.FSE.Web\Tango.FSE.Web.csproj">
+      <Project>{d6f7d31d-7f8c-45e2-ae0a-fbbd1f5f9d5f}</Project>
+      <Name>Tango.FSE.Web</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\MachineStudio\Tango.MachineStudio.Common\Tango.MachineStudio.Common.csproj">
       <Project>{CB0B0AA2-BB24-4BCA-A720-45E397684E12}</Project>
       <Name>Tango.MachineStudio.Common</Name>
@@ -456,7 +461,7 @@
           <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
         </WebProjectProperties>
       </FlavorProperties>
-      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
     </VisualStudio>
   </ProjectExtensions>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-- 
cgit v1.3.1