Fix for default branch (#2623)

* Fix for default branch * Fix for deployment profiles * Fix for profile creation * Fix for profile creation Co-authored-by: Johanna Lorenz <[email protected]>
microsoft · May 3, 2022 · 07fb38d · 07fb38d
1 parent fd6a942
commit 07fb38d
Show file tree

Hide file tree

Showing 20 changed files with 261 additions and 218 deletions.
diff --git a/...ellenceALMAccelerator/SolutionPackage/CanvasApps/cat_poweropsdevopsedition_7f3f4.meta.xml b/...ellenceALMAccelerator/SolutionPackage/CanvasApps/cat_poweropsdevopsedition_7f3f4.meta.xml
diff --git a/...kage/CanvasApps/cat_poweropsdevopsedition_7f3f4_DocumentUri_msapp_src/CanvasManifest.json b/...kage/CanvasApps/cat_poweropsdevopsedition_7f3f4_DocumentUri_msapp_src/CanvasManifest.json
@@ -1,8 +1,8 @@
 {
   "FormatVersion": "0.24",
   "Header": {
-    "DocVersion": "1.323",
-    "MinVersionToLoad": "1.323",
+    "DocVersion": "1.324",
+    "MinVersionToLoad": "1.324",
     "MSAppStructureVersion": "2.0"
   },
   "Properties": {

diff --git a/...ge/CanvasApps/cat_poweropsdevopsedition_7f3f4_DocumentUri_msapp_src/ControlTemplates.json b/...ge/CanvasApps/cat_poweropsdevopsedition_7f3f4_DocumentUri_msapp_src/ControlTemplates.json
@@ -39,7 +39,7 @@
     "LastModifiedTimestamp": "0",
     "Name": "button",
     "OverridableProperties": {},
-    "Version": "2.1.0"
+    "Version": "2.2.0"
   },
   "checkbox": {
     "CustomGroupControlTemplateName": "",
@@ -95,7 +95,7 @@
     "LastModifiedTimestamp": "0",
     "Name": "gallery",
     "OverridableProperties": {},
-    "Version": "2.12.0"
+    "Version": "2.13.0"
   },
   "galleryTemplate": {
     "CustomGroupControlTemplateName": "",
@@ -151,7 +151,7 @@
     "LastModifiedTimestamp": "0",
     "Name": "icon",
     "OverridableProperties": {},
-    "Version": "2.4.0"
+    "Version": "2.5.0"
   },
   "image": {
     "CustomGroupControlTemplateName": "",
@@ -179,7 +179,7 @@
     "LastModifiedTimestamp": "0",
     "Name": "label",
     "OverridableProperties": {},
-    "Version": "2.4.0"
+    "Version": "2.5.0"
   },
   "rectangle": {
     "CustomGroupControlTemplateName": "",
@@ -193,7 +193,7 @@
     "LastModifiedTimestamp": "0",
     "Name": "rectangle",
     "OverridableProperties": {},
-    "Version": "2.2.0"
+    "Version": "2.3.0"
   },
   "screen": {
     "CustomGroupControlTemplateName": "",

diff --git a/...s/cat_poweropsdevopsedition_7f3f4_DocumentUri_msapp_src/DataSources/Deployment Steps.json b/...s/cat_poweropsdevopsedition_7f3f4_DocumentUri_msapp_src/DataSources/Deployment Steps.json
@@ -154,31 +154,31 @@
         "OptionSetReferenceEntityName": "Deployment User Settings"
       },
       "OptionSetReferenceItem2": {
-        "OptionSetReferenceColumnName": "cat_allowshowallsolutions",
+        "OptionSetReferenceColumnName": "cat_allowadvanceddeploy",
         "OptionSetReferenceEntityName": "Deployment User Settings"
       },
       "OptionSetReferenceItem3": {
-        "OptionSetReferenceColumnName": "cat_allowadvanceddeploy",
+        "OptionSetReferenceColumnName": "cat_allowprofilecreation",
         "OptionSetReferenceEntityName": "Deployment User Settings"
       },
       "OptionSetReferenceItem4": {
-        "OptionSetReferenceColumnName": "cat_allowprofilecreation",
+        "OptionSetReferenceColumnName": "cat_allowdrillthroughs",
         "OptionSetReferenceEntityName": "Deployment User Settings"
       },
       "OptionSetReferenceItem5": {
-        "OptionSetReferenceColumnName": "cat_allowdrillthroughs",
+        "OptionSetReferenceColumnName": "cat_allowadvancedpromote",
         "OptionSetReferenceEntityName": "Deployment User Settings"
       },
       "OptionSetReferenceItem6": {
-        "OptionSetReferenceColumnName": "cat_allowadvancedpromote",
+        "OptionSetReferenceColumnName": "cat_allowmanagesolutions",
         "OptionSetReferenceEntityName": "Deployment User Settings"
       },
       "OptionSetReferenceItem7": {
-        "OptionSetReferenceColumnName": "cat_allowmanagesolutions",
+        "OptionSetReferenceColumnName": "cat_allowbypassprepare",
         "OptionSetReferenceEntityName": "Deployment User Settings"
       },
       "OptionSetReferenceItem8": {
-        "OptionSetReferenceColumnName": "cat_allowbypassprepare",
+        "OptionSetReferenceColumnName": "cat_allowshowallsolutions",
         "OptionSetReferenceEntityName": "Deployment User Settings"
       },
       "OptionSetReferenceItem9": {

diff --git a/...Apps/cat_poweropsdevopsedition_7f3f4_DocumentUri_msapp_src/Entropy/AppCheckerResult.sarif b/...Apps/cat_poweropsdevopsedition_7f3f4_DocumentUri_msapp_src/Entropy/AppCheckerResult.sarif
@@ -4813,7 +4813,7 @@
               }
             }
           ],
-          "version": "1.323"
+          "version": "1.324"
         }
       }
     }

diff --git a/...age/CanvasApps/cat_poweropsdevopsedition_7f3f4_DocumentUri_msapp_src/Entropy/Entropy.json b/...age/CanvasApps/cat_poweropsdevopsedition_7f3f4_DocumentUri_msapp_src/Entropy/Entropy.json
@@ -371,8 +371,9 @@
     "txtSolutionName": 88,
     "UpgradeToDeploymentProfiles": 9
   },
+  "DoesTestStepsMetadataExist": false,
   "FunctionParamsInvariantScripts": {},
-  "HeaderLastSavedDateTimeUTC": "05/02/2022 14:19:15",
+  "HeaderLastSavedDateTimeUTC": "05/03/2022 13:59:44",
   "IsLegacyComponentAllowGlobalScopeCase": false,
   "LocalConnectionIDReferences": {
     "03641810-f39f-42f1-a8ff-0b32337001b5": "\"/providers/microsoft.powerapps/apis/shared_webcontents/connections/shared-webcontents-40a92dab-e1fb-4554-8164-5373-980deeeb\"",
@@ -407,14 +408,14 @@
     "sharepointicon": "0010.png"
   },
   "LocalResourceRootPaths": {
-    "AADIcon": "https://docserverpwaprodwus.blob.core.windows.net/49754661-c6de-40a8-a414-aaceed569307-1/resource/Assets0Images0b5b1f083-c287-4e7d-af11-f0c714cd68dd.png?sv=2017-04-17&sr=b&sig=%2FJlLxSwBl%2Fx1PojtbeKhVN3DcO0WIwDQL0yTBNPh%2BUg%3D&spr=https&se=2022-05-03T14%3A33%3A21Z&sp=r",
-    "deployment": "https://docserverpwaprodwus.blob.core.windows.net/49754661-c6de-40a8-a414-aaceed569307-1/resource/Assets0Images00012.png?sv=2017-04-17&sr=b&sig=tJdV4yDEYLJNSCt44mZFtqT6geKS0dRhoGkPhwbM62M%3D&spr=https&se=2022-05-03T14%3A33%3A21Z&sp=r",
-    "download": "https://docserverpwaprodwus.blob.core.windows.net/49754661-c6de-40a8-a414-aaceed569307-1/resource/Assets0Images00005.svg?sv=2017-04-17&sr=b&sig=QJ5420Tns%2BdMJaXWkSoGeKK9dOMEzgrfxobC%2F4htAhU%3D&spr=https&se=2022-05-03T14%3A33%3A21Z&sp=r",
-    "ic_fluent_error_circle_24_regular": "https://docserverpwaprodwus.blob.core.windows.net/49754661-c6de-40a8-a414-aaceed569307-1/resource/Assets0Images00004.svg?sv=2017-04-17&sr=b&sig=SO7%2BxbYCKEPgOxJN6SvJdM718cVSx%2FIwGEglXulgdqU%3D&spr=https&se=2022-05-03T14%3A33%3A21Z&sp=r",
-    "loading-buffering": "https://docserverpwaprodwus.blob.core.windows.net/49754661-c6de-40a8-a414-aaceed569307-1/resource/Assets0Images00013.gif?sv=2017-04-17&sr=b&sig=jDDRkcP%2FoTe2u2lZjCQE4H%2BjeHKgeXr1pGlwBH%2FdfC0%3D&spr=https&se=2022-05-03T14%3A33%3A21Z&sp=r",
-    "PowerApps_scalable": "https://docserverpwaprodwus.blob.core.windows.net/49754661-c6de-40a8-a414-aaceed569307-1/resource/Assets0Images00008.svg?sv=2017-04-17&sr=b&sig=rZnSjkVrbzvPFzWkYIzhAWenio4I298ZtLhYEt3W3EQ%3D&spr=https&se=2022-05-03T14%3A33%3A21Z&sp=r",
-    "PowerAutomate_scalable": "https://docserverpwaprodwus.blob.core.windows.net/49754661-c6de-40a8-a414-aaceed569307-1/resource/Assets0Images00009.svg?sv=2017-04-17&sr=b&sig=aDkskwCTeViZIJuIyjbELOlxz1K39%2BTQC%2Fkj%2FhiL7DY%3D&spr=https&se=2022-05-03T14%3A33%3A21Z&sp=r",
-    "sharepointicon": "https://docserverpwaprodwus.blob.core.windows.net/49754661-c6de-40a8-a414-aaceed569307-1/resource/Assets0Images00010.png?sv=2017-04-17&sr=b&sig=Uz2Jm1e5rsIIxdITyGFVbyi4TRIf2rhrK6Qg3FAmIZI%3D&spr=https&se=2022-05-03T14%3A33%3A21Z&sp=r"
+    "AADIcon": "https://docserverpwaprodeus.blob.core.windows.net/cbf9dc45-d36b-4f3b-b8b7-359acb04e374-1/resource/Assets0Images0b5b1f083-c287-4e7d-af11-f0c714cd68dd.png?sv=2017-04-17&sr=b&sig=N90jokv2KMXe4zw0btBHpVu%2FHbq62WRLRFmIUN2C5Rk%3D&spr=https&se=2022-05-04T14%3A14%3A10Z&sp=r",
+    "deployment": "https://docserverpwaprodeus.blob.core.windows.net/cbf9dc45-d36b-4f3b-b8b7-359acb04e374-1/resource/Assets0Images00012.png?sv=2017-04-17&sr=b&sig=IFd7VOSFSaWBOFSnhqQM99dHYXqculTzNo6ZGl47%2FaI%3D&spr=https&se=2022-05-04T14%3A14%3A10Z&sp=r",
+    "download": "https://docserverpwaprodeus.blob.core.windows.net/cbf9dc45-d36b-4f3b-b8b7-359acb04e374-1/resource/Assets0Images00005.svg?sv=2017-04-17&sr=b&sig=2TVAxf8jLKbN0vSeBXnqDghMDxY%2BPiOdd6pluedMEs0%3D&spr=https&se=2022-05-04T14%3A14%3A10Z&sp=r",
+    "ic_fluent_error_circle_24_regular": "https://docserverpwaprodeus.blob.core.windows.net/cbf9dc45-d36b-4f3b-b8b7-359acb04e374-1/resource/Assets0Images00004.svg?sv=2017-04-17&sr=b&sig=ytpFygY0iRqFr9AOFAW0K2QigOZaFP32amVJxd4IzYc%3D&spr=https&se=2022-05-04T14%3A14%3A10Z&sp=r",
+    "loading-buffering": "https://docserverpwaprodeus.blob.core.windows.net/cbf9dc45-d36b-4f3b-b8b7-359acb04e374-1/resource/Assets0Images00013.gif?sv=2017-04-17&sr=b&sig=eNmX9QzKNVeJBy4lolZedyVWNKRFXfQ9kF5%2F%2BCjFqHQ%3D&spr=https&se=2022-05-04T14%3A14%3A10Z&sp=r",
+    "PowerApps_scalable": "https://docserverpwaprodeus.blob.core.windows.net/cbf9dc45-d36b-4f3b-b8b7-359acb04e374-1/resource/Assets0Images00008.svg?sv=2017-04-17&sr=b&sig=JvDkU2CBY8wCuVwLddEzpONOnwt0VfN8leotkEKGi%2F4%3D&spr=https&se=2022-05-04T14%3A14%3A10Z&sp=r",
+    "PowerAutomate_scalable": "https://docserverpwaprodeus.blob.core.windows.net/cbf9dc45-d36b-4f3b-b8b7-359acb04e374-1/resource/Assets0Images00009.svg?sv=2017-04-17&sr=b&sig=LfkHMe5LHsgYDY7cvnySkZamp82%2Fx15baT5qdu5fw9g%3D&spr=https&se=2022-05-04T14%3A14%3A10Z&sp=r",
+    "sharepointicon": "https://docserverpwaprodeus.blob.core.windows.net/cbf9dc45-d36b-4f3b-b8b7-359acb04e374-1/resource/Assets0Images00010.png?sv=2017-04-17&sr=b&sig=X0e2tLheAPFiBR%2BgZM01Rn9agz0Uwn%2FLQkj%2BExzccaY%3D&spr=https&se=2022-05-04T14%3A14%3A10Z&sp=r"
   },
   "OldLogoFileName": "4fkmbvku.jpg",
   "OrderComponentMetadata": {
@@ -460,11 +461,11 @@
     "Deployment Requests\\cat_deploymentrequesttype": 53,
     "Deployment Requests\\default.cds_cat_deploymentrequest_views": 67,
     "Deployment Steps": 85,
-    "Deployment Steps\\cat_approvaltype": 50,
+    "Deployment Steps\\cat_approvaltype": 49,
     "Deployment Steps\\cat_deploymentstep_statecode": 51,
     "Deployment Steps\\cat_deploymentstep_statuscode": 52,
     "Deployment Steps\\default.cds_cat_deploymentstep_views": 66,
-    "Deployment Steps\\field_security_permission_type": 49,
+    "Deployment Steps\\field_security_permission_type": 50,
     "Deployment User Settings": 87,
     "Deployment User Settings\\cat_deploymentusersetting_statecode": 56,
     "Deployment User Settings\\cat_deploymentusersetting_statuscode": 57,
@@ -514,9 +515,9 @@
     "SearchSharepointLists": 12,
     "SearchSharepointSites": 10,
     "Security Roles": 88,
-    "Security Roles\\componentstate": 59,
+    "Security Roles\\componentstate": 60,
     "Security Roles\\default.cds_role_views": 69,
-    "Security Roles\\isinherited": 60,
+    "Security Roles\\isinherited": 59,
     "Security Roles\\ismanaged": 58,
     "SelectedEnvironmentSolutions": 129,
     "SelectedOrgProjects": 127,
@@ -552,30 +553,30 @@
     "User Settings\\default.cds_cat_usersetting_views": 61,
     "Users": 81,
     "Users\\default.cds_systemuser_views": 63,
-    "Users\\systemuser_accessmode": 40,
-    "Users\\systemuser_address1_addresstypecode": 30,
-    "Users\\systemuser_address1_shippingmethodcode": 31,
-    "Users\\systemuser_address2_addresstypecode": 32,
-    "Users\\systemuser_address2_shippingmethodcode": 35,
-    "Users\\systemuser_azurestate": 42,
-    "Users\\systemuser_caltype": 41,
-    "Users\\systemuser_defaultfilterspopulated": 26,
-    "Users\\systemuser_deletestate": 39,
-    "Users\\systemuser_displayinserviceviews": 24,
+    "Users\\systemuser_accessmode": 32,
+    "Users\\systemuser_address1_addresstypecode": 34,
+    "Users\\systemuser_address1_shippingmethodcode": 33,
+    "Users\\systemuser_address2_addresstypecode": 30,
+    "Users\\systemuser_address2_shippingmethodcode": 31,
+    "Users\\systemuser_azurestate": 38,
+    "Users\\systemuser_caltype": 37,
+    "Users\\systemuser_defaultfilterspopulated": 22,
+    "Users\\systemuser_deletestate": 36,
+    "Users\\systemuser_displayinserviceviews": 27,
     "Users\\systemuser_emailrouteraccessapproval": 43,
-    "Users\\systemuser_incomingemaildeliverymethod": 37,
-    "Users\\systemuser_invitestatuscode": 33,
-    "Users\\systemuser_isactivedirectoryuser": 23,
-    "Users\\systemuser_isdisabled": 25,
-    "Users\\systemuser_isemailaddressapprovedbyo365admin": 28,
-    "Users\\systemuser_isintegrationuser": 27,
-    "Users\\systemuser_isuserlicensed": 22,
-    "Users\\systemuser_isusersynced": 29,
-    "Users\\systemuser_outgoingemaildeliverymethod": 36,
-    "Users\\systemuser_preferredaddresscode": 44,
-    "Users\\systemuser_preferredemailcode": 34,
-    "Users\\systemuser_preferredphonecode": 38,
-    "Users\\systemuser_setupuser": 21
+    "Users\\systemuser_incomingemaildeliverymethod": 40,
+    "Users\\systemuser_invitestatuscode": 42,
+    "Users\\systemuser_isactivedirectoryuser": 25,
+    "Users\\systemuser_isdisabled": 28,
+    "Users\\systemuser_isemailaddressapprovedbyo365admin": 21,
+    "Users\\systemuser_isintegrationuser": 23,
+    "Users\\systemuser_isuserlicensed": 26,
+    "Users\\systemuser_isusersynced": 24,
+    "Users\\systemuser_outgoingemaildeliverymethod": 41,
+    "Users\\systemuser_preferredaddresscode": 39,
+    "Users\\systemuser_preferredemailcode": 35,
+    "Users\\systemuser_preferredphonecode": 44,
+    "Users\\systemuser_setupuser": 29
   },
   "OrderGroupControls": {
     "EnvironmentSearchBox": {
@@ -685,7 +686,7 @@
     "drpConnectorShareGroupTeams": 267,
     "drpDeleteDeploymentProfiles": 75,
     "drpDeployEnvironments": 209,
-    "drpDeploymentSteps": 61,
+    "drpDeploymentSteps": 59,
     "drpFlowActivationUsers": 280,
     "drpFlowOwnerUsers": 278,
     "drpFlowShareGroupTeams": 279,
@@ -697,7 +698,7 @@
     "drpProfileOrgs": 89,
     "drpProfileProjects": 92,
     "drpProfileRepositories": 95,
-    "drpPullRequestSourceBranches": 60,
+    "drpPullRequestSourceBranches": 61,
     "drpPullRequestTargetBranches": 64,
     "drpPushDeploymentProfiles": 10,
     "drpSharepointLists": 240,
@@ -877,7 +878,7 @@
     "lblDeployGroupTeamName": 258,
     "lblDeployGroupTeamRoles": 229,
     "lblDeployGroupTeams": 224,
-    "lblDeploymentEnvironment": 59,
+    "lblDeploymentEnvironment": 57,
     "lblDeploymentEnvironmentName": 105,
     "lblDeploymentProfile": 146,
     "lblDeploymentProfileBranch": 97,
@@ -935,7 +936,7 @@
     "lblSolutionFriendlyName": 72,
     "lblSolutionImportHistory": 36,
     "lblSolutionImportHistoryEmpty": 35,
-    "lblSourceBranch": 58,
+    "lblSourceBranch": 60,
     "lblTargetBranch": 62,
     "loaderDeploymentEnvironment": 207,
     "loaderSolutionComponents": 213,
@@ -968,7 +969,7 @@
     "Test_7F478737223C4B69": 0,
     "tglCreateBranch": 15,
     "tglMySolutions": 144,
-    "tglPRAdvancedSettings": 57,
+    "tglPRAdvancedSettings": 58,
     "tglPRBypassPrepare": 65,
     "tglPublishAdvancedSettings": 14,
     "tglPublishBypassPrepare": 20,
@@ -1015,7 +1016,7 @@
   },
   "TemplateVersions": {},
   "VolatileProperties": {
-    "AnalysisLoadTime": 6.1293335000000004,
+    "AnalysisLoadTime": 8.8861229,
     "ControlCount": {
       "23319544814d4787a45f2d6caa5282ab": 1,
       "65045f6bb68044feac8f639d9c2191c6": 1,
@@ -1039,7 +1040,7 @@
       "timer": 1,
       "toggleSwitch": 6
     },
-    "DeserializationLoadTime": 4.6323645999999998,
+    "DeserializationLoadTime": 5.7005738,
     "ErrorCount": 0
   },
   "WasLocalDatabaseReferencesEmpty": false