Fix definition of Entry Point Environment variable

genexuslabs · Dec 29, 2024 · bcc9584 · bcc9584
1 parent 1f9d144
commit bcc9584
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/src/AzureFunctions/azurefunctions.targets b/src/AzureFunctions/azurefunctions.targets
@@ -98,6 +98,10 @@
 			Text="Azure functions deployment failed: The service bus connection cannot be empty"
 			Condition="'$(AZURE_FUNCTIONS_SERVICEBUS_CONNECTION)' == '' AND $(AZURE_FUNCTIONS_TRIGGER_TYPE) == 'servicebus'" />
 
+		<Error
+			Text="Azure functions deployment failed: The Blob Path and Connection Setting must be configured."
+			Condition="($(AZURE_FUNCTIONS_TRIGGER_TYPE) == 'blobstorage') AND ('$(AZURE_FUNCTIONS_BLOB_STORAGE_CONNECTION)' == '' OR '$(AZURE_FUNCTIONS_BLOB_STORAGE_PATH)' == '')" />
+
 	</Target>
 
 	<Target Name="ValidateRedisSupport" Condition="'$(AZURE_FUNCTIONS_TRIGGER_TYPE)' == 'http' AND '$(AZURE_FUNCTIONS_SESSION_STATE_PROVIDER)' == 'Redis'" >

diff --git a/src/AzureFunctions/deploy.msbuild b/src/AzureFunctions/deploy.msbuild
@@ -35,7 +35,8 @@
 	<Target Name="InitializeMappingVars" Inputs="@(SelectedObject)" Outputs="%(SelectedObject.Identity)" >
 		<PropertyGroup>
 			<EntryPointClassName Condition="'$(GENERATOR)' == 'Java'">$(Namespace).%(SelectedObject.QualifiedName)</EntryPointClassName>
-			<EntryPointClassName Condition = "'$(GENERATOR)' == '.NET Core' or '$(GENERATOR)' == '.NET'">%(SelectedObject.QualifiedName)</EntryPointClassName>
+			<EntryPointClassName Condition = "('$(GENERATOR)' == '.NET Core' or '$(GENERATOR)' == '.NET') AND '%(SelectedObject.Module)' != ''">%(SelectedObject.Module).a%(SelectedObject.Identity)</EntryPointClassName>
+			<EntryPointClassName Condition = "('$(GENERATOR)' == '.NET Core' or '$(GENERATOR)' == '.NET') AND '%(SelectedObject.Module)' == ''">a%(SelectedObject.Identity)</EntryPointClassName>
 			<EntryPointClassName>$(EntryPointClassName.ToLower())</EntryPointClassName>
 			<UpperFunctionName>$(AZURE_FUNCTIONS_FUNCTION_NAME.ToUpperInvariant())</UpperFunctionName>
 			<EnvVarName>GX_AZURE_$(UpperFunctionName)_CLASS</EnvVarName>
@@ -143,10 +144,6 @@
 		<Error
 			Text="Azure functions deployment failed: The APIM Version Set cannot be empty if the APIM API Version has a value."
 			Condition="$(AZURE_FUNCTIONS_TRIGGER_TYPE) == 'http' AND $(AZURE_APIM_API_VERSION_SET_ID) == '' AND $(AZURE_APIM_API_VERSION) != ''" />
-
-		<Error
-			Text="Azure functions deployment failed: The Blob Path and Connection Setting must be configured."
-			Condition="($(AZURE_FUNCTIONS_TRIGGER_TYPE) == 'blobstorage') AND ('$(AZURE_FUNCTIONS_BLOB_STORAGE_CONNECTION)' == '' OR '$(AZURE_FUNCTIONS_BLOB_STORAGE_PATH)' == '')" />
-
+
 	</Target>
 </Project>