Fix merge conflicts

Author: ch-rob

docs/aca/01-deploy-api-to-aca/index.md

@@ -17,7 +17,7 @@ In this module, we will start by creating the first microservice named `ACA Web
 
 - From VS Code Terminal tab, open developer command prompt or PowerShell terminal in the project folder `TasksTracker.ContainerApps` and initialize the project. This will create and ASP.NET Web API project scaffolded with a single controller.
     ```shell
-    dotnet new webapi -o TasksManager.Backend.Api
+    dotnet new webapi -o TasksTracker.TasksManager.Backend.Api
     ```
 
 - Next we need to containerize this application, so we can push it to Azure Container Registry as a docker image then deploy it to Azure Container Apps. Start by opening the VS Code Command Palette (++ctrl+shift+p++) and select `Docker: Add Docker Files to Workspace...`
@@ -73,7 +73,7 @@ In this module, we will start by creating the first microservice named `ACA Web
     ```
 - From VS Code Terminal tab, open developer command prompt or PowerShell terminal and navigate to the parent directory which hosts the `.csproj` project folder and build the project. 
     ```shell
-    cd {YourLocalPath}\TasksTracker.ContainerApps\TasksManager.Backend.Api
+    cd ~\TasksTracker.ContainerApps\TasksTracker.TasksManager.Backend.Api
     dotnet build
     ```
 Make sure that the build is successful and that there are no build errors. Usually you should see a "Build succeeded" message in the terminal upon a successful build.
@@ -177,8 +177,8 @@ We will be using Azure CLI to deploy the Web API Backend to ACA as shown in the
 -  Build the Web API project on ACR and push the docker image to ACR. Use the below command to initiate the image build and push process using ACR. The `.` at the end of the command represents the docker build context, in our case, we need to be on the parent directory which hosts the `.csproj`.
 
     ```shell
-    cd {YourLocalPath}\TasksTracker.ContainerApps
-    az acr build --registry $ACR_NAME --image "tasksmanager/$BACKEND_API_NAME" --file 'TasksManager.Backend.Api/Dockerfile' .
+    cd ~\TasksTracker.ContainerApps
+    az acr build --registry $ACR_NAME --image "tasksmanager/$BACKEND_API_NAME" --file 'TasksTracker.TasksManager.Backend.Api/Dockerfile' .
     ```
     Once this step is completed you can verify the results by going to the Azure portal and checking that a new repository named `tasksmanager/tasksmanager-backend-api` has been created and there is a new docker image with a `latest` tag is created.
 

docs/aca/03-aca-dapr-integration/index.md

@@ -35,14 +35,14 @@ You are now ready to run the applications locally using Dapr sidecar in a self-h
 !!! note
     Remember to replace the placeholders with your own values based on image below. Remember to use https port number for the Web API application.
 
-=== ".Net 6 or below"
+=== ".NET 6 or below"
 
     ```powershell
     cd TasksTracker.TasksManager.Backend.Api
     dapr run --app-id tasksmanager-backend-api --app-port <web api application https port number found under properties->launchSettings.json. e.g. 7112> --dapr-http-port 3500 --app-ssl -- dotnet run
     ```
 
-=== ".Net 7 or above"
+=== ".NET 7 or above"
 
     ```powershell
     cd TasksTracker.TasksManager.Backend.Api
@@ -164,14 +164,14 @@ The SDK offers developers three ways of making remote service invocation calls:
 !!! note
     Remember to replace the placeholders. Remember to use https port number for the Web API application.
 
-=== ".Net 6 or below"
+=== ".NET 6 or below"
 
     ```powershell
     ~\TasksTracker.ContainerApps\TasksTracker.WebPortal.Frontend.Ui> dapr run --app-id tasksmanager-frontend-webapp --app-port <web frontend application https port found under properties->launchSettings.json. e.g. 7000> --dapr-http-port 3501 --app-ssl -- dotnet run 
 
     ~\TasksTracker.ContainerApps\TasksTracker.TasksManager.Backend.Api> dapr run --app-id tasksmanager-backend-api --app-port <web api application https port found under properties->launchSettings.json. e.g. 7112> --dapr-http-port 3500 --app-ssl -- dotnet run
     ```
-=== ".Net 7 or above"
+=== ".NET 7 or above"
 
     ```powershell
     ~\TasksTracker.ContainerApps\TasksTracker.WebPortal.Frontend.Ui> dapr run --app-id tasksmanager-frontend-webapp --app-port <web frontend application https port found under properties->launchSettings.json. e.g. 7000> --dapr-http-port 3501 --app-ssl -- dotnet run --launch-profile https

docs/aca/04-aca-dapr-stateapi/index.md

@@ -17,14 +17,14 @@ Dapr's state management API allows you to save, read, and query key/value pairs
 
 To try out the State Management APIs, run the Backend API from VS Code by running the following command. Remember to replace the place holders with your own values:
 
-=== ".Net 6 or below"
+=== ".NET 6 or below"
 
     ```powershell
 
     ~\TasksTracker.ContainerApps\TasksTracker.TasksManager.Backend.Api> dapr run --app-id tasksmanager-backend-api --app-port <web api application https port number found under properties->launchSettings.json. e.g. 7112> --dapr-http-port 3500 --app-ssl -- dotnet run
     ```
 
-=== ".Net 7 or above"
+=== ".NET 7 or above"
 
     ```powershell
 
@@ -270,13 +270,13 @@ If you have been using the dapr cli commands instead of the aforementioned debug
 !!! note
     Remember to replace the placeholders. Remember to use https port number for the Web API application.
 
-=== ".Net 6 or below"
+=== ".NET 6 or below"
 
     ```powershell
 
     dapr run --app-id tasksmanager-backend-api --app-port <web api application https port number found under properties->launchSettings.json. e.g. 7112> --dapr-http-port 3500 --app-ssl --resources-path "../components" dotnet run
     ```
-=== ".Net 7 or above"
+=== ".NET 7 or above"
 
     ```powershell
 

docs/aca/05-aca-dapr-pubsubapi/index.md

@@ -213,7 +213,7 @@ To do so, run the below commands in PowerShell console, ensure you are on the ri
 !!! info
     Remember to replace the placeholders with your own values.
 
-=== ".Net 6 or below"
+=== ".NET 6 or below"
 
     ```powershell
 
@@ -223,7 +223,7 @@ To do so, run the below commands in PowerShell console, ensure you are on the ri
 
     ```
 
-=== ".Net 7 or above"
+=== ".NET 7 or above"
 
     ```powershell   
 
@@ -494,7 +494,7 @@ With all those bits in place, we are ready to run the publisher service `Backend
 !!! note
     Ensure you are on the right root folder of each respective project. Remember to replace the placeholders with your own values.
 
-=== ".Net 6 or below"
+=== ".NET 6 or below"
 
     ```powershell
 
@@ -504,7 +504,7 @@ With all those bits in place, we are ready to run the publisher service `Backend
       
     ```
 
-=== ".Net 7 or above"
+=== ".NET 7 or above"
 
     ````powershell