diff --git a/.gitignore b/.gitignore
index cd610c377..62d107fdd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -331,3 +331,6 @@ ASALocalRun/
 
 # Preserve Template files
 !**/Uno.Templates/**/Properties/**/*
+
+# Include .csproj.user files from templates
+!src/Uno.Templates/content/**/*.csproj.user
\ No newline at end of file
diff --git a/src/Uno.Templates/content/unoapp/.template.config/template.json b/src/Uno.Templates/content/unoapp/.template.config/template.json
index 73ff3dfb3..9747ea2ed 100644
--- a/src/Uno.Templates/content/unoapp/.template.config/template.json
+++ b/src/Uno.Templates/content/unoapp/.template.config/template.json
@@ -1998,6 +1998,11 @@
       "type": "computed",
       "value": "(osLower == 'windows' || osLower == 'windows_nt')",
       "datatype": "bool"
+    },
+    "unoRemoteControlPort": {
+      "type": "generated",
+      "generator": "port",
+      "replaces": "$RemoteControlPort$"
     }
   },
   "primaryOutputs": [
@@ -2035,6 +2040,11 @@
   "sources": [
     {
       "modifiers": [
+        {
+          "include": [
+            "MyExtensionsApp.1/MyExtensionsApp.1.csproj.user"
+          ]
+        },
         {
           "copyOnly": [
             "**/*.png",
diff --git a/src/Uno.Templates/content/unoapp/MyExtensionsApp.1/MyExtensionsApp.1.csproj.user b/src/Uno.Templates/content/unoapp/MyExtensionsApp.1/MyExtensionsApp.1.csproj.user
new file mode 100644
index 000000000..b2432f103
--- /dev/null
+++ b/src/Uno.Templates/content/unoapp/MyExtensionsApp.1/MyExtensionsApp.1.csproj.user
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <UnoRemoteControlPort>$RemoteControlPort$</UnoRemoteControlPort>
+  </PropertyGroup>
+</Project>
\ No newline at end of file