Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
HavenDV committed Feb 23, 2024
2 parents 6e452f2 + 267da0c commit dca9634
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
9 changes: 5 additions & 4 deletions Maui.Biometric.sln
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@ MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{94FE90BF-FA05-46C6-A207-6E454A236659}"
ProjectSection(SolutionItems) = preProject
.gitignore = .gitignore
README.md = README.md
LICENSE = LICENSE
.github\dependabot.yml = .github\dependabot.yml
src\Directory.Build.props = src\Directory.Build.props
LICENSE = LICENSE
README.md = README.md
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libs", "libs", "{928D4422-05CE-4AC2-89B0-31060889AE6A}"
ProjectSection(SolutionItems) = preProject
src\libs\Directory.Build.props = src\libs\Directory.Build.props
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Maui.Biometric", "src\libs\Maui.Biometric\Maui.Biometric.csproj", "{8E7AE677-AD62-4FFE-ACBF-0F1A947ACDDB}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Maui.Biometric", "src\libs\Maui.Biometric\Maui.Biometric.csproj", "{8E7AE677-AD62-4FFE-ACBF-0F1A947ACDDB}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sample", "sample", "{4746EB5B-E37C-40F0-8CA6-7D03185F5370}"
EndProject
Expand All @@ -26,7 +26,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{
.github\workflows\pr.yml = .github\workflows\pr.yml
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Maui.Biometric.SampleApp", "sample\Maui.Biometric.SampleApp.csproj", "{49D331B7-7DCE-4470-8EFA-4D140AAF003F}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Maui.Biometric.SampleApp", "sample\Maui.Biometric.SampleApp.csproj", "{49D331B7-7DCE-4470-8EFA-4D140AAF003F}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand All @@ -40,6 +40,7 @@ Global
{8E7AE677-AD62-4FFE-ACBF-0F1A947ACDDB}.Release|Any CPU.Build.0 = Release|Any CPU
{49D331B7-7DCE-4470-8EFA-4D140AAF003F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{49D331B7-7DCE-4470-8EFA-4D140AAF003F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{49D331B7-7DCE-4470-8EFA-4D140AAF003F}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{49D331B7-7DCE-4470-8EFA-4D140AAF003F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{49D331B7-7DCE-4470-8EFA-4D140AAF003F}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
Expand Down
3 changes: 2 additions & 1 deletion sample/Platforms/Windows/App.xaml.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using Microsoft.UI.Xaml;
using Maui.Biometric.SampleApp;
using Microsoft.UI.Xaml;

// To learn more about WinUI, the WinUI project structure,
// and more about our project templates, see: http://aka.ms/winui-project-info.
Expand Down

0 comments on commit dca9634

Please sign in to comment.