Merge branch 'main' into extract_context

Author: puppetsw

builds/azure-pipelines-release.yml

@@ -26,12 +26,22 @@ jobs:
       script: |
         [xml]$xmlDoc = Get-Content $(Build.SourcesDirectory)\src\Files.Package\Package.appxmanifest
         $xmlDoc.Package.Identity.Name="Files"
-        $xmlDoc.Package.Identity.Publisher="CN=53EC4384-7F5B-4CF6-8C23-513FFE9D1AB7"
+        $xmlDoc.Package.Identity.Publisher="Files"
         $xmlDoc.Package.Properties.DisplayName="Files"
         $xmlDoc.Package.Applications.Application.VisualElements.DisplayName="Files"
         $xmlDoc.Save('$(Build.SourcesDirectory)\src\Files.Package\Package.appxmanifest')
       failOnStderr: true
 
+  - task: PowerShell@2
+    displayName: 'Use Release Logo'
+    inputs:
+      targetType: 'inline'
+      script: |
+        gci $(Build.SourcesDirectory)\src -Include *.csproj, *.appxmanifest, *.wapproj -recurse | ForEach -Process {
+        (Get-Content $_ -Raw | ForEach -Process {$_ -replace "Assets\\AppTilesDev", "Assets\AppTiles"}) | Set-Content $_ -NoNewline
+        }
+      failOnStderr: true
+
   - task: DownloadSecureFile@1
     name: mapsDevKey
     displayName: 'Download Bing Maps Dev Key'
@@ -117,6 +127,16 @@ jobs:
         $xmlDoc.Save('$(Build.SourcesDirectory)\src\Files.Package\Package.appxmanifest')
       failOnStderr: true
 
+  - task: PowerShell@2
+    displayName: 'Use Release Logo'
+    inputs:
+      targetType: 'inline'
+      script: |
+        gci $(Build.SourcesDirectory)\src -Include *.csproj, *.appxmanifest, *.wapproj -recurse | ForEach -Process {
+        (Get-Content $_ -Raw | ForEach -Process {$_ -replace "Assets\\AppTilesDev", "Assets\AppTiles"}) | Set-Content $_ -NoNewline
+        }
+      failOnStderr: true
+
   - task: DownloadSecureFile@1
     name: mapsDevKey
     displayName: 'Download Bing Maps Dev Key'

builds/azure-pipelines.yml

@@ -17,12 +17,22 @@ steps:
     script: |
       [xml]$xmlDoc = Get-Content $(Build.SourcesDirectory)\src\Files.Package\Package.appxmanifest
       $xmlDoc.Package.Identity.Name="49306atecsolution.FilesUWP"
-        $xmlDoc.Package.Identity.Publisher="CN=53EC4384-7F5B-4CF6-8C23-513FFE9D1AB7"
+      $xmlDoc.Package.Identity.Publisher="CN=53EC4384-7F5B-4CF6-8C23-513FFE9D1AB7"
       $xmlDoc.Package.Properties.DisplayName="Files"
       $xmlDoc.Package.Applications.Application.VisualElements.DisplayName="Files"
       $xmlDoc.Save('$(Build.SourcesDirectory)\src\Files.Package\Package.appxmanifest')
     failOnStderr: true
 
+- task: PowerShell@2
+  displayName: 'Use Release Logo'
+  inputs:
+    targetType: 'inline'
+    script: |
+      gci $(Build.SourcesDirectory)\src -Include *.csproj, *.appxmanifest, *.wapproj -recurse | ForEach -Process {
+      (Get-Content $_ -Raw | ForEach -Process {$_ -replace "Assets\\AppTilesDev", "Assets\AppTiles"}) | Set-Content $_ -NoNewline
+      }
+    failOnStderr: true
+
 - task: DownloadSecureFile@1
   name: mapsDevKey
   displayName: 'Download Bing Maps Dev Key'

src/Common/CloudProvider.cs

@@ -41,6 +41,7 @@ public enum CloudProviders
         AmazonDrive,
         Nextcloud,
         Yandex,
-        Box
+        Box,
+        Jottacloud
     }
 }

src/Files.Launcher/Helpers/CloudDrivesDetector.cs

@@ -71,6 +71,7 @@ private static Task<List<CloudProvider>> DetectGenericCloudDrive()
                         "MEGA" => CloudProviders.Mega,
                         "Amazon Drive" => CloudProviders.AmazonDrive,
                         "Nextcloud" => CloudProviders.Nextcloud,
+                        "Jottacloud" => CloudProviders.Jottacloud,
                         _ => null
                     };
                     if (driveID == null)
@@ -86,6 +87,7 @@ private static Task<List<CloudProvider>> DetectGenericCloudDrive()
                             CloudProviders.Mega => $"MEGA ({Path.GetFileName(syncedFolder.TrimEnd('\\'))})",
                             CloudProviders.AmazonDrive => $"Amazon Drive",
                             CloudProviders.Nextcloud => $"Nextcloud",
+                            CloudProviders.Jottacloud => $"Jottacloud",
                             _ => null
                         },
                         SyncFolder = syncedFolder