diff --git a/VisualTreeAnalyzers.sln b/VisualTreeAnalyzers.sln index ae0581f..05865c3 100644 --- a/VisualTreeAnalyzers.sln +++ b/VisualTreeAnalyzers.sln @@ -1,20 +1,30 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.30523.141 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.31912.275 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{FCE7B4AE-4C2B-447A-9FA2-6CFAD8FF6089}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{553C9B33-97C2-4C57-B5E9-88608ED61475}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VisualTreeAnalyzers", "src\VisualTreeAnalyzers\VisualTreeAnalyzers.csproj", "{71D49058-4D49-4616-BDB7-A795823D9866}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VisualTreeAnalyzers.Tests", "tests\VisualTreeAnalyzers.Tests\VisualTreeAnalyzers.Tests.csproj", "{9CCA940B-ACFE-4773-9441-0B6EDF9504A3}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VisualTreeAnalyzers.Tests.UWP", "tests\VisualTreeAnalyzers.Tests.UWP\VisualTreeAnalyzers.Tests.UWP.csproj", "{9CCA940B-ACFE-4773-9441-0B6EDF9504A3}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{32423AB3-8EE7-4DFD-AC17-CC7E9CDEBCD3}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VisualTreeAnalyzersSampleApp", "samples\VisualTreeAnalyzersSampleApp\VisualTreeAnalyzersSampleApp.csproj", "{94C875F9-7682-4702-8C7F-A5A121093BBC}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VisualTreeAnalyzers.UWP", "src\VisualTreeAnalyzers.UWP\VisualTreeAnalyzers.UWP.csproj", "{71D49058-4D49-4616-BDB7-A795823D9866}" +EndProject +Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "VisualTreeAnalyzers.Shared", "src\VisualTreeAnalyzers.Shared\VisualTreeAnalyzers.Shared.shproj", "{1E1C64D1-8222-41A5-8AA9-4F028DF5C6B8}" +EndProject +Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "VisualTreeAnalyzers.Tests.Shared", "tests\VisualTreeAnalyzers.Tests.Shared\VisualTreeAnalyzers.Tests.Shared.shproj", "{459E3085-96D7-4A0C-8A7D-4F8A10AED340}" +EndProject Global + GlobalSection(SharedMSBuildProjectFiles) = preSolution + src\VisualTreeAnalyzers.Shared\VisualTreeAnalyzers.Shared.projitems*{1e1c64d1-8222-41a5-8aa9-4f028df5c6b8}*SharedItemsImports = 13 + tests\VisualTreeAnalyzers.Tests.Shared\VisualTreeAnalyzers.Tests.Shared.projitems*{459e3085-96d7-4a0c-8a7d-4f8a10aed340}*SharedItemsImports = 13 + src\VisualTreeAnalyzers.Shared\VisualTreeAnalyzers.Shared.projitems*{71d49058-4d49-4616-bdb7-a795823d9866}*SharedItemsImports = 4 + tests\VisualTreeAnalyzers.Tests.Shared\VisualTreeAnalyzers.Tests.Shared.projitems*{9cca940b-acfe-4773-9441-0b6edf9504a3}*SharedItemsImports = 4 + EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Debug|ARM = Debug|ARM @@ -28,26 +38,6 @@ Global Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {71D49058-4D49-4616-BDB7-A795823D9866}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {71D49058-4D49-4616-BDB7-A795823D9866}.Debug|Any CPU.Build.0 = Debug|Any CPU - {71D49058-4D49-4616-BDB7-A795823D9866}.Debug|ARM.ActiveCfg = Debug|ARM - {71D49058-4D49-4616-BDB7-A795823D9866}.Debug|ARM.Build.0 = Debug|ARM - {71D49058-4D49-4616-BDB7-A795823D9866}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {71D49058-4D49-4616-BDB7-A795823D9866}.Debug|ARM64.Build.0 = Debug|ARM64 - {71D49058-4D49-4616-BDB7-A795823D9866}.Debug|x64.ActiveCfg = Debug|x64 - {71D49058-4D49-4616-BDB7-A795823D9866}.Debug|x64.Build.0 = Debug|x64 - {71D49058-4D49-4616-BDB7-A795823D9866}.Debug|x86.ActiveCfg = Debug|x86 - {71D49058-4D49-4616-BDB7-A795823D9866}.Debug|x86.Build.0 = Debug|x86 - {71D49058-4D49-4616-BDB7-A795823D9866}.Release|Any CPU.ActiveCfg = Release|Any CPU - {71D49058-4D49-4616-BDB7-A795823D9866}.Release|Any CPU.Build.0 = Release|Any CPU - {71D49058-4D49-4616-BDB7-A795823D9866}.Release|ARM.ActiveCfg = Release|ARM - {71D49058-4D49-4616-BDB7-A795823D9866}.Release|ARM.Build.0 = Release|ARM - {71D49058-4D49-4616-BDB7-A795823D9866}.Release|ARM64.ActiveCfg = Release|ARM64 - {71D49058-4D49-4616-BDB7-A795823D9866}.Release|ARM64.Build.0 = Release|ARM64 - {71D49058-4D49-4616-BDB7-A795823D9866}.Release|x64.ActiveCfg = Release|x64 - {71D49058-4D49-4616-BDB7-A795823D9866}.Release|x64.Build.0 = Release|x64 - {71D49058-4D49-4616-BDB7-A795823D9866}.Release|x86.ActiveCfg = Release|x86 - {71D49058-4D49-4616-BDB7-A795823D9866}.Release|x86.Build.0 = Release|x86 {9CCA940B-ACFE-4773-9441-0B6EDF9504A3}.Debug|Any CPU.ActiveCfg = Debug|x86 {9CCA940B-ACFE-4773-9441-0B6EDF9504A3}.Debug|ARM.ActiveCfg = Debug|ARM {9CCA940B-ACFE-4773-9441-0B6EDF9504A3}.Debug|ARM.Build.0 = Debug|ARM @@ -100,14 +90,36 @@ Global {94C875F9-7682-4702-8C7F-A5A121093BBC}.Release|x86.ActiveCfg = Release|x86 {94C875F9-7682-4702-8C7F-A5A121093BBC}.Release|x86.Build.0 = Release|x86 {94C875F9-7682-4702-8C7F-A5A121093BBC}.Release|x86.Deploy.0 = Release|x86 + {71D49058-4D49-4616-BDB7-A795823D9866}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {71D49058-4D49-4616-BDB7-A795823D9866}.Debug|Any CPU.Build.0 = Debug|Any CPU + {71D49058-4D49-4616-BDB7-A795823D9866}.Debug|ARM.ActiveCfg = Debug|ARM + {71D49058-4D49-4616-BDB7-A795823D9866}.Debug|ARM.Build.0 = Debug|ARM + {71D49058-4D49-4616-BDB7-A795823D9866}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {71D49058-4D49-4616-BDB7-A795823D9866}.Debug|ARM64.Build.0 = Debug|ARM64 + {71D49058-4D49-4616-BDB7-A795823D9866}.Debug|x64.ActiveCfg = Debug|x64 + {71D49058-4D49-4616-BDB7-A795823D9866}.Debug|x64.Build.0 = Debug|x64 + {71D49058-4D49-4616-BDB7-A795823D9866}.Debug|x86.ActiveCfg = Debug|x86 + {71D49058-4D49-4616-BDB7-A795823D9866}.Debug|x86.Build.0 = Debug|x86 + {71D49058-4D49-4616-BDB7-A795823D9866}.Release|Any CPU.ActiveCfg = Release|Any CPU + {71D49058-4D49-4616-BDB7-A795823D9866}.Release|Any CPU.Build.0 = Release|Any CPU + {71D49058-4D49-4616-BDB7-A795823D9866}.Release|ARM.ActiveCfg = Release|ARM + {71D49058-4D49-4616-BDB7-A795823D9866}.Release|ARM.Build.0 = Release|ARM + {71D49058-4D49-4616-BDB7-A795823D9866}.Release|ARM64.ActiveCfg = Release|ARM64 + {71D49058-4D49-4616-BDB7-A795823D9866}.Release|ARM64.Build.0 = Release|ARM64 + {71D49058-4D49-4616-BDB7-A795823D9866}.Release|x64.ActiveCfg = Release|x64 + {71D49058-4D49-4616-BDB7-A795823D9866}.Release|x64.Build.0 = Release|x64 + {71D49058-4D49-4616-BDB7-A795823D9866}.Release|x86.ActiveCfg = Release|x86 + {71D49058-4D49-4616-BDB7-A795823D9866}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {71D49058-4D49-4616-BDB7-A795823D9866} = {553C9B33-97C2-4C57-B5E9-88608ED61475} {9CCA940B-ACFE-4773-9441-0B6EDF9504A3} = {FCE7B4AE-4C2B-447A-9FA2-6CFAD8FF6089} {94C875F9-7682-4702-8C7F-A5A121093BBC} = {32423AB3-8EE7-4DFD-AC17-CC7E9CDEBCD3} + {71D49058-4D49-4616-BDB7-A795823D9866} = {553C9B33-97C2-4C57-B5E9-88608ED61475} + {1E1C64D1-8222-41A5-8AA9-4F028DF5C6B8} = {553C9B33-97C2-4C57-B5E9-88608ED61475} + {459E3085-96D7-4A0C-8A7D-4F8A10AED340} = {FCE7B4AE-4C2B-447A-9FA2-6CFAD8FF6089} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {727E24E2-8BFC-48E0-AA93-5A15B0E6DF8A} diff --git a/build/nuget/BuildNuget.ps1 b/build/nuget/BuildNuget.ps1 index 2007d61..4d38c35 100644 --- a/build/nuget/BuildNuget.ps1 +++ b/build/nuget/BuildNuget.ps1 @@ -2,7 +2,7 @@ $scriptFolder = Split-Path -Path $MyInvocation.MyCommand.Path; $buildFolder = Split-Path -Path $scriptFolder; $workingDirectory = Split-Path $buildFolder -Parent; -$nuspecFile = $scriptFolder + "\VisualTreeAnalyzers.nuspec"; +$nuspecFile = $scriptFolder + "\VisualTreeAnalyzers.UWP.nuspec"; $nugetPackageOutput = $workingDirectory + "\artifacts\package"; if(Test-Path ($buildFolder + "./Nuget.exe") -PathType Leaf) diff --git a/build/nuget/VisualTreeAnalyzers.nuspec b/build/nuget/VisualTreeAnalyzers.UWP.nuspec similarity index 100% rename from build/nuget/VisualTreeAnalyzers.nuspec rename to build/nuget/VisualTreeAnalyzers.UWP.nuspec diff --git a/build/pipeline/azure-pipelines.ci.yml b/build/pipeline/azure-pipelines.ci.yml index 77fbf41..020b892 100644 --- a/build/pipeline/azure-pipelines.ci.yml +++ b/build/pipeline/azure-pipelines.ci.yml @@ -15,3 +15,4 @@ jobs: - template: ./templates/build-nupkg.yml parameters: testStep: 'Test_Debug_x64' + project: 'VisualTreeAnalyzers.UWP.csproj' diff --git a/build/pipeline/templates/build-nupkg.yml b/build/pipeline/templates/build-nupkg.yml index d8ba25b..85b24a2 100644 --- a/build/pipeline/templates/build-nupkg.yml +++ b/build/pipeline/templates/build-nupkg.yml @@ -1,6 +1,7 @@ parameters: solution: '**/*.sln' testSetup: 'Test_Debug_x64' + project: 'VisualTreeAnalyzers.UWP.csproj' jobs: - job: @@ -20,7 +21,7 @@ jobs: - task: MSBuild@1 displayName: "Build Release anyCPU" inputs: - solution: '**/VisualTreeAnalyzers.csproj' + solution: '**/${{parameters.project}}' msbuildArchitecture: 'x64' platform: 'AnyCPU' configuration: 'Release' @@ -28,7 +29,7 @@ jobs: - task: MSBuild@1 displayName: "Build Release x86" inputs: - solution: '**/VisualTreeAnalyzers.csproj' + solution: '**/${{parameters.project}}' msbuildArchitecture: 'x64' platform: 'x86' configuration: 'Release' @@ -37,7 +38,7 @@ jobs: - task: MSBuild@1 displayName: "Build Release x64" inputs: - solution: '**/VisualTreeAnalyzers.csproj' + solution: '**/${{parameters.project}}' msbuildArchitecture: 'x64' platform: 'x64' configuration: 'Release' @@ -45,7 +46,7 @@ jobs: - task: MSBuild@1 displayName: "Build Release ARM" inputs: - solution: '**/VisualTreeAnalyzers.csproj' + solution: '**/${{parameters.project}}' msbuildArchitecture: 'x64' platform: 'ARM' configuration: 'Release' @@ -53,7 +54,7 @@ jobs: - task: MSBuild@1 displayName: "Build Release ARM64" inputs: - solution: '**/VisualTreeAnalyzers.csproj' + solution: '**/${{parameters.project}}' msbuildArchitecture: 'x64' platform: 'ARM64' configuration: 'Release' diff --git a/samples/VisualTreeAnalyzersSampleApp/VisualTreeAnalyzersSampleApp.csproj b/samples/VisualTreeAnalyzersSampleApp/VisualTreeAnalyzersSampleApp.csproj index 33596cd..1e06186 100644 --- a/samples/VisualTreeAnalyzersSampleApp/VisualTreeAnalyzersSampleApp.csproj +++ b/samples/VisualTreeAnalyzersSampleApp/VisualTreeAnalyzersSampleApp.csproj @@ -174,13 +174,13 @@ - - {71d49058-4d49-4616-bdb7-a795823d9866} - VisualTreeAnalyzers - + - + + {71d49058-4d49-4616-bdb7-a795823d9866} + VisualTreeAnalyzers.UWP + 14.0 diff --git a/src/VisualTreeAnalyzers/Accessibility/AccessibilityAnalyzer.cs b/src/VisualTreeAnalyzers.Shared/Accessibility/AccessibilityAnalyzer.cs similarity index 100% rename from src/VisualTreeAnalyzers/Accessibility/AccessibilityAnalyzer.cs rename to src/VisualTreeAnalyzers.Shared/Accessibility/AccessibilityAnalyzer.cs diff --git a/src/VisualTreeAnalyzers/Accessibility/AccessibilityRule.cs b/src/VisualTreeAnalyzers.Shared/Accessibility/AccessibilityRule.cs similarity index 100% rename from src/VisualTreeAnalyzers/Accessibility/AccessibilityRule.cs rename to src/VisualTreeAnalyzers.Shared/Accessibility/AccessibilityRule.cs diff --git a/src/VisualTreeAnalyzers/Accessibility/Rules/ControlNameNotIncludeTypeRule.cs b/src/VisualTreeAnalyzers.Shared/Accessibility/Rules/ControlNameNotIncludeTypeRule.cs similarity index 100% rename from src/VisualTreeAnalyzers/Accessibility/Rules/ControlNameNotIncludeTypeRule.cs rename to src/VisualTreeAnalyzers.Shared/Accessibility/Rules/ControlNameNotIncludeTypeRule.cs diff --git a/src/VisualTreeAnalyzers/Accessibility/Rules/ControlNonEmptyNameRule.cs b/src/VisualTreeAnalyzers.Shared/Accessibility/Rules/ControlNonEmptyNameRule.cs similarity index 100% rename from src/VisualTreeAnalyzers/Accessibility/Rules/ControlNonEmptyNameRule.cs rename to src/VisualTreeAnalyzers.Shared/Accessibility/Rules/ControlNonEmptyNameRule.cs diff --git a/src/VisualTreeAnalyzers/Accessibility/Rules/ExpectKeyboardFocusableFalseRule.cs b/src/VisualTreeAnalyzers.Shared/Accessibility/Rules/ExpectKeyboardFocusableFalseRule.cs similarity index 100% rename from src/VisualTreeAnalyzers/Accessibility/Rules/ExpectKeyboardFocusableFalseRule.cs rename to src/VisualTreeAnalyzers.Shared/Accessibility/Rules/ExpectKeyboardFocusableFalseRule.cs diff --git a/src/VisualTreeAnalyzers/Accessibility/Rules/ExpectKeyboardFocusableTrueRule.cs b/src/VisualTreeAnalyzers.Shared/Accessibility/Rules/ExpectKeyboardFocusableTrueRule.cs similarity index 100% rename from src/VisualTreeAnalyzers/Accessibility/Rules/ExpectKeyboardFocusableTrueRule.cs rename to src/VisualTreeAnalyzers.Shared/Accessibility/Rules/ExpectKeyboardFocusableTrueRule.cs diff --git a/src/VisualTreeAnalyzers/Accessibility/Rules/LandmarkTypeMainOnceRule.cs b/src/VisualTreeAnalyzers.Shared/Accessibility/Rules/LandmarkTypeMainOnceRule.cs similarity index 100% rename from src/VisualTreeAnalyzers/Accessibility/Rules/LandmarkTypeMainOnceRule.cs rename to src/VisualTreeAnalyzers.Shared/Accessibility/Rules/LandmarkTypeMainOnceRule.cs diff --git a/src/VisualTreeAnalyzers/Accessibility/Rules/ListItemNameNotEqualDataContextRule.cs b/src/VisualTreeAnalyzers.Shared/Accessibility/Rules/ListItemNameNotEqualDataContextRule.cs similarity index 100% rename from src/VisualTreeAnalyzers/Accessibility/Rules/ListItemNameNotEqualDataContextRule.cs rename to src/VisualTreeAnalyzers.Shared/Accessibility/Rules/ListItemNameNotEqualDataContextRule.cs diff --git a/src/VisualTreeAnalyzers/Accessibility/Rules/LocalizedLandMarkTypeRule.cs b/src/VisualTreeAnalyzers.Shared/Accessibility/Rules/LocalizedLandMarkTypeRule.cs similarity index 100% rename from src/VisualTreeAnalyzers/Accessibility/Rules/LocalizedLandMarkTypeRule.cs rename to src/VisualTreeAnalyzers.Shared/Accessibility/Rules/LocalizedLandMarkTypeRule.cs diff --git a/src/VisualTreeAnalyzers/Accessibility/Rules/NameReasonableLengthRule.cs b/src/VisualTreeAnalyzers.Shared/Accessibility/Rules/NameReasonableLengthRule.cs similarity index 100% rename from src/VisualTreeAnalyzers/Accessibility/Rules/NameReasonableLengthRule.cs rename to src/VisualTreeAnalyzers.Shared/Accessibility/Rules/NameReasonableLengthRule.cs diff --git a/src/VisualTreeAnalyzers/Accessibility/Rules/OrientationNotNoneRule.cs b/src/VisualTreeAnalyzers.Shared/Accessibility/Rules/OrientationNotNoneRule.cs similarity index 100% rename from src/VisualTreeAnalyzers/Accessibility/Rules/OrientationNotNoneRule.cs rename to src/VisualTreeAnalyzers.Shared/Accessibility/Rules/OrientationNotNoneRule.cs diff --git a/src/VisualTreeAnalyzers/Accessibility/Rules/PatternInterfaceImplementedRule.cs b/src/VisualTreeAnalyzers.Shared/Accessibility/Rules/PatternInterfaceImplementedRule.cs similarity index 100% rename from src/VisualTreeAnalyzers/Accessibility/Rules/PatternInterfaceImplementedRule.cs rename to src/VisualTreeAnalyzers.Shared/Accessibility/Rules/PatternInterfaceImplementedRule.cs diff --git a/src/VisualTreeAnalyzers/Accessibility/Rules/RequiredSelectionRule.cs b/src/VisualTreeAnalyzers.Shared/Accessibility/Rules/RequiredSelectionRule.cs similarity index 100% rename from src/VisualTreeAnalyzers/Accessibility/Rules/RequiredSelectionRule.cs rename to src/VisualTreeAnalyzers.Shared/Accessibility/Rules/RequiredSelectionRule.cs diff --git a/src/VisualTreeAnalyzers/Accessibility/Rules/SingleSelectionRule.cs b/src/VisualTreeAnalyzers.Shared/Accessibility/Rules/SingleSelectionRule.cs similarity index 100% rename from src/VisualTreeAnalyzers/Accessibility/Rules/SingleSelectionRule.cs rename to src/VisualTreeAnalyzers.Shared/Accessibility/Rules/SingleSelectionRule.cs diff --git a/src/VisualTreeAnalyzers/Accessibility/Rules/TypeButtonIsInvokeOrToggleRule.cs b/src/VisualTreeAnalyzers.Shared/Accessibility/Rules/TypeButtonIsInvokeOrToggleRule.cs similarity index 100% rename from src/VisualTreeAnalyzers/Accessibility/Rules/TypeButtonIsInvokeOrToggleRule.cs rename to src/VisualTreeAnalyzers.Shared/Accessibility/Rules/TypeButtonIsInvokeOrToggleRule.cs diff --git a/src/VisualTreeAnalyzers/Core/AnalyzerHelper.cs b/src/VisualTreeAnalyzers.Shared/Core/AnalyzerHelper.cs similarity index 100% rename from src/VisualTreeAnalyzers/Core/AnalyzerHelper.cs rename to src/VisualTreeAnalyzers.Shared/Core/AnalyzerHelper.cs diff --git a/src/VisualTreeAnalyzers/Core/IElementAnalyzer.cs b/src/VisualTreeAnalyzers.Shared/Core/IElementAnalyzer.cs similarity index 100% rename from src/VisualTreeAnalyzers/Core/IElementAnalyzer.cs rename to src/VisualTreeAnalyzers.Shared/Core/IElementAnalyzer.cs diff --git a/src/VisualTreeAnalyzers/Core/IRule.cs b/src/VisualTreeAnalyzers.Shared/Core/IRule.cs similarity index 100% rename from src/VisualTreeAnalyzers/Core/IRule.cs rename to src/VisualTreeAnalyzers.Shared/Core/IRule.cs diff --git a/src/VisualTreeAnalyzers/Core/IVisualTreeWalker.cs b/src/VisualTreeAnalyzers.Shared/Core/IVisualTreeWalker.cs similarity index 100% rename from src/VisualTreeAnalyzers/Core/IVisualTreeWalker.cs rename to src/VisualTreeAnalyzers.Shared/Core/IVisualTreeWalker.cs diff --git a/src/VisualTreeAnalyzers/Core/IVisualTreeWalkerTimer.cs b/src/VisualTreeAnalyzers.Shared/Core/IVisualTreeWalkerTimer.cs similarity index 100% rename from src/VisualTreeAnalyzers/Core/IVisualTreeWalkerTimer.cs rename to src/VisualTreeAnalyzers.Shared/Core/IVisualTreeWalkerTimer.cs diff --git a/src/VisualTreeAnalyzers/Core/RuleScanner.cs b/src/VisualTreeAnalyzers.Shared/Core/RuleScanner.cs similarity index 100% rename from src/VisualTreeAnalyzers/Core/RuleScanner.cs rename to src/VisualTreeAnalyzers.Shared/Core/RuleScanner.cs diff --git a/src/VisualTreeAnalyzers/Core/VisualTreeWalker.cs b/src/VisualTreeAnalyzers.Shared/Core/VisualTreeWalker.cs similarity index 100% rename from src/VisualTreeAnalyzers/Core/VisualTreeWalker.cs rename to src/VisualTreeAnalyzers.Shared/Core/VisualTreeWalker.cs diff --git a/src/VisualTreeAnalyzers/Core/VisualTreeWalkerTimer.cs b/src/VisualTreeAnalyzers.Shared/Core/VisualTreeWalkerTimer.cs similarity index 100% rename from src/VisualTreeAnalyzers/Core/VisualTreeWalkerTimer.cs rename to src/VisualTreeAnalyzers.Shared/Core/VisualTreeWalkerTimer.cs diff --git a/src/VisualTreeAnalyzers/Snapshot/ElementSnapshot.cs b/src/VisualTreeAnalyzers.Shared/Snapshot/ElementSnapshot.cs similarity index 100% rename from src/VisualTreeAnalyzers/Snapshot/ElementSnapshot.cs rename to src/VisualTreeAnalyzers.Shared/Snapshot/ElementSnapshot.cs diff --git a/src/VisualTreeAnalyzers/Snapshot/ElementSnapshotCreator.cs b/src/VisualTreeAnalyzers.Shared/Snapshot/ElementSnapshotCreator.cs similarity index 100% rename from src/VisualTreeAnalyzers/Snapshot/ElementSnapshotCreator.cs rename to src/VisualTreeAnalyzers.Shared/Snapshot/ElementSnapshotCreator.cs diff --git a/src/VisualTreeAnalyzers/Snapshot/Exporter/IObjectToStringConverter.cs b/src/VisualTreeAnalyzers.Shared/Snapshot/Exporter/IObjectToStringConverter.cs similarity index 100% rename from src/VisualTreeAnalyzers/Snapshot/Exporter/IObjectToStringConverter.cs rename to src/VisualTreeAnalyzers.Shared/Snapshot/Exporter/IObjectToStringConverter.cs diff --git a/src/VisualTreeAnalyzers/Snapshot/Exporter/JsonExporter.cs b/src/VisualTreeAnalyzers.Shared/Snapshot/Exporter/JsonExporter.cs similarity index 100% rename from src/VisualTreeAnalyzers/Snapshot/Exporter/JsonExporter.cs rename to src/VisualTreeAnalyzers.Shared/Snapshot/Exporter/JsonExporter.cs diff --git a/src/VisualTreeAnalyzers/Snapshot/Exporter/JsonHelper.cs b/src/VisualTreeAnalyzers.Shared/Snapshot/Exporter/JsonHelper.cs similarity index 100% rename from src/VisualTreeAnalyzers/Snapshot/Exporter/JsonHelper.cs rename to src/VisualTreeAnalyzers.Shared/Snapshot/Exporter/JsonHelper.cs diff --git a/src/VisualTreeAnalyzers/Snapshot/Exporter/StandardObjectToStringConverter.cs b/src/VisualTreeAnalyzers.Shared/Snapshot/Exporter/StandardObjectToStringConverter.cs similarity index 100% rename from src/VisualTreeAnalyzers/Snapshot/Exporter/StandardObjectToStringConverter.cs rename to src/VisualTreeAnalyzers.Shared/Snapshot/Exporter/StandardObjectToStringConverter.cs diff --git a/src/VisualTreeAnalyzers/Snapshot/Exporter/XMLExporter.cs b/src/VisualTreeAnalyzers.Shared/Snapshot/Exporter/XMLExporter.cs similarity index 100% rename from src/VisualTreeAnalyzers/Snapshot/Exporter/XMLExporter.cs rename to src/VisualTreeAnalyzers.Shared/Snapshot/Exporter/XMLExporter.cs diff --git a/src/VisualTreeAnalyzers/Snapshot/IElementSnapshot.cs b/src/VisualTreeAnalyzers.Shared/Snapshot/IElementSnapshot.cs similarity index 100% rename from src/VisualTreeAnalyzers/Snapshot/IElementSnapshot.cs rename to src/VisualTreeAnalyzers.Shared/Snapshot/IElementSnapshot.cs diff --git a/src/VisualTreeAnalyzers/Snapshot/IElementSnapshotCreator.cs b/src/VisualTreeAnalyzers.Shared/Snapshot/IElementSnapshotCreator.cs similarity index 100% rename from src/VisualTreeAnalyzers/Snapshot/IElementSnapshotCreator.cs rename to src/VisualTreeAnalyzers.Shared/Snapshot/IElementSnapshotCreator.cs diff --git a/src/VisualTreeAnalyzers/Snapshot/NamespaceHelper.cs b/src/VisualTreeAnalyzers.Shared/Snapshot/NamespaceHelper.cs similarity index 100% rename from src/VisualTreeAnalyzers/Snapshot/NamespaceHelper.cs rename to src/VisualTreeAnalyzers.Shared/Snapshot/NamespaceHelper.cs diff --git a/src/VisualTreeAnalyzers/Snapshot/StandardOptions.cs b/src/VisualTreeAnalyzers.Shared/Snapshot/StandardOptions.cs similarity index 100% rename from src/VisualTreeAnalyzers/Snapshot/StandardOptions.cs rename to src/VisualTreeAnalyzers.Shared/Snapshot/StandardOptions.cs diff --git a/src/VisualTreeAnalyzers.Shared/VisualTreeAnalyzers.Shared.projitems b/src/VisualTreeAnalyzers.Shared/VisualTreeAnalyzers.Shared.projitems new file mode 100644 index 0000000..0cf8368 --- /dev/null +++ b/src/VisualTreeAnalyzers.Shared/VisualTreeAnalyzers.Shared.projitems @@ -0,0 +1,47 @@ + + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + true + 1e1c64d1-8222-41a5-8aa9-4f028df5c6b8 + + + VisualTreeAnalyzers + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/VisualTreeAnalyzers.Shared/VisualTreeAnalyzers.Shared.shproj b/src/VisualTreeAnalyzers.Shared/VisualTreeAnalyzers.Shared.shproj new file mode 100644 index 0000000..56471a8 --- /dev/null +++ b/src/VisualTreeAnalyzers.Shared/VisualTreeAnalyzers.Shared.shproj @@ -0,0 +1,13 @@ + + + + 1e1c64d1-8222-41a5-8aa9-4f028df5c6b8 + 14.0 + + + + + + + + diff --git a/src/VisualTreeAnalyzers/Properties/AssemblyInfo.cs b/src/VisualTreeAnalyzers.UWP/Properties/AssemblyInfo.cs similarity index 100% rename from src/VisualTreeAnalyzers/Properties/AssemblyInfo.cs rename to src/VisualTreeAnalyzers.UWP/Properties/AssemblyInfo.cs diff --git a/src/VisualTreeAnalyzers/Properties/VisualTreeAnalyzers.rd.xml b/src/VisualTreeAnalyzers.UWP/Properties/VisualTreeAnalyzers.rd.xml similarity index 100% rename from src/VisualTreeAnalyzers/Properties/VisualTreeAnalyzers.rd.xml rename to src/VisualTreeAnalyzers.UWP/Properties/VisualTreeAnalyzers.rd.xml diff --git a/src/VisualTreeAnalyzers/VisualTreeAnalyzers.csproj b/src/VisualTreeAnalyzers.UWP/VisualTreeAnalyzers.UWP.csproj similarity index 75% rename from src/VisualTreeAnalyzers/VisualTreeAnalyzers.csproj rename to src/VisualTreeAnalyzers.UWP/VisualTreeAnalyzers.UWP.csproj index 8e9a6be..4fca3bd 100644 --- a/src/VisualTreeAnalyzers/VisualTreeAnalyzers.csproj +++ b/src/VisualTreeAnalyzers.UWP/VisualTreeAnalyzers.UWP.csproj @@ -116,51 +116,18 @@ PackageReference - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 6.2.13 + 6.2.12 + 14.0 diff --git a/tests/VisualTreeAnalyzers.Tests/Accessibility/AccessibilityAnalyzerTests.cs b/tests/VisualTreeAnalyzers.Tests.Shared/Accessibility/AccessibilityAnalyzerTests.cs similarity index 96% rename from tests/VisualTreeAnalyzers.Tests/Accessibility/AccessibilityAnalyzerTests.cs rename to tests/VisualTreeAnalyzers.Tests.Shared/Accessibility/AccessibilityAnalyzerTests.cs index 03f4f96..6885fbb 100644 --- a/tests/VisualTreeAnalyzers.Tests/Accessibility/AccessibilityAnalyzerTests.cs +++ b/tests/VisualTreeAnalyzers.Tests.Shared/Accessibility/AccessibilityAnalyzerTests.cs @@ -5,8 +5,8 @@ using VisualTreeAnalyzers.Accessibility; using VisualTreeAnalyzers.Accessibility.Rules; using VisualTreeAnalyzers.Core; -using VisualTreeAnalyzers.Tests.TestInfra.DemoVisualTrees; -using VisualTreeAnalyzers.Tests.TestInfra.Utils; +using VisualTreeAnalyzers.Tests.UWP.TestInfra.DemoVisualTrees; +using VisualTreeAnalyzers.Tests.UWP.TestInfra.Utils; using Windows.UI; using Windows.UI.Xaml; using Windows.UI.Xaml.Automation; @@ -15,7 +15,7 @@ using Windows.UI.Xaml.Media; using Windows.UI.Xaml.Shapes; -namespace VisualTreeAnalyzers.Tests.Accessibility +namespace VisualTreeAnalyzers.Tests.UWP.Accessibility { [TestClass] public class AccessibilityAnalyzerTests diff --git a/tests/VisualTreeAnalyzers.Tests/Accessibility/Rules/ControlNameNotIncludeTypeRuleTests.cs b/tests/VisualTreeAnalyzers.Tests.Shared/Accessibility/Rules/ControlNameNotIncludeTypeRuleTests.cs similarity index 98% rename from tests/VisualTreeAnalyzers.Tests/Accessibility/Rules/ControlNameNotIncludeTypeRuleTests.cs rename to tests/VisualTreeAnalyzers.Tests.Shared/Accessibility/Rules/ControlNameNotIncludeTypeRuleTests.cs index a8835b8..4d04c6f 100644 --- a/tests/VisualTreeAnalyzers.Tests/Accessibility/Rules/ControlNameNotIncludeTypeRuleTests.cs +++ b/tests/VisualTreeAnalyzers.Tests.Shared/Accessibility/Rules/ControlNameNotIncludeTypeRuleTests.cs @@ -6,7 +6,7 @@ using Windows.UI.Xaml.Automation.Peers; using Windows.UI.Xaml.Controls; -namespace VisualTreeAnalyzers.Tests.Accessibility.Rules +namespace VisualTreeAnalyzers.Tests.UWP.Accessibility.Rules { [TestClass] public class ControlNameNotIncludeTypeRuleTests diff --git a/tests/VisualTreeAnalyzers.Tests/Accessibility/Rules/ControlNonEmptyNameRuleTests.cs b/tests/VisualTreeAnalyzers.Tests.Shared/Accessibility/Rules/ControlNonEmptyNameRuleTests.cs similarity index 97% rename from tests/VisualTreeAnalyzers.Tests/Accessibility/Rules/ControlNonEmptyNameRuleTests.cs rename to tests/VisualTreeAnalyzers.Tests.Shared/Accessibility/Rules/ControlNonEmptyNameRuleTests.cs index ad33e53..2f745d9 100644 --- a/tests/VisualTreeAnalyzers.Tests/Accessibility/Rules/ControlNonEmptyNameRuleTests.cs +++ b/tests/VisualTreeAnalyzers.Tests.Shared/Accessibility/Rules/ControlNonEmptyNameRuleTests.cs @@ -6,7 +6,7 @@ using Windows.UI.Xaml.Controls; using Windows.UI.Xaml.Shapes; -namespace VisualTreeAnalyzers.Tests.Accessibility.Rules +namespace VisualTreeAnalyzers.Tests.UWP.Accessibility.Rules { [TestClass] public class ControlNonEmptyNameRuleTests diff --git a/tests/VisualTreeAnalyzers.Tests/Accessibility/Rules/ExpectKeyboardFocusableFalseRuleTests.cs b/tests/VisualTreeAnalyzers.Tests.Shared/Accessibility/Rules/ExpectKeyboardFocusableFalseRuleTests.cs similarity index 92% rename from tests/VisualTreeAnalyzers.Tests/Accessibility/Rules/ExpectKeyboardFocusableFalseRuleTests.cs rename to tests/VisualTreeAnalyzers.Tests.Shared/Accessibility/Rules/ExpectKeyboardFocusableFalseRuleTests.cs index 3b94157..8866fbb 100644 --- a/tests/VisualTreeAnalyzers.Tests/Accessibility/Rules/ExpectKeyboardFocusableFalseRuleTests.cs +++ b/tests/VisualTreeAnalyzers.Tests.Shared/Accessibility/Rules/ExpectKeyboardFocusableFalseRuleTests.cs @@ -1,13 +1,13 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestTools.UnitTesting.AppContainer; using VisualTreeAnalyzers.Accessibility.Rules; -using VisualTreeAnalyzers.Tests.Accessibility.TestPeers; +using VisualTreeAnalyzers.Tests.UWP.Accessibility.TestPeers; using Windows.UI.Xaml; using Windows.UI.Xaml.Automation.Peers; using Windows.UI.Xaml.Controls; using Windows.UI.Xaml.Controls.Primitives; -namespace VisualTreeAnalyzers.Tests.Accessibility.Rules +namespace VisualTreeAnalyzers.Tests.UWP.Accessibility.Rules { [TestClass] public partial class ExpectKeyboardFocusableFalseRuleTests diff --git a/tests/VisualTreeAnalyzers.Tests/Accessibility/Rules/ExpectKeyboardFocusableTrueRuleTests.cs b/tests/VisualTreeAnalyzers.Tests.Shared/Accessibility/Rules/ExpectKeyboardFocusableTrueRuleTests.cs similarity index 94% rename from tests/VisualTreeAnalyzers.Tests/Accessibility/Rules/ExpectKeyboardFocusableTrueRuleTests.cs rename to tests/VisualTreeAnalyzers.Tests.Shared/Accessibility/Rules/ExpectKeyboardFocusableTrueRuleTests.cs index 8a7e96a..394869c 100644 --- a/tests/VisualTreeAnalyzers.Tests/Accessibility/Rules/ExpectKeyboardFocusableTrueRuleTests.cs +++ b/tests/VisualTreeAnalyzers.Tests.Shared/Accessibility/Rules/ExpectKeyboardFocusableTrueRuleTests.cs @@ -1,13 +1,13 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestTools.UnitTesting.AppContainer; using VisualTreeAnalyzers.Accessibility.Rules; -using VisualTreeAnalyzers.Tests.Accessibility.TestPeers; +using VisualTreeAnalyzers.Tests.UWP.Accessibility.TestPeers; using Windows.UI.Xaml; using Windows.UI.Xaml.Automation.Peers; using Windows.UI.Xaml.Controls; using Windows.UI.Xaml.Controls.Primitives; -namespace VisualTreeAnalyzers.Tests.Accessibility.Rules +namespace VisualTreeAnalyzers.Tests.UWP.Accessibility.Rules { [TestClass] public class ExpectKeyboardFocusableTrueRuleTests diff --git a/tests/VisualTreeAnalyzers.Tests/Accessibility/Rules/LandmarkTypeMainOnceRuleTests.cs b/tests/VisualTreeAnalyzers.Tests.Shared/Accessibility/Rules/LandmarkTypeMainOnceRuleTests.cs similarity index 97% rename from tests/VisualTreeAnalyzers.Tests/Accessibility/Rules/LandmarkTypeMainOnceRuleTests.cs rename to tests/VisualTreeAnalyzers.Tests.Shared/Accessibility/Rules/LandmarkTypeMainOnceRuleTests.cs index 2a53cb7..855be04 100644 --- a/tests/VisualTreeAnalyzers.Tests/Accessibility/Rules/LandmarkTypeMainOnceRuleTests.cs +++ b/tests/VisualTreeAnalyzers.Tests.Shared/Accessibility/Rules/LandmarkTypeMainOnceRuleTests.cs @@ -6,7 +6,7 @@ using Windows.UI.Xaml.Automation.Peers; using Windows.UI.Xaml.Controls; -namespace VisualTreeAnalyzers.Tests.Accessibility.Rules +namespace VisualTreeAnalyzers.Tests.UWP.Accessibility.Rules { [TestClass] public class LandmarkTypeMainOnceRuleTests diff --git a/tests/VisualTreeAnalyzers.Tests/Accessibility/Rules/ListItemNameNotEqualDataContextRuleTests.cs b/tests/VisualTreeAnalyzers.Tests.Shared/Accessibility/Rules/ListItemNameNotEqualDataContextRuleTests.cs similarity index 98% rename from tests/VisualTreeAnalyzers.Tests/Accessibility/Rules/ListItemNameNotEqualDataContextRuleTests.cs rename to tests/VisualTreeAnalyzers.Tests.Shared/Accessibility/Rules/ListItemNameNotEqualDataContextRuleTests.cs index ca961c4..a262c56 100644 --- a/tests/VisualTreeAnalyzers.Tests/Accessibility/Rules/ListItemNameNotEqualDataContextRuleTests.cs +++ b/tests/VisualTreeAnalyzers.Tests.Shared/Accessibility/Rules/ListItemNameNotEqualDataContextRuleTests.cs @@ -12,7 +12,7 @@ using Windows.UI.Xaml.Controls; using Windows.UI.Xaml.Media; -namespace VisualTreeAnalyzers.Tests.Accessibility.Rules +namespace VisualTreeAnalyzers.Tests.UWP.Accessibility.Rules { [TestClass] public class ListItemNameNotEqualDataContextRuleTests diff --git a/tests/VisualTreeAnalyzers.Tests/Accessibility/Rules/LocalizedLandMarkTypeRuleTests.cs b/tests/VisualTreeAnalyzers.Tests.Shared/Accessibility/Rules/LocalizedLandMarkTypeRuleTests.cs similarity index 92% rename from tests/VisualTreeAnalyzers.Tests/Accessibility/Rules/LocalizedLandMarkTypeRuleTests.cs rename to tests/VisualTreeAnalyzers.Tests.Shared/Accessibility/Rules/LocalizedLandMarkTypeRuleTests.cs index ef30616..6c513be 100644 --- a/tests/VisualTreeAnalyzers.Tests/Accessibility/Rules/LocalizedLandMarkTypeRuleTests.cs +++ b/tests/VisualTreeAnalyzers.Tests.Shared/Accessibility/Rules/LocalizedLandMarkTypeRuleTests.cs @@ -1,12 +1,12 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestTools.UnitTesting.AppContainer; using VisualTreeAnalyzers.Accessibility.Rules; -using VisualTreeAnalyzers.Tests.Accessibility.TestPeers; +using VisualTreeAnalyzers.Tests.UWP.Accessibility.TestPeers; using Windows.UI.Xaml; using Windows.UI.Xaml.Automation.Peers; using Windows.UI.Xaml.Controls; -namespace VisualTreeAnalyzers.Tests.Accessibility.Rules +namespace VisualTreeAnalyzers.Tests.UWP.Accessibility.Rules { [TestClass] public class LocalizedLandMarkTypeRuleTests diff --git a/tests/VisualTreeAnalyzers.Tests/Accessibility/Rules/NameReasonableLengthRuleTests.cs b/tests/VisualTreeAnalyzers.Tests.Shared/Accessibility/Rules/NameReasonableLengthRuleTests.cs similarity index 97% rename from tests/VisualTreeAnalyzers.Tests/Accessibility/Rules/NameReasonableLengthRuleTests.cs rename to tests/VisualTreeAnalyzers.Tests.Shared/Accessibility/Rules/NameReasonableLengthRuleTests.cs index 5e1fe9c..bd19d4f 100644 --- a/tests/VisualTreeAnalyzers.Tests/Accessibility/Rules/NameReasonableLengthRuleTests.cs +++ b/tests/VisualTreeAnalyzers.Tests.Shared/Accessibility/Rules/NameReasonableLengthRuleTests.cs @@ -11,7 +11,7 @@ using Windows.UI.Xaml.Controls; using Windows.UI.Xaml.Media; -namespace VisualTreeAnalyzers.Tests.Accessibility.Rules +namespace VisualTreeAnalyzers.Tests.UWP.Accessibility.Rules { [TestClass] public class NameReasonableLengthRuleTests diff --git a/tests/VisualTreeAnalyzers.Tests/Accessibility/Rules/OrientationNotNoneRuleTests.cs b/tests/VisualTreeAnalyzers.Tests.Shared/Accessibility/Rules/OrientationNotNoneRuleTests.cs similarity index 92% rename from tests/VisualTreeAnalyzers.Tests/Accessibility/Rules/OrientationNotNoneRuleTests.cs rename to tests/VisualTreeAnalyzers.Tests.Shared/Accessibility/Rules/OrientationNotNoneRuleTests.cs index 10021b9..a318ede 100644 --- a/tests/VisualTreeAnalyzers.Tests/Accessibility/Rules/OrientationNotNoneRuleTests.cs +++ b/tests/VisualTreeAnalyzers.Tests.Shared/Accessibility/Rules/OrientationNotNoneRuleTests.cs @@ -6,13 +6,13 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestTools.UnitTesting.AppContainer; using VisualTreeAnalyzers.Accessibility.Rules; -using VisualTreeAnalyzers.Tests.Accessibility.TestPeers; +using VisualTreeAnalyzers.Tests.UWP.Accessibility.TestPeers; using Windows.UI.Xaml; using Windows.UI.Xaml.Automation.Peers; using Windows.UI.Xaml.Controls; using Windows.UI.Xaml.Controls.Primitives; -namespace VisualTreeAnalyzers.Tests.Accessibility.Rules +namespace VisualTreeAnalyzers.Tests.UWP.Accessibility.Rules { [TestClass] public partial class OrientationNotNoneRuleTests diff --git a/tests/VisualTreeAnalyzers.Tests/Accessibility/Rules/PatternInterfaceImplementedRuleTests.cs b/tests/VisualTreeAnalyzers.Tests.Shared/Accessibility/Rules/PatternInterfaceImplementedRuleTests.cs similarity index 97% rename from tests/VisualTreeAnalyzers.Tests/Accessibility/Rules/PatternInterfaceImplementedRuleTests.cs rename to tests/VisualTreeAnalyzers.Tests.Shared/Accessibility/Rules/PatternInterfaceImplementedRuleTests.cs index 1a78fdd..c81aa4a 100644 --- a/tests/VisualTreeAnalyzers.Tests/Accessibility/Rules/PatternInterfaceImplementedRuleTests.cs +++ b/tests/VisualTreeAnalyzers.Tests.Shared/Accessibility/Rules/PatternInterfaceImplementedRuleTests.cs @@ -3,13 +3,13 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestTools.UnitTesting.AppContainer; using VisualTreeAnalyzers.Accessibility.Rules; -using VisualTreeAnalyzers.Tests.Accessibility.TestPeers; +using VisualTreeAnalyzers.Tests.UWP.Accessibility.TestPeers; using Windows.UI.Xaml; using Windows.UI.Xaml.Automation.Peers; using Windows.UI.Xaml.Controls; using Windows.UI.Xaml.Controls.Primitives; -namespace VisualTreeAnalyzers.Tests.Accessibility.Rules +namespace VisualTreeAnalyzers.Tests.UWP.Accessibility.Rules { [TestClass] public class PatternInterfaceImplementedRuleTests diff --git a/tests/VisualTreeAnalyzers.Tests/Accessibility/Rules/RequiredSelectionRuleTests.cs b/tests/VisualTreeAnalyzers.Tests.Shared/Accessibility/Rules/RequiredSelectionRuleTests.cs similarity index 90% rename from tests/VisualTreeAnalyzers.Tests/Accessibility/Rules/RequiredSelectionRuleTests.cs rename to tests/VisualTreeAnalyzers.Tests.Shared/Accessibility/Rules/RequiredSelectionRuleTests.cs index 8fa9517..99bcf2b 100644 --- a/tests/VisualTreeAnalyzers.Tests/Accessibility/Rules/RequiredSelectionRuleTests.cs +++ b/tests/VisualTreeAnalyzers.Tests.Shared/Accessibility/Rules/RequiredSelectionRuleTests.cs @@ -6,12 +6,12 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestTools.UnitTesting.AppContainer; using VisualTreeAnalyzers.Accessibility.Rules; -using VisualTreeAnalyzers.Tests.Accessibility.Rules.TestPeers; +using VisualTreeAnalyzers.Tests.UWP.Accessibility.Rules.TestPeers; using Windows.UI.Xaml; using Windows.UI.Xaml.Automation.Peers; using Windows.UI.Xaml.Controls; -namespace VisualTreeAnalyzers.Tests.Accessibility.Rules +namespace VisualTreeAnalyzers.Tests.UWP.Accessibility.Rules { [TestClass] public class RequiredSelectionRuleTests diff --git a/tests/VisualTreeAnalyzers.Tests/Accessibility/Rules/SingleSelectionRuleTests.cs b/tests/VisualTreeAnalyzers.Tests.Shared/Accessibility/Rules/SingleSelectionRuleTests.cs similarity index 92% rename from tests/VisualTreeAnalyzers.Tests/Accessibility/Rules/SingleSelectionRuleTests.cs rename to tests/VisualTreeAnalyzers.Tests.Shared/Accessibility/Rules/SingleSelectionRuleTests.cs index 30a8faf..6e8ac15 100644 --- a/tests/VisualTreeAnalyzers.Tests/Accessibility/Rules/SingleSelectionRuleTests.cs +++ b/tests/VisualTreeAnalyzers.Tests.Shared/Accessibility/Rules/SingleSelectionRuleTests.cs @@ -1,11 +1,11 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestTools.UnitTesting.AppContainer; using VisualTreeAnalyzers.Accessibility.Rules; -using VisualTreeAnalyzers.Tests.Accessibility.Rules.TestPeers; +using VisualTreeAnalyzers.Tests.UWP.Accessibility.Rules.TestPeers; using Windows.UI.Xaml.Automation.Peers; using Windows.UI.Xaml.Controls; -namespace VisualTreeAnalyzers.Tests.Accessibility.Rules +namespace VisualTreeAnalyzers.Tests.UWP.Accessibility.Rules { [TestClass] public partial class SingleSelectionRuleTests diff --git a/tests/VisualTreeAnalyzers.Tests/Accessibility/Rules/TypeButtonIsInvokeOrToggleRuleTests.cs b/tests/VisualTreeAnalyzers.Tests.Shared/Accessibility/Rules/TypeButtonIsInvokeOrToggleRuleTests.cs similarity index 92% rename from tests/VisualTreeAnalyzers.Tests/Accessibility/Rules/TypeButtonIsInvokeOrToggleRuleTests.cs rename to tests/VisualTreeAnalyzers.Tests.Shared/Accessibility/Rules/TypeButtonIsInvokeOrToggleRuleTests.cs index 831c4f4..0305f46 100644 --- a/tests/VisualTreeAnalyzers.Tests/Accessibility/Rules/TypeButtonIsInvokeOrToggleRuleTests.cs +++ b/tests/VisualTreeAnalyzers.Tests.Shared/Accessibility/Rules/TypeButtonIsInvokeOrToggleRuleTests.cs @@ -6,13 +6,13 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestTools.UnitTesting.AppContainer; using VisualTreeAnalyzers.Accessibility.Rules; -using VisualTreeAnalyzers.Tests.Accessibility.TestPeers; +using VisualTreeAnalyzers.Tests.UWP.Accessibility.TestPeers; using Windows.UI.Xaml; using Windows.UI.Xaml.Automation.Peers; using Windows.UI.Xaml.Controls; using Windows.UI.Xaml.Controls.Primitives; -namespace VisualTreeAnalyzers.Tests.Accessibility.Rules +namespace VisualTreeAnalyzers.Tests.UWP.Accessibility.Rules { [TestClass] public class TypeButtonIsInvokeOrToggleRuleTests diff --git a/tests/VisualTreeAnalyzers.Tests/Accessibility/TestPeers/ControlTypeFocusPeer.cs b/tests/VisualTreeAnalyzers.Tests.Shared/Accessibility/TestPeers/ControlTypeFocusPeer.cs similarity index 90% rename from tests/VisualTreeAnalyzers.Tests/Accessibility/TestPeers/ControlTypeFocusPeer.cs rename to tests/VisualTreeAnalyzers.Tests.Shared/Accessibility/TestPeers/ControlTypeFocusPeer.cs index b6763ff..7c4fec8 100644 --- a/tests/VisualTreeAnalyzers.Tests/Accessibility/TestPeers/ControlTypeFocusPeer.cs +++ b/tests/VisualTreeAnalyzers.Tests.Shared/Accessibility/TestPeers/ControlTypeFocusPeer.cs @@ -1,7 +1,7 @@ using Windows.UI.Xaml; using Windows.UI.Xaml.Automation.Peers; -namespace VisualTreeAnalyzers.Tests.Accessibility.TestPeers +namespace VisualTreeAnalyzers.Tests.UWP.Accessibility.TestPeers { class ControlTypeFocusPeer : ControlTypePeer { diff --git a/tests/VisualTreeAnalyzers.Tests/Accessibility/TestPeers/ControlTypePeer.cs b/tests/VisualTreeAnalyzers.Tests.Shared/Accessibility/TestPeers/ControlTypePeer.cs similarity index 88% rename from tests/VisualTreeAnalyzers.Tests/Accessibility/TestPeers/ControlTypePeer.cs rename to tests/VisualTreeAnalyzers.Tests.Shared/Accessibility/TestPeers/ControlTypePeer.cs index 4707c8e..b0b4680 100644 --- a/tests/VisualTreeAnalyzers.Tests/Accessibility/TestPeers/ControlTypePeer.cs +++ b/tests/VisualTreeAnalyzers.Tests.Shared/Accessibility/TestPeers/ControlTypePeer.cs @@ -1,7 +1,7 @@ using Windows.UI.Xaml; using Windows.UI.Xaml.Automation.Peers; -namespace VisualTreeAnalyzers.Tests.Accessibility.TestPeers +namespace VisualTreeAnalyzers.Tests.UWP.Accessibility.TestPeers { internal class ControlTypePeer : FrameworkElementAutomationPeer { diff --git a/tests/VisualTreeAnalyzers.Tests/Accessibility/TestPeers/LocalizedLandmarkPeer.cs b/tests/VisualTreeAnalyzers.Tests.Shared/Accessibility/TestPeers/LocalizedLandmarkPeer.cs similarity index 91% rename from tests/VisualTreeAnalyzers.Tests/Accessibility/TestPeers/LocalizedLandmarkPeer.cs rename to tests/VisualTreeAnalyzers.Tests.Shared/Accessibility/TestPeers/LocalizedLandmarkPeer.cs index efcf53c..914079d 100644 --- a/tests/VisualTreeAnalyzers.Tests/Accessibility/TestPeers/LocalizedLandmarkPeer.cs +++ b/tests/VisualTreeAnalyzers.Tests.Shared/Accessibility/TestPeers/LocalizedLandmarkPeer.cs @@ -6,7 +6,7 @@ using Windows.UI.Xaml; using Windows.UI.Xaml.Automation.Peers; -namespace VisualTreeAnalyzers.Tests.Accessibility.TestPeers +namespace VisualTreeAnalyzers.Tests.UWP.Accessibility.TestPeers { class LocalizedLandmarkPeer : ControlTypePeer { diff --git a/tests/VisualTreeAnalyzers.Tests/Accessibility/TestPeers/NoneOrientationPeer.cs b/tests/VisualTreeAnalyzers.Tests.Shared/Accessibility/TestPeers/NoneOrientationPeer.cs similarity index 89% rename from tests/VisualTreeAnalyzers.Tests/Accessibility/TestPeers/NoneOrientationPeer.cs rename to tests/VisualTreeAnalyzers.Tests.Shared/Accessibility/TestPeers/NoneOrientationPeer.cs index bc1d83b..cf8ec3f 100644 --- a/tests/VisualTreeAnalyzers.Tests/Accessibility/TestPeers/NoneOrientationPeer.cs +++ b/tests/VisualTreeAnalyzers.Tests.Shared/Accessibility/TestPeers/NoneOrientationPeer.cs @@ -1,7 +1,7 @@ using Windows.UI.Xaml; using Windows.UI.Xaml.Automation.Peers; -namespace VisualTreeAnalyzers.Tests.Accessibility.TestPeers +namespace VisualTreeAnalyzers.Tests.UWP.Accessibility.TestPeers { class NoneOrientationPeer : ControlTypePeer diff --git a/tests/VisualTreeAnalyzers.Tests/Accessibility/TestPeers/PatternInterfacePeer.cs b/tests/VisualTreeAnalyzers.Tests.Shared/Accessibility/TestPeers/PatternInterfacePeer.cs similarity index 91% rename from tests/VisualTreeAnalyzers.Tests/Accessibility/TestPeers/PatternInterfacePeer.cs rename to tests/VisualTreeAnalyzers.Tests.Shared/Accessibility/TestPeers/PatternInterfacePeer.cs index 7d89b35..2e25087 100644 --- a/tests/VisualTreeAnalyzers.Tests/Accessibility/TestPeers/PatternInterfacePeer.cs +++ b/tests/VisualTreeAnalyzers.Tests.Shared/Accessibility/TestPeers/PatternInterfacePeer.cs @@ -6,7 +6,7 @@ using Windows.UI.Xaml; using Windows.UI.Xaml.Automation.Peers; -namespace VisualTreeAnalyzers.Tests.Accessibility.TestPeers +namespace VisualTreeAnalyzers.Tests.UWP.Accessibility.TestPeers { class PatternInterfacePeer : ControlTypePeer { diff --git a/tests/VisualTreeAnalyzers.Tests/Accessibility/TestPeers/SelectionPeer.cs b/tests/VisualTreeAnalyzers.Tests.Shared/Accessibility/TestPeers/SelectionPeer.cs similarity index 94% rename from tests/VisualTreeAnalyzers.Tests/Accessibility/TestPeers/SelectionPeer.cs rename to tests/VisualTreeAnalyzers.Tests.Shared/Accessibility/TestPeers/SelectionPeer.cs index e10bee2..1775c6d 100644 --- a/tests/VisualTreeAnalyzers.Tests/Accessibility/TestPeers/SelectionPeer.cs +++ b/tests/VisualTreeAnalyzers.Tests.Shared/Accessibility/TestPeers/SelectionPeer.cs @@ -3,7 +3,7 @@ using Windows.UI.Xaml.Automation.Provider; using Windows.UI.Xaml.Controls; -namespace VisualTreeAnalyzers.Tests.Accessibility.Rules.TestPeers +namespace VisualTreeAnalyzers.Tests.UWP.Accessibility.Rules.TestPeers { class SelectionPeer : FrameworkElementAutomationPeer, ISelectionProvider { diff --git a/tests/VisualTreeAnalyzers.Tests/Assets/LockScreenLogo.scale-200.png b/tests/VisualTreeAnalyzers.Tests.Shared/Assets/LockScreenLogo.scale-200.png similarity index 100% rename from tests/VisualTreeAnalyzers.Tests/Assets/LockScreenLogo.scale-200.png rename to tests/VisualTreeAnalyzers.Tests.Shared/Assets/LockScreenLogo.scale-200.png diff --git a/tests/VisualTreeAnalyzers.Tests/Assets/SplashScreen.scale-200.png b/tests/VisualTreeAnalyzers.Tests.Shared/Assets/SplashScreen.scale-200.png similarity index 100% rename from tests/VisualTreeAnalyzers.Tests/Assets/SplashScreen.scale-200.png rename to tests/VisualTreeAnalyzers.Tests.Shared/Assets/SplashScreen.scale-200.png diff --git a/tests/VisualTreeAnalyzers.Tests/Assets/Square150x150Logo.scale-200.png b/tests/VisualTreeAnalyzers.Tests.Shared/Assets/Square150x150Logo.scale-200.png similarity index 100% rename from tests/VisualTreeAnalyzers.Tests/Assets/Square150x150Logo.scale-200.png rename to tests/VisualTreeAnalyzers.Tests.Shared/Assets/Square150x150Logo.scale-200.png diff --git a/tests/VisualTreeAnalyzers.Tests/Assets/Square44x44Logo.scale-200.png b/tests/VisualTreeAnalyzers.Tests.Shared/Assets/Square44x44Logo.scale-200.png similarity index 100% rename from tests/VisualTreeAnalyzers.Tests/Assets/Square44x44Logo.scale-200.png rename to tests/VisualTreeAnalyzers.Tests.Shared/Assets/Square44x44Logo.scale-200.png diff --git a/tests/VisualTreeAnalyzers.Tests/Assets/Square44x44Logo.targetsize-24_altform-unplated.png b/tests/VisualTreeAnalyzers.Tests.Shared/Assets/Square44x44Logo.targetsize-24_altform-unplated.png similarity index 100% rename from tests/VisualTreeAnalyzers.Tests/Assets/Square44x44Logo.targetsize-24_altform-unplated.png rename to tests/VisualTreeAnalyzers.Tests.Shared/Assets/Square44x44Logo.targetsize-24_altform-unplated.png diff --git a/tests/VisualTreeAnalyzers.Tests/Assets/StoreLogo.png b/tests/VisualTreeAnalyzers.Tests.Shared/Assets/StoreLogo.png similarity index 100% rename from tests/VisualTreeAnalyzers.Tests/Assets/StoreLogo.png rename to tests/VisualTreeAnalyzers.Tests.Shared/Assets/StoreLogo.png diff --git a/tests/VisualTreeAnalyzers.Tests/Assets/Wide310x150Logo.scale-200.png b/tests/VisualTreeAnalyzers.Tests.Shared/Assets/Wide310x150Logo.scale-200.png similarity index 100% rename from tests/VisualTreeAnalyzers.Tests/Assets/Wide310x150Logo.scale-200.png rename to tests/VisualTreeAnalyzers.Tests.Shared/Assets/Wide310x150Logo.scale-200.png diff --git a/tests/VisualTreeAnalyzers.Tests/Core/AnalyzerHelperTests.cs b/tests/VisualTreeAnalyzers.Tests.Shared/Core/AnalyzerHelperTests.cs similarity index 98% rename from tests/VisualTreeAnalyzers.Tests/Core/AnalyzerHelperTests.cs rename to tests/VisualTreeAnalyzers.Tests.Shared/Core/AnalyzerHelperTests.cs index 045d8ba..a731b0a 100644 --- a/tests/VisualTreeAnalyzers.Tests/Core/AnalyzerHelperTests.cs +++ b/tests/VisualTreeAnalyzers.Tests.Shared/Core/AnalyzerHelperTests.cs @@ -7,7 +7,7 @@ using Windows.UI.Xaml.Controls; using Windows.UI.Xaml.Media; -namespace VisualTreeAnalyzers.Tests.Core +namespace VisualTreeAnalyzers.Tests.UWP.Core { [TestClass] public class AnalyzerHelperTests diff --git a/tests/VisualTreeAnalyzers.Tests/Core/VisualTreeWalkerTests.cs b/tests/VisualTreeAnalyzers.Tests.Shared/Core/VisualTreeWalkerTests.cs similarity index 93% rename from tests/VisualTreeAnalyzers.Tests/Core/VisualTreeWalkerTests.cs rename to tests/VisualTreeAnalyzers.Tests.Shared/Core/VisualTreeWalkerTests.cs index 81b60ef..3767e67 100644 --- a/tests/VisualTreeAnalyzers.Tests/Core/VisualTreeWalkerTests.cs +++ b/tests/VisualTreeAnalyzers.Tests.Shared/Core/VisualTreeWalkerTests.cs @@ -2,13 +2,13 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestTools.UnitTesting.AppContainer; using VisualTreeAnalyzers.Core; -using VisualTreeAnalyzers.Tests.TestInfra.DemoVisualTrees; -using VisualTreeAnalyzers.Tests.TestInfra.TestImplementations; -using VisualTreeAnalyzers.Tests.TestInfra.Utils; +using VisualTreeAnalyzers.Tests.UWP.TestInfra.DemoVisualTrees; +using VisualTreeAnalyzers.Tests.Shared.TestImplementations; +using VisualTreeAnalyzers.Tests.UWP.TestInfra.Utils; using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; -namespace VisualTreeAnalyzers.Tests.Core +namespace VisualTreeAnalyzers.Tests.UWP.Core { [TestClass] public class VisualTreeWalkerTests diff --git a/tests/VisualTreeAnalyzers.Tests/Core/VisualTreeWalkerTimerTests.cs b/tests/VisualTreeAnalyzers.Tests.Shared/Core/VisualTreeWalkerTimerTests.cs similarity index 94% rename from tests/VisualTreeAnalyzers.Tests/Core/VisualTreeWalkerTimerTests.cs rename to tests/VisualTreeAnalyzers.Tests.Shared/Core/VisualTreeWalkerTimerTests.cs index b190d9d..ae233fb 100644 --- a/tests/VisualTreeAnalyzers.Tests/Core/VisualTreeWalkerTimerTests.cs +++ b/tests/VisualTreeAnalyzers.Tests.Shared/Core/VisualTreeWalkerTimerTests.cs @@ -1,11 +1,11 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestTools.UnitTesting.Logging; using VisualTreeAnalyzers.Core; -using VisualTreeAnalyzers.Tests.TestInfra.TestImplementations; -using VisualTreeAnalyzers.Tests.TestInfra.Utils; +using VisualTreeAnalyzers.Tests.Shared.TestImplementations; +using VisualTreeAnalyzers.Tests.UWP.TestInfra.Utils; using Windows.UI.Xaml.Controls; -namespace VisualTreeAnalyzers.Tests.Core +namespace VisualTreeAnalyzers.Tests.UWP.Core { [TestClass] public class VisualTreeWalkerTimerTests diff --git a/tests/VisualTreeAnalyzers.Tests/Snapshot/ElementSnapshotCreatorTests.cs b/tests/VisualTreeAnalyzers.Tests.Shared/Snapshot/ElementSnapshotCreatorTests.cs similarity index 93% rename from tests/VisualTreeAnalyzers.Tests/Snapshot/ElementSnapshotCreatorTests.cs rename to tests/VisualTreeAnalyzers.Tests.Shared/Snapshot/ElementSnapshotCreatorTests.cs index cfa026a..cae86f8 100644 --- a/tests/VisualTreeAnalyzers.Tests/Snapshot/ElementSnapshotCreatorTests.cs +++ b/tests/VisualTreeAnalyzers.Tests.Shared/Snapshot/ElementSnapshotCreatorTests.cs @@ -3,11 +3,11 @@ using System; using System.Collections.Generic; using VisualTreeAnalyzers.Snapshot; -using VisualTreeAnalyzers.Tests.TestInfra.DemoVisualTrees; +using VisualTreeAnalyzers.Tests.UWP.TestInfra.DemoVisualTrees; using Windows.UI.Xaml.Controls; using Windows.UI.Xaml.Media; -namespace VisualTreeAnalyzers.Tests.Snapshot +namespace VisualTreeAnalyzers.Tests.UWP.Snapshot { [TestClass] public class ElementSnapshotCreatorTests @@ -34,7 +34,7 @@ public void VerifyCreatesSimplePageTreeCorrectly() var pageSnapshot = snapshotCreator.CreateSnapshot(); Assert.AreEqual(testPropertyNames, pageSnapshot.PropertyNames); Assert.AreEqual("SimplePageName", pageSnapshot.ElementName); - Assert.AreEqual("VisualTreeAnalyzers.Tests.TestInfra.DemoVisualTrees.SimplePage", pageSnapshot.FullTypeName); + Assert.AreEqual("VisualTreeAnalyzers.Tests.UWP.TestInfra.DemoVisualTrees.SimplePage", pageSnapshot.FullTypeName); Assert.AreEqual(1, pageSnapshot.Children.Count); var gridSnapshot = pageSnapshot.Children[0]; diff --git a/tests/VisualTreeAnalyzers.Tests/Snapshot/Exporter/JsonExporterTests.cs b/tests/VisualTreeAnalyzers.Tests.Shared/Snapshot/Exporter/JsonExporterTests.cs similarity index 97% rename from tests/VisualTreeAnalyzers.Tests/Snapshot/Exporter/JsonExporterTests.cs rename to tests/VisualTreeAnalyzers.Tests.Shared/Snapshot/Exporter/JsonExporterTests.cs index defc9ab..4c96171 100644 --- a/tests/VisualTreeAnalyzers.Tests/Snapshot/Exporter/JsonExporterTests.cs +++ b/tests/VisualTreeAnalyzers.Tests.Shared/Snapshot/Exporter/JsonExporterTests.cs @@ -7,12 +7,12 @@ using System.Threading.Tasks; using VisualTreeAnalyzers.Snapshot; using VisualTreeAnalyzers.Snapshot.Exporter; -using VisualTreeAnalyzers.Tests.TestInfra.DemoVisualTrees; +using VisualTreeAnalyzers.Tests.UWP.TestInfra.DemoVisualTrees; using Windows.UI; using Windows.UI.Xaml.Controls; using Windows.UI.Xaml.Media; -namespace VisualTreeAnalyzers.Tests.Snapshot.Exporter +namespace VisualTreeAnalyzers.Tests.UWP.Snapshot.Exporter { [TestClass] public class JsonExporterTests @@ -69,7 +69,7 @@ public void VerifySinglePageJSONExport() var jsonAsText = export.Stringify(); - Assert.IsTrue(jsonAsText.Contains("VisualTreeAnalyzers.Tests.TestInfra.DemoVisualTrees.SimplePage")); + Assert.IsTrue(jsonAsText.Contains("VisualTreeAnalyzers.Tests.UWP.TestInfra.DemoVisualTrees.SimplePage")); Assert.IsTrue(jsonAsText.Contains("\"type\":\"Windows.UI.Xaml.Controls.Grid\",\"Name\":\"RootGrid\"")); } diff --git a/tests/VisualTreeAnalyzers.Tests/Snapshot/Exporter/XMLExporterTests.cs b/tests/VisualTreeAnalyzers.Tests.Shared/Snapshot/Exporter/XMLExporterTests.cs similarity index 97% rename from tests/VisualTreeAnalyzers.Tests/Snapshot/Exporter/XMLExporterTests.cs rename to tests/VisualTreeAnalyzers.Tests.Shared/Snapshot/Exporter/XMLExporterTests.cs index ba08509..aeb7bc5 100644 --- a/tests/VisualTreeAnalyzers.Tests/Snapshot/Exporter/XMLExporterTests.cs +++ b/tests/VisualTreeAnalyzers.Tests.Shared/Snapshot/Exporter/XMLExporterTests.cs @@ -2,12 +2,12 @@ using Microsoft.VisualStudio.TestTools.UnitTesting.AppContainer; using VisualTreeAnalyzers.Snapshot; using VisualTreeAnalyzers.Snapshot.Exporter; -using VisualTreeAnalyzers.Tests.TestInfra.DemoVisualTrees; +using VisualTreeAnalyzers.Tests.UWP.TestInfra.DemoVisualTrees; using Windows.UI; using Windows.UI.Xaml.Controls; using Windows.UI.Xaml.Media; -namespace VisualTreeAnalyzers.Tests.Snapshot.Exporter +namespace VisualTreeAnalyzers.Tests.UWP.Snapshot.Exporter { [TestClass] public class XmlExporterTests @@ -66,7 +66,7 @@ public void VerifySinglePageXMLExport() var xmlAsText = export.GetXml(); - Assert.IsTrue(xmlAsText.Contains("VisualTreeAnalyzers.Tests.TestInfra.DemoVisualTrees.SimplePage")); + Assert.IsTrue(xmlAsText.Contains("VisualTreeAnalyzers.Tests.UWP.TestInfra.DemoVisualTrees.SimplePage")); Assert.IsTrue(xmlAsText.Contains($"Windows.UI.Xaml.Controls.Grid Name=\"RootGrid\"")); } diff --git a/tests/VisualTreeAnalyzers.Tests/Snapshot/NamespaceHelperTests.cs b/tests/VisualTreeAnalyzers.Tests.Shared/Snapshot/NamespaceHelperTests.cs similarity index 95% rename from tests/VisualTreeAnalyzers.Tests/Snapshot/NamespaceHelperTests.cs rename to tests/VisualTreeAnalyzers.Tests.Shared/Snapshot/NamespaceHelperTests.cs index aa914b2..d17f2fe 100644 --- a/tests/VisualTreeAnalyzers.Tests/Snapshot/NamespaceHelperTests.cs +++ b/tests/VisualTreeAnalyzers.Tests.Shared/Snapshot/NamespaceHelperTests.cs @@ -1,7 +1,7 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using VisualTreeAnalyzers.Snapshot; -namespace VisualTreeAnalyzers.Tests.Snapshot +namespace VisualTreeAnalyzers.Tests.UWP.Snapshot { [TestClass] public class NamespaceHelperTests diff --git a/tests/VisualTreeAnalyzers.Tests/Snapshot/StandardOptionsTests.cs b/tests/VisualTreeAnalyzers.Tests.Shared/Snapshot/StandardOptionsTests.cs similarity index 98% rename from tests/VisualTreeAnalyzers.Tests/Snapshot/StandardOptionsTests.cs rename to tests/VisualTreeAnalyzers.Tests.Shared/Snapshot/StandardOptionsTests.cs index 7318787..057b509 100644 --- a/tests/VisualTreeAnalyzers.Tests/Snapshot/StandardOptionsTests.cs +++ b/tests/VisualTreeAnalyzers.Tests.Shared/Snapshot/StandardOptionsTests.cs @@ -6,7 +6,7 @@ using Windows.UI.Xaml.Controls; using Windows.UI.Xaml.Media; -namespace VisualTreeAnalyzers.Tests.Snapshot +namespace VisualTreeAnalyzers.Tests.UWP.Snapshot { [TestClass] public class StandardOptionsTests diff --git a/tests/VisualTreeAnalyzers.Tests/TestInfra/TestImplementations/AnalyzeInvokeCountAnalyzer.cs b/tests/VisualTreeAnalyzers.Tests.Shared/TestImplementations/AnalyzeInvokeCountAnalyzer.cs similarity index 75% rename from tests/VisualTreeAnalyzers.Tests/TestInfra/TestImplementations/AnalyzeInvokeCountAnalyzer.cs rename to tests/VisualTreeAnalyzers.Tests.Shared/TestImplementations/AnalyzeInvokeCountAnalyzer.cs index b4693ce..d5ff8da 100644 --- a/tests/VisualTreeAnalyzers.Tests/TestInfra/TestImplementations/AnalyzeInvokeCountAnalyzer.cs +++ b/tests/VisualTreeAnalyzers.Tests.Shared/TestImplementations/AnalyzeInvokeCountAnalyzer.cs @@ -1,9 +1,9 @@ using VisualTreeAnalyzers.Core; using Windows.UI.Xaml; -namespace VisualTreeAnalyzers.Tests.TestInfra.TestImplementations +namespace VisualTreeAnalyzers.Tests.Shared.TestImplementations { - class AnalyzeInvokeCountAnalyzer : IElementAnalyzer + public class AnalyzeInvokeCountAnalyzer : IElementAnalyzer { public int AnalyzeCount { get; private set; } public void Analyze(FrameworkElement element) diff --git a/tests/VisualTreeAnalyzers.Tests/TestInfra/TestImplementations/CountingElementAnalyzer.cs b/tests/VisualTreeAnalyzers.Tests.Shared/TestImplementations/CountingElementAnalyzer.cs similarity index 82% rename from tests/VisualTreeAnalyzers.Tests/TestInfra/TestImplementations/CountingElementAnalyzer.cs rename to tests/VisualTreeAnalyzers.Tests.Shared/TestImplementations/CountingElementAnalyzer.cs index a6d16f7..84f4f69 100644 --- a/tests/VisualTreeAnalyzers.Tests/TestInfra/TestImplementations/CountingElementAnalyzer.cs +++ b/tests/VisualTreeAnalyzers.Tests.Shared/TestImplementations/CountingElementAnalyzer.cs @@ -2,9 +2,9 @@ using VisualTreeAnalyzers.Core; using Windows.UI.Xaml; -namespace VisualTreeAnalyzers.Tests.TestInfra.TestImplementations +namespace VisualTreeAnalyzers.Tests.Shared.TestImplementations { - class CountingElementAnalyzer : IElementAnalyzer + public class CountingElementAnalyzer : IElementAnalyzer { private List visitedElements; private readonly bool visitChildren; @@ -19,11 +19,11 @@ public CountingElementAnalyzer(List elementCollection, bool sh public void Analyze(FrameworkElement element) { - if(!visitedElements.Contains(element)) + if (!visitedElements.Contains(element)) { visitedElements.Add(element); } - else if(shouldThrowWhenVisited) + else if (shouldThrowWhenVisited) { throw new System.InvalidOperationException("Error: Element already visited."); } diff --git a/tests/VisualTreeAnalyzers.Tests.Shared/VisualTreeAnalyzers.Tests.Shared.projitems b/tests/VisualTreeAnalyzers.Tests.Shared/VisualTreeAnalyzers.Tests.Shared.projitems new file mode 100644 index 0000000..837ce8e --- /dev/null +++ b/tests/VisualTreeAnalyzers.Tests.Shared/VisualTreeAnalyzers.Tests.Shared.projitems @@ -0,0 +1,43 @@ + + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + true + 1e1c64d1-8222-41a5-8aa9-4f028df5c6b8 + + + VisualTreeAnalyzers.Tests + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tests/VisualTreeAnalyzers.Tests.Shared/VisualTreeAnalyzers.Tests.Shared.shproj b/tests/VisualTreeAnalyzers.Tests.Shared/VisualTreeAnalyzers.Tests.Shared.shproj new file mode 100644 index 0000000..a2e87d7 --- /dev/null +++ b/tests/VisualTreeAnalyzers.Tests.Shared/VisualTreeAnalyzers.Tests.Shared.shproj @@ -0,0 +1,13 @@ + + + + {459E3085-96D7-4A0C-8A7D-4F8A10AED340} + 14.0 + + + + + + + + \ No newline at end of file diff --git a/tests/VisualTreeAnalyzers.Tests.UWP/Assets/LockScreenLogo.scale-200.png b/tests/VisualTreeAnalyzers.Tests.UWP/Assets/LockScreenLogo.scale-200.png new file mode 100644 index 0000000..735f57a Binary files /dev/null and b/tests/VisualTreeAnalyzers.Tests.UWP/Assets/LockScreenLogo.scale-200.png differ diff --git a/tests/VisualTreeAnalyzers.Tests.UWP/Assets/SplashScreen.scale-200.png b/tests/VisualTreeAnalyzers.Tests.UWP/Assets/SplashScreen.scale-200.png new file mode 100644 index 0000000..023e7f1 Binary files /dev/null and b/tests/VisualTreeAnalyzers.Tests.UWP/Assets/SplashScreen.scale-200.png differ diff --git a/tests/VisualTreeAnalyzers.Tests.UWP/Assets/Square150x150Logo.scale-200.png b/tests/VisualTreeAnalyzers.Tests.UWP/Assets/Square150x150Logo.scale-200.png new file mode 100644 index 0000000..af49fec Binary files /dev/null and b/tests/VisualTreeAnalyzers.Tests.UWP/Assets/Square150x150Logo.scale-200.png differ diff --git a/tests/VisualTreeAnalyzers.Tests.UWP/Assets/Square44x44Logo.scale-200.png b/tests/VisualTreeAnalyzers.Tests.UWP/Assets/Square44x44Logo.scale-200.png new file mode 100644 index 0000000..ce342a2 Binary files /dev/null and b/tests/VisualTreeAnalyzers.Tests.UWP/Assets/Square44x44Logo.scale-200.png differ diff --git a/tests/VisualTreeAnalyzers.Tests.UWP/Assets/Square44x44Logo.targetsize-24_altform-unplated.png b/tests/VisualTreeAnalyzers.Tests.UWP/Assets/Square44x44Logo.targetsize-24_altform-unplated.png new file mode 100644 index 0000000..f6c02ce Binary files /dev/null and b/tests/VisualTreeAnalyzers.Tests.UWP/Assets/Square44x44Logo.targetsize-24_altform-unplated.png differ diff --git a/tests/VisualTreeAnalyzers.Tests.UWP/Assets/StoreLogo.png b/tests/VisualTreeAnalyzers.Tests.UWP/Assets/StoreLogo.png new file mode 100644 index 0000000..7385b56 Binary files /dev/null and b/tests/VisualTreeAnalyzers.Tests.UWP/Assets/StoreLogo.png differ diff --git a/tests/VisualTreeAnalyzers.Tests.UWP/Assets/Wide310x150Logo.scale-200.png b/tests/VisualTreeAnalyzers.Tests.UWP/Assets/Wide310x150Logo.scale-200.png new file mode 100644 index 0000000..288995b Binary files /dev/null and b/tests/VisualTreeAnalyzers.Tests.UWP/Assets/Wide310x150Logo.scale-200.png differ diff --git a/tests/VisualTreeAnalyzers.Tests/Package.appxmanifest b/tests/VisualTreeAnalyzers.Tests.UWP/Package.appxmanifest similarity index 87% rename from tests/VisualTreeAnalyzers.Tests/Package.appxmanifest rename to tests/VisualTreeAnalyzers.Tests.UWP/Package.appxmanifest index 7e0216e..07a5234 100644 --- a/tests/VisualTreeAnalyzers.Tests/Package.appxmanifest +++ b/tests/VisualTreeAnalyzers.Tests.UWP/Package.appxmanifest @@ -12,7 +12,7 @@ - VisualTreeAnalyzers.Tests + VisualTreeAnalyzers.Tests.UWP Marcel Assets\StoreLogo.png @@ -27,12 +27,12 @@ + EntryPoint="VisualTreeAnalyzers.Tests.UWP.App"> diff --git a/tests/VisualTreeAnalyzers.Tests/Properties/AssemblyInfo.cs b/tests/VisualTreeAnalyzers.Tests.UWP/Properties/AssemblyInfo.cs similarity index 81% rename from tests/VisualTreeAnalyzers.Tests/Properties/AssemblyInfo.cs rename to tests/VisualTreeAnalyzers.Tests.UWP/Properties/AssemblyInfo.cs index e551327..10a7f28 100644 --- a/tests/VisualTreeAnalyzers.Tests/Properties/AssemblyInfo.cs +++ b/tests/VisualTreeAnalyzers.Tests.UWP/Properties/AssemblyInfo.cs @@ -2,11 +2,11 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -[assembly: AssemblyTitle("VisualTreeAnalyzers.Tests")] +[assembly: AssemblyTitle("VisualTreeAnalyzers.Tests.UWP")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("VisualTreeAnalyzers.Tests")] +[assembly: AssemblyProduct("VisualTreeAnalyzers.Tests.UWP")] [assembly: AssemblyCopyright("Copyright © 2020")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/tests/VisualTreeAnalyzers.Tests/Properties/Default.rd.xml b/tests/VisualTreeAnalyzers.Tests.UWP/Properties/Default.rd.xml similarity index 100% rename from tests/VisualTreeAnalyzers.Tests/Properties/Default.rd.xml rename to tests/VisualTreeAnalyzers.Tests.UWP/Properties/Default.rd.xml diff --git a/tests/VisualTreeAnalyzers.Tests/TestInfra/DemoVisualTrees/BreadthFirsSearchTestTree.xaml b/tests/VisualTreeAnalyzers.Tests.UWP/TestInfra/DemoVisualTrees/BreadthFirsSearchTestTree.xaml similarity index 95% rename from tests/VisualTreeAnalyzers.Tests/TestInfra/DemoVisualTrees/BreadthFirsSearchTestTree.xaml rename to tests/VisualTreeAnalyzers.Tests.UWP/TestInfra/DemoVisualTrees/BreadthFirsSearchTestTree.xaml index 349de0d..72650b8 100644 --- a/tests/VisualTreeAnalyzers.Tests/TestInfra/DemoVisualTrees/BreadthFirsSearchTestTree.xaml +++ b/tests/VisualTreeAnalyzers.Tests.UWP/TestInfra/DemoVisualTrees/BreadthFirsSearchTestTree.xaml @@ -1,5 +1,5 @@  /// An empty page that can be used on its own or navigated to within a Frame. diff --git a/tests/VisualTreeAnalyzers.Tests/TestInfra/DemoVisualTrees/PageWithDeepNesting.xaml b/tests/VisualTreeAnalyzers.Tests.UWP/TestInfra/DemoVisualTrees/PageWithDeepNesting.xaml similarity index 71% rename from tests/VisualTreeAnalyzers.Tests/TestInfra/DemoVisualTrees/PageWithDeepNesting.xaml rename to tests/VisualTreeAnalyzers.Tests.UWP/TestInfra/DemoVisualTrees/PageWithDeepNesting.xaml index 0f554b3..5ca2f77 100644 --- a/tests/VisualTreeAnalyzers.Tests/TestInfra/DemoVisualTrees/PageWithDeepNesting.xaml +++ b/tests/VisualTreeAnalyzers.Tests.UWP/TestInfra/DemoVisualTrees/PageWithDeepNesting.xaml @@ -1,8 +1,8 @@  /// An empty page that can be used on its own or navigated to within a Frame. diff --git a/tests/VisualTreeAnalyzers.Tests/TestInfra/DemoVisualTrees/PageWithFlatAndNestedLayout.xaml b/tests/VisualTreeAnalyzers.Tests.UWP/TestInfra/DemoVisualTrees/PageWithFlatAndNestedLayout.xaml similarity index 69% rename from tests/VisualTreeAnalyzers.Tests/TestInfra/DemoVisualTrees/PageWithFlatAndNestedLayout.xaml rename to tests/VisualTreeAnalyzers.Tests.UWP/TestInfra/DemoVisualTrees/PageWithFlatAndNestedLayout.xaml index 65585b2..3d6e202 100644 --- a/tests/VisualTreeAnalyzers.Tests/TestInfra/DemoVisualTrees/PageWithFlatAndNestedLayout.xaml +++ b/tests/VisualTreeAnalyzers.Tests.UWP/TestInfra/DemoVisualTrees/PageWithFlatAndNestedLayout.xaml @@ -1,8 +1,8 @@  /// An empty page that can be used on its own or navigated to within a Frame. diff --git a/tests/VisualTreeAnalyzers.Tests/TestInfra/DemoVisualTrees/PageWithFlatStructure.xaml b/tests/VisualTreeAnalyzers.Tests.UWP/TestInfra/DemoVisualTrees/PageWithFlatStructure.xaml similarity index 71% rename from tests/VisualTreeAnalyzers.Tests/TestInfra/DemoVisualTrees/PageWithFlatStructure.xaml rename to tests/VisualTreeAnalyzers.Tests.UWP/TestInfra/DemoVisualTrees/PageWithFlatStructure.xaml index c08ae20..d1ad054 100644 --- a/tests/VisualTreeAnalyzers.Tests/TestInfra/DemoVisualTrees/PageWithFlatStructure.xaml +++ b/tests/VisualTreeAnalyzers.Tests.UWP/TestInfra/DemoVisualTrees/PageWithFlatStructure.xaml @@ -1,8 +1,8 @@  /// An empty page that can be used on its own or navigated to within a Frame. diff --git a/tests/VisualTreeAnalyzers.Tests/TestInfra/DemoVisualTrees/SimplePage.xaml b/tests/VisualTreeAnalyzers.Tests.UWP/TestInfra/DemoVisualTrees/SimplePage.xaml similarity index 87% rename from tests/VisualTreeAnalyzers.Tests/TestInfra/DemoVisualTrees/SimplePage.xaml rename to tests/VisualTreeAnalyzers.Tests.UWP/TestInfra/DemoVisualTrees/SimplePage.xaml index 3300b5c..5fcd36c 100644 --- a/tests/VisualTreeAnalyzers.Tests/TestInfra/DemoVisualTrees/SimplePage.xaml +++ b/tests/VisualTreeAnalyzers.Tests.UWP/TestInfra/DemoVisualTrees/SimplePage.xaml @@ -1,5 +1,5 @@  /// An empty page that can be used on its own or navigated to within a Frame. diff --git a/tests/VisualTreeAnalyzers.Tests/TestInfra/Utils/RunOnUIThread.cs b/tests/VisualTreeAnalyzers.Tests.UWP/TestInfra/Utils/RunOnUIThread.cs similarity index 98% rename from tests/VisualTreeAnalyzers.Tests/TestInfra/Utils/RunOnUIThread.cs rename to tests/VisualTreeAnalyzers.Tests.UWP/TestInfra/Utils/RunOnUIThread.cs index e579c00..0329b83 100644 --- a/tests/VisualTreeAnalyzers.Tests/TestInfra/Utils/RunOnUIThread.cs +++ b/tests/VisualTreeAnalyzers.Tests.UWP/TestInfra/Utils/RunOnUIThread.cs @@ -6,7 +6,7 @@ using Windows.UI.ViewManagement; using Windows.UI.Xaml.Media; -namespace VisualTreeAnalyzers.Tests.TestInfra.Utils +namespace VisualTreeAnalyzers.Tests.UWP.TestInfra.Utils { // Class take from WinUI repository. Original source code: // https://github.com/microsoft/microsoft-ui-xaml/blob/master/test/MUXControlsTestApp/Utilities/RunOnUIThread.cs diff --git a/tests/VisualTreeAnalyzers.Tests/UnitTestApp.xaml b/tests/VisualTreeAnalyzers.Tests.UWP/UnitTestApp.xaml similarity index 92% rename from tests/VisualTreeAnalyzers.Tests/UnitTestApp.xaml rename to tests/VisualTreeAnalyzers.Tests.UWP/UnitTestApp.xaml index 0a26992..708da53 100644 --- a/tests/VisualTreeAnalyzers.Tests/UnitTestApp.xaml +++ b/tests/VisualTreeAnalyzers.Tests.UWP/UnitTestApp.xaml @@ -1,5 +1,5 @@  diff --git a/tests/VisualTreeAnalyzers.Tests/UnitTestApp.xaml.cs b/tests/VisualTreeAnalyzers.Tests.UWP/UnitTestApp.xaml.cs similarity index 99% rename from tests/VisualTreeAnalyzers.Tests/UnitTestApp.xaml.cs rename to tests/VisualTreeAnalyzers.Tests.UWP/UnitTestApp.xaml.cs index c82936d..18f2f20 100644 --- a/tests/VisualTreeAnalyzers.Tests/UnitTestApp.xaml.cs +++ b/tests/VisualTreeAnalyzers.Tests.UWP/UnitTestApp.xaml.cs @@ -15,7 +15,7 @@ using Windows.UI.Xaml.Media; using Windows.UI.Xaml.Navigation; -namespace VisualTreeAnalyzers.Tests +namespace VisualTreeAnalyzers.Tests.UWP { /// /// Provides application-specific behavior to supplement the default Application class. diff --git a/tests/VisualTreeAnalyzers.Tests/VisualTreeAnalyzers.Tests.csproj b/tests/VisualTreeAnalyzers.Tests.UWP/VisualTreeAnalyzers.Tests.UWP.csproj similarity index 79% rename from tests/VisualTreeAnalyzers.Tests/VisualTreeAnalyzers.Tests.csproj rename to tests/VisualTreeAnalyzers.Tests.UWP/VisualTreeAnalyzers.Tests.UWP.csproj index 6f52a23..d6c8355 100644 --- a/tests/VisualTreeAnalyzers.Tests/VisualTreeAnalyzers.Tests.csproj +++ b/tests/VisualTreeAnalyzers.Tests.UWP/VisualTreeAnalyzers.Tests.UWP.csproj @@ -7,8 +7,8 @@ {9CCA940B-ACFE-4773-9441-0B6EDF9504A3} AppContainerExe Properties - VisualTreeAnalyzers.Tests - VisualTreeAnalyzers.Tests + VisualTreeAnalyzers.Tests.UWP + VisualTreeAnalyzers.Tests.UWP en-US UAP 10.0.19041.0 @@ -113,30 +113,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - BreadthFirsSearchTestTree.xaml @@ -153,15 +129,9 @@ SimplePage.xaml - - - - - UnitTestApp.xaml - @@ -225,12 +195,12 @@ - + {71d49058-4d49-4616-bdb7-a795823d9866} - VisualTreeAnalyzers + VisualTreeAnalyzers.UWP - + 14.0 diff --git a/tests/VisualTreeAnalyzers.Tests/VisualTreeAnalyzers.Tests_TemporaryKey.pfx b/tests/VisualTreeAnalyzers.Tests.UWP/VisualTreeAnalyzers.Tests_TemporaryKey.pfx similarity index 100% rename from tests/VisualTreeAnalyzers.Tests/VisualTreeAnalyzers.Tests_TemporaryKey.pfx rename to tests/VisualTreeAnalyzers.Tests.UWP/VisualTreeAnalyzers.Tests_TemporaryKey.pfx