Repository import

src/ADOGenerator/Program.cs

@@ -112,10 +112,11 @@
                                              .ExecuteAsync();
                         accessToken = result.AccessToken;
                     }
-                    catch (MsalUiRequiredException)
+                    catch (Exception ex)
                     {
                         var result = await authService.AcquireTokenAsync(app);
                         accessToken = result.AccessToken;
+                        id.ErrorId().AddMessage($"Error: {ex.Message}");
                     }
                 }
                 else
@@ -263,6 +264,10 @@ bool ValidateExtensions(string templateFolderPath, string id)
     }
 
     var extensionsFile = File.ReadAllText(extensionsFilePath);
+    if(string.IsNullOrEmpty(extensionsFile))
+    {
+        return false;
+    }
     var extensionjson = JObject.Parse(extensionsFile);
     var extensions = extensionjson["Extensions"];
     if (extensions == null)

src/ADOGenerator/ServiceExtensions.cs

@@ -40,6 +40,11 @@ public static void AddMessage(this string id, string message)
                 string fileName = $"{DateTime.Now.ToString("yyyy-MM-dd")}-{id}.txt";
                 if (id.EndsWith("_Errors"))
                 {
+                    // Create Errors Log Directory if not exists
+                    if (!Directory.Exists(Path.Combine(logFilePath, "Errors")))
+                    {
+                        Directory.CreateDirectory(Path.Combine(logFilePath, "Errors"));
+                    }
                     // Create Log file
                     if (!File.Exists(Path.Combine(logFilePath, "Errors", fileName)))
                     {

src/ADOGenerator/Templates/MSL-Create-Build-Pipeline/ImportSourceCode/mslearn-tailspin-spacegame-web.json

@@ -0,0 +1,10 @@
+{
+  "parameters": {
+    "gitSource": {
+      "url": "https://github.com/jamcneil/mslearn-tailspin-spacegame-web",
+      "branch": "main"  
+    },
+    "serviceEndpointId": "$mslearn-tailspin-spacegame-web-code$",
+    "deleteServiceEndpointAfterImportIsDone": true
+  }
+}

src/ADOGenerator/Templates/MSL-SpaceGame-DeliveryPlans/ServiceEndpoints/Space Game - web-code.json → src/ADOGenerator/Templates/MSL-Create-Build-Pipeline/ServiceEndpoints/mslearn-tailspin-spacegame-web.json

@@ -4,7 +4,7 @@
   },
   "name": "Space Game - web-code",
   "type": "git",
-  "url": "https://dev.azure.com/sharplogic/Space Game/_git/Space Game - web",
+  "url": "https://github.com/jamcneil/mslearn-tailspin-spacegame-web",
   "authorization": {
     "scheme": "UsernamePassword",
     "parameters": {

src/ADOGenerator/Templates/MSL-Deploy-Docker-Template/BuildDefinitions/mslearn-tailspin-spacegame-web-deploy.json

@@ -0,0 +1,55 @@
+{
+  "triggers": [
+    {
+      "branchFilters": [],
+      "pathFilters": [],
+      "settingsSourceType": 2,
+      "batchChanges": false,
+      "maxConcurrentBuildsPerBranch": 1,
+      "triggerType": "continuousIntegration"
+    }
+  ],
+  "properties": {},
+  "tags": [],
+  "_links": "{}",
+  "jobAuthorizationScope": "projectCollection",
+  "jobTimeoutInMinutes": 60,
+  "jobCancelTimeoutInMinutes": 5,
+  "badgeEnabled": true,
+  "process": {
+    "yamlFilename": "azure-pipelines.yml",
+    "type": 2
+  },
+  "repository": {
+    "properties": {
+      "cloneUrl": "https://[email protected]/$Organization$/$ProjectName$/_git/mslearn-tailspin-spacegame-web-docker",
+      "fullName": "mslearn-tailspin-spacegame-web-docker",
+      "defaultBranch": "refs/heads/main",
+      "isFork": "False",
+      "safeRepository": "$mslearn-tailspin-spacegame-web-docker$",
+      "reportBuildStatus": "true",
+      "fetchDepth": "1"
+    },
+
+    "id": "$mslearn-tailspin-spacegame-web-docker$",
+    "type": "TfsGit",
+    "name": "mslearn-tailspin-spacegame-web-docker",
+    "url": "https://[email protected]/$Organization$/$ProjectName$/_git/mslearn-tailspin-spacegame-web-docker",
+    "defaultBranch": "refs/heads/main",
+    "clean": null,
+    "checkoutSubmodules": false
+  },
+  "quality": "definition",
+  "authoredBy": "{}",
+  "drafts": [],
+  "id": "",
+  "name": "mslearn-tailspin-spacegame-web-docker",
+  "url": "",
+  "uri": "",
+  "path": "\\",
+  "type": "build",
+  "queueStatus": "enabled",
+  "revision": 1,
+  "createdDate": "",
+  "project": "{}"
+}

src/ADOGenerator/Templates/MSL-Deploy-Docker-Template/ImportSourceCode/mslearn-tailspin-spacegame-web-docker.json

@@ -0,0 +1,9 @@
+{
+  "parameters": {
+    "gitSource": {
+      "url": "https://github.com/MicrosoftDocs/mslearn-tailspin-spacegame-web-docker"
+    },
+    "serviceEndpointId": "$tailspin-spacegame-web-docker-code$",
+    "deleteServiceEndpointAfterImportIsDone": true
+  }
+}

src/ADOGenerator/Templates/MSL-Deploy-Docker-Template/ServiceEndpoints/mslearn-tailspin-spacegame-web-docker-code.json

@@ -0,0 +1,16 @@
+{
+  "data": {
+
+  },
+  "name": "tailspin-spacegame-web-docker-code",
+  "type": "git",
+  "url": "https://github.com/MicrosoftDocs/mslearn-tailspin-spacegame-web-docker",
+  "authorization": {
+    "scheme": "UsernamePassword",
+    "parameters": {
+      "username": "$username$",
+      "password": "$password$"
+    }
+  },
+  "isReady": true
+}