diff --git a/.gitignore b/.gitignore index 32d9c064d..c1b184a87 100644 --- a/.gitignore +++ b/.gitignore @@ -45,6 +45,7 @@ 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 diff --git a/.vscode/launch.json b/.vscode/launch.json index 87cf40dbb..f3411003c 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -22,9 +22,11 @@ }, { "name": "Android Debug", - "type": "maui", - "request": "launch", - "project": "${workspaceFolder}/src/PostIt/PostIt.Android/PostIt.Android.csproj" + "type": "mono", + "preLaunchTask": "run-debug-android", + "request": "attach", + "address": "localhost", + "port": 55555 }, { "name": "Android Attach - Debug", diff --git a/.vscode/settings.json b/.vscode/settings.json index 7732a77b1..83a17ae38 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -45,6 +45,5 @@ ] } }, - "dotnet.defaultSolution": "yavsc.sln", - "axaml.selectedSolution": "/home/paul/Workspace/yavsc/yavsc.sln" + "dotnet.defaultSolution": "yavsc.sln" } diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 0b0bb63a5..15ee3405b 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -4,13 +4,9 @@ "tasks": [ { - "label": "build-debug-android", + "label": "run-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", diff --git a/CHANGELOG.md b/CHANGELOG.md index 011dfe449..8ef28cbdc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -94,7 +94,6 @@ 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 diff --git a/Makefile b/Makefile index 29fd47efa..e883088c2 100644 --- a/Makefile +++ b/Makefile @@ -21,30 +21,7 @@ src/Yavsc/bin/output/wwwroot: dotnet --project src/Yavsc.Org/Yavsc.Org.csproj publish 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 + ASPNETCORE_ENVIRONMENT=Development dotnet test watch: dotnet watch -p:Configuration=$(CONFIG) --project src/Yavsc/Yavsc.csproj diff --git a/src/PostIt/PostIt.Android/PostIt.Android.csproj b/src/PostIt/PostIt.Android/PostIt.Android.csproj index 18bfec459..14516758d 100644 --- a/src/PostIt/PostIt.Android/PostIt.Android.csproj +++ b/src/PostIt/PostIt.Android/PostIt.Android.csproj @@ -27,14 +27,4 @@ - - - - - - - + \ No newline at end of file diff --git a/src/PostIt/PostIt/Views/Layout/SessionStatusBanner.axaml b/src/PostIt/PostIt/Views/Layout/SessionStatusBanner.axaml index 5099e1e20..0088bd079 100644 --- a/src/PostIt/PostIt/Views/Layout/SessionStatusBanner.axaml +++ b/src/PostIt/PostIt/Views/Layout/SessionStatusBanner.axaml @@ -3,12 +3,7 @@ xmlns:vm="using:PostIt.ViewModels" x:Class="PostIt.Views.SessionStatusBanner" x:DataType="vm:SessionStatusViewModel"> - - - - - - diff --git a/src/PostIt/PostIt/postit-settings.json b/src/PostIt/PostIt/postit-settings.json index f46edd808..f62a9ac1c 100644 --- a/src/PostIt/PostIt/postit-settings.json +++ b/src/PostIt/PostIt/postit-settings.json @@ -1,6 +1,6 @@ { "Authentication": { - "Authority": "https://yavsc.pschneider.fr", + "Authority": "https://localhost:5001", "ClientId": "postit", "Scopes": [ "blogs", @@ -9,8 +9,13 @@ "RedirectUri": "postit://callback" }, "DarkMode": true, - "BlogsApiUrl": "https://blogs.pschneider.fr/api/v1/", - "ApiUrl": "https://api.pschneider.fr/api/v1/", + "BlogsApiUrl": "https://localhost:5003/api/v1/", + "ApiUrl": "https://localhost:5005/api/v1/", "SearchText": "", - "ProviderOngoingRequestsSortOption": "" -} + "ProviderOngoingRequestsSortOption": "", + "Loaded": true, + "IsDirty": true, + "CanNavigateNext": false, + "CanNavigatePrevious": true, + "SaveCommand": {} +} \ No newline at end of file diff --git a/src/test/Yavsc.Api.Tests/ActivityApiControllerTests.cs b/src/Yavsc.Api.Test/ActivityApiControllerTests.cs similarity index 100% rename from src/test/Yavsc.Api.Tests/ActivityApiControllerTests.cs rename to src/Yavsc.Api.Test/ActivityApiControllerTests.cs diff --git a/src/test/Yavsc.Api.Tests/ApiCollection.cs b/src/Yavsc.Api.Test/ApiCollection.cs similarity index 100% rename from src/test/Yavsc.Api.Tests/ApiCollection.cs rename to src/Yavsc.Api.Test/ApiCollection.cs diff --git a/src/test/Yavsc.Api.Tests/BillingControllerTests.cs b/src/Yavsc.Api.Test/BillingControllerTests.cs similarity index 100% rename from src/test/Yavsc.Api.Tests/BillingControllerTests.cs rename to src/Yavsc.Api.Test/BillingControllerTests.cs diff --git a/src/test/Yavsc.Api.Tests/EstimateApiControllerTests.cs b/src/Yavsc.Api.Test/EstimateApiControllerTests.cs similarity index 100% rename from src/test/Yavsc.Api.Tests/EstimateApiControllerTests.cs rename to src/Yavsc.Api.Test/EstimateApiControllerTests.cs diff --git a/src/test/Yavsc.Api.Tests/EstimateAttachmentsApiTests.cs b/src/Yavsc.Api.Test/EstimateAttachmentsApiTests.cs similarity index 100% rename from src/test/Yavsc.Api.Tests/EstimateAttachmentsApiTests.cs rename to src/Yavsc.Api.Test/EstimateAttachmentsApiTests.cs diff --git a/src/test/Yavsc.Api.Tests/EstimatePdfGenerationTests.cs b/src/Yavsc.Api.Test/EstimatePdfGenerationTests.cs similarity index 100% rename from src/test/Yavsc.Api.Tests/EstimatePdfGenerationTests.cs rename to src/Yavsc.Api.Test/EstimatePdfGenerationTests.cs diff --git a/src/test/Yavsc.Api.Tests/Fixtures/ApiWebServerFixture.cs b/src/Yavsc.Api.Test/Fixtures/ApiWebServerFixture.cs similarity index 100% rename from src/test/Yavsc.Api.Tests/Fixtures/ApiWebServerFixture.cs rename to src/Yavsc.Api.Test/Fixtures/ApiWebServerFixture.cs diff --git a/src/test/Yavsc.Api.Tests/FrontOfficeApiControllerTests.cs b/src/Yavsc.Api.Test/FrontOfficeApiControllerTests.cs similarity index 100% rename from src/test/Yavsc.Api.Tests/FrontOfficeApiControllerTests.cs rename to src/Yavsc.Api.Test/FrontOfficeApiControllerTests.cs diff --git a/src/test/Yavsc.Api.Tests/FrontOfficeQueryAttachmentsApiTests.cs b/src/Yavsc.Api.Test/FrontOfficeQueryAttachmentsApiTests.cs similarity index 100% rename from src/test/Yavsc.Api.Tests/FrontOfficeQueryAttachmentsApiTests.cs rename to src/Yavsc.Api.Test/FrontOfficeQueryAttachmentsApiTests.cs diff --git a/src/test/Yavsc.Api.Tests/HairCutQueryApiControllerTests.cs b/src/Yavsc.Api.Test/HairCutQueryApiControllerTests.cs similarity index 100% rename from src/test/Yavsc.Api.Tests/HairCutQueryApiControllerTests.cs rename to src/Yavsc.Api.Test/HairCutQueryApiControllerTests.cs diff --git a/src/test/Yavsc.Api.Tests/HairMultiCutQueryApiControllerTests.cs b/src/Yavsc.Api.Test/HairMultiCutQueryApiControllerTests.cs similarity index 100% rename from src/test/Yavsc.Api.Tests/HairMultiCutQueryApiControllerTests.cs rename to src/Yavsc.Api.Test/HairMultiCutQueryApiControllerTests.cs diff --git a/src/test/Yavsc.Api.Tests/HomeControllerTests.cs b/src/Yavsc.Api.Test/HomeControllerTests.cs similarity index 100% rename from src/test/Yavsc.Api.Tests/HomeControllerTests.cs rename to src/Yavsc.Api.Test/HomeControllerTests.cs diff --git a/src/test/Yavsc.Api.Tests/RdvQueryApiControllerTests.cs b/src/Yavsc.Api.Test/RdvQueryApiControllerTests.cs similarity index 100% rename from src/test/Yavsc.Api.Tests/RdvQueryApiControllerTests.cs rename to src/Yavsc.Api.Test/RdvQueryApiControllerTests.cs diff --git a/src/test/Yavsc.Api.Tests/Yavsc.Api.Tests.csproj b/src/Yavsc.Api.Test/Yavsc.Api.Test.csproj similarity index 77% rename from src/test/Yavsc.Api.Tests/Yavsc.Api.Tests.csproj rename to src/Yavsc.Api.Test/Yavsc.Api.Test.csproj index cf41a7d4b..18cf404f5 100644 --- a/src/test/Yavsc.Api.Tests/Yavsc.Api.Tests.csproj +++ b/src/Yavsc.Api.Test/Yavsc.Api.Test.csproj @@ -4,7 +4,7 @@ enable enable false - Yavsc.Api.Tests + Yavsc.Api.Test true 1.1.0.0 1.1.0.0 @@ -21,10 +21,10 @@ - - - - + + + + diff --git a/src/test/Yavsc.Blogs.Tests/BlogAclApiTests.cs b/src/Yavsc.Blogs.Tests/BlogAclApiTests.cs similarity index 100% rename from src/test/Yavsc.Blogs.Tests/BlogAclApiTests.cs rename to src/Yavsc.Blogs.Tests/BlogAclApiTests.cs diff --git a/src/test/Yavsc.Blogs.Tests/BlogApiMappedClaimsTests.cs b/src/Yavsc.Blogs.Tests/BlogApiMappedClaimsTests.cs similarity index 100% rename from src/test/Yavsc.Blogs.Tests/BlogApiMappedClaimsTests.cs rename to src/Yavsc.Blogs.Tests/BlogApiMappedClaimsTests.cs diff --git a/src/test/Yavsc.Blogs.Tests/BlogApiSmokeTests.cs b/src/Yavsc.Blogs.Tests/BlogApiSmokeTests.cs similarity index 100% rename from src/test/Yavsc.Blogs.Tests/BlogApiSmokeTests.cs rename to src/Yavsc.Blogs.Tests/BlogApiSmokeTests.cs diff --git a/src/test/Yavsc.Blogs.Tests/BlogApiTests.cs b/src/Yavsc.Blogs.Tests/BlogApiTests.cs similarity index 100% rename from src/test/Yavsc.Blogs.Tests/BlogApiTests.cs rename to src/Yavsc.Blogs.Tests/BlogApiTests.cs diff --git a/src/test/Yavsc.Blogs.Tests/BlogSpotServiceIndexTests.cs b/src/Yavsc.Blogs.Tests/BlogSpotServiceIndexTests.cs similarity index 100% rename from src/test/Yavsc.Blogs.Tests/BlogSpotServiceIndexTests.cs rename to src/Yavsc.Blogs.Tests/BlogSpotServiceIndexTests.cs diff --git a/src/test/Yavsc.Blogs.Tests/CircleMembersApiTests.cs b/src/Yavsc.Blogs.Tests/CircleMembersApiTests.cs similarity index 100% rename from src/test/Yavsc.Blogs.Tests/CircleMembersApiTests.cs rename to src/Yavsc.Blogs.Tests/CircleMembersApiTests.cs diff --git a/src/test/Yavsc.Blogs.Tests/CreateMultipartContentTests.cs b/src/Yavsc.Blogs.Tests/CreateMultipartContentTests.cs similarity index 100% rename from src/test/Yavsc.Blogs.Tests/CreateMultipartContentTests.cs rename to src/Yavsc.Blogs.Tests/CreateMultipartContentTests.cs diff --git a/src/test/Yavsc.Blogs.Tests/FileSystemApiTests.cs b/src/Yavsc.Blogs.Tests/FileSystemApiTests.cs similarity index 100% rename from src/test/Yavsc.Blogs.Tests/FileSystemApiTests.cs rename to src/Yavsc.Blogs.Tests/FileSystemApiTests.cs diff --git a/src/test/Yavsc.Blogs.Tests/Fixtures/BlogsWebServerFixture.cs b/src/Yavsc.Blogs.Tests/Fixtures/BlogsWebServerFixture.cs similarity index 100% rename from src/test/Yavsc.Blogs.Tests/Fixtures/BlogsWebServerFixture.cs rename to src/Yavsc.Blogs.Tests/Fixtures/BlogsWebServerFixture.cs diff --git a/src/test/Yavsc.Blogs.Tests/Fixtures/MappedClaimsBlogsWebServerFixture.cs b/src/Yavsc.Blogs.Tests/Fixtures/MappedClaimsBlogsWebServerFixture.cs similarity index 100% rename from src/test/Yavsc.Blogs.Tests/Fixtures/MappedClaimsBlogsWebServerFixture.cs rename to src/Yavsc.Blogs.Tests/Fixtures/MappedClaimsBlogsWebServerFixture.cs diff --git a/src/test/Yavsc.Blogs.Tests/Fixtures/TestApiTransport.cs b/src/Yavsc.Blogs.Tests/Fixtures/TestApiTransport.cs similarity index 100% rename from src/test/Yavsc.Blogs.Tests/Fixtures/TestApiTransport.cs rename to src/Yavsc.Blogs.Tests/Fixtures/TestApiTransport.cs diff --git a/src/test/Yavsc.Blogs.Tests/IBlogPostWireShapeTests.cs b/src/Yavsc.Blogs.Tests/IBlogPostWireShapeTests.cs similarity index 100% rename from src/test/Yavsc.Blogs.Tests/IBlogPostWireShapeTests.cs rename to src/Yavsc.Blogs.Tests/IBlogPostWireShapeTests.cs diff --git a/src/test/Yavsc.Blogs.Tests/JwtClaimMappingCollection.cs b/src/Yavsc.Blogs.Tests/JwtClaimMappingCollection.cs similarity index 100% rename from src/test/Yavsc.Blogs.Tests/JwtClaimMappingCollection.cs rename to src/Yavsc.Blogs.Tests/JwtClaimMappingCollection.cs diff --git a/src/test/Yavsc.Blogs.Tests/PublishEndpointTests.cs b/src/Yavsc.Blogs.Tests/PublishEndpointTests.cs similarity index 100% rename from src/test/Yavsc.Blogs.Tests/PublishEndpointTests.cs rename to src/Yavsc.Blogs.Tests/PublishEndpointTests.cs diff --git a/src/test/Yavsc.Blogs.Tests/Yavsc.Blogs.Tests.csproj b/src/Yavsc.Blogs.Tests/Yavsc.Blogs.Tests.csproj similarity index 81% rename from src/test/Yavsc.Blogs.Tests/Yavsc.Blogs.Tests.csproj rename to src/Yavsc.Blogs.Tests/Yavsc.Blogs.Tests.csproj index 28934efaf..4f046af88 100644 --- a/src/test/Yavsc.Blogs.Tests/Yavsc.Blogs.Tests.csproj +++ b/src/Yavsc.Blogs.Tests/Yavsc.Blogs.Tests.csproj @@ -23,13 +23,13 @@ - - - - + + + + - + \ No newline at end of file diff --git a/src/Yavsc.Blogs/appsettings-blogs.json b/src/Yavsc.Blogs/appsettings-blogs.json index 5361bfc3b..34134c937 100644 --- a/src/Yavsc.Blogs/appsettings-blogs.json +++ b/src/Yavsc.Blogs/appsettings-blogs.json @@ -26,10 +26,10 @@ "Kestrel": { "Endpoints": { "Http": { - "Url": "http://blogs.pschneider.fr" + "Url": "http://localhost:5002" }, "Https": { - "Url": "https://blogs.pschneider.fr" + "Url": "https://localhost:5003" } } } diff --git a/src/test/Yavsc.Org.Tests/ComputeKidTests.cs b/src/Yavsc.Org.Tests/ComputeKidTests.cs similarity index 100% rename from src/test/Yavsc.Org.Tests/ComputeKidTests.cs rename to src/Yavsc.Org.Tests/ComputeKidTests.cs diff --git a/src/test/Yavsc.Org.Tests/Controllers/ClientControllerCollectionTests.cs b/src/Yavsc.Org.Tests/Controllers/ClientControllerCollectionTests.cs similarity index 100% rename from src/test/Yavsc.Org.Tests/Controllers/ClientControllerCollectionTests.cs rename to src/Yavsc.Org.Tests/Controllers/ClientControllerCollectionTests.cs diff --git a/src/test/Yavsc.Org.Tests/Controllers/CommandFormsControllerTests.cs b/src/Yavsc.Org.Tests/Controllers/CommandFormsControllerTests.cs similarity index 100% rename from src/test/Yavsc.Org.Tests/Controllers/CommandFormsControllerTests.cs rename to src/Yavsc.Org.Tests/Controllers/CommandFormsControllerTests.cs diff --git a/src/test/Yavsc.Org.Tests/Controllers/CommentsApiIntegrationTests.cs b/src/Yavsc.Org.Tests/Controllers/CommentsApiIntegrationTests.cs similarity index 100% rename from src/test/Yavsc.Org.Tests/Controllers/CommentsApiIntegrationTests.cs rename to src/Yavsc.Org.Tests/Controllers/CommentsApiIntegrationTests.cs diff --git a/src/test/Yavsc.Org.Tests/Controllers/CommentsControllerTests.cs b/src/Yavsc.Org.Tests/Controllers/CommentsControllerTests.cs similarity index 100% rename from src/test/Yavsc.Org.Tests/Controllers/CommentsControllerTests.cs rename to src/Yavsc.Org.Tests/Controllers/CommentsControllerTests.cs diff --git a/src/test/Yavsc.Org.Tests/Controllers/TestWebApplicationFactoryIsolationTests.cs b/src/Yavsc.Org.Tests/Controllers/TestWebApplicationFactoryIsolationTests.cs similarity index 100% rename from src/test/Yavsc.Org.Tests/Controllers/TestWebApplicationFactoryIsolationTests.cs rename to src/Yavsc.Org.Tests/Controllers/TestWebApplicationFactoryIsolationTests.cs diff --git a/src/test/Yavsc.Org.Tests/DictionnaireMetierTests.cs b/src/Yavsc.Org.Tests/DictionnaireMetierTests.cs similarity index 100% rename from src/test/Yavsc.Org.Tests/DictionnaireMetierTests.cs rename to src/Yavsc.Org.Tests/DictionnaireMetierTests.cs diff --git a/src/test/Yavsc.Org.Tests/DumpHtml.cs b/src/Yavsc.Org.Tests/DumpHtml.cs similarity index 100% rename from src/test/Yavsc.Org.Tests/DumpHtml.cs rename to src/Yavsc.Org.Tests/DumpHtml.cs diff --git a/src/test/Yavsc.Org.Tests/Fakes/RecordingSmtpClient.cs b/src/Yavsc.Org.Tests/Fakes/RecordingSmtpClient.cs similarity index 100% rename from src/test/Yavsc.Org.Tests/Fakes/RecordingSmtpClient.cs rename to src/Yavsc.Org.Tests/Fakes/RecordingSmtpClient.cs diff --git a/src/test/Yavsc.Org.Tests/Fakes/RecordingSmtpClientFactory.cs b/src/Yavsc.Org.Tests/Fakes/RecordingSmtpClientFactory.cs similarity index 100% rename from src/test/Yavsc.Org.Tests/Fakes/RecordingSmtpClientFactory.cs rename to src/Yavsc.Org.Tests/Fakes/RecordingSmtpClientFactory.cs diff --git a/src/test/Yavsc.Org.Tests/Mandatory/BatchTests.cs b/src/Yavsc.Org.Tests/Mandatory/BatchTests.cs similarity index 100% rename from src/test/Yavsc.Org.Tests/Mandatory/BatchTests.cs rename to src/Yavsc.Org.Tests/Mandatory/BatchTests.cs diff --git a/src/test/Yavsc.Org.Tests/Mandatory/Remoting.cs b/src/Yavsc.Org.Tests/Mandatory/Remoting.cs similarity index 100% rename from src/test/Yavsc.Org.Tests/Mandatory/Remoting.cs rename to src/Yavsc.Org.Tests/Mandatory/Remoting.cs diff --git a/src/test/Yavsc.Org.Tests/Mandatory/Resources.cs b/src/Yavsc.Org.Tests/Mandatory/Resources.cs similarity index 100% rename from src/test/Yavsc.Org.Tests/Mandatory/Resources.cs rename to src/Yavsc.Org.Tests/Mandatory/Resources.cs diff --git a/src/test/Yavsc.Org.Tests/Mandatory/Services.cs b/src/Yavsc.Org.Tests/Mandatory/Services.cs similarity index 100% rename from src/test/Yavsc.Org.Tests/Mandatory/Services.cs rename to src/Yavsc.Org.Tests/Mandatory/Services.cs diff --git a/src/test/Yavsc.Org.Tests/NonRegression/AbstractTests.cs b/src/Yavsc.Org.Tests/NonRegression/AbstractTests.cs similarity index 100% rename from src/test/Yavsc.Org.Tests/NonRegression/AbstractTests.cs rename to src/Yavsc.Org.Tests/NonRegression/AbstractTests.cs diff --git a/src/test/Yavsc.Org.Tests/NonRegression/ApplicationUserDisplayTemplateTests.cs b/src/Yavsc.Org.Tests/NonRegression/ApplicationUserDisplayTemplateTests.cs similarity index 100% rename from src/test/Yavsc.Org.Tests/NonRegression/ApplicationUserDisplayTemplateTests.cs rename to src/Yavsc.Org.Tests/NonRegression/ApplicationUserDisplayTemplateTests.cs diff --git a/src/test/Yavsc.Org.Tests/NonRegression/AvatarFallbackTests.cs b/src/Yavsc.Org.Tests/NonRegression/AvatarFallbackTests.cs similarity index 100% rename from src/test/Yavsc.Org.Tests/NonRegression/AvatarFallbackTests.cs rename to src/Yavsc.Org.Tests/NonRegression/AvatarFallbackTests.cs diff --git a/src/test/Yavsc.Org.Tests/NonRegression/BillingServiceTests.cs b/src/Yavsc.Org.Tests/NonRegression/BillingServiceTests.cs similarity index 100% rename from src/test/Yavsc.Org.Tests/NonRegression/BillingServiceTests.cs rename to src/Yavsc.Org.Tests/NonRegression/BillingServiceTests.cs diff --git a/src/test/Yavsc.Org.Tests/NonRegression/Database.cs b/src/Yavsc.Org.Tests/NonRegression/Database.cs similarity index 100% rename from src/test/Yavsc.Org.Tests/NonRegression/Database.cs rename to src/Yavsc.Org.Tests/NonRegression/Database.cs diff --git a/src/test/Yavsc.Org.Tests/NonRegression/EMailling.cs b/src/Yavsc.Org.Tests/NonRegression/EMailling.cs similarity index 100% rename from src/test/Yavsc.Org.Tests/NonRegression/EMailling.cs rename to src/Yavsc.Org.Tests/NonRegression/EMailling.cs diff --git a/src/test/Yavsc.Org.Tests/NonRegression/FileServerUrlHelpersTests.cs b/src/Yavsc.Org.Tests/NonRegression/FileServerUrlHelpersTests.cs similarity index 100% rename from src/test/Yavsc.Org.Tests/NonRegression/FileServerUrlHelpersTests.cs rename to src/Yavsc.Org.Tests/NonRegression/FileServerUrlHelpersTests.cs diff --git a/src/test/Yavsc.Org.Tests/NonRegression/OidcSeedTests.cs b/src/Yavsc.Org.Tests/NonRegression/OidcSeedTests.cs similarity index 100% rename from src/test/Yavsc.Org.Tests/NonRegression/OidcSeedTests.cs rename to src/Yavsc.Org.Tests/NonRegression/OidcSeedTests.cs diff --git a/src/test/Yavsc.Org.Tests/NonRegression/PerformerCodeInputValidationTests.cs b/src/Yavsc.Org.Tests/NonRegression/PerformerCodeInputValidationTests.cs similarity index 100% rename from src/test/Yavsc.Org.Tests/NonRegression/PerformerCodeInputValidationTests.cs rename to src/Yavsc.Org.Tests/NonRegression/PerformerCodeInputValidationTests.cs diff --git a/src/test/Yavsc.Org.Tests/NonRegression/SetActivityCountryValidationViewTests.cs b/src/Yavsc.Org.Tests/NonRegression/SetActivityCountryValidationViewTests.cs similarity index 100% rename from src/test/Yavsc.Org.Tests/NonRegression/SetActivityCountryValidationViewTests.cs rename to src/Yavsc.Org.Tests/NonRegression/SetActivityCountryValidationViewTests.cs diff --git a/src/test/Yavsc.Org.Tests/NonRegression/UserDisplayHelpersTests.cs b/src/Yavsc.Org.Tests/NonRegression/UserDisplayHelpersTests.cs similarity index 100% rename from src/test/Yavsc.Org.Tests/NonRegression/UserDisplayHelpersTests.cs rename to src/Yavsc.Org.Tests/NonRegression/UserDisplayHelpersTests.cs diff --git a/src/test/Yavsc.Org.Tests/Resources/Test.TestResources.resx b/src/Yavsc.Org.Tests/Resources/Test.TestResources.resx similarity index 100% rename from src/test/Yavsc.Org.Tests/Resources/Test.TestResources.resx rename to src/Yavsc.Org.Tests/Resources/Test.TestResources.resx diff --git a/src/test/Yavsc.Org.Tests/Services/FileSystemAuthManagerTests.cs b/src/Yavsc.Org.Tests/Services/FileSystemAuthManagerTests.cs similarity index 100% rename from src/test/Yavsc.Org.Tests/Services/FileSystemAuthManagerTests.cs rename to src/Yavsc.Org.Tests/Services/FileSystemAuthManagerTests.cs diff --git a/src/test/Yavsc.Org.Tests/Smoke/AccountSmokeTests.cs b/src/Yavsc.Org.Tests/Smoke/AccountSmokeTests.cs similarity index 100% rename from src/test/Yavsc.Org.Tests/Smoke/AccountSmokeTests.cs rename to src/Yavsc.Org.Tests/Smoke/AccountSmokeTests.cs diff --git a/src/test/Yavsc.Org.Tests/Smoke/BlogSmokeTests.cs b/src/Yavsc.Org.Tests/Smoke/BlogSmokeTests.cs similarity index 100% rename from src/test/Yavsc.Org.Tests/Smoke/BlogSmokeTests.cs rename to src/Yavsc.Org.Tests/Smoke/BlogSmokeTests.cs diff --git a/src/test/Yavsc.Org.Tests/StaticAssetsPathsTests.cs b/src/Yavsc.Org.Tests/StaticAssetsPathsTests.cs similarity index 100% rename from src/test/Yavsc.Org.Tests/StaticAssetsPathsTests.cs rename to src/Yavsc.Org.Tests/StaticAssetsPathsTests.cs diff --git a/src/test/Yavsc.Org.Tests/TestUserMiddleware.cs b/src/Yavsc.Org.Tests/TestUserMiddleware.cs similarity index 100% rename from src/test/Yavsc.Org.Tests/TestUserMiddleware.cs rename to src/Yavsc.Org.Tests/TestUserMiddleware.cs diff --git a/src/test/Yavsc.Org.Tests/TestUserStartupFilter.cs b/src/Yavsc.Org.Tests/TestUserStartupFilter.cs similarity index 100% rename from src/test/Yavsc.Org.Tests/TestUserStartupFilter.cs rename to src/Yavsc.Org.Tests/TestUserStartupFilter.cs diff --git a/src/test/Yavsc.Org.Tests/TestWebApplicationFactory.cs b/src/Yavsc.Org.Tests/TestWebApplicationFactory.cs similarity index 100% rename from src/test/Yavsc.Org.Tests/TestWebApplicationFactory.cs rename to src/Yavsc.Org.Tests/TestWebApplicationFactory.cs diff --git a/src/test/Yavsc.Org.Tests/WebServerFixture.cs b/src/Yavsc.Org.Tests/WebServerFixture.cs similarity index 100% rename from src/test/Yavsc.Org.Tests/WebServerFixture.cs rename to src/Yavsc.Org.Tests/WebServerFixture.cs diff --git a/src/test/Yavsc.Org.Tests/Yavsc.Org.Tests.csproj b/src/Yavsc.Org.Tests/Yavsc.Org.Tests.csproj similarity index 94% rename from src/test/Yavsc.Org.Tests/Yavsc.Org.Tests.csproj rename to src/Yavsc.Org.Tests/Yavsc.Org.Tests.csproj index 7a364f2d6..8c69c08ce 100644 --- a/src/test/Yavsc.Org.Tests/Yavsc.Org.Tests.csproj +++ b/src/Yavsc.Org.Tests/Yavsc.Org.Tests.csproj @@ -42,9 +42,9 @@ - - - + + + diff --git a/src/test/Yavsc.Org.Tests/appsettings.json b/src/Yavsc.Org.Tests/appsettings.json similarity index 100% rename from src/test/Yavsc.Org.Tests/appsettings.json rename to src/Yavsc.Org.Tests/appsettings.json diff --git a/src/test/Yavsc.Org.Tests/test.runsettings b/src/Yavsc.Org.Tests/test.runsettings similarity index 100% rename from src/test/Yavsc.Org.Tests/test.runsettings rename to src/Yavsc.Org.Tests/test.runsettings diff --git a/src/test/Yavsc.Org.Tests/xunit.runner.json b/src/Yavsc.Org.Tests/xunit.runner.json similarity index 100% rename from src/test/Yavsc.Org.Tests/xunit.runner.json rename to src/Yavsc.Org.Tests/xunit.runner.json diff --git a/src/test/Yavsc.Server.Tests/BlogSpotServiceDetailsTests.cs b/src/Yavsc.Server.Tests/BlogSpotServiceDetailsTests.cs similarity index 100% rename from src/test/Yavsc.Server.Tests/BlogSpotServiceDetailsTests.cs rename to src/Yavsc.Server.Tests/BlogSpotServiceDetailsTests.cs diff --git a/src/test/Yavsc.Server.Tests/Fixtures/ServerServicesFixture.cs b/src/Yavsc.Server.Tests/Fixtures/ServerServicesFixture.cs similarity index 100% rename from src/test/Yavsc.Server.Tests/Fixtures/ServerServicesFixture.cs rename to src/Yavsc.Server.Tests/Fixtures/ServerServicesFixture.cs diff --git a/src/test/Yavsc.Server.Tests/Yavsc.Server.Tests.csproj b/src/Yavsc.Server.Tests/Yavsc.Server.Tests.csproj similarity index 85% rename from src/test/Yavsc.Server.Tests/Yavsc.Server.Tests.csproj rename to src/Yavsc.Server.Tests/Yavsc.Server.Tests.csproj index bb62ead21..61264cfc5 100644 --- a/src/test/Yavsc.Server.Tests/Yavsc.Server.Tests.csproj +++ b/src/Yavsc.Server.Tests/Yavsc.Server.Tests.csproj @@ -21,9 +21,9 @@ - - - + + + diff --git a/src/test/Yavsc.Tests.Shared/BlogHelpers.cs b/src/Yavsc.Tests.Shared/BlogHelpers.cs similarity index 100% rename from src/test/Yavsc.Tests.Shared/BlogHelpers.cs rename to src/Yavsc.Tests.Shared/BlogHelpers.cs diff --git a/src/test/Yavsc.Tests.Shared/IBackendFixture.cs b/src/Yavsc.Tests.Shared/IBackendFixture.cs similarity index 100% rename from src/test/Yavsc.Tests.Shared/IBackendFixture.cs rename to src/Yavsc.Tests.Shared/IBackendFixture.cs diff --git a/src/test/Yavsc.Tests.Shared/InMemoryDatabaseName.cs b/src/Yavsc.Tests.Shared/InMemoryDatabaseName.cs similarity index 100% rename from src/test/Yavsc.Tests.Shared/InMemoryDatabaseName.cs rename to src/Yavsc.Tests.Shared/InMemoryDatabaseName.cs diff --git a/src/test/Yavsc.Tests.Shared/README.md b/src/Yavsc.Tests.Shared/README.md similarity index 100% rename from src/test/Yavsc.Tests.Shared/README.md rename to src/Yavsc.Tests.Shared/README.md diff --git a/src/test/Yavsc.Tests.Shared/TestAuthPolicyProvider.cs b/src/Yavsc.Tests.Shared/TestAuthPolicyProvider.cs similarity index 100% rename from src/test/Yavsc.Tests.Shared/TestAuthPolicyProvider.cs rename to src/Yavsc.Tests.Shared/TestAuthPolicyProvider.cs diff --git a/src/test/Yavsc.Tests.Shared/TestTokenIssuer.cs b/src/Yavsc.Tests.Shared/TestTokenIssuer.cs similarity index 100% rename from src/test/Yavsc.Tests.Shared/TestTokenIssuer.cs rename to src/Yavsc.Tests.Shared/TestTokenIssuer.cs diff --git a/src/test/Yavsc.Tests.Shared/WebHostFixture.cs b/src/Yavsc.Tests.Shared/WebHostFixture.cs similarity index 100% rename from src/test/Yavsc.Tests.Shared/WebHostFixture.cs rename to src/Yavsc.Tests.Shared/WebHostFixture.cs diff --git a/src/test/Yavsc.Tests.Shared/Yavsc.Tests.Shared.csproj b/src/Yavsc.Tests.Shared/Yavsc.Tests.Shared.csproj similarity index 93% rename from src/test/Yavsc.Tests.Shared/Yavsc.Tests.Shared.csproj rename to src/Yavsc.Tests.Shared/Yavsc.Tests.Shared.csproj index b5819d758..dda2c21c8 100644 --- a/src/test/Yavsc.Tests.Shared/Yavsc.Tests.Shared.csproj +++ b/src/Yavsc.Tests.Shared/Yavsc.Tests.Shared.csproj @@ -24,6 +24,6 @@ - + \ No newline at end of file diff --git a/yavsc.sln b/yavsc.sln index e6caef782..d7cffd18f 100644 --- a/yavsc.sln +++ b/yavsc.sln @@ -15,6 +15,10 @@ 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}" @@ -27,21 +31,17 @@ 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("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{6EA238F3-C35C-B265-FF02-A4695B9C69A9}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Yavsc.Api.Test", "src\Yavsc.Api.Test\Yavsc.Api.Test.csproj", "{49A42F0E-6E18-4617-9716-3E728966D96F}" EndProject -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}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Yavsc.Server.Tests", "src\Yavsc.Server.Tests\Yavsc.Server.Tests.csproj", "{899B7240-729A-48BC-A993-300A6CCFCBEA}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -113,6 +113,18 @@ 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 @@ -173,6 +185,30 @@ 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 @@ -197,66 +233,30 @@ 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 - {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 + {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 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -267,19 +267,18 @@ 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} - {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} + {49A42F0E-6E18-4617-9716-3E728966D96F} = {76A7FBA6-B7EC-4864-85C0-1F470794BA0F} + {899B7240-729A-48BC-A993-300A6CCFCBEA} = {CDB1BDB5-53F9-4B43-864F-60F2E74F44E2} EndGlobalSection EndGlobal