fixes the default setup for PostIt.Android

.gitignore

@@ -45,7 +45,6 @@ DataDir/
 
 # gitleaks scan output (local secret-scan report, not for the repo)
 /gitleaks-report.json
-/test-report.html
-/test-report.xml
-
 
+# Exclude test reports (local test report, not for the repo)
+/test-reports

.vscode/launch.json

@@ -22,11 +22,9 @@
     },
     {
       "name": "Android Debug",
-      "type": "mono",
-      "preLaunchTask": "run-debug-android",
-      "request": "attach",
-      "address": "localhost",
-      "port": 55555
+      "type": "maui",
+      "request": "launch",
+      "project": "${workspaceFolder}/src/PostIt/PostIt.Android/PostIt.Android.csproj"
     },
     {
       "name": "Android Attach - Debug",

.vscode/settings.json

@@ -45,5 +45,6 @@
             ]
         }
     },
-    "dotnet.defaultSolution": "yavsc.sln"
+    "dotnet.defaultSolution": "yavsc.sln",
+    "axaml.selectedSolution": "/home/paul/Workspace/yavsc/yavsc.sln"
 }

.vscode/tasks.json

@@ -4,9 +4,13 @@
 
   "tasks": [
     {
-      "label": "run-debug-android",
+      "label": "build-debug-android",
       "command": "dotnet",
+      "detail": "Build the PostIt Android project in debug mode",
       "type": "shell",
+      "runOptions": {
+
+      },
       "problemMatcher": ["$msCompile"],
       "options": {
         "cwd": "${workspaceFolder}/src/PostIt/PostIt.Android",

CHANGELOG.md

@@ -94,6 +94,7 @@ et négociation HTTP/3 côté client PostIt.
   perçu « le fichier n'existe pas sur le serveur » tandis que la
   suppression avait réussi. La taille est désormais capturée avant la
   suppression.
+* PostIt default settings
 
 ## [1.0.8-rc17] - unstable
 

Makefile

@@ -21,7 +21,30 @@ src/Yavsc/bin/output/wwwroot:
 	dotnet --project src/Yavsc.Org/Yavsc.Org.csproj publish
 
 test:
-	ASPNETCORE_ENVIRONMENT=Development dotnet test
+	ASPNETCORE_ENVIRONMENT=Development dotnet test --report-xunit \
+    --report-xunit-html \
+		--results-directory "test-reports" \
+    --report-xunit-html-filename "test-results.html"
+
+test-postit:
+	ASPNETCORE_ENVIRONMENT=Development dotnet test \
+	  --report-xunit \
+    --report-xunit-html \
+		--results-directory "test-reports" \
+    --report-xunit-html-filename "postit-test-results.html" \
+	  --project src/PostIt/PostIt.Tests/PostIt.Tests.csproj
+
+backend-tests: Blogs-backend-test Org-backend-test Api-backend-test
+Api-backend-test:
+Blogs-backend-test:
+Org-backend-test:
+%-backend-test:
+	ASPNETCORE_ENVIRONMENT=Development dotnet test \
+	  --report-xunit \
+    --report-xunit-html \
+		--results-directory "test-reports" \
+    --report-xunit-html-filename "$*-backend-test-results.html" \
+	  --project src/test/Yavsc.$*.Tests/Yavsc.$*.Tests.csproj
 
 watch:
 	dotnet watch -p:Configuration=$(CONFIG) --project src/Yavsc/Yavsc.csproj

src/PostIt/PostIt.Android/PostIt.Android.csproj

@@ -27,4 +27,14 @@
   <ItemGroup>
     <ProjectReference Include="..\PostIt\PostIt.csproj" />
   </ItemGroup>
+  <!-- This is an Avalonia app, not a MAUI app: exclude the .NET MAUI VS Code
+       extension's injected HotReload agent (references Microsoft.Maui.*).
+       The agent file is added via CustomAfterMicrosoftCommonTargets, i.e. after
+       this file's item groups, so the removal must run in a target. -->
+  <Target Name="ExcludeMauiDeployHotReloadAgent" BeforeTargets="CoreCompile"
+          Condition="'$(MauiDeployHotReloadAgentSource)' != ''">
+    <ItemGroup>
+      <Compile Remove="$(MauiDeployHotReloadAgentSource)" />
+    </ItemGroup>
+  </Target>
 </Project>

src/PostIt/PostIt/Views/Layout/SessionStatusBanner.axaml

@@ -3,7 +3,12 @@
              xmlns:vm="using:PostIt.ViewModels"
              x:Class="PostIt.Views.SessionStatusBanner"
              x:DataType="vm:SessionStatusViewModel">
-  <Border DockPanel.Dock="Top"
+
+             <Design.DataContext>
+                  <vm:SessionStatusViewModel />
+              </Design.DataContext>
+
+             <Border DockPanel.Dock="Top"
           BorderBrush="#B0BEC5"
           BorderThickness="0,0,0,1"
           Padding="12,6">

src/PostIt/PostIt/postit-settings.json

@@ -1,6 +1,6 @@
 {
   "Authentication": {
-    "Authority": "https://localhost:5001",
+    "Authority": "https://yavsc.pschneider.fr",
     "ClientId": "postit",
     "Scopes": [
       "blogs",
@@ -9,13 +9,8 @@
     "RedirectUri": "postit://callback"
   },
   "DarkMode": true,
-  "BlogsApiUrl": "https://localhost:5003/api/v1/",
-  "ApiUrl": "https://localhost:5005/api/v1/",
+  "BlogsApiUrl": "https://blogs.pschneider.fr/api/v1/",
+  "ApiUrl": "https://api.pschneider.fr/api/v1/",
   "SearchText": "",
-  "ProviderOngoingRequestsSortOption": "",
-  "Loaded": true,
-  "IsDirty": true,
-  "CanNavigateNext": false,
-  "CanNavigatePrevious": true,
-  "SaveCommand": {}
+  "ProviderOngoingRequestsSortOption": ""
 }

src/Yavsc.Blogs/appsettings-blogs.json

@@ -26,10 +26,10 @@
   "Kestrel": {
     "Endpoints": {
       "Http": {
-        "Url": "http://localhost:5002"
+        "Url": "http://blogs.pschneider.fr"
       },
       "Https": {
-        "Url": "https://localhost:5003"
+        "Url": "https://blogs.pschneider.fr"
       }
     }
   }

src/test/Yavsc.Api.Tests/Yavsc.Api.Tests.csproj

@@ -4,7 +4,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>
-    <RootNamespace>Yavsc.Api.Test</RootNamespace>
+    <RootNamespace>Yavsc.Api.Tests</RootNamespace>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <AssemblyVersion>1.1.0.0</AssemblyVersion>
     <FileVersion>1.1.0.0</FileVersion>
@@ -21,10 +21,10 @@
     <PackageReference Include="xunit.v3.extensibility.core" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Yavsc.Abstract\Yavsc.Abstract.csproj" />
-    <ProjectReference Include="..\Yavsc.Server\Yavsc.Server.csproj" />
-    <ProjectReference Include="..\Yavsc.Api\Yavsc.Api.csproj" />
-    <ProjectReference Include="..\Yavsc.Org\Yavsc.Org.csproj" />
+    <ProjectReference Include="..\..\Yavsc.Abstract\Yavsc.Abstract.csproj" />
+    <ProjectReference Include="..\..\Yavsc.Server\Yavsc.Server.csproj" />
+    <ProjectReference Include="..\..\Yavsc.Api\Yavsc.Api.csproj" />
+    <ProjectReference Include="..\..\Yavsc.Org\Yavsc.Org.csproj" />
     <ProjectReference Include="..\Yavsc.Tests.Shared\Yavsc.Tests.Shared.csproj" />
   </ItemGroup>
   <ItemGroup>

src/test/Yavsc.Blogs.Tests/Yavsc.Blogs.Tests.csproj

@@ -23,10 +23,10 @@
     <PackageReference Include="xunit.v3.extensibility.core" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Yavsc.Abstract\Yavsc.Abstract.csproj" />
-    <ProjectReference Include="..\Yavsc.Api.Client\Yavsc.Api.Client.csproj" />
-    <ProjectReference Include="..\Yavsc.Server\Yavsc.Server.csproj" />
-    <ProjectReference Include="..\Yavsc.Blogs\Yavsc.Blogs.csproj" />
+    <ProjectReference Include="..\..\Yavsc.Abstract\Yavsc.Abstract.csproj" />
+    <ProjectReference Include="..\..\Yavsc.Api.Client\Yavsc.Api.Client.csproj" />
+    <ProjectReference Include="..\..\Yavsc.Server\Yavsc.Server.csproj" />
+    <ProjectReference Include="..\..\Yavsc.Blogs\Yavsc.Blogs.csproj" />
     <ProjectReference Include="..\Yavsc.Tests.Shared\Yavsc.Tests.Shared.csproj" />
   </ItemGroup>
   <ItemGroup>

src/test/Yavsc.Org.Tests/Yavsc.Org.Tests.csproj

@@ -42,9 +42,9 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Yavsc.Org\Yavsc.Org.csproj" />
-    <ProjectReference Include="..\Yavsc.Abstract\Yavsc.Abstract.csproj" />
-    <ProjectReference Include="..\Yavsc.Server\Yavsc.Server.csproj" />
+    <ProjectReference Include="..\..\Yavsc.Org\Yavsc.Org.csproj" />
+    <ProjectReference Include="..\..\Yavsc.Abstract\Yavsc.Abstract.csproj" />
+    <ProjectReference Include="..\..\Yavsc.Server\Yavsc.Server.csproj" />
     <ProjectReference Include="..\Yavsc.Tests.Shared\Yavsc.Tests.Shared.csproj" />
   </ItemGroup>
   <ItemGroup>

src/test/Yavsc.Server.Tests/Yavsc.Server.Tests.csproj

@@ -21,9 +21,9 @@
     <PackageReference Include="xunit.v3.extensibility.core" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Yavsc.Abstract\Yavsc.Abstract.csproj" />
-    <ProjectReference Include="..\Yavsc.Server\Yavsc.Server.csproj" />
-    <ProjectReference Include="..\Yavsc.Org\Yavsc.Org.csproj" />
+    <ProjectReference Include="..\..\Yavsc.Abstract\Yavsc.Abstract.csproj" />
+    <ProjectReference Include="..\..\Yavsc.Server\Yavsc.Server.csproj" />
+    <ProjectReference Include="..\..\Yavsc.Org\Yavsc.Org.csproj" />
     <ProjectReference Include="..\Yavsc.Tests.Shared\Yavsc.Tests.Shared.csproj" />
   </ItemGroup>
   <ItemGroup>

src/test/Yavsc.Tests.Shared/Yavsc.Tests.Shared.csproj

@@ -24,6 +24,6 @@
     <PackageReference Include="System.IdentityModel.Tokens.Jwt" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="../Yavsc.Abstract/Yavsc.Abstract.csproj" />
+    <ProjectReference Include="../../Yavsc.Abstract/Yavsc.Abstract.csproj" />
   </ItemGroup>
 </Project>

yavsc.sln

@@ -15,10 +15,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Yavsc.Api", "src\Yavsc.Api\
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "cli", "src\cli\cli.csproj", "{27DA6CEC-4266-4F78-BB32-8388F9A401D0}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{76A7FBA6-B7EC-4864-85C0-1F470794BA0F}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Yavsc.Org.Tests", "src\Yavsc.Org.Tests\Yavsc.Org.Tests.csproj", "{CDCF676A-2037-472E-8C8B-67C5E4FDFEA1}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Yavsc.Blogs", "src\Yavsc.Blogs\Yavsc.Blogs.csproj", "{5D9E161F-3CB3-4854-9D07-3DF6882EA66C}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PostIt", "PostIt", "{E13D107F-4053-D0DE-6394-453609595BFE}"
@@ -31,17 +27,21 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PostIt.Browser", "src\PostI
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PostIt.Desktop", "src\PostIt\PostIt.Desktop\PostIt.Desktop.csproj", "{EFE24256-9335-44C5-8B77-E180C2DB3C0B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Yavsc.Blogs.Tests", "src\Yavsc.Blogs.Tests\Yavsc.Blogs.Tests.csproj", "{0E471075-DABF-40E9-98B7-1630BEF19145}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Yavsc.Tests.Shared", "src\Yavsc.Tests.Shared\Yavsc.Tests.Shared.csproj", "{34D1F73D-BF74-47CC-9358-9F4F221C75D7}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Yavsc.Api.Client", "src\Yavsc.Api.Client\Yavsc.Api.Client.csproj", "{59AF5DEA-D349-495A-BC44-FC7BD4E55099}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PostIt.Tests", "src\PostIt\PostIt.Tests\PostIt.Tests.csproj", "{021E6F5A-B81D-42A7-9918-DFE39B424FC2}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Yavsc.Api.Test", "src\Yavsc.Api.Test\Yavsc.Api.Test.csproj", "{49A42F0E-6E18-4617-9716-3E728966D96F}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{6EA238F3-C35C-B265-FF02-A4695B9C69A9}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Yavsc.Server.Tests", "src\Yavsc.Server.Tests\Yavsc.Server.Tests.csproj", "{899B7240-729A-48BC-A993-300A6CCFCBEA}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Yavsc.Api.Tests", "src\test\Yavsc.Api.Tests\Yavsc.Api.Tests.csproj", "{70141DC1-39E5-4350-B995-9625347D29AA}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Yavsc.Tests.Shared", "src\test\Yavsc.Tests.Shared\Yavsc.Tests.Shared.csproj", "{1A563263-B5E7-4B44-9AE9-AD357C2FA1A4}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Yavsc.Server.Tests", "src\test\Yavsc.Server.Tests\Yavsc.Server.Tests.csproj", "{8788BE1C-A4D5-4641-A426-31F4D8D1BBFF}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Yavsc.Org.Tests", "src\test\Yavsc.Org.Tests\Yavsc.Org.Tests.csproj", "{7CC76BA8-D4C3-46DA-96A2-F028B6B0058B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Yavsc.Blogs.Tests", "src\test\Yavsc.Blogs.Tests\Yavsc.Blogs.Tests.csproj", "{22ECDDEE-EFD7-4501-9905-BF4E27C605C3}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -113,18 +113,6 @@ Global
 		{27DA6CEC-4266-4F78-BB32-8388F9A401D0}.Release|x64.Build.0 = Release|Any CPU
 		{27DA6CEC-4266-4F78-BB32-8388F9A401D0}.Release|x86.ActiveCfg = Release|Any CPU
 		{27DA6CEC-4266-4F78-BB32-8388F9A401D0}.Release|x86.Build.0 = Release|Any CPU
-		{CDCF676A-2037-472E-8C8B-67C5E4FDFEA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CDCF676A-2037-472E-8C8B-67C5E4FDFEA1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CDCF676A-2037-472E-8C8B-67C5E4FDFEA1}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{CDCF676A-2037-472E-8C8B-67C5E4FDFEA1}.Debug|x64.Build.0 = Debug|Any CPU
-		{CDCF676A-2037-472E-8C8B-67C5E4FDFEA1}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{CDCF676A-2037-472E-8C8B-67C5E4FDFEA1}.Debug|x86.Build.0 = Debug|Any CPU
-		{CDCF676A-2037-472E-8C8B-67C5E4FDFEA1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CDCF676A-2037-472E-8C8B-67C5E4FDFEA1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CDCF676A-2037-472E-8C8B-67C5E4FDFEA1}.Release|x64.ActiveCfg = Release|Any CPU
-		{CDCF676A-2037-472E-8C8B-67C5E4FDFEA1}.Release|x64.Build.0 = Release|Any CPU
-		{CDCF676A-2037-472E-8C8B-67C5E4FDFEA1}.Release|x86.ActiveCfg = Release|Any CPU
-		{CDCF676A-2037-472E-8C8B-67C5E4FDFEA1}.Release|x86.Build.0 = Release|Any CPU
 		{5D9E161F-3CB3-4854-9D07-3DF6882EA66C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5D9E161F-3CB3-4854-9D07-3DF6882EA66C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5D9E161F-3CB3-4854-9D07-3DF6882EA66C}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -185,30 +173,6 @@ Global
 		{EFE24256-9335-44C5-8B77-E180C2DB3C0B}.Release|x64.Build.0 = Release|Any CPU
 		{EFE24256-9335-44C5-8B77-E180C2DB3C0B}.Release|x86.ActiveCfg = Release|Any CPU
 		{EFE24256-9335-44C5-8B77-E180C2DB3C0B}.Release|x86.Build.0 = Release|Any CPU
-		{0E471075-DABF-40E9-98B7-1630BEF19145}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0E471075-DABF-40E9-98B7-1630BEF19145}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0E471075-DABF-40E9-98B7-1630BEF19145}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0E471075-DABF-40E9-98B7-1630BEF19145}.Debug|x64.Build.0 = Debug|Any CPU
-		{0E471075-DABF-40E9-98B7-1630BEF19145}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{0E471075-DABF-40E9-98B7-1630BEF19145}.Debug|x86.Build.0 = Debug|Any CPU
-		{0E471075-DABF-40E9-98B7-1630BEF19145}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0E471075-DABF-40E9-98B7-1630BEF19145}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0E471075-DABF-40E9-98B7-1630BEF19145}.Release|x64.ActiveCfg = Release|Any CPU
-		{0E471075-DABF-40E9-98B7-1630BEF19145}.Release|x64.Build.0 = Release|Any CPU
-		{0E471075-DABF-40E9-98B7-1630BEF19145}.Release|x86.ActiveCfg = Release|Any CPU
-		{0E471075-DABF-40E9-98B7-1630BEF19145}.Release|x86.Build.0 = Release|Any CPU
-		{34D1F73D-BF74-47CC-9358-9F4F221C75D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{34D1F73D-BF74-47CC-9358-9F4F221C75D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{34D1F73D-BF74-47CC-9358-9F4F221C75D7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{34D1F73D-BF74-47CC-9358-9F4F221C75D7}.Debug|x64.Build.0 = Debug|Any CPU
-		{34D1F73D-BF74-47CC-9358-9F4F221C75D7}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{34D1F73D-BF74-47CC-9358-9F4F221C75D7}.Debug|x86.Build.0 = Debug|Any CPU
-		{34D1F73D-BF74-47CC-9358-9F4F221C75D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{34D1F73D-BF74-47CC-9358-9F4F221C75D7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{34D1F73D-BF74-47CC-9358-9F4F221C75D7}.Release|x64.ActiveCfg = Release|Any CPU
-		{34D1F73D-BF74-47CC-9358-9F4F221C75D7}.Release|x64.Build.0 = Release|Any CPU
-		{34D1F73D-BF74-47CC-9358-9F4F221C75D7}.Release|x86.ActiveCfg = Release|Any CPU
-		{34D1F73D-BF74-47CC-9358-9F4F221C75D7}.Release|x86.Build.0 = Release|Any CPU
 		{59AF5DEA-D349-495A-BC44-FC7BD4E55099}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{59AF5DEA-D349-495A-BC44-FC7BD4E55099}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{59AF5DEA-D349-495A-BC44-FC7BD4E55099}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -233,30 +197,66 @@ Global
 		{021E6F5A-B81D-42A7-9918-DFE39B424FC2}.Release|x64.Build.0 = Release|Any CPU
 		{021E6F5A-B81D-42A7-9918-DFE39B424FC2}.Release|x86.ActiveCfg = Release|Any CPU
 		{021E6F5A-B81D-42A7-9918-DFE39B424FC2}.Release|x86.Build.0 = Release|Any CPU
-		{49A42F0E-6E18-4617-9716-3E728966D96F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{49A42F0E-6E18-4617-9716-3E728966D96F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{49A42F0E-6E18-4617-9716-3E728966D96F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{49A42F0E-6E18-4617-9716-3E728966D96F}.Debug|x64.Build.0 = Debug|Any CPU
-		{49A42F0E-6E18-4617-9716-3E728966D96F}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{49A42F0E-6E18-4617-9716-3E728966D96F}.Debug|x86.Build.0 = Debug|Any CPU
-		{49A42F0E-6E18-4617-9716-3E728966D96F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{49A42F0E-6E18-4617-9716-3E728966D96F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{49A42F0E-6E18-4617-9716-3E728966D96F}.Release|x64.ActiveCfg = Release|Any CPU
-		{49A42F0E-6E18-4617-9716-3E728966D96F}.Release|x64.Build.0 = Release|Any CPU
-		{49A42F0E-6E18-4617-9716-3E728966D96F}.Release|x86.ActiveCfg = Release|Any CPU
-		{49A42F0E-6E18-4617-9716-3E728966D96F}.Release|x86.Build.0 = Release|Any CPU
-		{899B7240-729A-48BC-A993-300A6CCFCBEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{899B7240-729A-48BC-A993-300A6CCFCBEA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{899B7240-729A-48BC-A993-300A6CCFCBEA}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{899B7240-729A-48BC-A993-300A6CCFCBEA}.Debug|x64.Build.0 = Debug|Any CPU
-		{899B7240-729A-48BC-A993-300A6CCFCBEA}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{899B7240-729A-48BC-A993-300A6CCFCBEA}.Debug|x86.Build.0 = Debug|Any CPU
-		{899B7240-729A-48BC-A993-300A6CCFCBEA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{899B7240-729A-48BC-A993-300A6CCFCBEA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{899B7240-729A-48BC-A993-300A6CCFCBEA}.Release|x64.ActiveCfg = Release|Any CPU
-		{899B7240-729A-48BC-A993-300A6CCFCBEA}.Release|x64.Build.0 = Release|Any CPU
-		{899B7240-729A-48BC-A993-300A6CCFCBEA}.Release|x86.ActiveCfg = Release|Any CPU
-		{899B7240-729A-48BC-A993-300A6CCFCBEA}.Release|x86.Build.0 = Release|Any CPU
+		{70141DC1-39E5-4350-B995-9625347D29AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{70141DC1-39E5-4350-B995-9625347D29AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{70141DC1-39E5-4350-B995-9625347D29AA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{70141DC1-39E5-4350-B995-9625347D29AA}.Debug|x64.Build.0 = Debug|Any CPU
+		{70141DC1-39E5-4350-B995-9625347D29AA}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{70141DC1-39E5-4350-B995-9625347D29AA}.Debug|x86.Build.0 = Debug|Any CPU
+		{70141DC1-39E5-4350-B995-9625347D29AA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{70141DC1-39E5-4350-B995-9625347D29AA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{70141DC1-39E5-4350-B995-9625347D29AA}.Release|x64.ActiveCfg = Release|Any CPU
+		{70141DC1-39E5-4350-B995-9625347D29AA}.Release|x64.Build.0 = Release|Any CPU
+		{70141DC1-39E5-4350-B995-9625347D29AA}.Release|x86.ActiveCfg = Release|Any CPU
+		{70141DC1-39E5-4350-B995-9625347D29AA}.Release|x86.Build.0 = Release|Any CPU
+		{1A563263-B5E7-4B44-9AE9-AD357C2FA1A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1A563263-B5E7-4B44-9AE9-AD357C2FA1A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1A563263-B5E7-4B44-9AE9-AD357C2FA1A4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1A563263-B5E7-4B44-9AE9-AD357C2FA1A4}.Debug|x64.Build.0 = Debug|Any CPU
+		{1A563263-B5E7-4B44-9AE9-AD357C2FA1A4}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1A563263-B5E7-4B44-9AE9-AD357C2FA1A4}.Debug|x86.Build.0 = Debug|Any CPU
+		{1A563263-B5E7-4B44-9AE9-AD357C2FA1A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1A563263-B5E7-4B44-9AE9-AD357C2FA1A4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1A563263-B5E7-4B44-9AE9-AD357C2FA1A4}.Release|x64.ActiveCfg = Release|Any CPU
+		{1A563263-B5E7-4B44-9AE9-AD357C2FA1A4}.Release|x64.Build.0 = Release|Any CPU
+		{1A563263-B5E7-4B44-9AE9-AD357C2FA1A4}.Release|x86.ActiveCfg = Release|Any CPU
+		{1A563263-B5E7-4B44-9AE9-AD357C2FA1A4}.Release|x86.Build.0 = Release|Any CPU
+		{8788BE1C-A4D5-4641-A426-31F4D8D1BBFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8788BE1C-A4D5-4641-A426-31F4D8D1BBFF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8788BE1C-A4D5-4641-A426-31F4D8D1BBFF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8788BE1C-A4D5-4641-A426-31F4D8D1BBFF}.Debug|x64.Build.0 = Debug|Any CPU
+		{8788BE1C-A4D5-4641-A426-31F4D8D1BBFF}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8788BE1C-A4D5-4641-A426-31F4D8D1BBFF}.Debug|x86.Build.0 = Debug|Any CPU
+		{8788BE1C-A4D5-4641-A426-31F4D8D1BBFF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8788BE1C-A4D5-4641-A426-31F4D8D1BBFF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8788BE1C-A4D5-4641-A426-31F4D8D1BBFF}.Release|x64.ActiveCfg = Release|Any CPU
+		{8788BE1C-A4D5-4641-A426-31F4D8D1BBFF}.Release|x64.Build.0 = Release|Any CPU
+		{8788BE1C-A4D5-4641-A426-31F4D8D1BBFF}.Release|x86.ActiveCfg = Release|Any CPU
+		{8788BE1C-A4D5-4641-A426-31F4D8D1BBFF}.Release|x86.Build.0 = Release|Any CPU
+		{7CC76BA8-D4C3-46DA-96A2-F028B6B0058B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7CC76BA8-D4C3-46DA-96A2-F028B6B0058B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7CC76BA8-D4C3-46DA-96A2-F028B6B0058B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7CC76BA8-D4C3-46DA-96A2-F028B6B0058B}.Debug|x64.Build.0 = Debug|Any CPU
+		{7CC76BA8-D4C3-46DA-96A2-F028B6B0058B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7CC76BA8-D4C3-46DA-96A2-F028B6B0058B}.Debug|x86.Build.0 = Debug|Any CPU
+		{7CC76BA8-D4C3-46DA-96A2-F028B6B0058B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7CC76BA8-D4C3-46DA-96A2-F028B6B0058B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7CC76BA8-D4C3-46DA-96A2-F028B6B0058B}.Release|x64.ActiveCfg = Release|Any CPU
+		{7CC76BA8-D4C3-46DA-96A2-F028B6B0058B}.Release|x64.Build.0 = Release|Any CPU
+		{7CC76BA8-D4C3-46DA-96A2-F028B6B0058B}.Release|x86.ActiveCfg = Release|Any CPU
+		{7CC76BA8-D4C3-46DA-96A2-F028B6B0058B}.Release|x86.Build.0 = Release|Any CPU
+		{22ECDDEE-EFD7-4501-9905-BF4E27C605C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{22ECDDEE-EFD7-4501-9905-BF4E27C605C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{22ECDDEE-EFD7-4501-9905-BF4E27C605C3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{22ECDDEE-EFD7-4501-9905-BF4E27C605C3}.Debug|x64.Build.0 = Debug|Any CPU
+		{22ECDDEE-EFD7-4501-9905-BF4E27C605C3}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{22ECDDEE-EFD7-4501-9905-BF4E27C605C3}.Debug|x86.Build.0 = Debug|Any CPU
+		{22ECDDEE-EFD7-4501-9905-BF4E27C605C3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{22ECDDEE-EFD7-4501-9905-BF4E27C605C3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{22ECDDEE-EFD7-4501-9905-BF4E27C605C3}.Release|x64.ActiveCfg = Release|Any CPU
+		{22ECDDEE-EFD7-4501-9905-BF4E27C605C3}.Release|x64.Build.0 = Release|Any CPU
+		{22ECDDEE-EFD7-4501-9905-BF4E27C605C3}.Release|x86.ActiveCfg = Release|Any CPU
+		{22ECDDEE-EFD7-4501-9905-BF4E27C605C3}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -267,18 +267,19 @@ Global
 		{88142EC2-FEB2-4D69-AD3A-74F3364360F0} = {CDB1BDB5-53F9-4B43-864F-60F2E74F44E2}
 		{95DAD2B5-4324-4E89-A337-5703E45CFBE8} = {CDB1BDB5-53F9-4B43-864F-60F2E74F44E2}
 		{27DA6CEC-4266-4F78-BB32-8388F9A401D0} = {CDB1BDB5-53F9-4B43-864F-60F2E74F44E2}
-		{CDCF676A-2037-472E-8C8B-67C5E4FDFEA1} = {76A7FBA6-B7EC-4864-85C0-1F470794BA0F}
 		{5D9E161F-3CB3-4854-9D07-3DF6882EA66C} = {CDB1BDB5-53F9-4B43-864F-60F2E74F44E2}
 		{E13D107F-4053-D0DE-6394-453609595BFE} = {CDB1BDB5-53F9-4B43-864F-60F2E74F44E2}
 		{38B554FD-2AAF-4278-B87B-729FA4DC0111} = {E13D107F-4053-D0DE-6394-453609595BFE}
 		{4C092CF8-524A-494D-AAFC-69383DFBA31D} = {E13D107F-4053-D0DE-6394-453609595BFE}
 		{AF96C1C4-D128-4CD7-A8BB-D194E6D270F0} = {E13D107F-4053-D0DE-6394-453609595BFE}
 		{EFE24256-9335-44C5-8B77-E180C2DB3C0B} = {E13D107F-4053-D0DE-6394-453609595BFE}
-		{0E471075-DABF-40E9-98B7-1630BEF19145} = {CDB1BDB5-53F9-4B43-864F-60F2E74F44E2}
-		{34D1F73D-BF74-47CC-9358-9F4F221C75D7} = {CDB1BDB5-53F9-4B43-864F-60F2E74F44E2}
 		{59AF5DEA-D349-495A-BC44-FC7BD4E55099} = {CDB1BDB5-53F9-4B43-864F-60F2E74F44E2}
 		{021E6F5A-B81D-42A7-9918-DFE39B424FC2} = {E13D107F-4053-D0DE-6394-453609595BFE}
-		{49A42F0E-6E18-4617-9716-3E728966D96F} = {76A7FBA6-B7EC-4864-85C0-1F470794BA0F}
-		{899B7240-729A-48BC-A993-300A6CCFCBEA} = {CDB1BDB5-53F9-4B43-864F-60F2E74F44E2}
+		{6EA238F3-C35C-B265-FF02-A4695B9C69A9} = {CDB1BDB5-53F9-4B43-864F-60F2E74F44E2}
+		{70141DC1-39E5-4350-B995-9625347D29AA} = {6EA238F3-C35C-B265-FF02-A4695B9C69A9}
+		{1A563263-B5E7-4B44-9AE9-AD357C2FA1A4} = {6EA238F3-C35C-B265-FF02-A4695B9C69A9}
+		{8788BE1C-A4D5-4641-A426-31F4D8D1BBFF} = {6EA238F3-C35C-B265-FF02-A4695B9C69A9}
+		{7CC76BA8-D4C3-46DA-96A2-F028B6B0058B} = {6EA238F3-C35C-B265-FF02-A4695B9C69A9}
+		{22ECDDEE-EFD7-4501-9905-BF4E27C605C3} = {6EA238F3-C35C-B265-FF02-A4695B9C69A9}
 	EndGlobalSection
 EndGlobal