Fix an issue where artifacts are not generated

.gitattributes

@@ -63,9 +63,7 @@
 #*.RTF   diff=astextplain
 
 ###############################################################################
-#
 # Remove from linguist lib detectable languages
-#
 ###############################################################################
 *.html linguist-detectable=false
 *.css linguist-detectable=false

.gitignore

@@ -40,6 +40,7 @@ bld/
 !src/FluentHub.App/Views/**
 !src/FluentHub.App/ViewModels/**
 !src/FluentHub.App/Assets/AppTiles/**
+!src/FluentHub.Package/Assets/AppTiles/**
 
 # Visual Studio 2015/2017 cache/options directory
 .vs/
@@ -192,7 +193,7 @@ publish/
 *.azurePubxml
 # Note: Comment the next line if you want to checkin your web deploy settings,
 # but database connection strings (with potential passwords) will be unencrypted
-*.pubxml
+#*.pubxml
 *.publishproj
 
 # Microsoft Azure Web App publish settings. Comment the next line if you want to

FluentHub.sln

@@ -13,6 +13,26 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentHub.App", "src\Fluent
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentHub.Core", "src\FluentHub.Core\FluentHub.Core.csproj", "{CCD6A838-6E6F-424F-BEE3-60C46F4B5308}"
 EndProject
+Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "FluentHub.Package", "src\FluentHub.Package\FluentHub.Package.wapproj", "{8F60FD8E-1921-47D6-97B0-D26D7B3A4999}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "git", "git", "{226C9D72-1B63-48CB-9E3A-6CE3CE4981A6}"
+	ProjectSection(SolutionItems) = preProject
+		.gitattributes = .gitattributes
+		.gitignore = .gitignore
+		CODEOWNERS = CODEOWNERS
+		CODE_OF_CONDUCT.md = CODE_OF_CONDUCT.md
+		crowdin.yml = crowdin.yml
+		LICENSE = LICENSE
+		Privacy.md = Privacy.md
+		README.md = README.md
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "builds", "builds", "{CE518E62-41E0-4F26-9251-518D4EC02A34}"
+	ProjectSection(SolutionItems) = preProject
+		builds\ci-pr.yml = builds\ci-pr.yml
+		builds\ci.yml = builds\ci.yml
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|arm64 = Debug|arm64
@@ -107,6 +127,33 @@ Global
 		{CCD6A838-6E6F-424F-BEE3-60C46F4B5308}.Sideload|x64.Build.0 = Sideload|x64
 		{CCD6A838-6E6F-424F-BEE3-60C46F4B5308}.Sideload|x86.ActiveCfg = Sideload|x86
 		{CCD6A838-6E6F-424F-BEE3-60C46F4B5308}.Sideload|x86.Build.0 = Sideload|x86
+		{8F60FD8E-1921-47D6-97B0-D26D7B3A4999}.Debug|arm64.ActiveCfg = Debug|ARM64
+		{8F60FD8E-1921-47D6-97B0-D26D7B3A4999}.Debug|arm64.Build.0 = Debug|ARM64
+		{8F60FD8E-1921-47D6-97B0-D26D7B3A4999}.Debug|arm64.Deploy.0 = Debug|ARM64
+		{8F60FD8E-1921-47D6-97B0-D26D7B3A4999}.Debug|x64.ActiveCfg = Debug|x64
+		{8F60FD8E-1921-47D6-97B0-D26D7B3A4999}.Debug|x64.Build.0 = Debug|x64
+		{8F60FD8E-1921-47D6-97B0-D26D7B3A4999}.Debug|x64.Deploy.0 = Debug|x64
+		{8F60FD8E-1921-47D6-97B0-D26D7B3A4999}.Debug|x86.ActiveCfg = Debug|x86
+		{8F60FD8E-1921-47D6-97B0-D26D7B3A4999}.Debug|x86.Build.0 = Debug|x86
+		{8F60FD8E-1921-47D6-97B0-D26D7B3A4999}.Debug|x86.Deploy.0 = Debug|x86
+		{8F60FD8E-1921-47D6-97B0-D26D7B3A4999}.Release|arm64.ActiveCfg = Release|ARM64
+		{8F60FD8E-1921-47D6-97B0-D26D7B3A4999}.Release|arm64.Build.0 = Release|ARM64
+		{8F60FD8E-1921-47D6-97B0-D26D7B3A4999}.Release|arm64.Deploy.0 = Release|ARM64
+		{8F60FD8E-1921-47D6-97B0-D26D7B3A4999}.Release|x64.ActiveCfg = Release|x64
+		{8F60FD8E-1921-47D6-97B0-D26D7B3A4999}.Release|x64.Build.0 = Release|x64
+		{8F60FD8E-1921-47D6-97B0-D26D7B3A4999}.Release|x64.Deploy.0 = Release|x64
+		{8F60FD8E-1921-47D6-97B0-D26D7B3A4999}.Release|x86.ActiveCfg = Release|x86
+		{8F60FD8E-1921-47D6-97B0-D26D7B3A4999}.Release|x86.Build.0 = Release|x86
+		{8F60FD8E-1921-47D6-97B0-D26D7B3A4999}.Release|x86.Deploy.0 = Release|x86
+		{8F60FD8E-1921-47D6-97B0-D26D7B3A4999}.Sideload|arm64.ActiveCfg = Sideload|ARM64
+		{8F60FD8E-1921-47D6-97B0-D26D7B3A4999}.Sideload|arm64.Build.0 = Sideload|ARM64
+		{8F60FD8E-1921-47D6-97B0-D26D7B3A4999}.Sideload|arm64.Deploy.0 = Sideload|ARM64
+		{8F60FD8E-1921-47D6-97B0-D26D7B3A4999}.Sideload|x64.ActiveCfg = Sideload|x64
+		{8F60FD8E-1921-47D6-97B0-D26D7B3A4999}.Sideload|x64.Build.0 = Sideload|x64
+		{8F60FD8E-1921-47D6-97B0-D26D7B3A4999}.Sideload|x64.Deploy.0 = Sideload|x64
+		{8F60FD8E-1921-47D6-97B0-D26D7B3A4999}.Sideload|x86.ActiveCfg = Sideload|x86
+		{8F60FD8E-1921-47D6-97B0-D26D7B3A4999}.Sideload|x86.Build.0 = Sideload|x86
+		{8F60FD8E-1921-47D6-97B0-D26D7B3A4999}.Sideload|x86.Deploy.0 = Sideload|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -116,6 +163,7 @@ Global
 		{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}
+		{8F60FD8E-1921-47D6-97B0-D26D7B3A4999} = {C6265587-7328-4B9E-AF1F-69F0E7301C5F}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {69E4A07A-D627-48B2-A72B-25F6082E0684}

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 FluentHub Community
+Copyright (c) 2022 FluentHub Team
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

builds/ci-pr.yml

@@ -33,8 +33,8 @@ jobs:
       targetType: 'inline'
       script: |
         [xml]$xmlDoc = Get-Content $(Build.SourcesDirectory)\src\FluentHub.Package\Package.appxmanifest
-        $xmlDoc.Package.Identity.Name="49462fluenthub-uwp.FluentHub"
-        $xmlDoc.Package.Identity.Publisher="CN=4E3C0825-4D00-4ECC-89F8-528E9200B125"
+        $xmlDoc.Package.Identity.Name="FluentHubDebug"
+        $xmlDoc.Package.Identity.Publisher="CN=FluentHub"
         $xmlDoc.Package.Properties.DisplayName="FluentHub"
         $xmlDoc.Package.Applications.Application.VisualElements.DisplayName="FluentHub"
         $xmlDoc.Save('$(Build.SourcesDirectory)\src\FluentHub.Package\Package.appxmanifest')
@@ -72,33 +72,46 @@ jobs:
   - task: UseDotNet@2
     inputs:
       packageType: sdk
-      version: 6.0.400
-
-  - task: NuGetToolInstaller@1
+      version: 7.0.x
+      includePreviewVersions: true
 
-  - task: NuGetCommand@2
+  - task: MSBuild@1
     inputs:
-      restoreSolution: '$(solution)'
+      platform: 'x64'
+      solution: '$(solution)'
+      configuration: '$(buildConfigurationDebug)'
+      msbuildArguments: '
+      /t:restore
+      /p:Configuration="$(buildConfigurationDebug)"
+      /p:Platform="$(buildPlatform)"
+      /p:PublishReadyToRun=true'
+      maximumCpuCount: true
 
-  - task: VSBuild@1
+  - task: MSBuild@1
     displayName: 'Build FluentHub'
     inputs:
       platform: 'x64'
       solution: '$(solution)'
-      configuration: '$(buildConfigurationSideload)'
+      configuration: '$(buildConfigurationDebug)'
       msbuildArgs: '
+      /t:build;_GenerateAppxPackage
+      /p:Configuration=Debug
+      /p:Platform="$(buildPlatform)"
+      /p:AppxBundle=Always
       /p:AppxBundlePlatforms="$(buildPlatform)"
-      /p:AppxBundle=Never
       /p:AppxPackageDir="$(appxPackageDir)"
-      /p:GenerateAppxPackageOnBuild=True
+      /p:AppxPackageSigningEnabled=true
+      /p:UapAppxPackageBuildMode=SideloadOnly
       /p:PackageCertificateKeyFile="$(caCertificate.secureFilePath)"
-      /p:UapAppxPackageBuildMode=Sideloadonly'
+      /p:PackageCertificatePassword="$(signingCert.password)"
+      /p:PackageCertificateThumbprint=""'
+      maximumCpuCount: true
 
   - task: CopyFiles@2
     displayName: 'Copy generated artifacts'
     inputs:
       SourceFolder: '$(system.defaultworkingdirectory)'
-      Contents: '**\bin\$(buildConfigurationSideload)\**'
+      Contents: '**\bin\$(buildConfigurationDebug)\**'
       TargetFolder: '$(build.artifactstagingdirectory)'
 
   - task: PublishBuildArtifacts@1
@@ -120,7 +133,7 @@ jobs:
       script: |
         [xml]$xmlDoc = Get-Content $(Build.SourcesDirectory)\src\FluentHub.Package\Package.appxmanifest
         $xmlDoc.Package.Identity.Name="FluentHubSideload"
-        $xmlDoc.Package.Identity.Publisher="FluentHub"
+        $xmlDoc.Package.Identity.Publisher="CN=FluentHub"
         $xmlDoc.Package.Properties.DisplayName="FluentHub"
         $xmlDoc.Package.Applications.Application.VisualElements.DisplayName="FluentHub"
         $xmlDoc.Save('$(Build.SourcesDirectory)\src\FluentHub.Package\Package.appxmanifest')
@@ -158,19 +171,19 @@ jobs:
   - task: UseDotNet@2
     inputs:
       packageType: sdk
-      version: 6.0.x
+      version: 7.0.x
       includePreviewVersions: true
 
   - task: MSBuild@1
     inputs:
       platform: 'x64'
       solution: '$(solution)'
-      configuration: '$(sideloadBuildConfiguration)'
+      configuration: '$(buildConfigurationSideload)'
       msbuildArguments: '
       /t:restore
-      /p:Configuration="$(sideloadBuildConfiguration)";
-      Platform="$(buildPlatform)";
-      PublishReadyToRun=true'
+      /p:Configuration="$(buildConfigurationSideload)"
+      /p:Platform="$(buildPlatform)"
+      /p:PublishReadyToRun=true'
       maximumCpuCount: true
 
   - task: MSBuild@1
@@ -257,19 +270,19 @@ jobs:
   - task: UseDotNet@2
     inputs:
       packageType: sdk
-      version: 6.0.x
+      version: 7.0.x
       includePreviewVersions: true
 
   - task: MSBuild@1
     inputs:
       platform: 'x64'
       solution: '$(solution)'
-      configuration: '$(buildConfiguration)'
+      configuration: '$(buildConfigurationRelease)'
       msbuildArguments: '
       /t:restore
-      /p:Configuration="$(buildConfiguration)";
-      Platform="$(buildPlatform)";
-      PublishReadyToRun=true'
+      /p:Configuration="$(buildConfigurationRelease)"
+      /p:Platform="$(buildPlatform)"
+      /p:PublishReadyToRun=true'
       maximumCpuCount: true
 
   - task: MSBuild@1
@@ -279,10 +292,12 @@ jobs:
       platform: 'x64'
       solution: '**/*.wapproj'
       msbuildArguments: '
+      /t:build;_GenerateAppxPackage
       /p:AppxBundlePlatforms="$(buildPlatform)"
       /p:AppxBundle=Always
       /p:AppxPackageDir="$(appxPackageDir)"
       /p:UapAppxPackageBuildMode=StoreUpload'
+      maximumCpuCount: true
 
   - task: CopyFiles@2
     displayName: 'Copy generated artifacts'