Migrate from UWP to the Windows App SDK (#316)

0x5bfa · Oct 16, 2022 · aec7b87 · aec7b87
1 parent d7aa6dd
commit aec7b87
Show file tree

Hide file tree

Showing 1,182 changed files with 7,298 additions and 12,530 deletions.
diff --git a/.gitignore b/.gitignore
@@ -37,8 +37,9 @@ bld/
 [Ll]ogs/
 
 # Exclude View[Model]s/Repositories/Releases contents
-!src/FluentHub.Uwp/Views/**
-!src/FluentHub.Uwp/ViewModels/**
+!src/FluentHub.App/Views/**
+!src/FluentHub.App/ViewModels/**
+!src/FluentHub.App/Assets/AppTiles/**
 
 # Visual Studio 2015/2017 cache/options directory
 .vs/
@@ -367,4 +368,4 @@ MigrationBackup/
 .ionide/
 
 # Fody - auto-generated XML schema
-FodyWeavers.xsd
+FodyWeavers.xsd
diff --git a/.gitmodules b/.gitmodules
diff --git a/FluentHub.sln b/FluentHub.sln
@@ -7,22 +7,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C6265587-732
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentHub.Octokit", "src\FluentHub.Octokit\FluentHub.Octokit.csproj", "{893EDCC9-4345-4F49-A13F-1A426A7BA432}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentHub.Octokit.Generation", "src\FluentHub.Octokit.Generation\FluentHub.Octokit.Generation.csproj", "{2219FA42-F8D3-4951-9578-76E000BB86D7}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentHub.Octokit.ModelGenerator", "src\FluentHub.Octokit.ModelGenerator\FluentHub.Octokit.ModelGenerator.csproj", "{2219FA42-F8D3-4951-9578-76E000BB86D7}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FluentHub.Uwp", "src\FluentHub.Uwp\FluentHub.Uwp.csproj", "{3B8F7422-E2C0-4BDF-9A95-EA59FFE277E8}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentHub.App", "src\FluentHub.App\FluentHub.App.csproj", "{3B8F7422-E2C0-4BDF-9A95-EA59FFE277E8}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentHub.Core", "src\FluentHub.Core\FluentHub.Core.csproj", "{CCD6A838-6E6F-424F-BEE3-60C46F4B5308}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "lib", "lib", "{CF82C68E-A7C3-48C7-B319-AF270EC350AB}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Octokit.GraphQL", "lib\octokit.graphql.net\Octokit.GraphQL\Octokit.GraphQL.csproj", "{66F5A0DF-F449-4D6E-922D-0AD17B813A3B}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Octokit.GraphQL.Core", "lib\octokit.graphql.net\Octokit.GraphQL.Core\Octokit.GraphQL.Core.csproj", "{AEAF7702-4AD2-4B09-BAA1-DCAF0E920279}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FluentHub.Primer.Octicon.Generation", "src\FluentHub.Primer.Octicon.Generation\FluentHub.Primer.Octicon.Generation.csproj", "{615C4102-586C-48A0-B147-554AD5FD8822}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "generators", "generators", "{EBF23B98-C2E9-46A1-A965-2BF4AF16479D}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -63,8 +53,8 @@ Global
 		{893EDCC9-4345-4F49-A13F-1A426A7BA432}.Sideload|x64.Build.0 = Sideload|x64
 		{893EDCC9-4345-4F49-A13F-1A426A7BA432}.Sideload|x86.ActiveCfg = Sideload|x86
 		{893EDCC9-4345-4F49-A13F-1A426A7BA432}.Sideload|x86.Build.0 = Sideload|x86
-		{2219FA42-F8D3-4951-9578-76E000BB86D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2219FA42-F8D3-4951-9578-76E000BB86D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2219FA42-F8D3-4951-9578-76E000BB86D7}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{2219FA42-F8D3-4951-9578-76E000BB86D7}.Debug|Any CPU.Build.0 = Debug|x64
 		{2219FA42-F8D3-4951-9578-76E000BB86D7}.Debug|arm64.ActiveCfg = Debug|Any CPU
 		{2219FA42-F8D3-4951-9578-76E000BB86D7}.Debug|arm64.Build.0 = Debug|Any CPU
 		{2219FA42-F8D3-4951-9578-76E000BB86D7}.Debug|x64.ActiveCfg = Debug|x64
@@ -87,9 +77,9 @@ Global
 		{2219FA42-F8D3-4951-9578-76E000BB86D7}.Sideload|x64.Build.0 = Sideload|Any CPU
 		{2219FA42-F8D3-4951-9578-76E000BB86D7}.Sideload|x86.ActiveCfg = Sideload|Any CPU
 		{2219FA42-F8D3-4951-9578-76E000BB86D7}.Sideload|x86.Build.0 = Sideload|Any CPU
-		{3B8F7422-E2C0-4BDF-9A95-EA59FFE277E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3B8F7422-E2C0-4BDF-9A95-EA59FFE277E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3B8F7422-E2C0-4BDF-9A95-EA59FFE277E8}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
+		{3B8F7422-E2C0-4BDF-9A95-EA59FFE277E8}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{3B8F7422-E2C0-4BDF-9A95-EA59FFE277E8}.Debug|Any CPU.Build.0 = Debug|x86
+		{3B8F7422-E2C0-4BDF-9A95-EA59FFE277E8}.Debug|Any CPU.Deploy.0 = Debug|x86
 		{3B8F7422-E2C0-4BDF-9A95-EA59FFE277E8}.Debug|arm64.ActiveCfg = Debug|arm64
 		{3B8F7422-E2C0-4BDF-9A95-EA59FFE277E8}.Debug|arm64.Build.0 = Debug|arm64
 		{3B8F7422-E2C0-4BDF-9A95-EA59FFE277E8}.Debug|arm64.Deploy.0 = Debug|arm64
@@ -123,8 +113,8 @@ Global
 		{3B8F7422-E2C0-4BDF-9A95-EA59FFE277E8}.Sideload|x86.ActiveCfg = Sideload|x86
 		{3B8F7422-E2C0-4BDF-9A95-EA59FFE277E8}.Sideload|x86.Build.0 = Sideload|x86
 		{3B8F7422-E2C0-4BDF-9A95-EA59FFE277E8}.Sideload|x86.Deploy.0 = Sideload|x86
-		{CCD6A838-6E6F-424F-BEE3-60C46F4B5308}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CCD6A838-6E6F-424F-BEE3-60C46F4B5308}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CCD6A838-6E6F-424F-BEE3-60C46F4B5308}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{CCD6A838-6E6F-424F-BEE3-60C46F4B5308}.Debug|Any CPU.Build.0 = Debug|x86
 		{CCD6A838-6E6F-424F-BEE3-60C46F4B5308}.Debug|arm64.ActiveCfg = Debug|arm64
 		{CCD6A838-6E6F-424F-BEE3-60C46F4B5308}.Debug|arm64.Build.0 = Debug|arm64
 		{CCD6A838-6E6F-424F-BEE3-60C46F4B5308}.Debug|x64.ActiveCfg = Debug|x64
@@ -147,91 +137,15 @@ Global
 		{CCD6A838-6E6F-424F-BEE3-60C46F4B5308}.Sideload|x64.Build.0 = Sideload|Any CPU
 		{CCD6A838-6E6F-424F-BEE3-60C46F4B5308}.Sideload|x86.ActiveCfg = Sideload|Any CPU
 		{CCD6A838-6E6F-424F-BEE3-60C46F4B5308}.Sideload|x86.Build.0 = Sideload|Any CPU
-		{66F5A0DF-F449-4D6E-922D-0AD17B813A3B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{66F5A0DF-F449-4D6E-922D-0AD17B813A3B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{66F5A0DF-F449-4D6E-922D-0AD17B813A3B}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{66F5A0DF-F449-4D6E-922D-0AD17B813A3B}.Debug|arm64.Build.0 = Debug|Any CPU
-		{66F5A0DF-F449-4D6E-922D-0AD17B813A3B}.Debug|x64.ActiveCfg = Debug|x64
-		{66F5A0DF-F449-4D6E-922D-0AD17B813A3B}.Debug|x64.Build.0 = Debug|x64
-		{66F5A0DF-F449-4D6E-922D-0AD17B813A3B}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{66F5A0DF-F449-4D6E-922D-0AD17B813A3B}.Debug|x86.Build.0 = Debug|Any CPU
-		{66F5A0DF-F449-4D6E-922D-0AD17B813A3B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{66F5A0DF-F449-4D6E-922D-0AD17B813A3B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{66F5A0DF-F449-4D6E-922D-0AD17B813A3B}.Release|arm64.ActiveCfg = Release|Any CPU
-		{66F5A0DF-F449-4D6E-922D-0AD17B813A3B}.Release|arm64.Build.0 = Release|Any CPU
-		{66F5A0DF-F449-4D6E-922D-0AD17B813A3B}.Release|x64.ActiveCfg = Release|x64
-		{66F5A0DF-F449-4D6E-922D-0AD17B813A3B}.Release|x64.Build.0 = Release|x64
-		{66F5A0DF-F449-4D6E-922D-0AD17B813A3B}.Release|x86.ActiveCfg = Release|Any CPU
-		{66F5A0DF-F449-4D6E-922D-0AD17B813A3B}.Release|x86.Build.0 = Release|Any CPU
-		{66F5A0DF-F449-4D6E-922D-0AD17B813A3B}.Sideload|Any CPU.ActiveCfg = Sideload|Any CPU
-		{66F5A0DF-F449-4D6E-922D-0AD17B813A3B}.Sideload|Any CPU.Build.0 = Sideload|Any CPU
-		{66F5A0DF-F449-4D6E-922D-0AD17B813A3B}.Sideload|arm64.ActiveCfg = Sideload|Any CPU
-		{66F5A0DF-F449-4D6E-922D-0AD17B813A3B}.Sideload|arm64.Build.0 = Sideload|Any CPU
-		{66F5A0DF-F449-4D6E-922D-0AD17B813A3B}.Sideload|x64.ActiveCfg = Sideload|Any CPU
-		{66F5A0DF-F449-4D6E-922D-0AD17B813A3B}.Sideload|x64.Build.0 = Sideload|Any CPU
-		{66F5A0DF-F449-4D6E-922D-0AD17B813A3B}.Sideload|x86.ActiveCfg = Sideload|Any CPU
-		{66F5A0DF-F449-4D6E-922D-0AD17B813A3B}.Sideload|x86.Build.0 = Sideload|Any CPU
-		{AEAF7702-4AD2-4B09-BAA1-DCAF0E920279}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AEAF7702-4AD2-4B09-BAA1-DCAF0E920279}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AEAF7702-4AD2-4B09-BAA1-DCAF0E920279}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{AEAF7702-4AD2-4B09-BAA1-DCAF0E920279}.Debug|arm64.Build.0 = Debug|Any CPU
-		{AEAF7702-4AD2-4B09-BAA1-DCAF0E920279}.Debug|x64.ActiveCfg = Debug|x64
-		{AEAF7702-4AD2-4B09-BAA1-DCAF0E920279}.Debug|x64.Build.0 = Debug|x64
-		{AEAF7702-4AD2-4B09-BAA1-DCAF0E920279}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{AEAF7702-4AD2-4B09-BAA1-DCAF0E920279}.Debug|x86.Build.0 = Debug|Any CPU
-		{AEAF7702-4AD2-4B09-BAA1-DCAF0E920279}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AEAF7702-4AD2-4B09-BAA1-DCAF0E920279}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AEAF7702-4AD2-4B09-BAA1-DCAF0E920279}.Release|arm64.ActiveCfg = Release|Any CPU
-		{AEAF7702-4AD2-4B09-BAA1-DCAF0E920279}.Release|arm64.Build.0 = Release|Any CPU
-		{AEAF7702-4AD2-4B09-BAA1-DCAF0E920279}.Release|x64.ActiveCfg = Release|x64
-		{AEAF7702-4AD2-4B09-BAA1-DCAF0E920279}.Release|x64.Build.0 = Release|x64
-		{AEAF7702-4AD2-4B09-BAA1-DCAF0E920279}.Release|x86.ActiveCfg = Release|Any CPU
-		{AEAF7702-4AD2-4B09-BAA1-DCAF0E920279}.Release|x86.Build.0 = Release|Any CPU
-		{AEAF7702-4AD2-4B09-BAA1-DCAF0E920279}.Sideload|Any CPU.ActiveCfg = Sideload|Any CPU
-		{AEAF7702-4AD2-4B09-BAA1-DCAF0E920279}.Sideload|Any CPU.Build.0 = Sideload|Any CPU
-		{AEAF7702-4AD2-4B09-BAA1-DCAF0E920279}.Sideload|arm64.ActiveCfg = Sideload|Any CPU
-		{AEAF7702-4AD2-4B09-BAA1-DCAF0E920279}.Sideload|arm64.Build.0 = Sideload|Any CPU
-		{AEAF7702-4AD2-4B09-BAA1-DCAF0E920279}.Sideload|x64.ActiveCfg = Sideload|Any CPU
-		{AEAF7702-4AD2-4B09-BAA1-DCAF0E920279}.Sideload|x64.Build.0 = Sideload|Any CPU
-		{AEAF7702-4AD2-4B09-BAA1-DCAF0E920279}.Sideload|x86.ActiveCfg = Sideload|Any CPU
-		{AEAF7702-4AD2-4B09-BAA1-DCAF0E920279}.Sideload|x86.Build.0 = Sideload|Any CPU
-		{615C4102-586C-48A0-B147-554AD5FD8822}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{615C4102-586C-48A0-B147-554AD5FD8822}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{615C4102-586C-48A0-B147-554AD5FD8822}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{615C4102-586C-48A0-B147-554AD5FD8822}.Debug|arm64.Build.0 = Debug|Any CPU
-		{615C4102-586C-48A0-B147-554AD5FD8822}.Debug|x64.ActiveCfg = Debug|x64
-		{615C4102-586C-48A0-B147-554AD5FD8822}.Debug|x64.Build.0 = Debug|x64
-		{615C4102-586C-48A0-B147-554AD5FD8822}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{615C4102-586C-48A0-B147-554AD5FD8822}.Debug|x86.Build.0 = Debug|Any CPU
-		{615C4102-586C-48A0-B147-554AD5FD8822}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{615C4102-586C-48A0-B147-554AD5FD8822}.Release|Any CPU.Build.0 = Release|Any CPU
-		{615C4102-586C-48A0-B147-554AD5FD8822}.Release|arm64.ActiveCfg = Release|Any CPU
-		{615C4102-586C-48A0-B147-554AD5FD8822}.Release|arm64.Build.0 = Release|Any CPU
-		{615C4102-586C-48A0-B147-554AD5FD8822}.Release|x64.ActiveCfg = Release|Any CPU
-		{615C4102-586C-48A0-B147-554AD5FD8822}.Release|x64.Build.0 = Release|Any CPU
-		{615C4102-586C-48A0-B147-554AD5FD8822}.Release|x86.ActiveCfg = Release|Any CPU
-		{615C4102-586C-48A0-B147-554AD5FD8822}.Release|x86.Build.0 = Release|Any CPU
-		{615C4102-586C-48A0-B147-554AD5FD8822}.Sideload|Any CPU.ActiveCfg = Debug|Any CPU
-		{615C4102-586C-48A0-B147-554AD5FD8822}.Sideload|Any CPU.Build.0 = Debug|Any CPU
-		{615C4102-586C-48A0-B147-554AD5FD8822}.Sideload|arm64.ActiveCfg = Debug|Any CPU
-		{615C4102-586C-48A0-B147-554AD5FD8822}.Sideload|arm64.Build.0 = Debug|Any CPU
-		{615C4102-586C-48A0-B147-554AD5FD8822}.Sideload|x64.ActiveCfg = Debug|Any CPU
-		{615C4102-586C-48A0-B147-554AD5FD8822}.Sideload|x64.Build.0 = Debug|Any CPU
-		{615C4102-586C-48A0-B147-554AD5FD8822}.Sideload|x86.ActiveCfg = Debug|Any CPU
-		{615C4102-586C-48A0-B147-554AD5FD8822}.Sideload|x86.Build.0 = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{893EDCC9-4345-4F49-A13F-1A426A7BA432} = {C6265587-7328-4B9E-AF1F-69F0E7301C5F}
-		{2219FA42-F8D3-4951-9578-76E000BB86D7} = {EBF23B98-C2E9-46A1-A965-2BF4AF16479D}
+		{2219FA42-F8D3-4951-9578-76E000BB86D7} = {C6265587-7328-4B9E-AF1F-69F0E7301C5F}
 		{3B8F7422-E2C0-4BDF-9A95-EA59FFE277E8} = {C6265587-7328-4B9E-AF1F-69F0E7301C5F}
 		{CCD6A838-6E6F-424F-BEE3-60C46F4B5308} = {C6265587-7328-4B9E-AF1F-69F0E7301C5F}
-		{66F5A0DF-F449-4D6E-922D-0AD17B813A3B} = {CF82C68E-A7C3-48C7-B319-AF270EC350AB}
-		{AEAF7702-4AD2-4B09-BAA1-DCAF0E920279} = {CF82C68E-A7C3-48C7-B319-AF270EC350AB}
-		{615C4102-586C-48A0-B147-554AD5FD8822} = {EBF23B98-C2E9-46A1-A965-2BF4AF16479D}
-		{EBF23B98-C2E9-46A1-A965-2BF4AF16479D} = {C6265587-7328-4B9E-AF1F-69F0E7301C5F}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {69E4A07A-D627-48B2-A72B-25F6082E0684}

diff --git a/README.md b/README.md
@@ -87,7 +87,7 @@ If you are interested in fixing issues and contributing directly to the code bas
 ├──lib                               // Library for submodules.
 |  └──octokit.graphql.net            // Official library for GitHub GraphQL API.
 └──src                               // The source code.
-   ├──FluentHub.Uwp                  // Code for most front-end elements of the app.
+   ├──FluentHub.App                  // Code for most front-end elements of the app.
    ├──FluentHub.Core                 // Core elements of the app.
    ├──FluentHub.Octokit              // Code for most back-end and API-related elements of the app such as mutations and queries.
    └──FluentHub.Octokit.Generation   // GitHub GraphQL API model generator.
@@ -142,8 +142,8 @@ See [the documentation](docs/credentials.md).
 ### 4. Build the project
 
 - Open `FluentHub.sln`.
-- Hit 'Set as Startup item' on `FluentHub.Uwp` in the Solution Explorer.
-- Build with `DEBUG|x64|FluentHub.Uwp (Universal Windows)`.
+- Hit 'Set as Startup item' on `FluentHub.App` in the Solution Explorer.
+- Build with `DEBUG|x64|FluentHub.App (Universal Windows)`.
 
 ## 💳 Credit
 

diff --git a/builds/ci-pr.yml b/builds/ci-pr.yml
@@ -33,12 +33,12 @@ jobs:
     inputs:
       targetType: 'inline'
       script: |
-        [xml]$xmlDoc = Get-Content $(Build.SourcesDirectory)\src\FluentHub.Uwp\Package.appxmanifest
+        [xml]$xmlDoc = Get-Content $(Build.SourcesDirectory)\src\FluentHub.App\Package.appxmanifest
         $xmlDoc.Package.Identity.Name="49462fluenthub-uwp.FluentHub"
         $xmlDoc.Package.Identity.Publisher="CN=4E3C0825-4D00-4ECC-89F8-528E9200B125"
         $xmlDoc.Package.Properties.DisplayName="FluentHub DEV"
         $xmlDoc.Package.Applications.Application.VisualElements.DisplayName="FluentHub DEV"
-        $xmlDoc.Save('$(Build.SourcesDirectory)\src\FluentHub.Uwp\Package.appxmanifest')
+        $xmlDoc.Save('$(Build.SourcesDirectory)\src\FluentHub.App\Package.appxmanifest')
       failOnStderr: true
 
   - task: DownloadSecureFile@1
@@ -51,7 +51,7 @@ jobs:
     inputs:
       SourceFolder: '$(Agent.TempDirectory)'
       Contents: '$(CredentialSecureFile.secureFilePath)'
-      TargetFolder: '$(Build.SourcesDirectory)\src\FluentHub.Uwp'
+      TargetFolder: '$(Build.SourcesDirectory)\src\FluentHub.App'
 
   - task: DownloadSecureFile@1
     name: caCertificate
@@ -113,12 +113,12 @@ jobs:
     inputs:
       targetType: 'inline'
       script: |
-        [xml]$xmlDoc = Get-Content $(Build.SourcesDirectory)\src\FluentHub.Uwp\Package.appxmanifest
+        [xml]$xmlDoc = Get-Content $(Build.SourcesDirectory)\src\FluentHub.App\Package.appxmanifest
         $xmlDoc.Package.Identity.Name="FluentHubSideload"
         $xmlDoc.Package.Identity.Publisher="FluentHub Team"
         $xmlDoc.Package.Properties.DisplayName="FluentHub"
         $xmlDoc.Package.Applications.Application.VisualElements.DisplayName="FluentHub Dev"
-        $xmlDoc.Save('$(Build.SourcesDirectory)\src\FluentHub.Uwp\Package.appxmanifest')
+        $xmlDoc.Save('$(Build.SourcesDirectory)\src\FluentHub.App\Package.appxmanifest')
       failOnStderr: true
 
   - task: DownloadSecureFile@1
@@ -132,7 +132,7 @@ jobs:
     inputs:
       SourceFolder: '$(Agent.TempDirectory)'
       Contents: '$(CredentialSecureFile.secureFilePath)'
-      TargetFolder: '$(Build.SourcesDirectory)\src\FluentHub.Uwp'
+      TargetFolder: '$(Build.SourcesDirectory)\src\FluentHub.App'
 
   - task: DownloadSecureFile@1
     name: caCertificate
@@ -189,12 +189,12 @@ jobs:
     inputs:
       targetType: 'inline'
       script: |
-        [xml]$xmlDoc = Get-Content $(Build.SourcesDirectory)\src\FluentHub.Uwp\Package.appxmanifest
+        [xml]$xmlDoc = Get-Content $(Build.SourcesDirectory)\src\FluentHub.App\Package.appxmanifest
         $xmlDoc.Package.Identity.Name="49462fluenthub-uwp.FluentHub"
         $xmlDoc.Package.Identity.Publisher="CN=4E3C0825-4D00-4ECC-89F8-528E9200B125"
         $xmlDoc.Package.Properties.DisplayName="FluentHub Dev"
         $xmlDoc.Package.Applications.Application.VisualElements.DisplayName="FluentHub Dev"
-        $xmlDoc.Save('$(Build.SourcesDirectory)\src\FluentHub.Uwp\Package.appxmanifest')
+        $xmlDoc.Save('$(Build.SourcesDirectory)\src\FluentHub.App\Package.appxmanifest')
       failOnStderr: true
 
   - task: DownloadSecureFile@1
@@ -208,7 +208,7 @@ jobs:
     inputs:
       SourceFolder: '$(Agent.TempDirectory)'
       Contents: '$(CredentialSecureFile.secureFilePath)'
-      TargetFolder: '$(Build.SourcesDirectory)\src\FluentHub.Uwp'
+      TargetFolder: '$(Build.SourcesDirectory)\src\FluentHub.App'
 
   - task: DownloadSecureFile@1
     name: caCertificate