diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..2a4562b --- /dev/null +++ b/.gitmodules @@ -0,0 +1,15 @@ +[submodule "external/Shell"] + path = external/Shell + url = https://github.com/AvaloniaInside/Shell.git +[submodule "external/capnproto-dotnetcore_Runtime"] + path = external/capnproto-dotnetcore_Runtime + url = https://github.com/FabInfra/capnproto-dotnetcore_Runtime.git +[submodule "external/S22.Sasl"] + path = external/S22.Sasl + url = https://github.com/kjkriegel/S22.Sasl.git +[submodule "external/nfc"] + path = external/nfc + url = https://gitlab.com/fabinfra/fabaccess/nfc.git +[submodule "api/schema"] + path = api/schema + url = https://gitlab.com/fabinfra/fabaccess/fabaccess-api.git diff --git a/Borepin.sln b/Borepin.sln index b23a5ac..b358d90 100644 --- a/Borepin.sln +++ b/Borepin.sln @@ -20,6 +20,16 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution README.md = README.md EndProjectSection EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Capnp.Net.Runtime", "external\capnproto-dotnetcore_Runtime\Capnp.Net.Runtime\Capnp.Net.Runtime.csproj", "{2805B6A8-35FC-4C2E-900A-111223E82985}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "S22.Sasl", "external\S22.Sasl\S22.Sasl.csproj", "{FC22A6DA-322D-4BF2-9288-AAA496B75F36}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AvaloniaInside.Shell", "external\Shell\src\AvaloniaInside.Shell\AvaloniaInside.Shell.csproj", "{0D3D5AE2-9524-4387-9565-EA363E8BF608}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NFC", "external\nfc\NFC\NFC.csproj", "{2B29261E-E23F-46A6-AFBC-1738E7F81471}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FabAccessAPI", "api\FabAccessAPI.csproj", "{26B621D8-E409-4ADE-B53C-8888ADA6817C}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -50,6 +60,26 @@ Global {1E07BDF6-DDC7-462E-BD29-77E150717455}.Debug|Any CPU.Build.0 = Debug|Any CPU {1E07BDF6-DDC7-462E-BD29-77E150717455}.Release|Any CPU.ActiveCfg = Release|Any CPU {1E07BDF6-DDC7-462E-BD29-77E150717455}.Release|Any CPU.Build.0 = Release|Any CPU + {2805B6A8-35FC-4C2E-900A-111223E82985}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2805B6A8-35FC-4C2E-900A-111223E82985}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2805B6A8-35FC-4C2E-900A-111223E82985}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2805B6A8-35FC-4C2E-900A-111223E82985}.Release|Any CPU.Build.0 = Release|Any CPU + {FC22A6DA-322D-4BF2-9288-AAA496B75F36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FC22A6DA-322D-4BF2-9288-AAA496B75F36}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FC22A6DA-322D-4BF2-9288-AAA496B75F36}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FC22A6DA-322D-4BF2-9288-AAA496B75F36}.Release|Any CPU.Build.0 = Release|Any CPU + {0D3D5AE2-9524-4387-9565-EA363E8BF608}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0D3D5AE2-9524-4387-9565-EA363E8BF608}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0D3D5AE2-9524-4387-9565-EA363E8BF608}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0D3D5AE2-9524-4387-9565-EA363E8BF608}.Release|Any CPU.Build.0 = Release|Any CPU + {2B29261E-E23F-46A6-AFBC-1738E7F81471}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2B29261E-E23F-46A6-AFBC-1738E7F81471}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2B29261E-E23F-46A6-AFBC-1738E7F81471}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2B29261E-E23F-46A6-AFBC-1738E7F81471}.Release|Any CPU.Build.0 = Release|Any CPU + {26B621D8-E409-4ADE-B53C-8888ADA6817C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {26B621D8-E409-4ADE-B53C-8888ADA6817C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {26B621D8-E409-4ADE-B53C-8888ADA6817C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {26B621D8-E409-4ADE-B53C-8888ADA6817C}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Borepin/Borepin.Android/Borepin.Android.csproj b/Borepin/Borepin.Android/Borepin.Android.csproj index 3b27168..19ec368 100644 --- a/Borepin/Borepin.Android/Borepin.Android.csproj +++ b/Borepin/Borepin.Android/Borepin.Android.csproj @@ -1,7 +1,7 @@  Exe - net7.0-android + net8.0-android34.0 21 enable com.CompanyName.AvaloniaTest diff --git a/Borepin/Borepin.Browser/Borepin.Browser.csproj b/Borepin/Borepin.Browser/Borepin.Browser.csproj index 778eec8..58103c7 100644 --- a/Borepin/Borepin.Browser/Borepin.Browser.csproj +++ b/Borepin/Borepin.Browser/Borepin.Browser.csproj @@ -1,6 +1,6 @@  - net7.0 + net8.0 browser-wasm AppBundle\main.js Exe diff --git a/Borepin/Borepin.Desktop/Borepin.Desktop.csproj b/Borepin/Borepin.Desktop/Borepin.Desktop.csproj index 8967d0c..62303f2 100644 --- a/Borepin/Borepin.Desktop/Borepin.Desktop.csproj +++ b/Borepin/Borepin.Desktop/Borepin.Desktop.csproj @@ -3,7 +3,7 @@ WinExe - net7.0 + net8.0 enable true app.manifest diff --git a/Borepin/Borepin.iOS/Borepin.iOS.csproj b/Borepin/Borepin.iOS/Borepin.iOS.csproj index 491a259..5564988 100644 --- a/Borepin/Borepin.iOS/Borepin.iOS.csproj +++ b/Borepin/Borepin.iOS/Borepin.iOS.csproj @@ -1,7 +1,7 @@  Exe - net7.0-ios + net8.0-ios16.1 10.0 manual enable diff --git a/Borepin/Borepin/Borepin.csproj b/Borepin/Borepin/Borepin.csproj index 6ab1669..2d67105 100644 --- a/Borepin/Borepin/Borepin.csproj +++ b/Borepin/Borepin/Borepin.csproj @@ -1,6 +1,6 @@  - net7.0 + net8.0 enable latest @@ -12,7 +12,6 @@ - @@ -28,4 +27,12 @@ + + + + + + + + diff --git a/Borepin/Borepin/MainView.axaml b/Borepin/Borepin/MainView.axaml index 763156b..8551d8a 100644 --- a/Borepin/Borepin/MainView.axaml +++ b/Borepin/Borepin/MainView.axaml @@ -59,6 +59,14 @@ + + + + + + + + - + @@ -37,6 +37,7 @@ diff --git a/Borepin/Borepin/Styles.axaml b/Borepin/Borepin/Styles.axaml index d968d24..2dc0839 100644 --- a/Borepin/Borepin/Styles.axaml +++ b/Borepin/Borepin/Styles.axaml @@ -93,7 +93,7 @@ - +