From a9620199557508e75169e07eb2d73cdd6148cc48 Mon Sep 17 00:00:00 2001
From: Sabrina Juarez Garcia <sabrina.juarez@globant.com>
Date: Tue, 31 Dec 2024 10:56:57 -0300
Subject: [PATCH 1/2] Changes to HTTP Azure functions due to impl of MVC rest
 controllers

---
 .../http/Directory.Build.targets              | 17 ++++++
 .../azurefunctions-create-NETpackage.targets  | 59 ++++++++++++++++---
 2 files changed, 68 insertions(+), 8 deletions(-)
 create mode 100644 src/AzureFunctions/http/Directory.Build.targets

diff --git a/src/AzureFunctions/http/Directory.Build.targets b/src/AzureFunctions/http/Directory.Build.targets
new file mode 100644
index 0000000..a43ce32
--- /dev/null
+++ b/src/AzureFunctions/http/Directory.Build.targets
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+	<ItemGroup Condition="'$(MSBuildProjectName)' == 'GeneXus.Programs.Common'">
+      <Reference Update="GeneXus.dll">
+        <HintPath>../../GeneXus.dll</HintPath>
+      </Reference>
+    </ItemGroup>
+   <ItemGroup Condition="'$(MSBuildProjectName)' != 'GeneXus.Deploy.AzureFunctions.Handlers' AND '$(MSBuildProjectName)' != 'GeneXus.Programs.Common' AND '$(MSBuildProjectName)' != 'GxWebStartup'">    
+	    <Reference Update="GeneXus.dll">
+        <HintPath>../../GeneXus.dll</HintPath>
+      </Reference>
+      <PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="1.17.4" OutputItemType="Analyzer" />
+      <PackageReference Include="Microsoft.Azure.Functions.Worker" Version="1.23.0" />
+      <ProjectReference Include="..\GeneXus.Deploy.AzureFunctions.Handlers\GeneXus.Deploy.AzureFunctions.Handlers.csproj" />
+    </ItemGroup>
+</Project>
+
diff --git a/src/Common/Azure/azurefunctions-create-NETpackage.targets b/src/Common/Azure/azurefunctions-create-NETpackage.targets
index e782a02..95b6d2f 100644
--- a/src/Common/Azure/azurefunctions-create-NETpackage.targets
+++ b/src/Common/Azure/azurefunctions-create-NETpackage.targets
@@ -8,6 +8,8 @@
 		<DeploymentTargetBinPath>$(GX_PROGRAM_DIR)\DeploymentTargets\AzureFunctions\AzFunctionFiles\bin</DeploymentTargetBinPath>
 		<DeploymentTargetSrcPath>$(GX_PROGRAM_DIR)\DeploymentTargets\AzureFunctions\AzFunctionFiles\src</DeploymentTargetSrcPath>
 		<DeploySrcBuildPath>$(DeployFullPath)\src\build</DeploySrcBuildPath>
+		<DeploySrcWebPath>$(DeployFullPath)/src/web</DeploySrcWebPath>
+		<AzureFunctionsHandlerProject>GeneXus.Deploy.AzureFunctions.Handlers.csproj</AzureFunctionsHandlerProject>
 	</PropertyGroup>
 
 	<ItemGroup>
@@ -16,19 +18,34 @@
 	</ItemGroup>	
 
 	<Target Name="CreateNETPackage" DependsOnTargets="ValidatePackaging;NETpackageZipDeploy" Condition="'$(NETGenerator)' == 'true'"/>
-	
-	<Target Name="CopyAzureBinaries" Condition="'$(DeployType)'!='SOURCES' AND '$(NETGenerator)' == 'true'">
+
+	<Target Name="TransformMVCToAzureFunctions" Condition="'$(NETGenerator)' == 'true' AND '$(AZURE_FUNCTIONS_TRIGGER_TYPE)' == 'http'">
+		<!-- Transform MVC of rest services to Azure functions -->
+		<Message Text="Convert MVC Services to Azure Functions..." Importance="high" />
+		<GenerateAzHTTPFunctionFromMVC 
+			serviceSourcePath="$(DeploySrcWebPath)"
+		/>
+	</Target>
+
+	<Target Name="AddAzureHandlersSources" Condition="'$(DeployType)'=='SOURCES' AND '$(NETGenerator)' == 'true'" DependsOnTargets="TransformMVCToAzureFunctions"> 
+		<Message Text="Adding Azure Functions Handlers sources to $(DeploymentUnit).sln" Importance="high" ></Message>
 		
-		<PropertyGroup>
-			<AzureFunctionsHandlerProject>GeneXus.Deploy.AzureFunctions.Handlers.csproj</AzureFunctionsHandlerProject>
-		</PropertyGroup>
+		<Copy SourceFiles="@(AzureFunctionsRootSrc)"
+		DestinationFolder="$(DeployFullPath)/src/build/GeneXus.Deploy.AzureFunctions.Handlers/%(RecursiveDir)" SkipUnchangedFiles="true" />
+
+		<Copy SourceFiles="$(DeployAppDir)/functions.metadata"
+		DestinationFolder="$(DeployFullPath)/src/build/GeneXus.Deploy.AzureFunctions.Handlers" SkipUnchangedFiles="true" Condition="Exists('$(DeployAppDir)/functions.metadata')"/>
+	
+		<Exec Command="dotnet sln $(DeploymentUnit).sln add &quot;$(DeploySrcBuildPath)/GeneXus.Deploy.AzureFunctions.Handlers/GeneXus.Deploy.AzureFunctions.Handlers.csproj&quot;" WorkingDirectory="$(DeploySrcBuildPath)" />
+	</Target>
+
+	<Target Name="BuildAzureHandlersSources" Condition="'$(DeployType)'!='SOURCES' AND '$(NETGenerator)' == 'true' AND '$(AZURE_FUNCTIONS_TRIGGER_TYPE)' != 'http'">
 
 		<PropertyGroup>
 			<CosmosDBSupport Condition="'$(AZURE_FUNCTIONS_TRIGGER_TYPE)' == 'cosmosdb'">true</CosmosDBSupport>
 			<TimerSupport Condition="'$(AZURE_FUNCTIONS_TRIGGER_TYPE)' == 'timer'">true</TimerSupport>
 			<AzureQueueSupport Condition="'$(AZURE_FUNCTIONS_TRIGGER_TYPE)' == 'queue'">true</AzureQueueSupport>
 			<ServiceBusSupport Condition="'$(AZURE_FUNCTIONS_TRIGGER_TYPE)' == 'servicebus'">true</ServiceBusSupport>
-			<HttpSupport Condition="'$(AZURE_FUNCTIONS_TRIGGER_TYPE)' == 'http'">true</HttpSupport>
 			<BlobSupport Condition="'$(AZURE_FUNCTIONS_TRIGGER_TYPE)' == 'blobstorage'">true</BlobSupport>
 			<EventGridSupport Condition="'$(AZURE_FUNCTIONS_TRIGGER_TYPE)' == 'eventgrid'">true</EventGridSupport>
 		</PropertyGroup>
@@ -45,6 +62,31 @@
 
 	</Target>
 
+	<Target Name="BuildAzureHandlersSourcesHTTP" Condition="'$(DeployType)' != 'SOURCES' AND '$(NETGenerator)' == 'true' AND '$(AZURE_FUNCTIONS_TRIGGER_TYPE)' == 'http'" DependsOnTargets="TransformMVCToAzureFunctions">
+		
+		<PropertyGroup>
+			<HttpSupport Condition="'$(AZURE_FUNCTIONS_TRIGGER_TYPE)' == 'http'">true</HttpSupport>
+		</PropertyGroup>
+
+		<Copy SourceFiles="@(AzureFunctionsRootSrc)"
+		DestinationFolder="$(DeployFullPath)/src/build/GeneXus.Deploy.AzureFunctions.Handlers/%(RecursiveDir)" SkipUnchangedFiles="true" />
+
+		<Copy SourceFiles="$(DeployAppDir)/functions.metadata"
+		DestinationFolder="$(DeployFullPath)/src/build/GeneXus.Deploy.AzureFunctions.Handlers" SkipUnchangedFiles="true" />
+	
+		<Exec Command="dotnet sln $(DeploymentUnit).sln add &quot;$(DeploySrcBuildPath)/GeneXus.Deploy.AzureFunctions.Handlers/GeneXus.Deploy.AzureFunctions.Handlers.csproj&quot;" WorkingDirectory="$(DeploySrcBuildPath)" />
+
+		<!--Add dependencies to project-->
+		<Copy SourceFiles = "$(GX_PROGRAM_DIR)\DeploymentTargets\AzureFunctions\http\Directory.Build.targets"
+		DestinationFolder= "$(DeployFullPath)/src/build"/>
+		
+		<Exec Command="dotnet Build &quot;$(DeployFullPath)/src/build/$(DeploymentUnit).sln&quot; -c Release --force -p:DebugType=None -p:CosmosDBSupport=$(CosmosDBSupport) -p:TimerSupport=$(TimerSupport) -p:AzureQueueSupport=$(AzureQueueSupport) -p:ServiceBusSupport=$(ServiceBusSupport) -p:HttpSupport=$(HttpSupport) -p:BlobSupport=$(BlobSupport) -p:EventGridSupport=$(EventGridSupport)" WorkingDirectory="$(DeploySrcBuildPath)" ConsoleToMSBuild="true"/>
+
+		<Delete Files="$(DeployFullPath)/bin/local.settings.json" Condition="Exists('$(DeployFullPath)/bin/local.settings.json')" />
+
+	</Target>
+
+
 	<Target Name="GenerateSources" Condition = "'$(NETGenerator)' == 'true'">
 		
 		<MakeDir
@@ -124,8 +166,9 @@
 		/>
 	</Target>
 
-	<Target Name="PrepareDeploy" DependsOnTargets="GenerateSources;GenerateConfigs;RedisSupport;CopyAzureBinaries;UpdateHostJsonFile" Condition="'$(NETGenerator)' == 'true'">
-	<Message Text="Adding required files to the deploy...(this may take a while)" Importance="high"/>
+	<Target Name="PrepareDeploy" DependsOnTargets="GenerateSources;GenerateConfigs;RedisSupport;AddAzureHandlersSources;BuildAzureHandlersSources;BuildAzureHandlersSourcesHTTP;UpdateHostJsonFile" Condition="'$(NETGenerator)' == 'true'">
+
+		<Message Text="Adding required files to the deploy...(this may take a while)" Importance="high"/>
 
 		<ItemGroup>
 			<ConfResources Include="$(DeployFullPath)\*.svc" />

From 2081cc3b08f8eb8365649a07eb5fef82a141f18c Mon Sep 17 00:00:00 2001
From: Sabrina Juarez Garcia <sabrina.juarez@globant.com>
Date: Tue, 31 Dec 2024 13:47:51 -0300
Subject: [PATCH 2/2] Fix casing

---
 src/Common/Azure/azurefunctions-create-NETpackage.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Common/Azure/azurefunctions-create-NETpackage.targets b/src/Common/Azure/azurefunctions-create-NETpackage.targets
index 95b6d2f..7cde810 100644
--- a/src/Common/Azure/azurefunctions-create-NETpackage.targets
+++ b/src/Common/Azure/azurefunctions-create-NETpackage.targets
@@ -80,7 +80,7 @@
 		<Copy SourceFiles = "$(GX_PROGRAM_DIR)\DeploymentTargets\AzureFunctions\http\Directory.Build.targets"
 		DestinationFolder= "$(DeployFullPath)/src/build"/>
 		
-		<Exec Command="dotnet Build &quot;$(DeployFullPath)/src/build/$(DeploymentUnit).sln&quot; -c Release --force -p:DebugType=None -p:CosmosDBSupport=$(CosmosDBSupport) -p:TimerSupport=$(TimerSupport) -p:AzureQueueSupport=$(AzureQueueSupport) -p:ServiceBusSupport=$(ServiceBusSupport) -p:HttpSupport=$(HttpSupport) -p:BlobSupport=$(BlobSupport) -p:EventGridSupport=$(EventGridSupport)" WorkingDirectory="$(DeploySrcBuildPath)" ConsoleToMSBuild="true"/>
+		<Exec Command="dotnet build &quot;$(DeployFullPath)/src/build/$(DeploymentUnit).sln&quot; -c Release --force -p:DebugType=None -p:CosmosDBSupport=$(CosmosDBSupport) -p:TimerSupport=$(TimerSupport) -p:AzureQueueSupport=$(AzureQueueSupport) -p:ServiceBusSupport=$(ServiceBusSupport) -p:HttpSupport=$(HttpSupport) -p:BlobSupport=$(BlobSupport) -p:EventGridSupport=$(EventGridSupport)" WorkingDirectory="$(DeploySrcBuildPath)" ConsoleToMSBuild="true"/>
 
 		<Delete Files="$(DeployFullPath)/bin/local.settings.json" Condition="Exists('$(DeployFullPath)/bin/local.settings.json')" />