diff --git a/.editorconfig b/.editorconfig index a8b77e7e290d..d4094b2cf3d6 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,44 +1,454 @@ -# editorconfig.org +# Version: 1.6.2 (Using https://semver.org/) +# Updated: 2020-11-02 +# See https://github.com/RehanSaeed/EditorConfig/releases for release notes. +# See https://github.com/RehanSaeed/EditorConfig for updates to this file. +# See http://EditorConfig.org for more information about .editorconfig files. -# top-most EditorConfig file +########################################## +# Common Settings +########################################## + +# This file is the top-most EditorConfig file root = true -# Default settings: -# A newline ending every file -# Use 4 spaces as indentation +# All Files [*] -insert_final_newline = true -end_of_line = crlf +charset = utf-8 indent_style = space indent_size = 4 - -# Trim trailing whitespace, limited support. -# https://github.com/editorconfig/editorconfig/wiki/Property-research:-Trim-trailing-spaces +insert_final_newline = true trim_trailing_whitespace = true -[*.{cs,vb}] -dotnet_style_predefined_type_for_locals_parameters_members = true:error +########################################## +# File Extension Settings +########################################## + +# Visual Studio Solution Files +[*.sln] +indent_style = tab -dotnet_naming_rule.private_members_with_underscore.symbols = private_fields -dotnet_naming_rule.private_members_with_underscore.style = prefix_underscore -dotnet_naming_rule.private_members_with_underscore.severity = suggestion +# Visual Studio XML Project Files +[*.{csproj,vbproj,vcxproj.filters,proj,projitems,shproj}] +indent_size = 2 -dotnet_naming_symbols.private_fields.applicable_kinds = field -dotnet_naming_symbols.private_fields.applicable_accessibilities = private -# dotnet_naming_symbols.private_fields.required_modifiers = abstract,async,readonly,static # all except const +# XML Configuration Files +[*.{xml,config,props,targets,nuspec,resx,ruleset,vsixmanifest,vsct}] +indent_size = 2 -dotnet_naming_style.prefix_underscore.capitalization = camel_case -dotnet_naming_style.prefix_underscore.required_prefix = _ +# JSON Files +[*.{json,json5,webmanifest}] +indent_size = 2 + +# YAML Files +[*.{yml,yaml}] +indent_size = 2 + +# Markdown Files +[*.md] +trim_trailing_whitespace = false + +# Web Files +[*.{htm,html,js,jsm,ts,tsx,css,sass,scss,less,svg,vue}] +indent_size = 2 + +# Batch Files +[*.{cmd,bat}] +end_of_line = crlf + +# Bash Files +[*.sh] +end_of_line = lf + +# Makefiles +[Makefile] +indent_style = tab -# https://github.com/MicrosoftDocs/visualstudio-docs/blob/master/docs/ide/editorconfig-code-style-settings-reference.md -[*.cs] -csharp_style_var_for_built_in_types = true:suggestion -csharp_style_var_when_type_is_apparent = true:suggestion -csharp_style_var_elsewhere = true:suggestion -csharp_prefer_braces = false : none [*.js] trim_trailing_whitespace = true [*.less] trim_trailing_whitespace = false + +########################################## +# File Header (Uncomment to support file headers) +# https://docs.microsoft.com/visualstudio/ide/reference/add-file-header +########################################## + +# [*.{cs,csx,cake,vb,vbx}] +file_header_template = Copyright (c) Umbraco.\nSee LICENSE for more details. + +# SA1636: File header copyright text should match +# Justification: .editorconfig supports file headers. If this is changed to a value other than "none", a stylecop.json file will need to added to the project. +# dotnet_diagnostic.SA1636.severity = none + +########################################## +# .NET Language Conventions +# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions +########################################## + +# .NET Code Style Settings +# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#net-code-style-settings +[*.{cs,csx,cake,vb,vbx}] +# "this." and "Me." qualifiers +# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#this-and-me +dotnet_style_qualification_for_field = false:suggestion +dotnet_style_qualification_for_property = false:suggestion +dotnet_style_qualification_for_method = false:suggestion +dotnet_style_qualification_for_event = false:suggestion +# Language keywords instead of framework type names for type references +# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#language-keywords +dotnet_style_predefined_type_for_locals_parameters_members = true:warning +dotnet_style_predefined_type_for_member_access = true:warning +# Modifier preferences +# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#normalize-modifiers +dotnet_style_require_accessibility_modifiers = always:warning +csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:warning +visual_basic_preferred_modifier_order = Partial,Default,Private,Protected,Public,Friend,NotOverridable,Overridable,MustOverride,Overloads,Overrides,MustInherit,NotInheritable,Static,Shared,Shadows,ReadOnly,WriteOnly,Dim,Const,WithEvents,Widening,Narrowing,Custom,Async:warning +dotnet_style_readonly_field = true:warning +# Parentheses preferences +# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#parentheses-preferences +dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:warning +dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:warning +dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:warning +dotnet_style_parentheses_in_other_operators = never_if_unnecessary:suggestion +# Expression-level preferences +# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#expression-level-preferences +dotnet_style_object_initializer = true:warning +dotnet_style_collection_initializer = true:warning +dotnet_style_explicit_tuple_names = true:warning +dotnet_style_prefer_inferred_tuple_names = true:warning +dotnet_style_prefer_inferred_anonymous_type_member_names = true:warning +dotnet_style_prefer_auto_properties = true:warning +dotnet_style_prefer_is_null_check_over_reference_equality_method = true:warning +dotnet_style_prefer_conditional_expression_over_assignment = false:suggestion +dotnet_style_prefer_conditional_expression_over_return = false:suggestion +dotnet_style_prefer_compound_assignment = true:warning +# Null-checking preferences +# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#null-checking-preferences +dotnet_style_coalesce_expression = true:warning +dotnet_style_null_propagation = true:warning +# Parameter preferences +# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#parameter-preferences +dotnet_code_quality_unused_parameters = all:warning +# More style options (Undocumented) +# https://github.com/MicrosoftDocs/visualstudio-docs/issues/3641 +dotnet_style_operator_placement_when_wrapping = end_of_line +# https://github.com/dotnet/roslyn/pull/40070 +dotnet_style_prefer_simplified_interpolation = true:warning + +# C# Code Style Settings +# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#c-code-style-settings +[*.{cs,csx,cake}] +# Implicit and explicit types +# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#implicit-and-explicit-types +csharp_style_var_for_built_in_types = never +csharp_style_var_when_type_is_apparent = true:warning +csharp_style_var_elsewhere = false:warning +# Expression-bodied members +# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#expression-bodied-members +csharp_style_expression_bodied_methods = true:suggestion +csharp_style_expression_bodied_constructors = true:suggestion +csharp_style_expression_bodied_operators = true:suggestion +csharp_style_expression_bodied_properties = true:suggestion +csharp_style_expression_bodied_indexers = true:suggestion +csharp_style_expression_bodied_accessors = true:suggestion +csharp_style_expression_bodied_lambdas = true:suggestion +csharp_style_expression_bodied_local_functions = true:suggestion +# Pattern matching +# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#pattern-matching +csharp_style_pattern_matching_over_is_with_cast_check = true:warning +csharp_style_pattern_matching_over_as_with_null_check = true:warning +# Inlined variable declarations +# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#inlined-variable-declarations +csharp_style_inlined_variable_declaration = true:warning +# Expression-level preferences +# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#expression-level-preferences +csharp_prefer_simple_default_expression = true:warning +# "Null" checking preferences +# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#c-null-checking-preferences +csharp_style_throw_expression = true:warning +csharp_style_conditional_delegate_call = true:warning +# Code block preferences +# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#code-block-preferences +csharp_prefer_braces = true:warning +# Unused value preferences +# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#unused-value-preferences +csharp_style_unused_value_expression_statement_preference = discard_variable:suggestion +csharp_style_unused_value_assignment_preference = discard_variable:suggestion +# Index and range preferences +# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#index-and-range-preferences +csharp_style_prefer_index_operator = true:warning +csharp_style_prefer_range_operator = true:warning +# Miscellaneous preferences +# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#miscellaneous-preferences +csharp_style_deconstructed_variable_declaration = true:warning +csharp_style_pattern_local_over_anonymous_function = true:warning +csharp_using_directive_placement = outside_namespace:warning +csharp_prefer_static_local_function = true:warning +csharp_prefer_simple_using_statement = true:suggestion + +########################################## +# .NET Formatting Conventions +# https://docs.microsoft.com/visualstudio/ide/editorconfig-code-style-settings-reference#formatting-conventions +########################################## + +# Organize usings +# https://docs.microsoft.com/visualstudio/ide/editorconfig-formatting-conventions#organize-using-directives +dotnet_sort_system_directives_first = true +# Newline options +# https://docs.microsoft.com/visualstudio/ide/editorconfig-formatting-conventions#new-line-options +csharp_new_line_before_open_brace = all +csharp_new_line_before_else = true +csharp_new_line_before_catch = true +csharp_new_line_before_finally = true +csharp_new_line_before_members_in_object_initializers = true +csharp_new_line_before_members_in_anonymous_types = true +csharp_new_line_between_query_expression_clauses = true +# Indentation options +# https://docs.microsoft.com/visualstudio/ide/editorconfig-formatting-conventions#indentation-options +csharp_indent_case_contents = true +csharp_indent_switch_labels = true +csharp_indent_labels = no_change +csharp_indent_block_contents = true +csharp_indent_braces = false +csharp_indent_case_contents_when_block = false +# Spacing options +# https://docs.microsoft.com/visualstudio/ide/editorconfig-formatting-conventions#spacing-options +csharp_space_after_cast = false +csharp_space_after_keywords_in_control_flow_statements = true +csharp_space_between_parentheses = false +csharp_space_before_colon_in_inheritance_clause = true +csharp_space_after_colon_in_inheritance_clause = true +csharp_space_around_binary_operators = before_and_after +csharp_space_between_method_declaration_parameter_list_parentheses = false +csharp_space_between_method_declaration_empty_parameter_list_parentheses = false +csharp_space_between_method_declaration_name_and_open_parenthesis = false +csharp_space_between_method_call_parameter_list_parentheses = false +csharp_space_between_method_call_empty_parameter_list_parentheses = false +csharp_space_between_method_call_name_and_opening_parenthesis = false +csharp_space_after_comma = true +csharp_space_before_comma = false +csharp_space_after_dot = false +csharp_space_before_dot = false +csharp_space_after_semicolon_in_for_statement = true +csharp_space_before_semicolon_in_for_statement = false +csharp_space_around_declaration_statements = false +csharp_space_before_open_square_brackets = false +csharp_space_between_empty_square_brackets = false +csharp_space_between_square_brackets = false +# Wrapping options +# https://docs.microsoft.com/visualstudio/ide/editorconfig-formatting-conventions#wrap-options +csharp_preserve_single_line_statements = false +csharp_preserve_single_line_blocks = true + +########################################## +# .NET Naming Conventions +# https://docs.microsoft.com/visualstudio/ide/editorconfig-naming-conventions +########################################## + +[*.{cs,csx,cake,vb,vbx}] + +########################################## +# Styles +########################################## + +# camel_case_style - Define the camelCase style +dotnet_naming_style.camel_case_style.capitalization = camel_case +# pascal_case_style - Define the PascalCase style +dotnet_naming_style.pascal_case_style.capitalization = pascal_case +# first_upper_style - The first character must start with an upper-case character +dotnet_naming_style.first_upper_style.capitalization = first_word_upper +# prefix_interface_with_i_style - Interfaces must be PascalCase and the first character of an interface must be an 'I' +dotnet_naming_style.prefix_interface_with_i_style.capitalization = pascal_case +dotnet_naming_style.prefix_interface_with_i_style.required_prefix = I +# prefix_type_parameters_with_t_style - Generic Type Parameters must be PascalCase and the first character must be a 'T' +dotnet_naming_style.prefix_type_parameters_with_t_style.capitalization = pascal_case +dotnet_naming_style.prefix_type_parameters_with_t_style.required_prefix = T +# disallowed_style - Anything that has this style applied is marked as disallowed +dotnet_naming_style.disallowed_style.capitalization = pascal_case +dotnet_naming_style.disallowed_style.required_prefix = ____RULE_VIOLATION____ +dotnet_naming_style.disallowed_style.required_suffix = ____RULE_VIOLATION____ +# internal_error_style - This style should never occur... if it does, it indicates a bug in file or in the parser using the file +dotnet_naming_style.internal_error_style.capitalization = pascal_case +dotnet_naming_style.internal_error_style.required_prefix = ____INTERNAL_ERROR____ +dotnet_naming_style.internal_error_style.required_suffix = ____INTERNAL_ERROR____ + +########################################## +# .NET Design Guideline Field Naming Rules +# Naming rules for fields follow the .NET Framework design guidelines +# https://docs.microsoft.com/dotnet/standard/design-guidelines/index +########################################## + +# All public/protected/protected_internal constant fields must be PascalCase +# https://docs.microsoft.com/dotnet/standard/design-guidelines/field +dotnet_naming_symbols.public_protected_constant_fields_group.applicable_accessibilities = public, protected, protected_internal +dotnet_naming_symbols.public_protected_constant_fields_group.required_modifiers = const +dotnet_naming_symbols.public_protected_constant_fields_group.applicable_kinds = field +dotnet_naming_rule.public_protected_constant_fields_must_be_pascal_case_rule.symbols = public_protected_constant_fields_group +dotnet_naming_rule.public_protected_constant_fields_must_be_pascal_case_rule.style = pascal_case_style +dotnet_naming_rule.public_protected_constant_fields_must_be_pascal_case_rule.severity = warning + +# All public/protected/protected_internal static readonly fields must be PascalCase +# https://docs.microsoft.com/dotnet/standard/design-guidelines/field +dotnet_naming_symbols.public_protected_static_readonly_fields_group.applicable_accessibilities = public, protected, protected_internal +dotnet_naming_symbols.public_protected_static_readonly_fields_group.required_modifiers = static, readonly +dotnet_naming_symbols.public_protected_static_readonly_fields_group.applicable_kinds = field +dotnet_naming_rule.public_protected_static_readonly_fields_must_be_pascal_case_rule.symbols = public_protected_static_readonly_fields_group +dotnet_naming_rule.public_protected_static_readonly_fields_must_be_pascal_case_rule.style = pascal_case_style +dotnet_naming_rule.public_protected_static_readonly_fields_must_be_pascal_case_rule.severity = warning + +# No other public/protected/protected_internal fields are allowed +# https://docs.microsoft.com/dotnet/standard/design-guidelines/field +dotnet_naming_symbols.other_public_protected_fields_group.applicable_accessibilities = public, protected, protected_internal +dotnet_naming_symbols.other_public_protected_fields_group.applicable_kinds = field +dotnet_naming_rule.other_public_protected_fields_disallowed_rule.symbols = other_public_protected_fields_group +dotnet_naming_rule.other_public_protected_fields_disallowed_rule.style = disallowed_style +dotnet_naming_rule.other_public_protected_fields_disallowed_rule.severity = error + +########################################## +# StyleCop Field Naming Rules +# Naming rules for fields follow the StyleCop analyzers +# This does not override any rules using disallowed_style above +# https://github.com/DotNetAnalyzers/StyleCopAnalyzers +########################################## + +# All constant fields must be PascalCase +# https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1303.md +dotnet_naming_symbols.stylecop_constant_fields_group.applicable_accessibilities = public, internal, protected_internal, protected, private_protected, private +dotnet_naming_symbols.stylecop_constant_fields_group.required_modifiers = const +dotnet_naming_symbols.stylecop_constant_fields_group.applicable_kinds = field +dotnet_naming_rule.stylecop_constant_fields_must_be_pascal_case_rule.symbols = stylecop_constant_fields_group +dotnet_naming_rule.stylecop_constant_fields_must_be_pascal_case_rule.style = pascal_case_style +dotnet_naming_rule.stylecop_constant_fields_must_be_pascal_case_rule.severity = warning + +# All static readonly fields must be PascalCase +# Ajusted to ignore private fields. +# https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1311.md +dotnet_naming_symbols.stylecop_static_readonly_fields_group.applicable_accessibilities = public, internal, protected_internal, protected, private_protected +dotnet_naming_symbols.stylecop_static_readonly_fields_group.required_modifiers = static, readonly +dotnet_naming_symbols.stylecop_static_readonly_fields_group.applicable_kinds = field +dotnet_naming_rule.stylecop_static_readonly_fields_must_be_pascal_case_rule.symbols = stylecop_static_readonly_fields_group +dotnet_naming_rule.stylecop_static_readonly_fields_must_be_pascal_case_rule.style = pascal_case_style +dotnet_naming_rule.stylecop_static_readonly_fields_must_be_pascal_case_rule.severity = warning + +# No non-private instance fields are allowed +# https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1401.md +dotnet_naming_symbols.stylecop_fields_must_be_private_group.applicable_accessibilities = public, internal, protected_internal, protected, private_protected +dotnet_naming_symbols.stylecop_fields_must_be_private_group.applicable_kinds = field +dotnet_naming_rule.stylecop_instance_fields_must_be_private_rule.symbols = stylecop_fields_must_be_private_group +dotnet_naming_rule.stylecop_instance_fields_must_be_private_rule.style = disallowed_style +dotnet_naming_rule.stylecop_instance_fields_must_be_private_rule.severity = error + +# Local variables must be camelCase +# https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1312.md +dotnet_naming_symbols.stylecop_local_fields_group.applicable_accessibilities = local +dotnet_naming_symbols.stylecop_local_fields_group.applicable_kinds = local +dotnet_naming_rule.stylecop_local_fields_must_be_camel_case_rule.symbols = stylecop_local_fields_group +dotnet_naming_rule.stylecop_local_fields_must_be_camel_case_rule.style = camel_case_style +dotnet_naming_rule.stylecop_local_fields_must_be_camel_case_rule.severity = silent + +# This rule should never fire. However, it's included for at least two purposes: +# First, it helps to understand, reason about, and root-case certain types of issues, such as bugs in .editorconfig parsers. +# Second, it helps to raise immediate awareness if a new field type is added (as occurred recently in C#). +dotnet_naming_symbols.sanity_check_uncovered_field_case_group.applicable_accessibilities = * +dotnet_naming_symbols.sanity_check_uncovered_field_case_group.applicable_kinds = field +dotnet_naming_rule.sanity_check_uncovered_field_case_rule.symbols = sanity_check_uncovered_field_case_group +dotnet_naming_rule.sanity_check_uncovered_field_case_rule.style = internal_error_style +dotnet_naming_rule.sanity_check_uncovered_field_case_rule.severity = error + + +########################################## +# Other Naming Rules +########################################## + +# All of the following must be PascalCase: +# - Namespaces +# https://docs.microsoft.com/dotnet/standard/design-guidelines/names-of-namespaces +# https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1300.md +# - Classes and Enumerations +# https://docs.microsoft.com/dotnet/standard/design-guidelines/names-of-classes-structs-and-interfaces +# https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1300.md +# - Delegates +# https://docs.microsoft.com/dotnet/standard/design-guidelines/names-of-classes-structs-and-interfaces#names-of-common-types +# - Constructors, Properties, Events, Methods +# https://docs.microsoft.com/dotnet/standard/design-guidelines/names-of-type-members +dotnet_naming_symbols.element_group.applicable_kinds = namespace, class, enum, struct, delegate, event, method, property +dotnet_naming_rule.element_rule.symbols = element_group +dotnet_naming_rule.element_rule.style = pascal_case_style +dotnet_naming_rule.element_rule.severity = warning + +# Interfaces use PascalCase and are prefixed with uppercase 'I' +# https://docs.microsoft.com/dotnet/standard/design-guidelines/names-of-classes-structs-and-interfaces +dotnet_naming_symbols.interface_group.applicable_kinds = interface +dotnet_naming_rule.interface_rule.symbols = interface_group +dotnet_naming_rule.interface_rule.style = prefix_interface_with_i_style +dotnet_naming_rule.interface_rule.severity = warning + +# Generics Type Parameters use PascalCase and are prefixed with uppercase 'T' +# https://docs.microsoft.com/dotnet/standard/design-guidelines/names-of-classes-structs-and-interfaces +dotnet_naming_symbols.type_parameter_group.applicable_kinds = type_parameter +dotnet_naming_rule.type_parameter_rule.symbols = type_parameter_group +dotnet_naming_rule.type_parameter_rule.style = prefix_type_parameters_with_t_style +dotnet_naming_rule.type_parameter_rule.severity = warning + +# Function parameters use camelCase +# https://docs.microsoft.com/dotnet/standard/design-guidelines/naming-parameters +dotnet_naming_symbols.parameters_group.applicable_kinds = parameter +dotnet_naming_rule.parameters_rule.symbols = parameters_group +dotnet_naming_rule.parameters_rule.style = camel_case_style +dotnet_naming_rule.parameters_rule.severity = warning + +# Private static fields use camelCase and start with s_ +dotnet_naming_symbols.private_static_field_symbols.applicable_accessibilities = private +dotnet_naming_symbols.private_static_field_symbols.required_modifiers = static, shared +dotnet_naming_symbols.private_static_field_symbols.applicable_kinds = field +dotnet_naming_rule.private_static_fields_must_be_camel_cased_and_prefixed_with_s_underscore.symbols = private_static_field_symbols +dotnet_naming_rule.private_static_fields_must_be_camel_cased_and_prefixed_with_s_underscore.style = camel_case_and_prefix_with_s_underscore_style +dotnet_naming_rule.private_static_fields_must_be_camel_cased_and_prefixed_with_s_underscore.severity = warning +dotnet_naming_style.camel_case_and_prefix_with_s_underscore_style.required_prefix = s_ +dotnet_naming_style.camel_case_and_prefix_with_s_underscore_style.capitalization = camel_case + +# Instance fields use camelCase and are prefixed with '_' +dotnet_naming_symbols.private_field_symbols.applicable_accessibilities = private +dotnet_naming_symbols.private_field_symbols.applicable_kinds = field +dotnet_naming_rule.private_instance_fields_must_be_camel_cased_and_prefixed_with_underscore.symbols = private_field_symbols +dotnet_naming_rule.private_instance_fields_must_be_camel_cased_and_prefixed_with_underscore.style = camel_case_and_prefix_with_underscore_style +dotnet_naming_rule.private_instance_fields_must_be_camel_cased_and_prefixed_with_underscore.severity = warning +dotnet_naming_style.camel_case_and_prefix_with_underscore_style.required_prefix = _ +dotnet_naming_style.camel_case_and_prefix_with_underscore_style.capitalization = camel_case + +########################################## +# License +########################################## +# The following applies as to the .editorconfig file ONLY, and is +# included below for reference, per the requirements of the license +# corresponding to this .editorconfig file. +# See: https://github.com/RehanSaeed/EditorConfig +# +# MIT License +# +# Copyright (c) 2017-2019 Muhammad Rehan Saeed +# Copyright (c) 2019 Henry Gabryjelski +# +# Permission is hereby granted, free of charge, to any +# person obtaining a copy of this software and associated +# documentation files (the "Software"), to deal in the +# Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, +# sublicense, and/or sell copies of the Software, and to permit +# persons to whom the Software is furnished to do so, subject +# to the following conditions: +# +# The above copyright notice and this permission notice shall be +# included in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +# OTHER DEALINGS IN THE SOFTWARE. +########################################## \ No newline at end of file diff --git a/.gitignore b/.gitignore index 82a173e81c77..f12007b74f61 100644 --- a/.gitignore +++ b/.gitignore @@ -19,13 +19,13 @@ .DS_Store ._.DS_Store .vs/ -/local/ +.idea/ # Build directories [Bb]in/ -[Db]ebug*/ -[Rr]elease*/ -obj/ +[Oo]bj/ +[Db]ebug/ +[Rr]elease/ # Tools _ReSharper*/ @@ -35,52 +35,17 @@ _NCrunch_*/ *.ncrunchproject *.crunchsolution.cache tools/NDepend/ - [Tt]est[Rr]esult* [Bb]uild[Ll]og.* -*.[Pp]ublish.xml [sS]ource [sS]andbox -umbraco.config -App_Data/TEMP/* -[Uu]mbraco/[Pp]resentation/[Uu]mbraco/[Pp]lugins/* -[Uu]mbraco/[Pp]resentation/[Uu]ser[Cc]ontrols/* -[Uu]mbraco/[Pp]resentation/[Ss]cripts/* -[Uu]mbraco/[Pp]resentation/[Ff]onts/* -[Uu]mbraco/[Pp]resentation/[Cc]ss/* - -src/Umbraco.Tests/App_Data/* - -umbraco/presentation/umbraco/plugins/uComponents/uComponentsInstaller.ascx -umbraco/presentation/packages/uComponents/MultiNodePicker/CustomTreeService.asmx - -src/Umbraco.Tests/config/applications.config -src/Umbraco.Tests/config/trees.config -src/Umbraco.Tests/config/404handlers.config -src/Umbraco.Tests/[Cc]onfig/umbracoSettings.config -src/packages/ -src/packages/repositories.config - -*.transformed - node_modules lib-bower - -src/Umbraco.Web.UI.Client/[Bb]uild/* -src/Umbraco.Web.UI.Client/[Bb]uild/[Bb]elle/ - -src/Umbraco.Web.UI.Client/src/[Ll]ess/*.css -src/Umbraco.Web.UI.Client/vwd.webinfo - -src/*.psess -src/*.vspx - +*.psess +*.vspx NDependOut/* QueryResult.htm - -build/ApiDocs/* -build/ApiDocs/Output/* -src/Umbraco.Web.UI.Client/bower_components/* +tools/docfx/* # Ignore rule for clearing out Belle (avoid rebuilding all the time) preserve.belle @@ -88,22 +53,6 @@ preserve.belle # Ignore rule for output of generated documentation files from grunt docserve src/Umbraco.Web.UI.Docs/api src/Umbraco.Web.UI.Docs/package-lock.json -src/*.boltdata/ -src/umbraco.sln.ide/* -src/.vs/ - -src/Umbraco.Tests/[Mm]edia -tools/docfx/* -apidocs/_site/* -src/*/project.lock.json -src/.idea/* - -apidocs/api/* -build/docs.zip -build/ui-docs.zip -build/csharp-docs.zip -src/packages/ -src/PrecompiledWeb/* # Build build.out/ @@ -111,46 +60,44 @@ build.tmp/ build/hooks/ build/temp/ -# Acceptance tests -cypress.env.json -/src/Umbraco.Tests.AcceptanceTest/cypress/support/chainable.ts -/src/Umbraco.Tests.AcceptanceTest/package-lock.json -/src/Umbraco.Tests.AcceptanceTest/cypress/videos/ -/src/Umbraco.Tests.AcceptanceTest/cypress/screenshots/ - -/src/Umbraco.Web.UI.Client/TESTS-*.xml -/src/ApiDocs/api/* -/src/Umbraco.Web.UI.Client/package-lock.json -/src/Umbraco.Web.UI/wwwroot/Media/* -/src/Umbraco.Tests.Integration/App_Data/* -/src/Umbraco.Tests.Integration/TEMP/* -/src/Umbraco.Web.UI/wwwroot/[Uu]mbraco/assets/* -/src/Umbraco.Web.UI/wwwroot/[Uu]mbraco/js/* -/src/Umbraco.Web.UI/wwwroot/[Uu]mbraco/lib/* -/src/Umbraco.Web.UI/wwwroot/[Uu]mbraco/views/* -/src/Umbraco.Web.UI/wwwroot/App_Data/TEMP/* -/src/Umbraco.Web.UI/App_Data/Logs/* -/src/Umbraco.Web.UI/App_Data/TEMP/TypesCache/* -/src/Umbraco.Web.UI/App_Data/TEMP/* -/src/Umbraco.Web.UI/App_Data/Smidge/Cache/* -/src/Umbraco.Web.UI/[Uu]mbraco/[Ll]ogs -/src/Umbraco.Web.UI/[Uu]mbraco/[Dd]ata/* -/src/Umbraco.Web.UI/[Uu]mbraco/[Mm]odels/* -/src/Umbraco.Web.UI/[Vv]iews/*.vbhtml -/src/Umbraco.Web.UI/appsettings.json -/src/Umbraco.Web.UI/appsettings.Development.json -/src/Umbraco.Web.UI/appsettings.Local.json - - -src/Umbraco.Tests.Integration/umbraco/Data/ -src/Umbraco.Tests.Integration/umbraco/logs/ - -src/Umbraco.Tests.Integration/Views/ - -src/Umbraco.Tests/TEMP/ - -src/Umbraco.Tests.UnitTests/umbraco/Data/TEMP/ -src/Umbraco.Tests.Integration.SqlCe/umbraco/Data/TEMP/ -src/Umbraco.Tests.Integration.SqlCe/DatabaseContextTests.sdf +# Build output +build/docs.zip +build/ui-docs.zip +build/csharp-docs.zip +build/ApiDocs/* +build/ApiDocs/Output/* +src/ApiDocs/api/* +# Environment specific data +src/Umbraco.Web.UI.Client/[Bb]uild/* +src/Umbraco.Web.UI.Client/[Bb]uild/[Bb]elle/ +src/Umbraco.Web.UI.Client/src/[Ll]ess/*.css +src/Umbraco.Web.UI.Client/TESTS-*.xml +src/Umbraco.Web.UI/[Uu]mbraco/[Dd]ata/* +src/Umbraco.Web.UI/[Uu]mbraco/[Ll]ogs +src/Umbraco.Web.UI/[Uu]mbraco/[Mm]odels/* +src/Umbraco.Web.UI/appsettings.Development.json +src/Umbraco.Web.UI/appsettings.json +src/Umbraco.Web.UI/appsettings.Local.json +src/Umbraco.Web.UI/wwwroot/[Uu]mbraco/assets/* +src/Umbraco.Web.UI/wwwroot/[Uu]mbraco/js/* +src/Umbraco.Web.UI/wwwroot/[Uu]mbraco/lib/* +src/Umbraco.Web.UI/wwwroot/[Uu]mbraco/views/* +src/Umbraco.Web.UI/wwwroot/Media/* + +# Tests +cypress.env.json +tests/Umbraco.Tests.AcceptanceTest/cypress/screenshots/ +tests/Umbraco.Tests.AcceptanceTest/cypress/support/chainable.ts +tests/Umbraco.Tests.AcceptanceTest/cypress/videos/ +tests/Umbraco.Tests.AcceptanceTest/package-lock.json +tests/Umbraco.Tests.Integration.SqlCe/DatabaseContextTests.sdf +tests/Umbraco.Tests.Integration.SqlCe/umbraco/Data/TEMP/ +tests/Umbraco.Tests.Integration/TEMP/* +tests/Umbraco.Tests.Integration/umbraco/Data/ +tests/Umbraco.Tests.Integration/umbraco/logs/ +tests/Umbraco.Tests.Integration/Views/ +tests/Umbraco.Tests.UnitTests/umbraco/Data/TEMP/ + +# Ignore auto-generated schema src/Umbraco.Web.UI/umbraco/config/appsettings-schema.json diff --git a/Directory.Build.props b/Directory.Build.props index e600602a27d1..74f1ebad3dc2 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,23 +1,13 @@ - - - + + - - - - $(MSBuildThisFileDirectory)linting\codeanalysis.tests.ruleset - - - - - $(MSBuildThisFileDirectory)linting\codeanalysis.ruleset - - - - + + + $(MSBuildThisFileDirectory)codeanalysis.ruleset + diff --git a/Directory.Build.targets b/Directory.Build.targets deleted file mode 100644 index e9ffa1525528..000000000000 --- a/Directory.Build.targets +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - - - - - - - - - diff --git a/NuGet.Config b/NuGet.Config index 955cb08d39b3..a0d5bc04818d 100644 --- a/NuGet.Config +++ b/NuGet.Config @@ -1,15 +1,7 @@ - + - - - - - - - - + + + + diff --git a/build/Azure/azuregalleryrelease.ps1 b/build/Azure/azuregalleryrelease.ps1 deleted file mode 100644 index 61505171a234..000000000000 --- a/build/Azure/azuregalleryrelease.ps1 +++ /dev/null @@ -1,59 +0,0 @@ -Param( - [string]$GitHubPersonalAccessToken, - [string]$Directory -) -$workingDirectory = $Directory -CD "$($workingDirectory)" - -# Clone repo -$fullGitUrl = "https://$($env:GIT_URL)/$($env:GIT_REPOSITORYNAME).git" -git clone $($fullGitUrl) $($env:GIT_REPOSITORYNAME) 2>&1 | % { $_.ToString() } - -# Remove everything so that unzipping the release later will update everything -# Don't remove the readme file nor the git directory -Write-Host "Cleaning up git directory before adding new version" -Remove-Item -Recurse "$($workingDirectory)\$($env:GIT_REPOSITORYNAME)\*" -Exclude README.md,.git - -# Find release zip -$zipsDir = "$($workingDirectory)\$($env:BUILD_DEFINITIONNAME)\zips" -$pattern = "UmbracoCms.([0-9]{1,2}.[0-9]{1,3}.[0-9]{1,3}).zip" -Write-Host "Searching for Umbraco release files in $($zipsDir) for a file with pattern $($pattern)" -$file = (Get-ChildItem "$($zipsDir)" | Where-Object { $_.Name -match "$($pattern)" }) - -if($file) -{ - # Get release name - $version = [regex]::Match($($file.Name), $($pattern)).captures.groups[1].value - $releaseName = "Umbraco $($version)" - Write-Host "Found $($releaseName)" - - # Unzip into repository to update release - Add-Type -AssemblyName System.IO.Compression.FileSystem - Write-Host "Unzipping $($file.FullName) to $($workingDirectory)\$($env:GIT_REPOSITORYNAME)" - [System.IO.Compression.ZipFile]::ExtractToDirectory("$($file.FullName)", "$($workingDirectory)\$($env:GIT_REPOSITORYNAME)") - - # Telling git who we are - git config --global user.email "coffee@umbraco.com" 2>&1 | % { $_.ToString() } - git config --global user.name "Umbraco HQ" 2>&1 | % { $_.ToString() } - - # Commit - CD "$($workingDirectory)\$($env:GIT_REPOSITORYNAME)" - Write-Host "Committing Umbraco $($version) Release from Build Output" - - git add . 2>&1 | % { $_.ToString() } - git commit -m " Release $($releaseName) from Build Output" 2>&1 | % { $_.ToString() } - - # Tag the release - git tag -a "v$($version)" -m "v$($version)" - - # Push release to master - $fullGitAuthUrl = "https://$($env:GIT_USERNAME):$($GitHubPersonalAccessToken)@$($env:GIT_URL)/$($env:GIT_REPOSITORYNAME).git" - git push $($fullGitAuthUrl) 2>&1 | % { $_.ToString() } - - #Push tag to master - git push $($fullGitAuthUrl) --tags 2>&1 | % { $_.ToString() } -} -else -{ - Write-Error "Umbraco release file not found, searched in $($workingDirectory)\$($zipsDir) for a file with pattern $($pattern) - canceling" -} diff --git a/build/NuSpecs/UmbracoCms.StaticAssets.nuspec b/build/NuSpecs/UmbracoCms.StaticAssets.nuspec index cd8367d8c892..86ad68dd5fc9 100644 --- a/build/NuSpecs/UmbracoCms.StaticAssets.nuspec +++ b/build/NuSpecs/UmbracoCms.StaticAssets.nuspec @@ -23,11 +23,7 @@ - - - - - + diff --git a/build/NuSpecs/build/Umbraco.Cms.StaticAssets.props b/build/NuSpecs/buildTransitive/Umbraco.Cms.StaticAssets.props similarity index 100% rename from build/NuSpecs/build/Umbraco.Cms.StaticAssets.props rename to build/NuSpecs/buildTransitive/Umbraco.Cms.StaticAssets.props diff --git a/build/NuSpecs/build/Umbraco.Cms.StaticAssets.targets b/build/NuSpecs/buildTransitive/Umbraco.Cms.StaticAssets.targets similarity index 100% rename from build/NuSpecs/build/Umbraco.Cms.StaticAssets.targets rename to build/NuSpecs/buildTransitive/Umbraco.Cms.StaticAssets.targets diff --git a/build/NuSpecs/tools/ClientDependency.config.install.xdt b/build/NuSpecs/tools/ClientDependency.config.install.xdt deleted file mode 100644 index c8d81a9ac4c4..000000000000 --- a/build/NuSpecs/tools/ClientDependency.config.install.xdt +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/build/NuSpecs/tools/Readme.txt b/build/NuSpecs/tools/Readme.txt deleted file mode 100644 index b0583a2b4dd1..000000000000 --- a/build/NuSpecs/tools/Readme.txt +++ /dev/null @@ -1,27 +0,0 @@ - - 888 - 888 -888 888 88888b.d88b. 88888b. 888d888 8888b. .d8888b .d88b. -888 888 888 "888 "88b 888 "88b 888P" "88b d88P" d88""88b -888 888 888 888 888 888 888 888 .d888888 888 888 888 -Y88 88Y 888 888 888 888 d88P 888 888 888 Y88b. Y88..88P - "Y888P" 888 888 888 88888P" 888 "Y888888 "Y8888P "Y88P" - ------------------------------------------------------------------- - -Don't forget to build! - - -When upgrading your website using NuGet you should answer "No" to the questions to overwrite the Web.config -file (and config files in the config folder). - -This NuGet package includes build targets that extend the creation of a deploy package, which is generated by -Publishing from Visual Studio. The targets will only work once Publishing is configured, so if you don't use -Publish this won't affect you. -The following items will now be automatically included when creating a deploy package or publishing to the file -system: umbraco, config\splashes and global.asax. - -Please read the release notes on our.umbraco.com: -https://our.umbraco.com/download/releases - -- Umbraco diff --git a/build/NuSpecs/tools/ReadmeUpgrade.txt b/build/NuSpecs/tools/ReadmeUpgrade.txt deleted file mode 100644 index fd1b2174e2fc..000000000000 --- a/build/NuSpecs/tools/ReadmeUpgrade.txt +++ /dev/null @@ -1,26 +0,0 @@ - - 888 - 888 -888 888 88888b.d88b. 88888b. 888d888 8888b. .d8888b .d88b. -888 888 888 "888 "88b 888 "88b 888P" "88b d88P" d88""88b -888 888 888 888 888 888 888 888 .d888888 888 888 888 -Y88 88Y 888 888 888 888 d88P 888 888 888 Y88b. Y88..88P - "Y888P" 888 888 888 88888P" 888 "Y888888 "Y8888P "Y88P" - ------------------------------------------------------------------- - -Don't forget to build! - -We've done our best to transform your configuration files but in case something is not quite right: we recommend you look in source control for the previous version so you can find the original files before they were transformed. - -This NuGet package includes build targets that extend the creation of a deploy package, which is generated by -Publishing from Visual Studio. The targets will only work once Publishing is configured, so if you don't use -Publish this won't affect you. - -The following items will now be automatically included when creating a deploy package or publishing to the file -system: umbraco, config\splashes and global.asax. - -Please read the release notes on our.umbraco.com: -https://our.umbraco.com/contribute/releases - -- Umbraco diff --git a/build/NuSpecs/tools/Views.Web.config.install.xdt b/build/NuSpecs/tools/Views.Web.config.install.xdt deleted file mode 100644 index 7dd2640d09d4..000000000000 --- a/build/NuSpecs/tools/Views.Web.config.install.xdt +++ /dev/null @@ -1,32 +0,0 @@ - - - - -
-
- - - - - - - - - - - - - - - - - - - - - diff --git a/build/NuSpecs/tools/Web.config.cloud.xdt b/build/NuSpecs/tools/Web.config.cloud.xdt deleted file mode 100644 index 988c7411260f..000000000000 --- a/build/NuSpecs/tools/Web.config.cloud.xdt +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/NuSpecs/tools/Web.config.install.xdt b/build/NuSpecs/tools/Web.config.install.xdt deleted file mode 100644 index fe5b7db704bc..000000000000 --- a/build/NuSpecs/tools/Web.config.install.xdt +++ /dev/null @@ -1,209 +0,0 @@ - - - - - - - - -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/NuSpecs/tools/applications.config.install.xdt b/build/NuSpecs/tools/applications.config.install.xdt deleted file mode 100644 index 5c05b2b4e93d..000000000000 --- a/build/NuSpecs/tools/applications.config.install.xdt +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/build/NuSpecs/tools/cache.config.install.xdt b/build/NuSpecs/tools/cache.config.install.xdt deleted file mode 100644 index 746e3c329852..000000000000 --- a/build/NuSpecs/tools/cache.config.install.xdt +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/build/NuSpecs/tools/install.ps1 b/build/NuSpecs/tools/install.ps1 deleted file mode 100644 index 0be28f9467c2..000000000000 --- a/build/NuSpecs/tools/install.ps1 +++ /dev/null @@ -1,107 +0,0 @@ -param($installPath, $toolsPath, $package, $project) - -Write-Host "installPath:" "${installPath}" -Write-Host "toolsPath:" "${toolsPath}" - -Write-Host " " - -if ($project) { - $dateTime = Get-Date -Format yyyyMMdd-HHmmss - - # Create paths and list them - $projectPath = (Get-Item $project.Properties.Item("FullPath").Value).FullName - Write-Host "projectPath:" "${projectPath}" - $webConfigSource = Join-Path $projectPath "Web.config" - Write-Host "webConfigSource:" "${webConfigSource}" - $configFolder = Join-Path $projectPath "Config" - Write-Host "configFolder:" "${configFolder}" - - # Copy umbraco and umbraco_files from package to project folder - $umbracoFolder = Join-Path $projectPath "Umbraco" - New-Item -ItemType Directory -Force -Path $umbracoFolder - $umbracoFolderSource = Join-Path $installPath "UmbracoFiles\Umbraco" - - Write-Host "copying files to $umbracoFolder ..." - # see https://support.microsoft.com/en-us/help/954404/return-codes-that-are-used-by-the-robocopy-utility-in-windows-server-2 - robocopy $umbracoFolderSource $umbracoFolder /is /it /e - if (($lastexitcode -eq 1) -or ($lastexitcode -eq 3) -or ($lastexitcode -eq 5) -or ($lastexitcode -eq 7)) - { - write-host "Copy succeeded!" - } - else - { - write-host "Copy failed with exit code:" $lastexitcode - } - - $copyWebconfig = $true - $destinationWebConfig = Join-Path $projectPath "Web.config" - - if(Test-Path $destinationWebConfig) - { - Try - { - [xml]$config = Get-Content $destinationWebConfig - - $config.configuration.appSettings.ChildNodes | ForEach-Object { - if($_.key -eq "Umbraco.Core.ConfigurationStatus") - { - # The web.config has an umbraco-specific appSetting in it - # don't overwrite it and let config transforms do their thing - $copyWebconfig = $false - } - } - } - Catch - { - Write-Host "An error occurred:" - Write-Host $_ - } - } - - if($copyWebconfig -eq $true) - { - $packageWebConfigSource = Join-Path $installPath "UmbracoFiles\Web.config" - Copy-Item $packageWebConfigSource $destinationWebConfig -Force - - # Copy files that don't get automatically copied for Website projects - # We do this here, when copyWebconfig is true because we only want to do it for new installs - # If this is an upgrade then the files should already be there - $splashesSource = Join-Path $installPath "UmbracoFiles\Config\splashes\*.*" - $splashesDestination = Join-Path $projectPath "Config\splashes\" - New-Item $splashesDestination -Type directory - Copy-Item $splashesSource $splashesDestination -Force - } else { - # This part only runs for upgrades - - $upgradeViewSource = Join-Path $umbracoFolderSource "Views\install\*" - $upgradeView = Join-Path $umbracoFolder "Views\install\" - Write-Host "Copying2 ${upgradeViewSource} to ${upgradeView}" - Copy-Item $upgradeViewSource $upgradeView -Force - - Try - { - # Disable tours for upgrades, presumably Umbraco experience is already available - $umbracoSettingsConfigPath = Join-Path $configFolder "umbracoSettings.config" - $content = (Get-Content $umbracoSettingsConfigPath).Replace('','') - # Saves with UTF-8 encoding without BOM which makes sure Umbraco can still read it - # Reference: https://stackoverflow.com/a/32951824/5018 - [IO.File]::WriteAllLines($umbracoSettingsConfigPath, $content) - } - Catch - { - # Not a big problem if this fails, let it go - # Write-Host "An error occurred:" - # Write-Host $_ - } - } - - # Open appropriate readme - if($copyWebconfig -eq $true) - { - $DTE.ItemOperations.OpenFile($toolsPath + '\Readme.txt') - } - else - { - $DTE.ItemOperations.OpenFile($toolsPath + '\ReadmeUpgrade.txt') - } -} diff --git a/build/NuSpecs/tools/processing.config.install.xdt b/build/NuSpecs/tools/processing.config.install.xdt deleted file mode 100644 index 0bef321533d0..000000000000 --- a/build/NuSpecs/tools/processing.config.install.xdt +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/build/NuSpecs/tools/serilog.config.install.xdt b/build/NuSpecs/tools/serilog.config.install.xdt deleted file mode 100644 index b4a10b7bc2d9..000000000000 --- a/build/NuSpecs/tools/serilog.config.install.xdt +++ /dev/null @@ -1,9 +0,0 @@ - -> - - - - - - - diff --git a/build/NuSpecs/tools/umbracoSettings.config.install.xdt b/build/NuSpecs/tools/umbracoSettings.config.install.xdt deleted file mode 100644 index 295fc0ba5731..000000000000 --- a/build/NuSpecs/tools/umbracoSettings.config.install.xdt +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/build/V8-Docs-Pipeline.yml b/build/V8-Docs-Pipeline.yml deleted file mode 100644 index 56e8fde60ccf..000000000000 --- a/build/V8-Docs-Pipeline.yml +++ /dev/null @@ -1,52 +0,0 @@ -############################################################## -## V8 CMS - .NET & AngularJS Doc sites ## -## Built on demand only, NO automatic PR/branch triggers ## -## ## -## This build pipeline has a webhook for sucessful ## -## builds, that sends the ZIP artifacts to our.umb to host ## -############################################################## - -# Name != name of pipeline but the build number format -# https://docs.microsoft.com/en-us/azure/devops/pipelines/process/run-number?view=azure-devops&tabs=yaml - -# Build Pipeline triggers -# https://docs.microsoft.com/en-us/azure/devops/pipelines/repos/github?view=azure-devops&tabs=yaml#ci-triggers -trigger: none -pr: none - -# Variables & their default values -variables: - buildPlatform: 'Any CPU' - buildConfiguration: 'Release' - -# VM to run the build on & it's installed software -# https://docs.microsoft.com/en-us/azure/devops/pipelines/agents/hosted?view=azure-devops -# https://github.com/actions/virtual-environments/blob/master/images/win/Windows2019-Readme.md -pool: - vmImage: 'windows-2019' - -jobs: - - job: buildDocs - displayName: 'Build static docs site as ZIPs' - steps: - - - task: PowerShell@2 - displayName: 'Prep build tool, build C# & JS Docs' - inputs: - targetType: 'inline' - script: | - $uenv=./build.ps1 -get -doc - $uenv.SandboxNode() - $uenv.CompileBelle() - $uenv.PrepareAngularDocs() - $nugetsourceUmbraco = "https://api.nuget.org/v3/index.json" - $uenv.PrepareCSharpDocs() - $uenv.RestoreNode() - errorActionPreference: 'continue' - workingDirectory: 'build' - - - task: PublishPipelineArtifact@1 - inputs: - targetPath: '$(Build.Repository.LocalPath)\build.out\' - artifact: 'docs' - publishLocation: 'pipeline' \ No newline at end of file diff --git a/build/azure-pipelines.yml b/build/azure-pipelines.yml index 9d931122d0ad..219e1c133471 100644 --- a/build/azure-pipelines.yml +++ b/build/azure-pipelines.yml @@ -217,18 +217,18 @@ stages: inputs: scriptType: inlineScript inlineScript: > - @{ username = $env:Umbraco__CMS__Unattended__UnattendedUserEmail; password = $env:Umbraco__CMS__Unattended__UnattendedUserPassword } | ConvertTo-Json | Set-Content -Path "src\Umbraco.Tests.AcceptanceTest\cypress.env.json" + @{ username = $env:Umbraco__CMS__Unattended__UnattendedUserEmail; password = $env:Umbraco__CMS__Unattended__UnattendedUserPassword } | ConvertTo-Json | Set-Content -Path "tests\Umbraco.Tests.AcceptanceTest\cypress.env.json" - task: Npm@1 name: PrepareTask displayName: npm install (AcceptanceTest) inputs: - workingDir: 'src\Umbraco.Tests.AcceptanceTest' + workingDir: 'tests\Umbraco.Tests.AcceptanceTest' - task: Npm@1 displayName: Run Cypress (Desktop) condition: always() continueOnError: true inputs: - workingDir: src\Umbraco.Tests.AcceptanceTest + workingDir: tests\Umbraco.Tests.AcceptanceTest command: 'custom' customCommand: 'run test -- --reporter junit --reporter-options "mochaFile=results/test-output-D-[hash].xml,toConsole=true" --config="viewportHeight=1600,viewportWidth=2560,screenshotsFolder=cypress/artifacts/desktop/screenshots,videosFolder=cypress/artifacts/desktop/videos,videoUploadOnPasses=false"' @@ -236,14 +236,14 @@ stages: condition: always() inputs: testResultsFormat: 'JUnit' - testResultsFiles: 'src/Umbraco.Tests.AcceptanceTest/results/test-output-D-*.xml' + testResultsFiles: 'tests/Umbraco.Tests.AcceptanceTest/results/test-output-D-*.xml' mergeTestResults: true testRunTitle: "Test results Desktop" # - task: Npm@1 # displayName: Run Cypress (Tablet portrait) # condition: always() # inputs: -# workingDir: src\Umbraco.Tests.AcceptanceTest +# workingDir: tests\Umbraco.Tests.AcceptanceTest # command: 'custom' # customCommand: 'run test -- --config="viewportHeight=1366,viewportWidth=1024,screenshotsFolder=cypress/artifacts/tablet/screenshots,videosFolder=cypress/artifacts/tablet/videos,videoUploadOnPasses=false"' # @@ -251,14 +251,14 @@ stages: # displayName: Run Cypress (Mobile protrait) # condition: always() # inputs: -# workingDir: src\Umbraco.Tests.AcceptanceTest +# workingDir: tests\Umbraco.Tests.AcceptanceTest # command: 'custom' # customCommand: 'run test -- --config="viewportHeight=812,viewportWidth=375,screenshotsFolder=cypress/artifacts/mobile/screenshots,videosFolder=cypress/artifacts/mobile/videos,videoUploadOnPasses=false"' - task: PublishPipelineArtifact@1 displayName: "Publish test artifacts" condition: failed() inputs: - targetPath: '$(Build.SourcesDirectory)/src/Umbraco.Tests.AcceptanceTest/cypress/artifacts' + targetPath: '$(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest/cypress/artifacts' artifact: 'Test artifacts - Windows' - job: Linux_Acceptance_tests displayName: Linux @@ -310,7 +310,7 @@ stages: displayName: Generate Cypress.env.json inputs: targetType: 'inline' - script: 'echo "{ \"username\": \"$USERNAME\", \"password\": \"$PASSWORD\" }" > "src/Umbraco.Tests.AcceptanceTest/cypress.env.json"' + script: 'echo "{ \"username\": \"$USERNAME\", \"password\": \"$PASSWORD\" }" > "tests/Umbraco.Tests.AcceptanceTest/cypress.env.json"' env: USERNAME: $(Umbraco__CMS__Unattended__UnattendedUserEmail) PASSWORD: $(Umbraco__CMS__Unattended__UnattendedUserPassword) @@ -318,13 +318,13 @@ stages: name: PrepareTask displayName: npm install (AcceptanceTest) inputs: - workingDir: 'src/Umbraco.Tests.AcceptanceTest' + workingDir: 'tests/Umbraco.Tests.AcceptanceTest' - task: Npm@1 displayName: Run Cypress (Desktop) condition: always() continueOnError: true inputs: - workingDir: src/Umbraco.Tests.AcceptanceTest + workingDir: tests/Umbraco.Tests.AcceptanceTest command: 'custom' customCommand: 'run test -- --reporter junit --reporter-options "mochaFile=results/test-output-D-[hash].xml,toConsole=true" --config="viewportHeight=1600,viewportWidth=2560,screenshotsFolder=cypress/artifacts/desktop/screenshots,videosFolder=cypress/artifacts/desktop/videos,videoUploadOnPasses=false"' @@ -332,14 +332,14 @@ stages: condition: always() inputs: testResultsFormat: 'JUnit' - testResultsFiles: 'src/Umbraco.Tests.AcceptanceTest/results/test-output-D-*.xml' + testResultsFiles: 'tests/Umbraco.Tests.AcceptanceTest/results/test-output-D-*.xml' mergeTestResults: true testRunTitle: "Test results Desktop" # - task: Npm@1 # displayName: Run Cypress (Tablet portrait) # condition: always() # inputs: - # workingDir: src/Umbraco.Tests.AcceptanceTest + # workingDir: tests/Umbraco.Tests.AcceptanceTest # command: 'custom' # customCommand: 'run test -- --config="viewportHeight=1366,viewportWidth=1024,screenshotsFolder=cypress/artifacts/tablet/screenshots,videosFolder=cypress/artifacts/tablet/videos,videoUploadOnPasses=false"' # @@ -347,14 +347,14 @@ stages: # displayName: Run Cypress (Mobile protrait) # condition: always() # inputs: - # workingDir: src/Umbraco.Tests.AcceptanceTest + # workingDir: tests/Umbraco.Tests.AcceptanceTest # command: 'custom' # customCommand: 'run test -- --config="viewportHeight=812,viewportWidth=375,screenshotsFolder=cypress/artifacts/mobile/screenshots,videosFolder=cypress/artifacts/mobile/videos,videoUploadOnPasses=false"' - task: PublishPipelineArtifact@1 displayName: "Publish test artifacts" condition: failed() inputs: - targetPath: '$(Build.SourcesDirectory)/src/Umbraco.Tests.AcceptanceTest/cypress/artifacts' + targetPath: '$(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest/cypress/artifacts' artifact: 'Test artifacts - Linux' - stage: Artifacts dependsOn: [] diff --git a/build/build.ps1 b/build/build.ps1 index 02510d94aecd..230b2da97139 100644 --- a/build/build.ps1 +++ b/build/build.ps1 @@ -265,7 +265,7 @@ # beware of the weird double \\ at the end of paths # see http://edgylogic.com/blog/powershell-and-external-commands-done-right/ - &$this.BuildEnv.VisualStudio.MsBuild "$($this.SolutionRoot)\src\Umbraco.Tests\Umbraco.Tests.csproj" ` + &$this.BuildEnv.VisualStudio.MsBuild "$($this.SolutionRoot)\tests\Umbraco.Tests\Umbraco.Tests.csproj" ` /p:WarningLevel=0 ` /p:Configuration=$buildConfiguration ` /p:Platform=AnyCPU ` diff --git a/linting/codeanalysis.ruleset b/codeanalysis.ruleset similarity index 92% rename from linting/codeanalysis.ruleset rename to codeanalysis.ruleset index 57c9fb7d606e..ab5ad88f57c1 100644 --- a/linting/codeanalysis.ruleset +++ b/codeanalysis.ruleset @@ -1,4 +1,4 @@ - + @@ -15,4 +15,4 @@ - \ No newline at end of file + diff --git a/linting/.editorconfig b/linting/.editorconfig deleted file mode 100644 index 66967e074f92..000000000000 --- a/linting/.editorconfig +++ /dev/null @@ -1,447 +0,0 @@ -# Version: 1.6.2 (Using https://semver.org/) -# Updated: 2020-11-02 -# See https://github.com/RehanSaeed/EditorConfig/releases for release notes. -# See https://github.com/RehanSaeed/EditorConfig for updates to this file. -# See http://EditorConfig.org for more information about .editorconfig files. - -########################################## -# Common Settings -########################################## - -# This file is the top-most EditorConfig file -root = true - -# All Files -[*] -charset = utf-8 -indent_style = space -indent_size = 4 -insert_final_newline = true -trim_trailing_whitespace = true - -########################################## -# File Extension Settings -########################################## - -# Visual Studio Solution Files -[*.sln] -indent_style = tab - -# Visual Studio XML Project Files -[*.{csproj,vbproj,vcxproj.filters,proj,projitems,shproj}] -indent_size = 2 - -# XML Configuration Files -[*.{xml,config,props,targets,nuspec,resx,ruleset,vsixmanifest,vsct}] -indent_size = 2 - -# JSON Files -[*.{json,json5,webmanifest}] -indent_size = 2 - -# YAML Files -[*.{yml,yaml}] -indent_size = 2 - -# Markdown Files -[*.md] -trim_trailing_whitespace = false - -# Web Files -[*.{htm,html,js,jsm,ts,tsx,css,sass,scss,less,svg,vue}] -indent_size = 2 - -# Batch Files -[*.{cmd,bat}] -end_of_line = crlf - -# Bash Files -[*.sh] -end_of_line = lf - -# Makefiles -[Makefile] -indent_style = tab - -########################################## -# File Header (Uncomment to support file headers) -# https://docs.microsoft.com/visualstudio/ide/reference/add-file-header -########################################## - -# [*.{cs,csx,cake,vb,vbx}] -file_header_template = Copyright (c) Umbraco.\nSee LICENSE for more details. - -# SA1636: File header copyright text should match -# Justification: .editorconfig supports file headers. If this is changed to a value other than "none", a stylecop.json file will need to added to the project. -# dotnet_diagnostic.SA1636.severity = none - -########################################## -# .NET Language Conventions -# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions -########################################## - -# .NET Code Style Settings -# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#net-code-style-settings -[*.{cs,csx,cake,vb,vbx}] -# "this." and "Me." qualifiers -# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#this-and-me -dotnet_style_qualification_for_field = false:suggestion -dotnet_style_qualification_for_property = false:suggestion -dotnet_style_qualification_for_method = false:suggestion -dotnet_style_qualification_for_event = false:suggestion -# Language keywords instead of framework type names for type references -# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#language-keywords -dotnet_style_predefined_type_for_locals_parameters_members = true:warning -dotnet_style_predefined_type_for_member_access = true:warning -# Modifier preferences -# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#normalize-modifiers -dotnet_style_require_accessibility_modifiers = always:warning -csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:warning -visual_basic_preferred_modifier_order = Partial,Default,Private,Protected,Public,Friend,NotOverridable,Overridable,MustOverride,Overloads,Overrides,MustInherit,NotInheritable,Static,Shared,Shadows,ReadOnly,WriteOnly,Dim,Const,WithEvents,Widening,Narrowing,Custom,Async:warning -dotnet_style_readonly_field = true:warning -# Parentheses preferences -# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#parentheses-preferences -dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:warning -dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:warning -dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:warning -dotnet_style_parentheses_in_other_operators = never_if_unnecessary:suggestion -# Expression-level preferences -# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#expression-level-preferences -dotnet_style_object_initializer = true:warning -dotnet_style_collection_initializer = true:warning -dotnet_style_explicit_tuple_names = true:warning -dotnet_style_prefer_inferred_tuple_names = true:warning -dotnet_style_prefer_inferred_anonymous_type_member_names = true:warning -dotnet_style_prefer_auto_properties = true:warning -dotnet_style_prefer_is_null_check_over_reference_equality_method = true:warning -dotnet_style_prefer_conditional_expression_over_assignment = false:suggestion -dotnet_style_prefer_conditional_expression_over_return = false:suggestion -dotnet_style_prefer_compound_assignment = true:warning -# Null-checking preferences -# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#null-checking-preferences -dotnet_style_coalesce_expression = true:warning -dotnet_style_null_propagation = true:warning -# Parameter preferences -# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#parameter-preferences -dotnet_code_quality_unused_parameters = all:warning -# More style options (Undocumented) -# https://github.com/MicrosoftDocs/visualstudio-docs/issues/3641 -dotnet_style_operator_placement_when_wrapping = end_of_line -# https://github.com/dotnet/roslyn/pull/40070 -dotnet_style_prefer_simplified_interpolation = true:warning - -# C# Code Style Settings -# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#c-code-style-settings -[*.{cs,csx,cake}] -# Implicit and explicit types -# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#implicit-and-explicit-types -csharp_style_var_for_built_in_types = never -csharp_style_var_when_type_is_apparent = true:warning -csharp_style_var_elsewhere = false:warning -# Expression-bodied members -# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#expression-bodied-members -csharp_style_expression_bodied_methods = true:warning -csharp_style_expression_bodied_constructors = true:warning -csharp_style_expression_bodied_operators = true:warning -csharp_style_expression_bodied_properties = true:warning -csharp_style_expression_bodied_indexers = true:warning -csharp_style_expression_bodied_accessors = true:warning -csharp_style_expression_bodied_lambdas = true:warning -csharp_style_expression_bodied_local_functions = true:warning -# Pattern matching -# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#pattern-matching -csharp_style_pattern_matching_over_is_with_cast_check = true:warning -csharp_style_pattern_matching_over_as_with_null_check = true:warning -# Inlined variable declarations -# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#inlined-variable-declarations -csharp_style_inlined_variable_declaration = true:warning -# Expression-level preferences -# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#expression-level-preferences -csharp_prefer_simple_default_expression = true:warning -# "Null" checking preferences -# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#c-null-checking-preferences -csharp_style_throw_expression = true:warning -csharp_style_conditional_delegate_call = true:warning -# Code block preferences -# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#code-block-preferences -csharp_prefer_braces = true:warning -# Unused value preferences -# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#unused-value-preferences -csharp_style_unused_value_expression_statement_preference = discard_variable:suggestion -csharp_style_unused_value_assignment_preference = discard_variable:suggestion -# Index and range preferences -# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#index-and-range-preferences -csharp_style_prefer_index_operator = true:warning -csharp_style_prefer_range_operator = true:warning -# Miscellaneous preferences -# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#miscellaneous-preferences -csharp_style_deconstructed_variable_declaration = true:warning -csharp_style_pattern_local_over_anonymous_function = true:warning -csharp_using_directive_placement = outside_namespace:warning -csharp_prefer_static_local_function = true:warning -csharp_prefer_simple_using_statement = true:suggestion - -########################################## -# .NET Formatting Conventions -# https://docs.microsoft.com/visualstudio/ide/editorconfig-code-style-settings-reference#formatting-conventions -########################################## - -# Organize usings -# https://docs.microsoft.com/visualstudio/ide/editorconfig-formatting-conventions#organize-using-directives -dotnet_sort_system_directives_first = true -# Newline options -# https://docs.microsoft.com/visualstudio/ide/editorconfig-formatting-conventions#new-line-options -csharp_new_line_before_open_brace = all -csharp_new_line_before_else = true -csharp_new_line_before_catch = true -csharp_new_line_before_finally = true -csharp_new_line_before_members_in_object_initializers = true -csharp_new_line_before_members_in_anonymous_types = true -csharp_new_line_between_query_expression_clauses = true -# Indentation options -# https://docs.microsoft.com/visualstudio/ide/editorconfig-formatting-conventions#indentation-options -csharp_indent_case_contents = true -csharp_indent_switch_labels = true -csharp_indent_labels = no_change -csharp_indent_block_contents = true -csharp_indent_braces = false -csharp_indent_case_contents_when_block = false -# Spacing options -# https://docs.microsoft.com/visualstudio/ide/editorconfig-formatting-conventions#spacing-options -csharp_space_after_cast = false -csharp_space_after_keywords_in_control_flow_statements = true -csharp_space_between_parentheses = false -csharp_space_before_colon_in_inheritance_clause = true -csharp_space_after_colon_in_inheritance_clause = true -csharp_space_around_binary_operators = before_and_after -csharp_space_between_method_declaration_parameter_list_parentheses = false -csharp_space_between_method_declaration_empty_parameter_list_parentheses = false -csharp_space_between_method_declaration_name_and_open_parenthesis = false -csharp_space_between_method_call_parameter_list_parentheses = false -csharp_space_between_method_call_empty_parameter_list_parentheses = false -csharp_space_between_method_call_name_and_opening_parenthesis = false -csharp_space_after_comma = true -csharp_space_before_comma = false -csharp_space_after_dot = false -csharp_space_before_dot = false -csharp_space_after_semicolon_in_for_statement = true -csharp_space_before_semicolon_in_for_statement = false -csharp_space_around_declaration_statements = false -csharp_space_before_open_square_brackets = false -csharp_space_between_empty_square_brackets = false -csharp_space_between_square_brackets = false -# Wrapping options -# https://docs.microsoft.com/visualstudio/ide/editorconfig-formatting-conventions#wrap-options -csharp_preserve_single_line_statements = false -csharp_preserve_single_line_blocks = true - -########################################## -# .NET Naming Conventions -# https://docs.microsoft.com/visualstudio/ide/editorconfig-naming-conventions -########################################## - -[*.{cs,csx,cake,vb,vbx}] - -########################################## -# Styles -########################################## - -# camel_case_style - Define the camelCase style -dotnet_naming_style.camel_case_style.capitalization = camel_case -# pascal_case_style - Define the PascalCase style -dotnet_naming_style.pascal_case_style.capitalization = pascal_case -# first_upper_style - The first character must start with an upper-case character -dotnet_naming_style.first_upper_style.capitalization = first_word_upper -# prefix_interface_with_i_style - Interfaces must be PascalCase and the first character of an interface must be an 'I' -dotnet_naming_style.prefix_interface_with_i_style.capitalization = pascal_case -dotnet_naming_style.prefix_interface_with_i_style.required_prefix = I -# prefix_type_parameters_with_t_style - Generic Type Parameters must be PascalCase and the first character must be a 'T' -dotnet_naming_style.prefix_type_parameters_with_t_style.capitalization = pascal_case -dotnet_naming_style.prefix_type_parameters_with_t_style.required_prefix = T -# disallowed_style - Anything that has this style applied is marked as disallowed -dotnet_naming_style.disallowed_style.capitalization = pascal_case -dotnet_naming_style.disallowed_style.required_prefix = ____RULE_VIOLATION____ -dotnet_naming_style.disallowed_style.required_suffix = ____RULE_VIOLATION____ -# internal_error_style - This style should never occur... if it does, it indicates a bug in file or in the parser using the file -dotnet_naming_style.internal_error_style.capitalization = pascal_case -dotnet_naming_style.internal_error_style.required_prefix = ____INTERNAL_ERROR____ -dotnet_naming_style.internal_error_style.required_suffix = ____INTERNAL_ERROR____ - -########################################## -# .NET Design Guideline Field Naming Rules -# Naming rules for fields follow the .NET Framework design guidelines -# https://docs.microsoft.com/dotnet/standard/design-guidelines/index -########################################## - -# All public/protected/protected_internal constant fields must be PascalCase -# https://docs.microsoft.com/dotnet/standard/design-guidelines/field -dotnet_naming_symbols.public_protected_constant_fields_group.applicable_accessibilities = public, protected, protected_internal -dotnet_naming_symbols.public_protected_constant_fields_group.required_modifiers = const -dotnet_naming_symbols.public_protected_constant_fields_group.applicable_kinds = field -dotnet_naming_rule.public_protected_constant_fields_must_be_pascal_case_rule.symbols = public_protected_constant_fields_group -dotnet_naming_rule.public_protected_constant_fields_must_be_pascal_case_rule.style = pascal_case_style -dotnet_naming_rule.public_protected_constant_fields_must_be_pascal_case_rule.severity = warning - -# All public/protected/protected_internal static readonly fields must be PascalCase -# https://docs.microsoft.com/dotnet/standard/design-guidelines/field -dotnet_naming_symbols.public_protected_static_readonly_fields_group.applicable_accessibilities = public, protected, protected_internal -dotnet_naming_symbols.public_protected_static_readonly_fields_group.required_modifiers = static, readonly -dotnet_naming_symbols.public_protected_static_readonly_fields_group.applicable_kinds = field -dotnet_naming_rule.public_protected_static_readonly_fields_must_be_pascal_case_rule.symbols = public_protected_static_readonly_fields_group -dotnet_naming_rule.public_protected_static_readonly_fields_must_be_pascal_case_rule.style = pascal_case_style -dotnet_naming_rule.public_protected_static_readonly_fields_must_be_pascal_case_rule.severity = warning - -# No other public/protected/protected_internal fields are allowed -# https://docs.microsoft.com/dotnet/standard/design-guidelines/field -dotnet_naming_symbols.other_public_protected_fields_group.applicable_accessibilities = public, protected, protected_internal -dotnet_naming_symbols.other_public_protected_fields_group.applicable_kinds = field -dotnet_naming_rule.other_public_protected_fields_disallowed_rule.symbols = other_public_protected_fields_group -dotnet_naming_rule.other_public_protected_fields_disallowed_rule.style = disallowed_style -dotnet_naming_rule.other_public_protected_fields_disallowed_rule.severity = error - -########################################## -# StyleCop Field Naming Rules -# Naming rules for fields follow the StyleCop analyzers -# This does not override any rules using disallowed_style above -# https://github.com/DotNetAnalyzers/StyleCopAnalyzers -########################################## - -# All constant fields must be PascalCase -# https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1303.md -dotnet_naming_symbols.stylecop_constant_fields_group.applicable_accessibilities = public, internal, protected_internal, protected, private_protected, private -dotnet_naming_symbols.stylecop_constant_fields_group.required_modifiers = const -dotnet_naming_symbols.stylecop_constant_fields_group.applicable_kinds = field -dotnet_naming_rule.stylecop_constant_fields_must_be_pascal_case_rule.symbols = stylecop_constant_fields_group -dotnet_naming_rule.stylecop_constant_fields_must_be_pascal_case_rule.style = pascal_case_style -dotnet_naming_rule.stylecop_constant_fields_must_be_pascal_case_rule.severity = warning - -# All static readonly fields must be PascalCase -# Ajusted to ignore private fields. -# https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1311.md -dotnet_naming_symbols.stylecop_static_readonly_fields_group.applicable_accessibilities = public, internal, protected_internal, protected, private_protected -dotnet_naming_symbols.stylecop_static_readonly_fields_group.required_modifiers = static, readonly -dotnet_naming_symbols.stylecop_static_readonly_fields_group.applicable_kinds = field -dotnet_naming_rule.stylecop_static_readonly_fields_must_be_pascal_case_rule.symbols = stylecop_static_readonly_fields_group -dotnet_naming_rule.stylecop_static_readonly_fields_must_be_pascal_case_rule.style = pascal_case_style -dotnet_naming_rule.stylecop_static_readonly_fields_must_be_pascal_case_rule.severity = warning - -# No non-private instance fields are allowed -# https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1401.md -dotnet_naming_symbols.stylecop_fields_must_be_private_group.applicable_accessibilities = public, internal, protected_internal, protected, private_protected -dotnet_naming_symbols.stylecop_fields_must_be_private_group.applicable_kinds = field -dotnet_naming_rule.stylecop_instance_fields_must_be_private_rule.symbols = stylecop_fields_must_be_private_group -dotnet_naming_rule.stylecop_instance_fields_must_be_private_rule.style = disallowed_style -dotnet_naming_rule.stylecop_instance_fields_must_be_private_rule.severity = error - -# Local variables must be camelCase -# https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1312.md -dotnet_naming_symbols.stylecop_local_fields_group.applicable_accessibilities = local -dotnet_naming_symbols.stylecop_local_fields_group.applicable_kinds = local -dotnet_naming_rule.stylecop_local_fields_must_be_camel_case_rule.symbols = stylecop_local_fields_group -dotnet_naming_rule.stylecop_local_fields_must_be_camel_case_rule.style = camel_case_style -dotnet_naming_rule.stylecop_local_fields_must_be_camel_case_rule.severity = silent - -# This rule should never fire. However, it's included for at least two purposes: -# First, it helps to understand, reason about, and root-case certain types of issues, such as bugs in .editorconfig parsers. -# Second, it helps to raise immediate awareness if a new field type is added (as occurred recently in C#). -dotnet_naming_symbols.sanity_check_uncovered_field_case_group.applicable_accessibilities = * -dotnet_naming_symbols.sanity_check_uncovered_field_case_group.applicable_kinds = field -dotnet_naming_rule.sanity_check_uncovered_field_case_rule.symbols = sanity_check_uncovered_field_case_group -dotnet_naming_rule.sanity_check_uncovered_field_case_rule.style = internal_error_style -dotnet_naming_rule.sanity_check_uncovered_field_case_rule.severity = error - - -########################################## -# Other Naming Rules -########################################## - -# All of the following must be PascalCase: -# - Namespaces -# https://docs.microsoft.com/dotnet/standard/design-guidelines/names-of-namespaces -# https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1300.md -# - Classes and Enumerations -# https://docs.microsoft.com/dotnet/standard/design-guidelines/names-of-classes-structs-and-interfaces -# https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1300.md -# - Delegates -# https://docs.microsoft.com/dotnet/standard/design-guidelines/names-of-classes-structs-and-interfaces#names-of-common-types -# - Constructors, Properties, Events, Methods -# https://docs.microsoft.com/dotnet/standard/design-guidelines/names-of-type-members -dotnet_naming_symbols.element_group.applicable_kinds = namespace, class, enum, struct, delegate, event, method, property -dotnet_naming_rule.element_rule.symbols = element_group -dotnet_naming_rule.element_rule.style = pascal_case_style -dotnet_naming_rule.element_rule.severity = warning - -# Interfaces use PascalCase and are prefixed with uppercase 'I' -# https://docs.microsoft.com/dotnet/standard/design-guidelines/names-of-classes-structs-and-interfaces -dotnet_naming_symbols.interface_group.applicable_kinds = interface -dotnet_naming_rule.interface_rule.symbols = interface_group -dotnet_naming_rule.interface_rule.style = prefix_interface_with_i_style -dotnet_naming_rule.interface_rule.severity = warning - -# Generics Type Parameters use PascalCase and are prefixed with uppercase 'T' -# https://docs.microsoft.com/dotnet/standard/design-guidelines/names-of-classes-structs-and-interfaces -dotnet_naming_symbols.type_parameter_group.applicable_kinds = type_parameter -dotnet_naming_rule.type_parameter_rule.symbols = type_parameter_group -dotnet_naming_rule.type_parameter_rule.style = prefix_type_parameters_with_t_style -dotnet_naming_rule.type_parameter_rule.severity = warning - -# Function parameters use camelCase -# https://docs.microsoft.com/dotnet/standard/design-guidelines/naming-parameters -dotnet_naming_symbols.parameters_group.applicable_kinds = parameter -dotnet_naming_rule.parameters_rule.symbols = parameters_group -dotnet_naming_rule.parameters_rule.style = camel_case_style -dotnet_naming_rule.parameters_rule.severity = warning - -# Private static fields use camelCase and start with s_ -dotnet_naming_symbols.private_static_field_symbols.applicable_accessibilities = private -dotnet_naming_symbols.private_static_field_symbols.required_modifiers = static, shared -dotnet_naming_symbols.private_static_field_symbols.applicable_kinds = field -dotnet_naming_rule.private_static_fields_must_be_camel_cased_and_prefixed_with_s_underscore.symbols = private_static_field_symbols -dotnet_naming_rule.private_static_fields_must_be_camel_cased_and_prefixed_with_s_underscore.style = camel_case_and_prefix_with_s_underscore_style -dotnet_naming_rule.private_static_fields_must_be_camel_cased_and_prefixed_with_s_underscore.severity = warning -dotnet_naming_style.camel_case_and_prefix_with_s_underscore_style.required_prefix = s_ -dotnet_naming_style.camel_case_and_prefix_with_s_underscore_style.capitalization = camel_case - -# Instance fields use camelCase and are prefixed with '_' -dotnet_naming_symbols.private_field_symbols.applicable_accessibilities = private -dotnet_naming_symbols.private_field_symbols.applicable_kinds = field -dotnet_naming_rule.private_instance_fields_must_be_camel_cased_and_prefixed_with_underscore.symbols = private_field_symbols -dotnet_naming_rule.private_instance_fields_must_be_camel_cased_and_prefixed_with_underscore.style = camel_case_and_prefix_with_underscore_style -dotnet_naming_rule.private_instance_fields_must_be_camel_cased_and_prefixed_with_underscore.severity = warning -dotnet_naming_style.camel_case_and_prefix_with_underscore_style.required_prefix = _ -dotnet_naming_style.camel_case_and_prefix_with_underscore_style.capitalization = camel_case - -########################################## -# License -########################################## -# The following applies as to the .editorconfig file ONLY, and is -# included below for reference, per the requirements of the license -# corresponding to this .editorconfig file. -# See: https://github.com/RehanSaeed/EditorConfig -# -# MIT License -# -# Copyright (c) 2017-2019 Muhammad Rehan Saeed -# Copyright (c) 2019 Henry Gabryjelski -# -# Permission is hereby granted, free of charge, to any -# person obtaining a copy of this software and associated -# documentation files (the "Software"), to deal in the -# Software without restriction, including without limitation -# the rights to use, copy, modify, merge, publish, distribute, -# sublicense, and/or sell copies of the Software, and to permit -# persons to whom the Software is furnished to do so, subject -# to the following conditions: -# -# The above copyright notice and this permission notice shall be -# included in all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -# OTHER DEALINGS IN THE SOFTWARE. -########################################## diff --git a/src/.editorconfig b/src/.editorconfig deleted file mode 100644 index 66967e074f92..000000000000 --- a/src/.editorconfig +++ /dev/null @@ -1,447 +0,0 @@ -# Version: 1.6.2 (Using https://semver.org/) -# Updated: 2020-11-02 -# See https://github.com/RehanSaeed/EditorConfig/releases for release notes. -# See https://github.com/RehanSaeed/EditorConfig for updates to this file. -# See http://EditorConfig.org for more information about .editorconfig files. - -########################################## -# Common Settings -########################################## - -# This file is the top-most EditorConfig file -root = true - -# All Files -[*] -charset = utf-8 -indent_style = space -indent_size = 4 -insert_final_newline = true -trim_trailing_whitespace = true - -########################################## -# File Extension Settings -########################################## - -# Visual Studio Solution Files -[*.sln] -indent_style = tab - -# Visual Studio XML Project Files -[*.{csproj,vbproj,vcxproj.filters,proj,projitems,shproj}] -indent_size = 2 - -# XML Configuration Files -[*.{xml,config,props,targets,nuspec,resx,ruleset,vsixmanifest,vsct}] -indent_size = 2 - -# JSON Files -[*.{json,json5,webmanifest}] -indent_size = 2 - -# YAML Files -[*.{yml,yaml}] -indent_size = 2 - -# Markdown Files -[*.md] -trim_trailing_whitespace = false - -# Web Files -[*.{htm,html,js,jsm,ts,tsx,css,sass,scss,less,svg,vue}] -indent_size = 2 - -# Batch Files -[*.{cmd,bat}] -end_of_line = crlf - -# Bash Files -[*.sh] -end_of_line = lf - -# Makefiles -[Makefile] -indent_style = tab - -########################################## -# File Header (Uncomment to support file headers) -# https://docs.microsoft.com/visualstudio/ide/reference/add-file-header -########################################## - -# [*.{cs,csx,cake,vb,vbx}] -file_header_template = Copyright (c) Umbraco.\nSee LICENSE for more details. - -# SA1636: File header copyright text should match -# Justification: .editorconfig supports file headers. If this is changed to a value other than "none", a stylecop.json file will need to added to the project. -# dotnet_diagnostic.SA1636.severity = none - -########################################## -# .NET Language Conventions -# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions -########################################## - -# .NET Code Style Settings -# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#net-code-style-settings -[*.{cs,csx,cake,vb,vbx}] -# "this." and "Me." qualifiers -# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#this-and-me -dotnet_style_qualification_for_field = false:suggestion -dotnet_style_qualification_for_property = false:suggestion -dotnet_style_qualification_for_method = false:suggestion -dotnet_style_qualification_for_event = false:suggestion -# Language keywords instead of framework type names for type references -# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#language-keywords -dotnet_style_predefined_type_for_locals_parameters_members = true:warning -dotnet_style_predefined_type_for_member_access = true:warning -# Modifier preferences -# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#normalize-modifiers -dotnet_style_require_accessibility_modifiers = always:warning -csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:warning -visual_basic_preferred_modifier_order = Partial,Default,Private,Protected,Public,Friend,NotOverridable,Overridable,MustOverride,Overloads,Overrides,MustInherit,NotInheritable,Static,Shared,Shadows,ReadOnly,WriteOnly,Dim,Const,WithEvents,Widening,Narrowing,Custom,Async:warning -dotnet_style_readonly_field = true:warning -# Parentheses preferences -# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#parentheses-preferences -dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:warning -dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:warning -dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:warning -dotnet_style_parentheses_in_other_operators = never_if_unnecessary:suggestion -# Expression-level preferences -# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#expression-level-preferences -dotnet_style_object_initializer = true:warning -dotnet_style_collection_initializer = true:warning -dotnet_style_explicit_tuple_names = true:warning -dotnet_style_prefer_inferred_tuple_names = true:warning -dotnet_style_prefer_inferred_anonymous_type_member_names = true:warning -dotnet_style_prefer_auto_properties = true:warning -dotnet_style_prefer_is_null_check_over_reference_equality_method = true:warning -dotnet_style_prefer_conditional_expression_over_assignment = false:suggestion -dotnet_style_prefer_conditional_expression_over_return = false:suggestion -dotnet_style_prefer_compound_assignment = true:warning -# Null-checking preferences -# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#null-checking-preferences -dotnet_style_coalesce_expression = true:warning -dotnet_style_null_propagation = true:warning -# Parameter preferences -# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#parameter-preferences -dotnet_code_quality_unused_parameters = all:warning -# More style options (Undocumented) -# https://github.com/MicrosoftDocs/visualstudio-docs/issues/3641 -dotnet_style_operator_placement_when_wrapping = end_of_line -# https://github.com/dotnet/roslyn/pull/40070 -dotnet_style_prefer_simplified_interpolation = true:warning - -# C# Code Style Settings -# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#c-code-style-settings -[*.{cs,csx,cake}] -# Implicit and explicit types -# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#implicit-and-explicit-types -csharp_style_var_for_built_in_types = never -csharp_style_var_when_type_is_apparent = true:warning -csharp_style_var_elsewhere = false:warning -# Expression-bodied members -# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#expression-bodied-members -csharp_style_expression_bodied_methods = true:warning -csharp_style_expression_bodied_constructors = true:warning -csharp_style_expression_bodied_operators = true:warning -csharp_style_expression_bodied_properties = true:warning -csharp_style_expression_bodied_indexers = true:warning -csharp_style_expression_bodied_accessors = true:warning -csharp_style_expression_bodied_lambdas = true:warning -csharp_style_expression_bodied_local_functions = true:warning -# Pattern matching -# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#pattern-matching -csharp_style_pattern_matching_over_is_with_cast_check = true:warning -csharp_style_pattern_matching_over_as_with_null_check = true:warning -# Inlined variable declarations -# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#inlined-variable-declarations -csharp_style_inlined_variable_declaration = true:warning -# Expression-level preferences -# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#expression-level-preferences -csharp_prefer_simple_default_expression = true:warning -# "Null" checking preferences -# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#c-null-checking-preferences -csharp_style_throw_expression = true:warning -csharp_style_conditional_delegate_call = true:warning -# Code block preferences -# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#code-block-preferences -csharp_prefer_braces = true:warning -# Unused value preferences -# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#unused-value-preferences -csharp_style_unused_value_expression_statement_preference = discard_variable:suggestion -csharp_style_unused_value_assignment_preference = discard_variable:suggestion -# Index and range preferences -# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#index-and-range-preferences -csharp_style_prefer_index_operator = true:warning -csharp_style_prefer_range_operator = true:warning -# Miscellaneous preferences -# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#miscellaneous-preferences -csharp_style_deconstructed_variable_declaration = true:warning -csharp_style_pattern_local_over_anonymous_function = true:warning -csharp_using_directive_placement = outside_namespace:warning -csharp_prefer_static_local_function = true:warning -csharp_prefer_simple_using_statement = true:suggestion - -########################################## -# .NET Formatting Conventions -# https://docs.microsoft.com/visualstudio/ide/editorconfig-code-style-settings-reference#formatting-conventions -########################################## - -# Organize usings -# https://docs.microsoft.com/visualstudio/ide/editorconfig-formatting-conventions#organize-using-directives -dotnet_sort_system_directives_first = true -# Newline options -# https://docs.microsoft.com/visualstudio/ide/editorconfig-formatting-conventions#new-line-options -csharp_new_line_before_open_brace = all -csharp_new_line_before_else = true -csharp_new_line_before_catch = true -csharp_new_line_before_finally = true -csharp_new_line_before_members_in_object_initializers = true -csharp_new_line_before_members_in_anonymous_types = true -csharp_new_line_between_query_expression_clauses = true -# Indentation options -# https://docs.microsoft.com/visualstudio/ide/editorconfig-formatting-conventions#indentation-options -csharp_indent_case_contents = true -csharp_indent_switch_labels = true -csharp_indent_labels = no_change -csharp_indent_block_contents = true -csharp_indent_braces = false -csharp_indent_case_contents_when_block = false -# Spacing options -# https://docs.microsoft.com/visualstudio/ide/editorconfig-formatting-conventions#spacing-options -csharp_space_after_cast = false -csharp_space_after_keywords_in_control_flow_statements = true -csharp_space_between_parentheses = false -csharp_space_before_colon_in_inheritance_clause = true -csharp_space_after_colon_in_inheritance_clause = true -csharp_space_around_binary_operators = before_and_after -csharp_space_between_method_declaration_parameter_list_parentheses = false -csharp_space_between_method_declaration_empty_parameter_list_parentheses = false -csharp_space_between_method_declaration_name_and_open_parenthesis = false -csharp_space_between_method_call_parameter_list_parentheses = false -csharp_space_between_method_call_empty_parameter_list_parentheses = false -csharp_space_between_method_call_name_and_opening_parenthesis = false -csharp_space_after_comma = true -csharp_space_before_comma = false -csharp_space_after_dot = false -csharp_space_before_dot = false -csharp_space_after_semicolon_in_for_statement = true -csharp_space_before_semicolon_in_for_statement = false -csharp_space_around_declaration_statements = false -csharp_space_before_open_square_brackets = false -csharp_space_between_empty_square_brackets = false -csharp_space_between_square_brackets = false -# Wrapping options -# https://docs.microsoft.com/visualstudio/ide/editorconfig-formatting-conventions#wrap-options -csharp_preserve_single_line_statements = false -csharp_preserve_single_line_blocks = true - -########################################## -# .NET Naming Conventions -# https://docs.microsoft.com/visualstudio/ide/editorconfig-naming-conventions -########################################## - -[*.{cs,csx,cake,vb,vbx}] - -########################################## -# Styles -########################################## - -# camel_case_style - Define the camelCase style -dotnet_naming_style.camel_case_style.capitalization = camel_case -# pascal_case_style - Define the PascalCase style -dotnet_naming_style.pascal_case_style.capitalization = pascal_case -# first_upper_style - The first character must start with an upper-case character -dotnet_naming_style.first_upper_style.capitalization = first_word_upper -# prefix_interface_with_i_style - Interfaces must be PascalCase and the first character of an interface must be an 'I' -dotnet_naming_style.prefix_interface_with_i_style.capitalization = pascal_case -dotnet_naming_style.prefix_interface_with_i_style.required_prefix = I -# prefix_type_parameters_with_t_style - Generic Type Parameters must be PascalCase and the first character must be a 'T' -dotnet_naming_style.prefix_type_parameters_with_t_style.capitalization = pascal_case -dotnet_naming_style.prefix_type_parameters_with_t_style.required_prefix = T -# disallowed_style - Anything that has this style applied is marked as disallowed -dotnet_naming_style.disallowed_style.capitalization = pascal_case -dotnet_naming_style.disallowed_style.required_prefix = ____RULE_VIOLATION____ -dotnet_naming_style.disallowed_style.required_suffix = ____RULE_VIOLATION____ -# internal_error_style - This style should never occur... if it does, it indicates a bug in file or in the parser using the file -dotnet_naming_style.internal_error_style.capitalization = pascal_case -dotnet_naming_style.internal_error_style.required_prefix = ____INTERNAL_ERROR____ -dotnet_naming_style.internal_error_style.required_suffix = ____INTERNAL_ERROR____ - -########################################## -# .NET Design Guideline Field Naming Rules -# Naming rules for fields follow the .NET Framework design guidelines -# https://docs.microsoft.com/dotnet/standard/design-guidelines/index -########################################## - -# All public/protected/protected_internal constant fields must be PascalCase -# https://docs.microsoft.com/dotnet/standard/design-guidelines/field -dotnet_naming_symbols.public_protected_constant_fields_group.applicable_accessibilities = public, protected, protected_internal -dotnet_naming_symbols.public_protected_constant_fields_group.required_modifiers = const -dotnet_naming_symbols.public_protected_constant_fields_group.applicable_kinds = field -dotnet_naming_rule.public_protected_constant_fields_must_be_pascal_case_rule.symbols = public_protected_constant_fields_group -dotnet_naming_rule.public_protected_constant_fields_must_be_pascal_case_rule.style = pascal_case_style -dotnet_naming_rule.public_protected_constant_fields_must_be_pascal_case_rule.severity = warning - -# All public/protected/protected_internal static readonly fields must be PascalCase -# https://docs.microsoft.com/dotnet/standard/design-guidelines/field -dotnet_naming_symbols.public_protected_static_readonly_fields_group.applicable_accessibilities = public, protected, protected_internal -dotnet_naming_symbols.public_protected_static_readonly_fields_group.required_modifiers = static, readonly -dotnet_naming_symbols.public_protected_static_readonly_fields_group.applicable_kinds = field -dotnet_naming_rule.public_protected_static_readonly_fields_must_be_pascal_case_rule.symbols = public_protected_static_readonly_fields_group -dotnet_naming_rule.public_protected_static_readonly_fields_must_be_pascal_case_rule.style = pascal_case_style -dotnet_naming_rule.public_protected_static_readonly_fields_must_be_pascal_case_rule.severity = warning - -# No other public/protected/protected_internal fields are allowed -# https://docs.microsoft.com/dotnet/standard/design-guidelines/field -dotnet_naming_symbols.other_public_protected_fields_group.applicable_accessibilities = public, protected, protected_internal -dotnet_naming_symbols.other_public_protected_fields_group.applicable_kinds = field -dotnet_naming_rule.other_public_protected_fields_disallowed_rule.symbols = other_public_protected_fields_group -dotnet_naming_rule.other_public_protected_fields_disallowed_rule.style = disallowed_style -dotnet_naming_rule.other_public_protected_fields_disallowed_rule.severity = error - -########################################## -# StyleCop Field Naming Rules -# Naming rules for fields follow the StyleCop analyzers -# This does not override any rules using disallowed_style above -# https://github.com/DotNetAnalyzers/StyleCopAnalyzers -########################################## - -# All constant fields must be PascalCase -# https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1303.md -dotnet_naming_symbols.stylecop_constant_fields_group.applicable_accessibilities = public, internal, protected_internal, protected, private_protected, private -dotnet_naming_symbols.stylecop_constant_fields_group.required_modifiers = const -dotnet_naming_symbols.stylecop_constant_fields_group.applicable_kinds = field -dotnet_naming_rule.stylecop_constant_fields_must_be_pascal_case_rule.symbols = stylecop_constant_fields_group -dotnet_naming_rule.stylecop_constant_fields_must_be_pascal_case_rule.style = pascal_case_style -dotnet_naming_rule.stylecop_constant_fields_must_be_pascal_case_rule.severity = warning - -# All static readonly fields must be PascalCase -# Ajusted to ignore private fields. -# https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1311.md -dotnet_naming_symbols.stylecop_static_readonly_fields_group.applicable_accessibilities = public, internal, protected_internal, protected, private_protected -dotnet_naming_symbols.stylecop_static_readonly_fields_group.required_modifiers = static, readonly -dotnet_naming_symbols.stylecop_static_readonly_fields_group.applicable_kinds = field -dotnet_naming_rule.stylecop_static_readonly_fields_must_be_pascal_case_rule.symbols = stylecop_static_readonly_fields_group -dotnet_naming_rule.stylecop_static_readonly_fields_must_be_pascal_case_rule.style = pascal_case_style -dotnet_naming_rule.stylecop_static_readonly_fields_must_be_pascal_case_rule.severity = warning - -# No non-private instance fields are allowed -# https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1401.md -dotnet_naming_symbols.stylecop_fields_must_be_private_group.applicable_accessibilities = public, internal, protected_internal, protected, private_protected -dotnet_naming_symbols.stylecop_fields_must_be_private_group.applicable_kinds = field -dotnet_naming_rule.stylecop_instance_fields_must_be_private_rule.symbols = stylecop_fields_must_be_private_group -dotnet_naming_rule.stylecop_instance_fields_must_be_private_rule.style = disallowed_style -dotnet_naming_rule.stylecop_instance_fields_must_be_private_rule.severity = error - -# Local variables must be camelCase -# https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1312.md -dotnet_naming_symbols.stylecop_local_fields_group.applicable_accessibilities = local -dotnet_naming_symbols.stylecop_local_fields_group.applicable_kinds = local -dotnet_naming_rule.stylecop_local_fields_must_be_camel_case_rule.symbols = stylecop_local_fields_group -dotnet_naming_rule.stylecop_local_fields_must_be_camel_case_rule.style = camel_case_style -dotnet_naming_rule.stylecop_local_fields_must_be_camel_case_rule.severity = silent - -# This rule should never fire. However, it's included for at least two purposes: -# First, it helps to understand, reason about, and root-case certain types of issues, such as bugs in .editorconfig parsers. -# Second, it helps to raise immediate awareness if a new field type is added (as occurred recently in C#). -dotnet_naming_symbols.sanity_check_uncovered_field_case_group.applicable_accessibilities = * -dotnet_naming_symbols.sanity_check_uncovered_field_case_group.applicable_kinds = field -dotnet_naming_rule.sanity_check_uncovered_field_case_rule.symbols = sanity_check_uncovered_field_case_group -dotnet_naming_rule.sanity_check_uncovered_field_case_rule.style = internal_error_style -dotnet_naming_rule.sanity_check_uncovered_field_case_rule.severity = error - - -########################################## -# Other Naming Rules -########################################## - -# All of the following must be PascalCase: -# - Namespaces -# https://docs.microsoft.com/dotnet/standard/design-guidelines/names-of-namespaces -# https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1300.md -# - Classes and Enumerations -# https://docs.microsoft.com/dotnet/standard/design-guidelines/names-of-classes-structs-and-interfaces -# https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1300.md -# - Delegates -# https://docs.microsoft.com/dotnet/standard/design-guidelines/names-of-classes-structs-and-interfaces#names-of-common-types -# - Constructors, Properties, Events, Methods -# https://docs.microsoft.com/dotnet/standard/design-guidelines/names-of-type-members -dotnet_naming_symbols.element_group.applicable_kinds = namespace, class, enum, struct, delegate, event, method, property -dotnet_naming_rule.element_rule.symbols = element_group -dotnet_naming_rule.element_rule.style = pascal_case_style -dotnet_naming_rule.element_rule.severity = warning - -# Interfaces use PascalCase and are prefixed with uppercase 'I' -# https://docs.microsoft.com/dotnet/standard/design-guidelines/names-of-classes-structs-and-interfaces -dotnet_naming_symbols.interface_group.applicable_kinds = interface -dotnet_naming_rule.interface_rule.symbols = interface_group -dotnet_naming_rule.interface_rule.style = prefix_interface_with_i_style -dotnet_naming_rule.interface_rule.severity = warning - -# Generics Type Parameters use PascalCase and are prefixed with uppercase 'T' -# https://docs.microsoft.com/dotnet/standard/design-guidelines/names-of-classes-structs-and-interfaces -dotnet_naming_symbols.type_parameter_group.applicable_kinds = type_parameter -dotnet_naming_rule.type_parameter_rule.symbols = type_parameter_group -dotnet_naming_rule.type_parameter_rule.style = prefix_type_parameters_with_t_style -dotnet_naming_rule.type_parameter_rule.severity = warning - -# Function parameters use camelCase -# https://docs.microsoft.com/dotnet/standard/design-guidelines/naming-parameters -dotnet_naming_symbols.parameters_group.applicable_kinds = parameter -dotnet_naming_rule.parameters_rule.symbols = parameters_group -dotnet_naming_rule.parameters_rule.style = camel_case_style -dotnet_naming_rule.parameters_rule.severity = warning - -# Private static fields use camelCase and start with s_ -dotnet_naming_symbols.private_static_field_symbols.applicable_accessibilities = private -dotnet_naming_symbols.private_static_field_symbols.required_modifiers = static, shared -dotnet_naming_symbols.private_static_field_symbols.applicable_kinds = field -dotnet_naming_rule.private_static_fields_must_be_camel_cased_and_prefixed_with_s_underscore.symbols = private_static_field_symbols -dotnet_naming_rule.private_static_fields_must_be_camel_cased_and_prefixed_with_s_underscore.style = camel_case_and_prefix_with_s_underscore_style -dotnet_naming_rule.private_static_fields_must_be_camel_cased_and_prefixed_with_s_underscore.severity = warning -dotnet_naming_style.camel_case_and_prefix_with_s_underscore_style.required_prefix = s_ -dotnet_naming_style.camel_case_and_prefix_with_s_underscore_style.capitalization = camel_case - -# Instance fields use camelCase and are prefixed with '_' -dotnet_naming_symbols.private_field_symbols.applicable_accessibilities = private -dotnet_naming_symbols.private_field_symbols.applicable_kinds = field -dotnet_naming_rule.private_instance_fields_must_be_camel_cased_and_prefixed_with_underscore.symbols = private_field_symbols -dotnet_naming_rule.private_instance_fields_must_be_camel_cased_and_prefixed_with_underscore.style = camel_case_and_prefix_with_underscore_style -dotnet_naming_rule.private_instance_fields_must_be_camel_cased_and_prefixed_with_underscore.severity = warning -dotnet_naming_style.camel_case_and_prefix_with_underscore_style.required_prefix = _ -dotnet_naming_style.camel_case_and_prefix_with_underscore_style.capitalization = camel_case - -########################################## -# License -########################################## -# The following applies as to the .editorconfig file ONLY, and is -# included below for reference, per the requirements of the license -# corresponding to this .editorconfig file. -# See: https://github.com/RehanSaeed/EditorConfig -# -# MIT License -# -# Copyright (c) 2017-2019 Muhammad Rehan Saeed -# Copyright (c) 2019 Henry Gabryjelski -# -# Permission is hereby granted, free of charge, to any -# person obtaining a copy of this software and associated -# documentation files (the "Software"), to deal in the -# Software without restriction, including without limitation -# the rights to use, copy, modify, merge, publish, distribute, -# sublicense, and/or sell copies of the Software, and to permit -# persons to whom the Software is furnished to do so, subject -# to the following conditions: -# -# The above copyright notice and this permission notice shall be -# included in all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -# OTHER DEALINGS IN THE SOFTWARE. -########################################## diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 3bb1e7176761..5fb6242c0215 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -1,4 +1,7 @@  + + + 9.1.0 9.1.0 @@ -36,6 +39,4 @@ true - - diff --git a/src/Umbraco.TestData/Umbraco.TestData.csproj b/src/Umbraco.TestData/Umbraco.TestData.csproj deleted file mode 100644 index eedf6e5668e6..000000000000 --- a/src/Umbraco.TestData/Umbraco.TestData.csproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - false - Umbraco.TestData - net5.0 - - - - - - - - - - - - - - diff --git a/linting/stylecop.json b/stylecop.json similarity index 100% rename from linting/stylecop.json rename to stylecop.json diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props new file mode 100644 index 000000000000..0726083c3622 --- /dev/null +++ b/tests/Directory.Build.props @@ -0,0 +1,9 @@ + + + + + + + $(MSBuildThisFileDirectory)codeanalysis.ruleset + + diff --git a/src/Umbraco.TestData/Configuration/TestDataSettings.cs b/tests/Umbraco.TestData/Configuration/TestDataSettings.cs similarity index 100% rename from src/Umbraco.TestData/Configuration/TestDataSettings.cs rename to tests/Umbraco.TestData/Configuration/TestDataSettings.cs diff --git a/src/Umbraco.TestData/Extensions/UmbracoBuilderExtensions.cs b/tests/Umbraco.TestData/Extensions/UmbracoBuilderExtensions.cs similarity index 100% rename from src/Umbraco.TestData/Extensions/UmbracoBuilderExtensions.cs rename to tests/Umbraco.TestData/Extensions/UmbracoBuilderExtensions.cs diff --git a/src/Umbraco.TestData/LoadTestComposer.cs b/tests/Umbraco.TestData/LoadTestComposer.cs similarity index 100% rename from src/Umbraco.TestData/LoadTestComposer.cs rename to tests/Umbraco.TestData/LoadTestComposer.cs diff --git a/src/Umbraco.TestData/LoadTestController.cs b/tests/Umbraco.TestData/LoadTestController.cs similarity index 100% rename from src/Umbraco.TestData/LoadTestController.cs rename to tests/Umbraco.TestData/LoadTestController.cs diff --git a/src/Umbraco.TestData/SegmentTestController.cs b/tests/Umbraco.TestData/SegmentTestController.cs similarity index 100% rename from src/Umbraco.TestData/SegmentTestController.cs rename to tests/Umbraco.TestData/SegmentTestController.cs diff --git a/tests/Umbraco.TestData/Umbraco.TestData.csproj b/tests/Umbraco.TestData/Umbraco.TestData.csproj new file mode 100644 index 000000000000..c54dedf06fc9 --- /dev/null +++ b/tests/Umbraco.TestData/Umbraco.TestData.csproj @@ -0,0 +1,20 @@ + + + + false + Umbraco.TestData + net5.0 + + + + + + + + + + + + + + diff --git a/src/Umbraco.TestData/UmbracoTestDataController.cs b/tests/Umbraco.TestData/UmbracoTestDataController.cs similarity index 100% rename from src/Umbraco.TestData/UmbracoTestDataController.cs rename to tests/Umbraco.TestData/UmbracoTestDataController.cs diff --git a/src/Umbraco.TestData/readme.md b/tests/Umbraco.TestData/readme.md similarity index 100% rename from src/Umbraco.TestData/readme.md rename to tests/Umbraco.TestData/readme.md diff --git a/src/Umbraco.Tests.AcceptanceTest/README.md b/tests/Umbraco.Tests.AcceptanceTest/README.md similarity index 97% rename from src/Umbraco.Tests.AcceptanceTest/README.md rename to tests/Umbraco.Tests.AcceptanceTest/README.md index f4edaa92eaac..4339004f511c 100644 --- a/src/Umbraco.Tests.AcceptanceTest/README.md +++ b/tests/Umbraco.Tests.AcceptanceTest/README.md @@ -1,36 +1,36 @@ -# Umbraco Acceptance Tests - -### Prerequisites -- NodeJS 12+ -- A running installed Umbraco on url: [https://localhost:44331](https://localhost:44331) (Default development port) - - Install using a `SqlServer`/`LocalDb` as the tests execute too fast for `SqlCE` to handle. - -### Getting started -The tests are located in the project/folder as `Umbraco.Tests.AcceptanceTests`. Make sure you run `npm install` in that folder, or let your IDE do that. - -The script will ask you to enter the username and password for a superadmin user of your Umbraco CMS. - -### Executing tests -There are two npm scripts that can be used to execute the test: - -1. `npm run test` - - Executes the tests headless. -1. `npm run ui` - - Executes the tests in a browser handled by a cypress application. - - In case of errors it is recommended to use the UI to debug. - -### Enviroment Configuration - -The enviroment configuration is begin setup by the npm installation script. -This results in the creation of this file: `cypress.env.json`. -This file is already added to `.gitignore` and can contain values that are different for each developer machine. - -The file has the following content: -``` -{ - "username": "", - "password": "" -} -``` -You can change this if you like or run the config script to reset the values, type "npm run config" in your terminal. +# Umbraco Acceptance Tests + +### Prerequisites +- NodeJS 12+ +- A running installed Umbraco on url: [https://localhost:44331](https://localhost:44331) (Default development port) + - Install using a `SqlServer`/`LocalDb` as the tests execute too fast for `SqlCE` to handle. + +### Getting started +The tests are located in the project/folder as `Umbraco.Tests.AcceptanceTests`. Make sure you run `npm install` in that folder, or let your IDE do that. + +The script will ask you to enter the username and password for a superadmin user of your Umbraco CMS. + +### Executing tests +There are two npm scripts that can be used to execute the test: + +1. `npm run test` + - Executes the tests headless. +1. `npm run ui` + - Executes the tests in a browser handled by a cypress application. + + In case of errors it is recommended to use the UI to debug. + +### Enviroment Configuration + +The enviroment configuration is begin setup by the npm installation script. +This results in the creation of this file: `cypress.env.json`. +This file is already added to `.gitignore` and can contain values that are different for each developer machine. + +The file has the following content: +``` +{ + "username": "", + "password": "" +} +``` +You can change this if you like or run the config script to reset the values, type "npm run config" in your terminal. diff --git a/src/Umbraco.Tests.AcceptanceTest/config.js b/tests/Umbraco.Tests.AcceptanceTest/config.js similarity index 100% rename from src/Umbraco.Tests.AcceptanceTest/config.js rename to tests/Umbraco.Tests.AcceptanceTest/config.js diff --git a/src/Umbraco.Tests.AcceptanceTest/cypress.json b/tests/Umbraco.Tests.AcceptanceTest/cypress.json similarity index 100% rename from src/Umbraco.Tests.AcceptanceTest/cypress.json rename to tests/Umbraco.Tests.AcceptanceTest/cypress.json diff --git a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Content/content.ts b/tests/Umbraco.Tests.AcceptanceTest/cypress/integration/Content/content.ts similarity index 100% rename from src/Umbraco.Tests.AcceptanceTest/cypress/integration/Content/content.ts rename to tests/Umbraco.Tests.AcceptanceTest/cypress/integration/Content/content.ts diff --git a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Content/urlpicker.ts b/tests/Umbraco.Tests.AcceptanceTest/cypress/integration/Content/urlpicker.ts similarity index 100% rename from src/Umbraco.Tests.AcceptanceTest/cypress/integration/Content/urlpicker.ts rename to tests/Umbraco.Tests.AcceptanceTest/cypress/integration/Content/urlpicker.ts diff --git a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/DataTypes/dataTypes.ts b/tests/Umbraco.Tests.AcceptanceTest/cypress/integration/DataTypes/dataTypes.ts similarity index 100% rename from src/Umbraco.Tests.AcceptanceTest/cypress/integration/DataTypes/dataTypes.ts rename to tests/Umbraco.Tests.AcceptanceTest/cypress/integration/DataTypes/dataTypes.ts diff --git a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/HelpPanel/systemInformation.ts b/tests/Umbraco.Tests.AcceptanceTest/cypress/integration/HelpPanel/systemInformation.ts similarity index 100% rename from src/Umbraco.Tests.AcceptanceTest/cypress/integration/HelpPanel/systemInformation.ts rename to tests/Umbraco.Tests.AcceptanceTest/cypress/integration/HelpPanel/systemInformation.ts diff --git a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Login/login.ts b/tests/Umbraco.Tests.AcceptanceTest/cypress/integration/Login/login.ts similarity index 100% rename from src/Umbraco.Tests.AcceptanceTest/cypress/integration/Login/login.ts rename to tests/Umbraco.Tests.AcceptanceTest/cypress/integration/Login/login.ts diff --git a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Members/memberGroups.js b/tests/Umbraco.Tests.AcceptanceTest/cypress/integration/Members/memberGroups.js similarity index 100% rename from src/Umbraco.Tests.AcceptanceTest/cypress/integration/Members/memberGroups.js rename to tests/Umbraco.Tests.AcceptanceTest/cypress/integration/Members/memberGroups.js diff --git a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Members/members.js b/tests/Umbraco.Tests.AcceptanceTest/cypress/integration/Members/members.js similarity index 100% rename from src/Umbraco.Tests.AcceptanceTest/cypress/integration/Members/members.js rename to tests/Umbraco.Tests.AcceptanceTest/cypress/integration/Members/members.js diff --git a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/dataTypes.ts b/tests/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/dataTypes.ts similarity index 100% rename from src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/dataTypes.ts rename to tests/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/dataTypes.ts diff --git a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/documentTypes.ts b/tests/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/documentTypes.ts similarity index 100% rename from src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/documentTypes.ts rename to tests/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/documentTypes.ts diff --git a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/languages.ts b/tests/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/languages.ts similarity index 100% rename from src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/languages.ts rename to tests/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/languages.ts diff --git a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/macros.ts b/tests/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/macros.ts similarity index 100% rename from src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/macros.ts rename to tests/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/macros.ts diff --git a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/mediaTypes.ts b/tests/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/mediaTypes.ts similarity index 100% rename from src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/mediaTypes.ts rename to tests/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/mediaTypes.ts diff --git a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/memberTypes.ts b/tests/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/memberTypes.ts similarity index 100% rename from src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/memberTypes.ts rename to tests/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/memberTypes.ts diff --git a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/partialsViewMacroFiles.ts b/tests/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/partialsViewMacroFiles.ts similarity index 100% rename from src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/partialsViewMacroFiles.ts rename to tests/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/partialsViewMacroFiles.ts diff --git a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/partialsViews.ts b/tests/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/partialsViews.ts similarity index 100% rename from src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/partialsViews.ts rename to tests/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/partialsViews.ts diff --git a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/relationTypes.ts b/tests/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/relationTypes.ts similarity index 100% rename from src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/relationTypes.ts rename to tests/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/relationTypes.ts diff --git a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/scripts.ts b/tests/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/scripts.ts similarity index 100% rename from src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/scripts.ts rename to tests/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/scripts.ts diff --git a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/stylesheets.ts b/tests/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/stylesheets.ts similarity index 100% rename from src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/stylesheets.ts rename to tests/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/stylesheets.ts diff --git a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/templates.ts b/tests/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/templates.ts similarity index 100% rename from src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/templates.ts rename to tests/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/templates.ts diff --git a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Tabs/tabs.ts b/tests/Umbraco.Tests.AcceptanceTest/cypress/integration/Tabs/tabs.ts similarity index 100% rename from src/Umbraco.Tests.AcceptanceTest/cypress/integration/Tabs/tabs.ts rename to tests/Umbraco.Tests.AcceptanceTest/cypress/integration/Tabs/tabs.ts diff --git a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Tours/backofficeTour.ts b/tests/Umbraco.Tests.AcceptanceTest/cypress/integration/Tours/backofficeTour.ts similarity index 100% rename from src/Umbraco.Tests.AcceptanceTest/cypress/integration/Tours/backofficeTour.ts rename to tests/Umbraco.Tests.AcceptanceTest/cypress/integration/Tours/backofficeTour.ts diff --git a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Users/userGroups.js b/tests/Umbraco.Tests.AcceptanceTest/cypress/integration/Users/userGroups.js similarity index 100% rename from src/Umbraco.Tests.AcceptanceTest/cypress/integration/Users/userGroups.js rename to tests/Umbraco.Tests.AcceptanceTest/cypress/integration/Users/userGroups.js diff --git a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Users/users.ts b/tests/Umbraco.Tests.AcceptanceTest/cypress/integration/Users/users.ts similarity index 100% rename from src/Umbraco.Tests.AcceptanceTest/cypress/integration/Users/users.ts rename to tests/Umbraco.Tests.AcceptanceTest/cypress/integration/Users/users.ts diff --git a/src/Umbraco.Tests.AcceptanceTest/cypress/plugins/index.js b/tests/Umbraco.Tests.AcceptanceTest/cypress/plugins/index.js similarity index 100% rename from src/Umbraco.Tests.AcceptanceTest/cypress/plugins/index.js rename to tests/Umbraco.Tests.AcceptanceTest/cypress/plugins/index.js diff --git a/src/Umbraco.Tests.AcceptanceTest/cypress/support/commands.js b/tests/Umbraco.Tests.AcceptanceTest/cypress/support/commands.js similarity index 100% rename from src/Umbraco.Tests.AcceptanceTest/cypress/support/commands.js rename to tests/Umbraco.Tests.AcceptanceTest/cypress/support/commands.js diff --git a/src/Umbraco.Tests.AcceptanceTest/cypress/support/index.ts b/tests/Umbraco.Tests.AcceptanceTest/cypress/support/index.ts similarity index 100% rename from src/Umbraco.Tests.AcceptanceTest/cypress/support/index.ts rename to tests/Umbraco.Tests.AcceptanceTest/cypress/support/index.ts diff --git a/src/Umbraco.Tests.AcceptanceTest/cypress/tsconfig.json b/tests/Umbraco.Tests.AcceptanceTest/cypress/tsconfig.json similarity index 100% rename from src/Umbraco.Tests.AcceptanceTest/cypress/tsconfig.json rename to tests/Umbraco.Tests.AcceptanceTest/cypress/tsconfig.json diff --git a/src/Umbraco.Tests.AcceptanceTest/cypress/typings.d.ts b/tests/Umbraco.Tests.AcceptanceTest/cypress/typings.d.ts similarity index 100% rename from src/Umbraco.Tests.AcceptanceTest/cypress/typings.d.ts rename to tests/Umbraco.Tests.AcceptanceTest/cypress/typings.d.ts diff --git a/src/Umbraco.Tests.AcceptanceTest/package.json b/tests/Umbraco.Tests.AcceptanceTest/package.json similarity index 100% rename from src/Umbraco.Tests.AcceptanceTest/package.json rename to tests/Umbraco.Tests.AcceptanceTest/package.json diff --git a/src/Umbraco.Tests.AcceptanceTest/postinstall.js b/tests/Umbraco.Tests.AcceptanceTest/postinstall.js similarity index 100% rename from src/Umbraco.Tests.AcceptanceTest/postinstall.js rename to tests/Umbraco.Tests.AcceptanceTest/postinstall.js diff --git a/src/Umbraco.Tests.AcceptanceTest/tsconfig.json b/tests/Umbraco.Tests.AcceptanceTest/tsconfig.json similarity index 100% rename from src/Umbraco.Tests.AcceptanceTest/tsconfig.json rename to tests/Umbraco.Tests.AcceptanceTest/tsconfig.json diff --git a/src/Umbraco.Tests.AcceptanceTest/tslint.json b/tests/Umbraco.Tests.AcceptanceTest/tslint.json similarity index 100% rename from src/Umbraco.Tests.AcceptanceTest/tslint.json rename to tests/Umbraco.Tests.AcceptanceTest/tslint.json diff --git a/src/Umbraco.Tests.Benchmarks/CombineGuidBenchmarks.cs b/tests/Umbraco.Tests.Benchmarks/CombineGuidBenchmarks.cs similarity index 100% rename from src/Umbraco.Tests.Benchmarks/CombineGuidBenchmarks.cs rename to tests/Umbraco.Tests.Benchmarks/CombineGuidBenchmarks.cs diff --git a/src/Umbraco.Tests.Benchmarks/ConcurrentDictionaryBenchmarks.cs b/tests/Umbraco.Tests.Benchmarks/ConcurrentDictionaryBenchmarks.cs similarity index 100% rename from src/Umbraco.Tests.Benchmarks/ConcurrentDictionaryBenchmarks.cs rename to tests/Umbraco.Tests.Benchmarks/ConcurrentDictionaryBenchmarks.cs diff --git a/src/Umbraco.Tests.Benchmarks/Config/QuickRunConfigAttribute.cs b/tests/Umbraco.Tests.Benchmarks/Config/QuickRunConfigAttribute.cs similarity index 100% rename from src/Umbraco.Tests.Benchmarks/Config/QuickRunConfigAttribute.cs rename to tests/Umbraco.Tests.Benchmarks/Config/QuickRunConfigAttribute.cs diff --git a/src/Umbraco.Tests.Benchmarks/Config/QuickRunWithMemoryDiagnoserConfigAttribute.cs b/tests/Umbraco.Tests.Benchmarks/Config/QuickRunWithMemoryDiagnoserConfigAttribute.cs similarity index 100% rename from src/Umbraco.Tests.Benchmarks/Config/QuickRunWithMemoryDiagnoserConfigAttribute.cs rename to tests/Umbraco.Tests.Benchmarks/Config/QuickRunWithMemoryDiagnoserConfigAttribute.cs diff --git a/src/Umbraco.Tests.Benchmarks/CtorInvokeBenchmarks.cs.bak b/tests/Umbraco.Tests.Benchmarks/CtorInvokeBenchmarks.cs.bak similarity index 100% rename from src/Umbraco.Tests.Benchmarks/CtorInvokeBenchmarks.cs.bak rename to tests/Umbraco.Tests.Benchmarks/CtorInvokeBenchmarks.cs.bak diff --git a/src/Umbraco.Tests.Benchmarks/EnumeratorBenchmarks.cs b/tests/Umbraco.Tests.Benchmarks/EnumeratorBenchmarks.cs similarity index 100% rename from src/Umbraco.Tests.Benchmarks/EnumeratorBenchmarks.cs rename to tests/Umbraco.Tests.Benchmarks/EnumeratorBenchmarks.cs diff --git a/src/Umbraco.Tests.Benchmarks/HashFromStreams.cs b/tests/Umbraco.Tests.Benchmarks/HashFromStreams.cs similarity index 100% rename from src/Umbraco.Tests.Benchmarks/HashFromStreams.cs rename to tests/Umbraco.Tests.Benchmarks/HashFromStreams.cs diff --git a/src/Umbraco.Tests.Benchmarks/HexStringBenchmarks.cs b/tests/Umbraco.Tests.Benchmarks/HexStringBenchmarks.cs similarity index 100% rename from src/Umbraco.Tests.Benchmarks/HexStringBenchmarks.cs rename to tests/Umbraco.Tests.Benchmarks/HexStringBenchmarks.cs diff --git a/src/Umbraco.Tests.Benchmarks/JsonSerializerSettingsBenchmarks.cs b/tests/Umbraco.Tests.Benchmarks/JsonSerializerSettingsBenchmarks.cs similarity index 100% rename from src/Umbraco.Tests.Benchmarks/JsonSerializerSettingsBenchmarks.cs rename to tests/Umbraco.Tests.Benchmarks/JsonSerializerSettingsBenchmarks.cs diff --git a/src/Umbraco.Tests.Benchmarks/LinqCastBenchmarks.cs b/tests/Umbraco.Tests.Benchmarks/LinqCastBenchmarks.cs similarity index 100% rename from src/Umbraco.Tests.Benchmarks/LinqCastBenchmarks.cs rename to tests/Umbraco.Tests.Benchmarks/LinqCastBenchmarks.cs diff --git a/src/Umbraco.Tests.Benchmarks/LoggerAllocationBenchmark.cs b/tests/Umbraco.Tests.Benchmarks/LoggerAllocationBenchmark.cs similarity index 100% rename from src/Umbraco.Tests.Benchmarks/LoggerAllocationBenchmark.cs rename to tests/Umbraco.Tests.Benchmarks/LoggerAllocationBenchmark.cs diff --git a/src/Umbraco.Tests.Benchmarks/ModelToSqlExpressionHelperBenchmarks.cs b/tests/Umbraco.Tests.Benchmarks/ModelToSqlExpressionHelperBenchmarks.cs similarity index 100% rename from src/Umbraco.Tests.Benchmarks/ModelToSqlExpressionHelperBenchmarks.cs rename to tests/Umbraco.Tests.Benchmarks/ModelToSqlExpressionHelperBenchmarks.cs diff --git a/src/Umbraco.Tests.Benchmarks/Program.cs b/tests/Umbraco.Tests.Benchmarks/Program.cs similarity index 100% rename from src/Umbraco.Tests.Benchmarks/Program.cs rename to tests/Umbraco.Tests.Benchmarks/Program.cs diff --git a/src/Umbraco.Tests.Benchmarks/ReflectionUtilities-Unused.cs.bak b/tests/Umbraco.Tests.Benchmarks/ReflectionUtilities-Unused.cs.bak similarity index 100% rename from src/Umbraco.Tests.Benchmarks/ReflectionUtilities-Unused.cs.bak rename to tests/Umbraco.Tests.Benchmarks/ReflectionUtilities-Unused.cs.bak diff --git a/src/Umbraco.Tests.Benchmarks/SqlTemplatesBenchmark.cs b/tests/Umbraco.Tests.Benchmarks/SqlTemplatesBenchmark.cs similarity index 100% rename from src/Umbraco.Tests.Benchmarks/SqlTemplatesBenchmark.cs rename to tests/Umbraco.Tests.Benchmarks/SqlTemplatesBenchmark.cs diff --git a/src/Umbraco.Tests.Benchmarks/StringReplaceManyBenchmarks.cs b/tests/Umbraco.Tests.Benchmarks/StringReplaceManyBenchmarks.cs similarity index 100% rename from src/Umbraco.Tests.Benchmarks/StringReplaceManyBenchmarks.cs rename to tests/Umbraco.Tests.Benchmarks/StringReplaceManyBenchmarks.cs diff --git a/src/Umbraco.Tests.Benchmarks/TryConvertToBenchmarks.cs b/tests/Umbraco.Tests.Benchmarks/TryConvertToBenchmarks.cs similarity index 100% rename from src/Umbraco.Tests.Benchmarks/TryConvertToBenchmarks.cs rename to tests/Umbraco.Tests.Benchmarks/TryConvertToBenchmarks.cs diff --git a/src/Umbraco.Tests.Benchmarks/TypeFinderBenchmarks.cs b/tests/Umbraco.Tests.Benchmarks/TypeFinderBenchmarks.cs similarity index 100% rename from src/Umbraco.Tests.Benchmarks/TypeFinderBenchmarks.cs rename to tests/Umbraco.Tests.Benchmarks/TypeFinderBenchmarks.cs diff --git a/src/Umbraco.Tests.Benchmarks/TypeLoaderBenchmarks.cs b/tests/Umbraco.Tests.Benchmarks/TypeLoaderBenchmarks.cs similarity index 100% rename from src/Umbraco.Tests.Benchmarks/TypeLoaderBenchmarks.cs rename to tests/Umbraco.Tests.Benchmarks/TypeLoaderBenchmarks.cs diff --git a/src/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj b/tests/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj similarity index 84% rename from src/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj rename to tests/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj index 2915ce44e220..55a2b609a942 100644 --- a/src/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj +++ b/tests/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj @@ -12,8 +12,8 @@ - - + + diff --git a/src/Umbraco.Tests.Benchmarks/XmlBenchmarks.cs b/tests/Umbraco.Tests.Benchmarks/XmlBenchmarks.cs similarity index 100% rename from src/Umbraco.Tests.Benchmarks/XmlBenchmarks.cs rename to tests/Umbraco.Tests.Benchmarks/XmlBenchmarks.cs diff --git a/src/Umbraco.Tests.Benchmarks/app.config b/tests/Umbraco.Tests.Benchmarks/app.config similarity index 100% rename from src/Umbraco.Tests.Benchmarks/app.config rename to tests/Umbraco.Tests.Benchmarks/app.config diff --git a/src/Umbraco.Tests.Common/Builders/AuditEntryBuilder.cs b/tests/Umbraco.Tests.Common/Builders/AuditEntryBuilder.cs similarity index 100% rename from src/Umbraco.Tests.Common/Builders/AuditEntryBuilder.cs rename to tests/Umbraco.Tests.Common/Builders/AuditEntryBuilder.cs diff --git a/src/Umbraco.Tests.Common/Builders/BuilderBase.cs b/tests/Umbraco.Tests.Common/Builders/BuilderBase.cs similarity index 100% rename from src/Umbraco.Tests.Common/Builders/BuilderBase.cs rename to tests/Umbraco.Tests.Common/Builders/BuilderBase.cs diff --git a/src/Umbraco.Tests.Common/Builders/ChildBuilderBase.cs b/tests/Umbraco.Tests.Common/Builders/ChildBuilderBase.cs similarity index 100% rename from src/Umbraco.Tests.Common/Builders/ChildBuilderBase.cs rename to tests/Umbraco.Tests.Common/Builders/ChildBuilderBase.cs diff --git a/src/Umbraco.Tests.Common/Builders/ConfigurationEditorBuilder.cs b/tests/Umbraco.Tests.Common/Builders/ConfigurationEditorBuilder.cs similarity index 100% rename from src/Umbraco.Tests.Common/Builders/ConfigurationEditorBuilder.cs rename to tests/Umbraco.Tests.Common/Builders/ConfigurationEditorBuilder.cs diff --git a/src/Umbraco.Tests.Common/Builders/ContentBuilder.cs b/tests/Umbraco.Tests.Common/Builders/ContentBuilder.cs similarity index 100% rename from src/Umbraco.Tests.Common/Builders/ContentBuilder.cs rename to tests/Umbraco.Tests.Common/Builders/ContentBuilder.cs diff --git a/src/Umbraco.Tests.Common/Builders/ContentCultureInfosBuilder.cs b/tests/Umbraco.Tests.Common/Builders/ContentCultureInfosBuilder.cs similarity index 100% rename from src/Umbraco.Tests.Common/Builders/ContentCultureInfosBuilder.cs rename to tests/Umbraco.Tests.Common/Builders/ContentCultureInfosBuilder.cs diff --git a/src/Umbraco.Tests.Common/Builders/ContentCultureInfosCollectionBuilder.cs b/tests/Umbraco.Tests.Common/Builders/ContentCultureInfosCollectionBuilder.cs similarity index 100% rename from src/Umbraco.Tests.Common/Builders/ContentCultureInfosCollectionBuilder.cs rename to tests/Umbraco.Tests.Common/Builders/ContentCultureInfosCollectionBuilder.cs diff --git a/src/Umbraco.Tests.Common/Builders/ContentItemSaveBuilder.cs b/tests/Umbraco.Tests.Common/Builders/ContentItemSaveBuilder.cs similarity index 100% rename from src/Umbraco.Tests.Common/Builders/ContentItemSaveBuilder.cs rename to tests/Umbraco.Tests.Common/Builders/ContentItemSaveBuilder.cs diff --git a/src/Umbraco.Tests.Common/Builders/ContentPropertyBasicBuilder.cs b/tests/Umbraco.Tests.Common/Builders/ContentPropertyBasicBuilder.cs similarity index 100% rename from src/Umbraco.Tests.Common/Builders/ContentPropertyBasicBuilder.cs rename to tests/Umbraco.Tests.Common/Builders/ContentPropertyBasicBuilder.cs diff --git a/src/Umbraco.Tests.Common/Builders/ContentTypeBaseBuilder.cs b/tests/Umbraco.Tests.Common/Builders/ContentTypeBaseBuilder.cs similarity index 100% rename from src/Umbraco.Tests.Common/Builders/ContentTypeBaseBuilder.cs rename to tests/Umbraco.Tests.Common/Builders/ContentTypeBaseBuilder.cs diff --git a/src/Umbraco.Tests.Common/Builders/ContentTypeBuilder.cs b/tests/Umbraco.Tests.Common/Builders/ContentTypeBuilder.cs similarity index 100% rename from src/Umbraco.Tests.Common/Builders/ContentTypeBuilder.cs rename to tests/Umbraco.Tests.Common/Builders/ContentTypeBuilder.cs diff --git a/src/Umbraco.Tests.Common/Builders/ContentTypeSortBuilder.cs b/tests/Umbraco.Tests.Common/Builders/ContentTypeSortBuilder.cs similarity index 100% rename from src/Umbraco.Tests.Common/Builders/ContentTypeSortBuilder.cs rename to tests/Umbraco.Tests.Common/Builders/ContentTypeSortBuilder.cs diff --git a/src/Umbraco.Tests.Common/Builders/ContentVariantSaveBuilder.cs b/tests/Umbraco.Tests.Common/Builders/ContentVariantSaveBuilder.cs similarity index 100% rename from src/Umbraco.Tests.Common/Builders/ContentVariantSaveBuilder.cs rename to tests/Umbraco.Tests.Common/Builders/ContentVariantSaveBuilder.cs diff --git a/src/Umbraco.Tests.Common/Builders/DataEditorBuilder.cs b/tests/Umbraco.Tests.Common/Builders/DataEditorBuilder.cs similarity index 100% rename from src/Umbraco.Tests.Common/Builders/DataEditorBuilder.cs rename to tests/Umbraco.Tests.Common/Builders/DataEditorBuilder.cs diff --git a/src/Umbraco.Tests.Common/Builders/DataTypeBuilder.cs b/tests/Umbraco.Tests.Common/Builders/DataTypeBuilder.cs similarity index 100% rename from src/Umbraco.Tests.Common/Builders/DataTypeBuilder.cs rename to tests/Umbraco.Tests.Common/Builders/DataTypeBuilder.cs diff --git a/src/Umbraco.Tests.Common/Builders/DataValueEditorBuilder.cs b/tests/Umbraco.Tests.Common/Builders/DataValueEditorBuilder.cs similarity index 100% rename from src/Umbraco.Tests.Common/Builders/DataValueEditorBuilder.cs rename to tests/Umbraco.Tests.Common/Builders/DataValueEditorBuilder.cs diff --git a/src/Umbraco.Tests.Common/Builders/DictionaryItemBuilder.cs b/tests/Umbraco.Tests.Common/Builders/DictionaryItemBuilder.cs similarity index 100% rename from src/Umbraco.Tests.Common/Builders/DictionaryItemBuilder.cs rename to tests/Umbraco.Tests.Common/Builders/DictionaryItemBuilder.cs diff --git a/src/Umbraco.Tests.Common/Builders/DictionaryTranslationBuilder.cs b/tests/Umbraco.Tests.Common/Builders/DictionaryTranslationBuilder.cs similarity index 100% rename from src/Umbraco.Tests.Common/Builders/DictionaryTranslationBuilder.cs rename to tests/Umbraco.Tests.Common/Builders/DictionaryTranslationBuilder.cs diff --git a/src/Umbraco.Tests.Common/Builders/DocumentEntitySlimBuilder.cs b/tests/Umbraco.Tests.Common/Builders/DocumentEntitySlimBuilder.cs similarity index 100% rename from src/Umbraco.Tests.Common/Builders/DocumentEntitySlimBuilder.cs rename to tests/Umbraco.Tests.Common/Builders/DocumentEntitySlimBuilder.cs diff --git a/src/Umbraco.Tests.Common/Builders/EntitySlimBuilder.cs b/tests/Umbraco.Tests.Common/Builders/EntitySlimBuilder.cs similarity index 100% rename from src/Umbraco.Tests.Common/Builders/EntitySlimBuilder.cs rename to tests/Umbraco.Tests.Common/Builders/EntitySlimBuilder.cs diff --git a/src/Umbraco.Tests.Common/Builders/Extensions/BuilderExtensions.cs b/tests/Umbraco.Tests.Common/Builders/Extensions/BuilderExtensions.cs similarity index 100% rename from src/Umbraco.Tests.Common/Builders/Extensions/BuilderExtensions.cs rename to tests/Umbraco.Tests.Common/Builders/Extensions/BuilderExtensions.cs diff --git a/src/Umbraco.Tests.Common/Builders/Extensions/ContentItemSaveBuilderExtensions.cs b/tests/Umbraco.Tests.Common/Builders/Extensions/ContentItemSaveBuilderExtensions.cs similarity index 100% rename from src/Umbraco.Tests.Common/Builders/Extensions/ContentItemSaveBuilderExtensions.cs rename to tests/Umbraco.Tests.Common/Builders/Extensions/ContentItemSaveBuilderExtensions.cs diff --git a/src/Umbraco.Tests.Common/Builders/Extensions/ContentTypeBuilderExtensions.cs b/tests/Umbraco.Tests.Common/Builders/Extensions/ContentTypeBuilderExtensions.cs similarity index 100% rename from src/Umbraco.Tests.Common/Builders/Extensions/ContentTypeBuilderExtensions.cs rename to tests/Umbraco.Tests.Common/Builders/Extensions/ContentTypeBuilderExtensions.cs diff --git a/src/Umbraco.Tests.Common/Builders/Extensions/StringExtensions.cs b/tests/Umbraco.Tests.Common/Builders/Extensions/StringExtensions.cs similarity index 100% rename from src/Umbraco.Tests.Common/Builders/Extensions/StringExtensions.cs rename to tests/Umbraco.Tests.Common/Builders/Extensions/StringExtensions.cs diff --git a/src/Umbraco.Tests.Common/Builders/GenericCollectionBuilder.cs b/tests/Umbraco.Tests.Common/Builders/GenericCollectionBuilder.cs similarity index 100% rename from src/Umbraco.Tests.Common/Builders/GenericCollectionBuilder.cs rename to tests/Umbraco.Tests.Common/Builders/GenericCollectionBuilder.cs diff --git a/src/Umbraco.Tests.Common/Builders/GenericDictionaryBuilder.cs b/tests/Umbraco.Tests.Common/Builders/GenericDictionaryBuilder.cs similarity index 100% rename from src/Umbraco.Tests.Common/Builders/GenericDictionaryBuilder.cs rename to tests/Umbraco.Tests.Common/Builders/GenericDictionaryBuilder.cs diff --git a/src/Umbraco.Tests.Common/Builders/Interfaces/IAccountBuilder.cs b/tests/Umbraco.Tests.Common/Builders/Interfaces/IAccountBuilder.cs similarity index 100% rename from src/Umbraco.Tests.Common/Builders/Interfaces/IAccountBuilder.cs rename to tests/Umbraco.Tests.Common/Builders/Interfaces/IAccountBuilder.cs diff --git a/src/Umbraco.Tests.Common/Builders/Interfaces/IBuildContentCultureInfosCollection.cs b/tests/Umbraco.Tests.Common/Builders/Interfaces/IBuildContentCultureInfosCollection.cs similarity index 100% rename from src/Umbraco.Tests.Common/Builders/Interfaces/IBuildContentCultureInfosCollection.cs rename to tests/Umbraco.Tests.Common/Builders/Interfaces/IBuildContentCultureInfosCollection.cs diff --git a/src/Umbraco.Tests.Common/Builders/Interfaces/IBuildContentTypes.cs b/tests/Umbraco.Tests.Common/Builders/Interfaces/IBuildContentTypes.cs similarity index 100% rename from src/Umbraco.Tests.Common/Builders/Interfaces/IBuildContentTypes.cs rename to tests/Umbraco.Tests.Common/Builders/Interfaces/IBuildContentTypes.cs diff --git a/src/Umbraco.Tests.Common/Builders/Interfaces/IBuildPropertyGroups.cs b/tests/Umbraco.Tests.Common/Builders/Interfaces/IBuildPropertyGroups.cs similarity index 100% rename from src/Umbraco.Tests.Common/Builders/Interfaces/IBuildPropertyGroups.cs rename to tests/Umbraco.Tests.Common/Builders/Interfaces/IBuildPropertyGroups.cs diff --git a/src/Umbraco.Tests.Common/Builders/Interfaces/IBuildPropertyTypes.cs b/tests/Umbraco.Tests.Common/Builders/Interfaces/IBuildPropertyTypes.cs similarity index 100% rename from src/Umbraco.Tests.Common/Builders/Interfaces/IBuildPropertyTypes.cs rename to tests/Umbraco.Tests.Common/Builders/Interfaces/IBuildPropertyTypes.cs diff --git a/src/Umbraco.Tests.Common/Builders/Interfaces/IWithAliasBuilder.cs b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithAliasBuilder.cs similarity index 100% rename from src/Umbraco.Tests.Common/Builders/Interfaces/IWithAliasBuilder.cs rename to tests/Umbraco.Tests.Common/Builders/Interfaces/IWithAliasBuilder.cs diff --git a/src/Umbraco.Tests.Common/Builders/Interfaces/IWithCreateDateBuilder.cs b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithCreateDateBuilder.cs similarity index 100% rename from src/Umbraco.Tests.Common/Builders/Interfaces/IWithCreateDateBuilder.cs rename to tests/Umbraco.Tests.Common/Builders/Interfaces/IWithCreateDateBuilder.cs diff --git a/src/Umbraco.Tests.Common/Builders/Interfaces/IWithCreatorIdBuilder.cs b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithCreatorIdBuilder.cs similarity index 100% rename from src/Umbraco.Tests.Common/Builders/Interfaces/IWithCreatorIdBuilder.cs rename to tests/Umbraco.Tests.Common/Builders/Interfaces/IWithCreatorIdBuilder.cs diff --git a/src/Umbraco.Tests.Common/Builders/Interfaces/IWithCultureInfoBuilder.cs b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithCultureInfoBuilder.cs similarity index 100% rename from src/Umbraco.Tests.Common/Builders/Interfaces/IWithCultureInfoBuilder.cs rename to tests/Umbraco.Tests.Common/Builders/Interfaces/IWithCultureInfoBuilder.cs diff --git a/src/Umbraco.Tests.Common/Builders/Interfaces/IWithDateBuilder.cs b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithDateBuilder.cs similarity index 100% rename from src/Umbraco.Tests.Common/Builders/Interfaces/IWithDateBuilder.cs rename to tests/Umbraco.Tests.Common/Builders/Interfaces/IWithDateBuilder.cs diff --git a/src/Umbraco.Tests.Common/Builders/Interfaces/IWithDeleteDateBuilder.cs b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithDeleteDateBuilder.cs similarity index 100% rename from src/Umbraco.Tests.Common/Builders/Interfaces/IWithDeleteDateBuilder.cs rename to tests/Umbraco.Tests.Common/Builders/Interfaces/IWithDeleteDateBuilder.cs diff --git a/src/Umbraco.Tests.Common/Builders/Interfaces/IWithDescriptionBuilder.cs b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithDescriptionBuilder.cs similarity index 100% rename from src/Umbraco.Tests.Common/Builders/Interfaces/IWithDescriptionBuilder.cs rename to tests/Umbraco.Tests.Common/Builders/Interfaces/IWithDescriptionBuilder.cs diff --git a/src/Umbraco.Tests.Common/Builders/Interfaces/IWithEmailBuilder.cs b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithEmailBuilder.cs similarity index 100% rename from src/Umbraco.Tests.Common/Builders/Interfaces/IWithEmailBuilder.cs rename to tests/Umbraco.Tests.Common/Builders/Interfaces/IWithEmailBuilder.cs diff --git a/src/Umbraco.Tests.Common/Builders/Interfaces/IWithFailedPasswordAttemptsBuilder.cs b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithFailedPasswordAttemptsBuilder.cs similarity index 100% rename from src/Umbraco.Tests.Common/Builders/Interfaces/IWithFailedPasswordAttemptsBuilder.cs rename to tests/Umbraco.Tests.Common/Builders/Interfaces/IWithFailedPasswordAttemptsBuilder.cs diff --git a/src/Umbraco.Tests.Common/Builders/Interfaces/IWithIconBuilder.cs b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithIconBuilder.cs similarity index 100% rename from src/Umbraco.Tests.Common/Builders/Interfaces/IWithIconBuilder.cs rename to tests/Umbraco.Tests.Common/Builders/Interfaces/IWithIconBuilder.cs diff --git a/src/Umbraco.Tests.Common/Builders/Interfaces/IWithIdBuilder.cs b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithIdBuilder.cs similarity index 100% rename from src/Umbraco.Tests.Common/Builders/Interfaces/IWithIdBuilder.cs rename to tests/Umbraco.Tests.Common/Builders/Interfaces/IWithIdBuilder.cs diff --git a/src/Umbraco.Tests.Common/Builders/Interfaces/IWithIsApprovedBuilder.cs b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithIsApprovedBuilder.cs similarity index 100% rename from src/Umbraco.Tests.Common/Builders/Interfaces/IWithIsApprovedBuilder.cs rename to tests/Umbraco.Tests.Common/Builders/Interfaces/IWithIsApprovedBuilder.cs diff --git a/src/Umbraco.Tests.Common/Builders/Interfaces/IWithIsContainerBuilder.cs b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithIsContainerBuilder.cs similarity index 100% rename from src/Umbraco.Tests.Common/Builders/Interfaces/IWithIsContainerBuilder.cs rename to tests/Umbraco.Tests.Common/Builders/Interfaces/IWithIsContainerBuilder.cs diff --git a/src/Umbraco.Tests.Common/Builders/Interfaces/IWithIsLockedOutBuilder.cs b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithIsLockedOutBuilder.cs similarity index 100% rename from src/Umbraco.Tests.Common/Builders/Interfaces/IWithIsLockedOutBuilder.cs rename to tests/Umbraco.Tests.Common/Builders/Interfaces/IWithIsLockedOutBuilder.cs diff --git a/src/Umbraco.Tests.Common/Builders/Interfaces/IWithKeyBuilder.cs b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithKeyBuilder.cs similarity index 100% rename from src/Umbraco.Tests.Common/Builders/Interfaces/IWithKeyBuilder.cs rename to tests/Umbraco.Tests.Common/Builders/Interfaces/IWithKeyBuilder.cs diff --git a/src/Umbraco.Tests.Common/Builders/Interfaces/IWithLastLoginDateBuilder.cs b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithLastLoginDateBuilder.cs similarity index 100% rename from src/Umbraco.Tests.Common/Builders/Interfaces/IWithLastLoginDateBuilder.cs rename to tests/Umbraco.Tests.Common/Builders/Interfaces/IWithLastLoginDateBuilder.cs diff --git a/src/Umbraco.Tests.Common/Builders/Interfaces/IWithLastPasswordChangeDateBuilder.cs b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithLastPasswordChangeDateBuilder.cs similarity index 100% rename from src/Umbraco.Tests.Common/Builders/Interfaces/IWithLastPasswordChangeDateBuilder.cs rename to tests/Umbraco.Tests.Common/Builders/Interfaces/IWithLastPasswordChangeDateBuilder.cs diff --git a/src/Umbraco.Tests.Common/Builders/Interfaces/IWithLevelBuilder.cs b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithLevelBuilder.cs similarity index 100% rename from src/Umbraco.Tests.Common/Builders/Interfaces/IWithLevelBuilder.cs rename to tests/Umbraco.Tests.Common/Builders/Interfaces/IWithLevelBuilder.cs diff --git a/src/Umbraco.Tests.Common/Builders/Interfaces/IWithLoginBuilder.cs b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithLoginBuilder.cs similarity index 100% rename from src/Umbraco.Tests.Common/Builders/Interfaces/IWithLoginBuilder.cs rename to tests/Umbraco.Tests.Common/Builders/Interfaces/IWithLoginBuilder.cs diff --git a/src/Umbraco.Tests.Common/Builders/Interfaces/IWithNameBuilder.cs b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithNameBuilder.cs similarity index 100% rename from src/Umbraco.Tests.Common/Builders/Interfaces/IWithNameBuilder.cs rename to tests/Umbraco.Tests.Common/Builders/Interfaces/IWithNameBuilder.cs diff --git a/src/Umbraco.Tests.Common/Builders/Interfaces/IWithParentContentTypeBuilder.cs b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithParentContentTypeBuilder.cs similarity index 100% rename from src/Umbraco.Tests.Common/Builders/Interfaces/IWithParentContentTypeBuilder.cs rename to tests/Umbraco.Tests.Common/Builders/Interfaces/IWithParentContentTypeBuilder.cs diff --git a/src/Umbraco.Tests.Common/Builders/Interfaces/IWithParentIdBuilder.cs b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithParentIdBuilder.cs similarity index 100% rename from src/Umbraco.Tests.Common/Builders/Interfaces/IWithParentIdBuilder.cs rename to tests/Umbraco.Tests.Common/Builders/Interfaces/IWithParentIdBuilder.cs diff --git a/src/Umbraco.Tests.Common/Builders/Interfaces/IWithPathBuilder.cs b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithPathBuilder.cs similarity index 100% rename from src/Umbraco.Tests.Common/Builders/Interfaces/IWithPathBuilder.cs rename to tests/Umbraco.Tests.Common/Builders/Interfaces/IWithPathBuilder.cs diff --git a/src/Umbraco.Tests.Common/Builders/Interfaces/IWithPropertyTypeIdsIncrementingFrom.cs b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithPropertyTypeIdsIncrementingFrom.cs similarity index 100% rename from src/Umbraco.Tests.Common/Builders/Interfaces/IWithPropertyTypeIdsIncrementingFrom.cs rename to tests/Umbraco.Tests.Common/Builders/Interfaces/IWithPropertyTypeIdsIncrementingFrom.cs diff --git a/src/Umbraco.Tests.Common/Builders/Interfaces/IWithPropertyValues.cs b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithPropertyValues.cs similarity index 100% rename from src/Umbraco.Tests.Common/Builders/Interfaces/IWithPropertyValues.cs rename to tests/Umbraco.Tests.Common/Builders/Interfaces/IWithPropertyValues.cs diff --git a/src/Umbraco.Tests.Common/Builders/Interfaces/IWithSortOrderBuilder.cs b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithSortOrderBuilder.cs similarity index 100% rename from src/Umbraco.Tests.Common/Builders/Interfaces/IWithSortOrderBuilder.cs rename to tests/Umbraco.Tests.Common/Builders/Interfaces/IWithSortOrderBuilder.cs diff --git a/src/Umbraco.Tests.Common/Builders/Interfaces/IWithSupportsPublishing.cs b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithSupportsPublishing.cs similarity index 100% rename from src/Umbraco.Tests.Common/Builders/Interfaces/IWithSupportsPublishing.cs rename to tests/Umbraco.Tests.Common/Builders/Interfaces/IWithSupportsPublishing.cs diff --git a/src/Umbraco.Tests.Common/Builders/Interfaces/IWithThumbnailBuilder.cs b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithThumbnailBuilder.cs similarity index 100% rename from src/Umbraco.Tests.Common/Builders/Interfaces/IWithThumbnailBuilder.cs rename to tests/Umbraco.Tests.Common/Builders/Interfaces/IWithThumbnailBuilder.cs diff --git a/src/Umbraco.Tests.Common/Builders/Interfaces/IWithTrashedBuilder.cs b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithTrashedBuilder.cs similarity index 100% rename from src/Umbraco.Tests.Common/Builders/Interfaces/IWithTrashedBuilder.cs rename to tests/Umbraco.Tests.Common/Builders/Interfaces/IWithTrashedBuilder.cs diff --git a/src/Umbraco.Tests.Common/Builders/Interfaces/IWithUpdateDateBuilder.cs b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithUpdateDateBuilder.cs similarity index 100% rename from src/Umbraco.Tests.Common/Builders/Interfaces/IWithUpdateDateBuilder.cs rename to tests/Umbraco.Tests.Common/Builders/Interfaces/IWithUpdateDateBuilder.cs diff --git a/src/Umbraco.Tests.Common/Builders/LanguageBuilder.cs b/tests/Umbraco.Tests.Common/Builders/LanguageBuilder.cs similarity index 100% rename from src/Umbraco.Tests.Common/Builders/LanguageBuilder.cs rename to tests/Umbraco.Tests.Common/Builders/LanguageBuilder.cs diff --git a/src/Umbraco.Tests.Common/Builders/MacroBuilder.cs b/tests/Umbraco.Tests.Common/Builders/MacroBuilder.cs similarity index 100% rename from src/Umbraco.Tests.Common/Builders/MacroBuilder.cs rename to tests/Umbraco.Tests.Common/Builders/MacroBuilder.cs diff --git a/src/Umbraco.Tests.Common/Builders/MacroPropertyBuilder.cs b/tests/Umbraco.Tests.Common/Builders/MacroPropertyBuilder.cs similarity index 100% rename from src/Umbraco.Tests.Common/Builders/MacroPropertyBuilder.cs rename to tests/Umbraco.Tests.Common/Builders/MacroPropertyBuilder.cs diff --git a/src/Umbraco.Tests.Common/Builders/MediaBuilder.cs b/tests/Umbraco.Tests.Common/Builders/MediaBuilder.cs similarity index 100% rename from src/Umbraco.Tests.Common/Builders/MediaBuilder.cs rename to tests/Umbraco.Tests.Common/Builders/MediaBuilder.cs diff --git a/src/Umbraco.Tests.Common/Builders/MediaTypeBuilder.cs b/tests/Umbraco.Tests.Common/Builders/MediaTypeBuilder.cs similarity index 100% rename from src/Umbraco.Tests.Common/Builders/MediaTypeBuilder.cs rename to tests/Umbraco.Tests.Common/Builders/MediaTypeBuilder.cs diff --git a/src/Umbraco.Tests.Common/Builders/MemberBuilder.cs b/tests/Umbraco.Tests.Common/Builders/MemberBuilder.cs similarity index 100% rename from src/Umbraco.Tests.Common/Builders/MemberBuilder.cs rename to tests/Umbraco.Tests.Common/Builders/MemberBuilder.cs diff --git a/src/Umbraco.Tests.Common/Builders/MemberGroupBuilder.cs b/tests/Umbraco.Tests.Common/Builders/MemberGroupBuilder.cs similarity index 100% rename from src/Umbraco.Tests.Common/Builders/MemberGroupBuilder.cs rename to tests/Umbraco.Tests.Common/Builders/MemberGroupBuilder.cs diff --git a/src/Umbraco.Tests.Common/Builders/MemberTypeBuilder.cs b/tests/Umbraco.Tests.Common/Builders/MemberTypeBuilder.cs similarity index 100% rename from src/Umbraco.Tests.Common/Builders/MemberTypeBuilder.cs rename to tests/Umbraco.Tests.Common/Builders/MemberTypeBuilder.cs diff --git a/src/Umbraco.Tests.Common/Builders/PropertyBuilder.cs b/tests/Umbraco.Tests.Common/Builders/PropertyBuilder.cs similarity index 100% rename from src/Umbraco.Tests.Common/Builders/PropertyBuilder.cs rename to tests/Umbraco.Tests.Common/Builders/PropertyBuilder.cs diff --git a/src/Umbraco.Tests.Common/Builders/PropertyGroupBuilder.cs b/tests/Umbraco.Tests.Common/Builders/PropertyGroupBuilder.cs similarity index 100% rename from src/Umbraco.Tests.Common/Builders/PropertyGroupBuilder.cs rename to tests/Umbraco.Tests.Common/Builders/PropertyGroupBuilder.cs diff --git a/src/Umbraco.Tests.Common/Builders/PropertyTypeBuilder.cs b/tests/Umbraco.Tests.Common/Builders/PropertyTypeBuilder.cs similarity index 100% rename from src/Umbraco.Tests.Common/Builders/PropertyTypeBuilder.cs rename to tests/Umbraco.Tests.Common/Builders/PropertyTypeBuilder.cs diff --git a/src/Umbraco.Tests.Common/Builders/RelationBuilder.cs b/tests/Umbraco.Tests.Common/Builders/RelationBuilder.cs similarity index 100% rename from src/Umbraco.Tests.Common/Builders/RelationBuilder.cs rename to tests/Umbraco.Tests.Common/Builders/RelationBuilder.cs diff --git a/src/Umbraco.Tests.Common/Builders/RelationTypeBuilder.cs b/tests/Umbraco.Tests.Common/Builders/RelationTypeBuilder.cs similarity index 100% rename from src/Umbraco.Tests.Common/Builders/RelationTypeBuilder.cs rename to tests/Umbraco.Tests.Common/Builders/RelationTypeBuilder.cs diff --git a/src/Umbraco.Tests.Common/Builders/StylesheetBuilder.cs b/tests/Umbraco.Tests.Common/Builders/StylesheetBuilder.cs similarity index 100% rename from src/Umbraco.Tests.Common/Builders/StylesheetBuilder.cs rename to tests/Umbraco.Tests.Common/Builders/StylesheetBuilder.cs diff --git a/src/Umbraco.Tests.Common/Builders/TemplateBuilder.cs b/tests/Umbraco.Tests.Common/Builders/TemplateBuilder.cs similarity index 100% rename from src/Umbraco.Tests.Common/Builders/TemplateBuilder.cs rename to tests/Umbraco.Tests.Common/Builders/TemplateBuilder.cs diff --git a/src/Umbraco.Tests.Common/Builders/TreeBuilder.cs b/tests/Umbraco.Tests.Common/Builders/TreeBuilder.cs similarity index 100% rename from src/Umbraco.Tests.Common/Builders/TreeBuilder.cs rename to tests/Umbraco.Tests.Common/Builders/TreeBuilder.cs diff --git a/src/Umbraco.Tests.Common/Builders/UmbracoIdentityRoleBuilder.cs b/tests/Umbraco.Tests.Common/Builders/UmbracoIdentityRoleBuilder.cs similarity index 100% rename from src/Umbraco.Tests.Common/Builders/UmbracoIdentityRoleBuilder.cs rename to tests/Umbraco.Tests.Common/Builders/UmbracoIdentityRoleBuilder.cs diff --git a/src/Umbraco.Tests.Common/Builders/UserBuilder.cs b/tests/Umbraco.Tests.Common/Builders/UserBuilder.cs similarity index 100% rename from src/Umbraco.Tests.Common/Builders/UserBuilder.cs rename to tests/Umbraco.Tests.Common/Builders/UserBuilder.cs diff --git a/src/Umbraco.Tests.Common/Builders/UserGroupBuilder.cs b/tests/Umbraco.Tests.Common/Builders/UserGroupBuilder.cs similarity index 100% rename from src/Umbraco.Tests.Common/Builders/UserGroupBuilder.cs rename to tests/Umbraco.Tests.Common/Builders/UserGroupBuilder.cs diff --git a/src/Umbraco.Tests.Common/Builders/XmlDocumentBuilder.cs b/tests/Umbraco.Tests.Common/Builders/XmlDocumentBuilder.cs similarity index 100% rename from src/Umbraco.Tests.Common/Builders/XmlDocumentBuilder.cs rename to tests/Umbraco.Tests.Common/Builders/XmlDocumentBuilder.cs diff --git a/src/Umbraco.Tests.Common/Extensions/ContentBaseExtensions.cs b/tests/Umbraco.Tests.Common/Extensions/ContentBaseExtensions.cs similarity index 100% rename from src/Umbraco.Tests.Common/Extensions/ContentBaseExtensions.cs rename to tests/Umbraco.Tests.Common/Extensions/ContentBaseExtensions.cs diff --git a/src/Umbraco.Tests.Common/Published/PublishedSnapshotTestObjects.cs b/tests/Umbraco.Tests.Common/Published/PublishedSnapshotTestObjects.cs similarity index 100% rename from src/Umbraco.Tests.Common/Published/PublishedSnapshotTestObjects.cs rename to tests/Umbraco.Tests.Common/Published/PublishedSnapshotTestObjects.cs diff --git a/src/Umbraco.Tests.Common/TaskHelper.cs b/tests/Umbraco.Tests.Common/TaskHelper.cs similarity index 100% rename from src/Umbraco.Tests.Common/TaskHelper.cs rename to tests/Umbraco.Tests.Common/TaskHelper.cs diff --git a/src/Umbraco.Tests.Common/TestClone.cs b/tests/Umbraco.Tests.Common/TestClone.cs similarity index 100% rename from src/Umbraco.Tests.Common/TestClone.cs rename to tests/Umbraco.Tests.Common/TestClone.cs diff --git a/src/Umbraco.Tests.Common/TestDefaultCultureAccessor.cs b/tests/Umbraco.Tests.Common/TestDefaultCultureAccessor.cs similarity index 100% rename from src/Umbraco.Tests.Common/TestDefaultCultureAccessor.cs rename to tests/Umbraco.Tests.Common/TestDefaultCultureAccessor.cs diff --git a/src/Umbraco.Tests.Common/TestHelperBase.cs b/tests/Umbraco.Tests.Common/TestHelperBase.cs similarity index 100% rename from src/Umbraco.Tests.Common/TestHelperBase.cs rename to tests/Umbraco.Tests.Common/TestHelperBase.cs diff --git a/src/Umbraco.Tests.Common/TestHelpers/FileSystemsCreator.cs b/tests/Umbraco.Tests.Common/TestHelpers/FileSystemsCreator.cs similarity index 100% rename from src/Umbraco.Tests.Common/TestHelpers/FileSystemsCreator.cs rename to tests/Umbraco.Tests.Common/TestHelpers/FileSystemsCreator.cs diff --git a/src/Umbraco.Tests.Common/TestHelpers/LogTestHelper.cs b/tests/Umbraco.Tests.Common/TestHelpers/LogTestHelper.cs similarity index 100% rename from src/Umbraco.Tests.Common/TestHelpers/LogTestHelper.cs rename to tests/Umbraco.Tests.Common/TestHelpers/LogTestHelper.cs diff --git a/src/Umbraco.Tests.Common/TestHelpers/MockedValueEditors.cs b/tests/Umbraco.Tests.Common/TestHelpers/MockedValueEditors.cs similarity index 100% rename from src/Umbraco.Tests.Common/TestHelpers/MockedValueEditors.cs rename to tests/Umbraco.Tests.Common/TestHelpers/MockedValueEditors.cs diff --git a/src/Umbraco.Tests.Common/TestHelpers/PublishedContent/AutoPublishedContentType.cs b/tests/Umbraco.Tests.Common/TestHelpers/PublishedContent/AutoPublishedContentType.cs similarity index 100% rename from src/Umbraco.Tests.Common/TestHelpers/PublishedContent/AutoPublishedContentType.cs rename to tests/Umbraco.Tests.Common/TestHelpers/PublishedContent/AutoPublishedContentType.cs diff --git a/src/Umbraco.Tests.Common/TestHelpers/PublishedContent/ContentType2.cs b/tests/Umbraco.Tests.Common/TestHelpers/PublishedContent/ContentType2.cs similarity index 100% rename from src/Umbraco.Tests.Common/TestHelpers/PublishedContent/ContentType2.cs rename to tests/Umbraco.Tests.Common/TestHelpers/PublishedContent/ContentType2.cs diff --git a/src/Umbraco.Tests.Common/TestHelpers/PublishedContent/ContentType2Sub.cs b/tests/Umbraco.Tests.Common/TestHelpers/PublishedContent/ContentType2Sub.cs similarity index 100% rename from src/Umbraco.Tests.Common/TestHelpers/PublishedContent/ContentType2Sub.cs rename to tests/Umbraco.Tests.Common/TestHelpers/PublishedContent/ContentType2Sub.cs diff --git a/src/Umbraco.Tests.Common/TestHelpers/PublishedContent/InternalPublishedPropertyWithLanguageVariants.cs b/tests/Umbraco.Tests.Common/TestHelpers/PublishedContent/InternalPublishedPropertyWithLanguageVariants.cs similarity index 100% rename from src/Umbraco.Tests.Common/TestHelpers/PublishedContent/InternalPublishedPropertyWithLanguageVariants.cs rename to tests/Umbraco.Tests.Common/TestHelpers/PublishedContent/InternalPublishedPropertyWithLanguageVariants.cs diff --git a/src/Umbraco.Tests.Common/TestHelpers/PublishedContent/PublishedContentStrong1.cs b/tests/Umbraco.Tests.Common/TestHelpers/PublishedContent/PublishedContentStrong1.cs similarity index 100% rename from src/Umbraco.Tests.Common/TestHelpers/PublishedContent/PublishedContentStrong1.cs rename to tests/Umbraco.Tests.Common/TestHelpers/PublishedContent/PublishedContentStrong1.cs diff --git a/src/Umbraco.Tests.Common/TestHelpers/PublishedContent/PublishedContentStrong1Sub.cs b/tests/Umbraco.Tests.Common/TestHelpers/PublishedContent/PublishedContentStrong1Sub.cs similarity index 100% rename from src/Umbraco.Tests.Common/TestHelpers/PublishedContent/PublishedContentStrong1Sub.cs rename to tests/Umbraco.Tests.Common/TestHelpers/PublishedContent/PublishedContentStrong1Sub.cs diff --git a/src/Umbraco.Tests.Common/TestHelpers/PublishedContent/PublishedContentStrong2.cs b/tests/Umbraco.Tests.Common/TestHelpers/PublishedContent/PublishedContentStrong2.cs similarity index 100% rename from src/Umbraco.Tests.Common/TestHelpers/PublishedContent/PublishedContentStrong2.cs rename to tests/Umbraco.Tests.Common/TestHelpers/PublishedContent/PublishedContentStrong2.cs diff --git a/src/Umbraco.Tests.Common/TestHelpers/StringNewlineExtensions.cs b/tests/Umbraco.Tests.Common/TestHelpers/StringNewlineExtensions.cs similarity index 100% rename from src/Umbraco.Tests.Common/TestHelpers/StringNewlineExtensions.cs rename to tests/Umbraco.Tests.Common/TestHelpers/StringNewlineExtensions.cs diff --git a/src/Umbraco.Tests.Common/TestHelpers/Stubs/TestProfiler.cs b/tests/Umbraco.Tests.Common/TestHelpers/Stubs/TestProfiler.cs similarity index 100% rename from src/Umbraco.Tests.Common/TestHelpers/Stubs/TestProfiler.cs rename to tests/Umbraco.Tests.Common/TestHelpers/Stubs/TestProfiler.cs diff --git a/src/Umbraco.Tests.Common/TestHelpers/TestDatabase.cs b/tests/Umbraco.Tests.Common/TestHelpers/TestDatabase.cs similarity index 100% rename from src/Umbraco.Tests.Common/TestHelpers/TestDatabase.cs rename to tests/Umbraco.Tests.Common/TestHelpers/TestDatabase.cs diff --git a/src/Umbraco.Tests.Common/TestHelpers/TestEnvironment.cs b/tests/Umbraco.Tests.Common/TestHelpers/TestEnvironment.cs similarity index 100% rename from src/Umbraco.Tests.Common/TestHelpers/TestEnvironment.cs rename to tests/Umbraco.Tests.Common/TestHelpers/TestEnvironment.cs diff --git a/src/Umbraco.Tests.Common/TestPublishedSnapshotAccessor.cs b/tests/Umbraco.Tests.Common/TestPublishedSnapshotAccessor.cs similarity index 100% rename from src/Umbraco.Tests.Common/TestPublishedSnapshotAccessor.cs rename to tests/Umbraco.Tests.Common/TestPublishedSnapshotAccessor.cs diff --git a/src/Umbraco.Tests.Common/TestUmbracoContextAccessor.cs b/tests/Umbraco.Tests.Common/TestUmbracoContextAccessor.cs similarity index 100% rename from src/Umbraco.Tests.Common/TestUmbracoContextAccessor.cs rename to tests/Umbraco.Tests.Common/TestUmbracoContextAccessor.cs diff --git a/src/Umbraco.Tests.Common/TestVariationContextAccessor.cs b/tests/Umbraco.Tests.Common/TestVariationContextAccessor.cs similarity index 100% rename from src/Umbraco.Tests.Common/TestVariationContextAccessor.cs rename to tests/Umbraco.Tests.Common/TestVariationContextAccessor.cs diff --git a/src/Umbraco.Tests.Common/Testing/TestHostingEnvironment.cs b/tests/Umbraco.Tests.Common/Testing/TestHostingEnvironment.cs similarity index 100% rename from src/Umbraco.Tests.Common/Testing/TestHostingEnvironment.cs rename to tests/Umbraco.Tests.Common/Testing/TestHostingEnvironment.cs diff --git a/src/Umbraco.Tests.Common/Testing/TestOptionAttributeBase.cs b/tests/Umbraco.Tests.Common/Testing/TestOptionAttributeBase.cs similarity index 100% rename from src/Umbraco.Tests.Common/Testing/TestOptionAttributeBase.cs rename to tests/Umbraco.Tests.Common/Testing/TestOptionAttributeBase.cs diff --git a/src/Umbraco.Tests.Common/Testing/UmbracoTestAttribute.cs b/tests/Umbraco.Tests.Common/Testing/UmbracoTestAttribute.cs similarity index 100% rename from src/Umbraco.Tests.Common/Testing/UmbracoTestAttribute.cs rename to tests/Umbraco.Tests.Common/Testing/UmbracoTestAttribute.cs diff --git a/src/Umbraco.Tests.Common/Testing/UmbracoTestOptions.cs b/tests/Umbraco.Tests.Common/Testing/UmbracoTestOptions.cs similarity index 100% rename from src/Umbraco.Tests.Common/Testing/UmbracoTestOptions.cs rename to tests/Umbraco.Tests.Common/Testing/UmbracoTestOptions.cs diff --git a/src/Umbraco.Tests.Common/Umbraco.Tests.Common.csproj b/tests/Umbraco.Tests.Common/Umbraco.Tests.Common.csproj similarity index 80% rename from src/Umbraco.Tests.Common/Umbraco.Tests.Common.csproj rename to tests/Umbraco.Tests.Common/Umbraco.Tests.Common.csproj index f17eb9909074..3e1723f59e57 100644 --- a/src/Umbraco.Tests.Common/Umbraco.Tests.Common.csproj +++ b/tests/Umbraco.Tests.Common/Umbraco.Tests.Common.csproj @@ -22,8 +22,8 @@ - - - + + + diff --git a/src/Umbraco.Tests.Integration.SqlCe/Umbraco.Infrastructure/Persistence/DatabaseBuilderTests.cs b/tests/Umbraco.Tests.Integration.SqlCe/Umbraco.Infrastructure/Persistence/DatabaseBuilderTests.cs similarity index 100% rename from src/Umbraco.Tests.Integration.SqlCe/Umbraco.Infrastructure/Persistence/DatabaseBuilderTests.cs rename to tests/Umbraco.Tests.Integration.SqlCe/Umbraco.Infrastructure/Persistence/DatabaseBuilderTests.cs diff --git a/src/Umbraco.Tests.Integration.SqlCe/Umbraco.Tests.Integration.SqlCe.csproj b/tests/Umbraco.Tests.Integration.SqlCe/Umbraco.Tests.Integration.SqlCe.csproj similarity index 66% rename from src/Umbraco.Tests.Integration.SqlCe/Umbraco.Tests.Integration.SqlCe.csproj rename to tests/Umbraco.Tests.Integration.SqlCe/Umbraco.Tests.Integration.SqlCe.csproj index a1f6ecd78d80..b4631e56dc62 100644 --- a/src/Umbraco.Tests.Integration.SqlCe/Umbraco.Tests.Integration.SqlCe.csproj +++ b/tests/Umbraco.Tests.Integration.SqlCe/Umbraco.Tests.Integration.SqlCe.csproj @@ -21,13 +21,13 @@ - - - + + + - - - + + + diff --git a/src/Umbraco.Tests.Integration/AssemblyAttributes.cs b/tests/Umbraco.Tests.Integration/AssemblyAttributes.cs similarity index 100% rename from src/Umbraco.Tests.Integration/AssemblyAttributes.cs rename to tests/Umbraco.Tests.Integration/AssemblyAttributes.cs diff --git a/src/Umbraco.Tests.Integration/ComponentRuntimeTests.cs b/tests/Umbraco.Tests.Integration/ComponentRuntimeTests.cs similarity index 100% rename from src/Umbraco.Tests.Integration/ComponentRuntimeTests.cs rename to tests/Umbraco.Tests.Integration/ComponentRuntimeTests.cs diff --git a/src/Umbraco.Tests.Integration/DependencyInjection/UmbracoBuilderExtensions.cs b/tests/Umbraco.Tests.Integration/DependencyInjection/UmbracoBuilderExtensions.cs similarity index 95% rename from src/Umbraco.Tests.Integration/DependencyInjection/UmbracoBuilderExtensions.cs rename to tests/Umbraco.Tests.Integration/DependencyInjection/UmbracoBuilderExtensions.cs index 1d7142d270df..7bf435485f39 100644 --- a/src/Umbraco.Tests.Integration/DependencyInjection/UmbracoBuilderExtensions.cs +++ b/tests/Umbraco.Tests.Integration/DependencyInjection/UmbracoBuilderExtensions.cs @@ -79,11 +79,10 @@ private static ILocalizedTextService GetLocalizedTextService(IServiceProvider fa new Lazy(() => { // get the src folder - var currFolder = new DirectoryInfo(TestContext.CurrentContext.TestDirectory); - while (!currFolder.Name.Equals("src", StringComparison.InvariantCultureIgnoreCase)) - { - currFolder = currFolder.Parent; - } + var root = TestContext.CurrentContext.TestDirectory.Split("tests")[0]; + var srcFolder = Path.Combine(root, "src"); + + var currFolder = new DirectoryInfo(srcFolder); DirectoryInfo uiProject = currFolder.GetDirectories("Umbraco.Web.UI", SearchOption.TopDirectoryOnly).First(); var mainLangFolder = new DirectoryInfo(Path.Combine(uiProject.FullName, globalSettings.Value.UmbracoPath.TrimStart("~/"), "config", "lang")); diff --git a/src/Umbraco.Tests.Integration/Extensions/ServiceCollectionExtensions.cs b/tests/Umbraco.Tests.Integration/Extensions/ServiceCollectionExtensions.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Extensions/ServiceCollectionExtensions.cs rename to tests/Umbraco.Tests.Integration/Extensions/ServiceCollectionExtensions.cs diff --git a/src/Umbraco.Tests.Integration/GlobalSetupTeardown.cs b/tests/Umbraco.Tests.Integration/GlobalSetupTeardown.cs similarity index 100% rename from src/Umbraco.Tests.Integration/GlobalSetupTeardown.cs rename to tests/Umbraco.Tests.Integration/GlobalSetupTeardown.cs diff --git a/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs b/tests/Umbraco.Tests.Integration/Implementations/TestHelper.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Implementations/TestHelper.cs rename to tests/Umbraco.Tests.Integration/Implementations/TestHelper.cs diff --git a/src/Umbraco.Tests.Integration/Implementations/TestLifetime.cs b/tests/Umbraco.Tests.Integration/Implementations/TestLifetime.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Implementations/TestLifetime.cs rename to tests/Umbraco.Tests.Integration/Implementations/TestLifetime.cs diff --git a/src/Umbraco.Tests.Integration/Implementations/TestUmbracoBootPermissionChecker.cs b/tests/Umbraco.Tests.Integration/Implementations/TestUmbracoBootPermissionChecker.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Implementations/TestUmbracoBootPermissionChecker.cs rename to tests/Umbraco.Tests.Integration/Implementations/TestUmbracoBootPermissionChecker.cs diff --git a/src/Umbraco.Tests.Integration/TestData/Packages/Document_Type_Picker_1.1.package.xml b/tests/Umbraco.Tests.Integration/TestData/Packages/Document_Type_Picker_1.1.package.xml similarity index 100% rename from src/Umbraco.Tests.Integration/TestData/Packages/Document_Type_Picker_1.1.package.xml rename to tests/Umbraco.Tests.Integration/TestData/Packages/Document_Type_Picker_1.1.package.xml diff --git a/src/Umbraco.Tests.Integration/TestData/Packages/Hello_1.0.0.package.xml b/tests/Umbraco.Tests.Integration/TestData/Packages/Hello_1.0.0.package.xml similarity index 100% rename from src/Umbraco.Tests.Integration/TestData/Packages/Hello_1.0.0.package.xml rename to tests/Umbraco.Tests.Integration/TestData/Packages/Hello_1.0.0.package.xml diff --git a/src/Umbraco.Tests.Integration/TestServerTest/Controllers/EnsureNotAmbiguousActionNameControllerTests.cs b/tests/Umbraco.Tests.Integration/TestServerTest/Controllers/EnsureNotAmbiguousActionNameControllerTests.cs similarity index 100% rename from src/Umbraco.Tests.Integration/TestServerTest/Controllers/EnsureNotAmbiguousActionNameControllerTests.cs rename to tests/Umbraco.Tests.Integration/TestServerTest/Controllers/EnsureNotAmbiguousActionNameControllerTests.cs diff --git a/src/Umbraco.Tests.Integration/TestServerTest/TestAuthHandler.cs b/tests/Umbraco.Tests.Integration/TestServerTest/TestAuthHandler.cs similarity index 100% rename from src/Umbraco.Tests.Integration/TestServerTest/TestAuthHandler.cs rename to tests/Umbraco.Tests.Integration/TestServerTest/TestAuthHandler.cs diff --git a/src/Umbraco.Tests.Integration/TestServerTest/UmbracoTestServerTestBase.cs b/tests/Umbraco.Tests.Integration/TestServerTest/UmbracoTestServerTestBase.cs similarity index 100% rename from src/Umbraco.Tests.Integration/TestServerTest/UmbracoTestServerTestBase.cs rename to tests/Umbraco.Tests.Integration/TestServerTest/UmbracoTestServerTestBase.cs diff --git a/src/Umbraco.Tests.Integration/TestServerTest/UmbracoWebApplicationFactory.cs b/tests/Umbraco.Tests.Integration/TestServerTest/UmbracoWebApplicationFactory.cs similarity index 100% rename from src/Umbraco.Tests.Integration/TestServerTest/UmbracoWebApplicationFactory.cs rename to tests/Umbraco.Tests.Integration/TestServerTest/UmbracoWebApplicationFactory.cs diff --git a/src/Umbraco.Tests.Integration/Testing/BaseTestDatabase.cs b/tests/Umbraco.Tests.Integration/Testing/BaseTestDatabase.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Testing/BaseTestDatabase.cs rename to tests/Umbraco.Tests.Integration/Testing/BaseTestDatabase.cs diff --git a/src/Umbraco.Tests.Integration/Testing/ITestDatabase.cs b/tests/Umbraco.Tests.Integration/Testing/ITestDatabase.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Testing/ITestDatabase.cs rename to tests/Umbraco.Tests.Integration/Testing/ITestDatabase.cs diff --git a/src/Umbraco.Tests.Integration/Testing/IntegrationTestComponent.cs b/tests/Umbraco.Tests.Integration/Testing/IntegrationTestComponent.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Testing/IntegrationTestComponent.cs rename to tests/Umbraco.Tests.Integration/Testing/IntegrationTestComponent.cs diff --git a/src/Umbraco.Tests.Integration/Testing/LocalDbTestDatabase.cs b/tests/Umbraco.Tests.Integration/Testing/LocalDbTestDatabase.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Testing/LocalDbTestDatabase.cs rename to tests/Umbraco.Tests.Integration/Testing/LocalDbTestDatabase.cs diff --git a/src/Umbraco.Tests.Integration/Testing/SqlDeveloperTestDatabase.cs b/tests/Umbraco.Tests.Integration/Testing/SqlDeveloperTestDatabase.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Testing/SqlDeveloperTestDatabase.cs rename to tests/Umbraco.Tests.Integration/Testing/SqlDeveloperTestDatabase.cs diff --git a/src/Umbraco.Tests.Integration/Testing/TestDatabaseFactory.cs b/tests/Umbraco.Tests.Integration/Testing/TestDatabaseFactory.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Testing/TestDatabaseFactory.cs rename to tests/Umbraco.Tests.Integration/Testing/TestDatabaseFactory.cs diff --git a/src/Umbraco.Tests.Integration/Testing/TestDatabaseSettings.cs b/tests/Umbraco.Tests.Integration/Testing/TestDatabaseSettings.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Testing/TestDatabaseSettings.cs rename to tests/Umbraco.Tests.Integration/Testing/TestDatabaseSettings.cs diff --git a/src/Umbraco.Tests.Integration/Testing/TestDbMeta.cs b/tests/Umbraco.Tests.Integration/Testing/TestDbMeta.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Testing/TestDbMeta.cs rename to tests/Umbraco.Tests.Integration/Testing/TestDbMeta.cs diff --git a/src/Umbraco.Tests.Integration/Testing/TestUmbracoDatabaseFactoryProvider.cs b/tests/Umbraco.Tests.Integration/Testing/TestUmbracoDatabaseFactoryProvider.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Testing/TestUmbracoDatabaseFactoryProvider.cs rename to tests/Umbraco.Tests.Integration/Testing/TestUmbracoDatabaseFactoryProvider.cs diff --git a/src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs b/tests/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs rename to tests/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs diff --git a/src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTestWithContent.cs b/tests/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTestWithContent.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTestWithContent.cs rename to tests/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTestWithContent.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Core/IO/FileSystemsTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Core/IO/FileSystemsTests.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Core/IO/FileSystemsTests.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Core/IO/FileSystemsTests.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Core/IO/ShadowFileSystemTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Core/IO/ShadowFileSystemTests.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Core/IO/ShadowFileSystemTests.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Core/IO/ShadowFileSystemTests.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Core/Mapping/ContentTypeModelMappingTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Core/Mapping/ContentTypeModelMappingTests.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Core/Mapping/ContentTypeModelMappingTests.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Core/Mapping/ContentTypeModelMappingTests.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Core/Mapping/UmbracoMapperTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Core/Mapping/UmbracoMapperTests.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Core/Mapping/UmbracoMapperTests.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Core/Mapping/UmbracoMapperTests.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Core/Mapping/UserModelMapperTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Core/Mapping/UserModelMapperTests.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Core/Mapping/UserModelMapperTests.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Core/Mapping/UserModelMapperTests.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Core/Packaging/CreatedPackagesRepositoryTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Core/Packaging/CreatedPackagesRepositoryTests.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Core/Packaging/CreatedPackagesRepositoryTests.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Core/Packaging/CreatedPackagesRepositoryTests.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Core/RuntimeStateTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Core/RuntimeStateTests.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Core/RuntimeStateTests.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Core/RuntimeStateTests.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Core/Services/SectionServiceTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Core/Services/SectionServiceTests.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Core/Services/SectionServiceTests.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Core/Services/SectionServiceTests.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/ExamineBaseTest.cs b/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/ExamineBaseTest.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/ExamineBaseTest.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/ExamineBaseTest.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/ExamineDemoDataContentService.cs b/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/ExamineDemoDataContentService.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/ExamineDemoDataContentService.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/ExamineDemoDataContentService.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/ExamineDemoDataMediaService.cs b/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/ExamineDemoDataMediaService.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/ExamineDemoDataMediaService.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/ExamineDemoDataMediaService.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/ExamineExtensions.cs b/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/ExamineExtensions.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/ExamineExtensions.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/ExamineExtensions.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/IndexInitializer.cs b/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/IndexInitializer.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/IndexInitializer.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/IndexInitializer.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/IndexTest.cs b/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/IndexTest.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/IndexTest.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/IndexTest.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/PublishedContentQueryTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/PublishedContentQueryTests.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/PublishedContentQueryTests.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/PublishedContentQueryTests.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/RandomIdRAMDirectory.cs b/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/RandomIdRAMDirectory.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/RandomIdRAMDirectory.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/RandomIdRAMDirectory.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/SearchTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/SearchTests.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/SearchTests.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/SearchTests.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/TestFiles.Designer.cs b/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/TestFiles.Designer.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/TestFiles.Designer.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/TestFiles.Designer.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/TestFiles.resx b/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/TestFiles.resx similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/TestFiles.resx rename to tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/TestFiles.resx diff --git a/src/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/TestFiles/media.xml b/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/TestFiles/media.xml similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/TestFiles/media.xml rename to tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/TestFiles/media.xml diff --git a/src/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/TestFiles/umbraco-sort.config b/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/TestFiles/umbraco-sort.config similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/TestFiles/umbraco-sort.config rename to tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/TestFiles/umbraco-sort.config diff --git a/src/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/TestFiles/umbraco.config b/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/TestFiles/umbraco.config similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/TestFiles/umbraco.config rename to tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/TestFiles/umbraco.config diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Migrations/AdvancedMigrationTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Migrations/AdvancedMigrationTests.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Migrations/AdvancedMigrationTests.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Migrations/AdvancedMigrationTests.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Packaging/PackageDataInstallationTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Packaging/PackageDataInstallationTests.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Packaging/PackageDataInstallationTests.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Packaging/PackageDataInstallationTests.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Packaging/PackageInstallationTest.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Packaging/PackageInstallationTest.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Packaging/PackageInstallationTest.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Packaging/PackageInstallationTest.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/LocksTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/LocksTests.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/LocksTests.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/LocksTests.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoBulkInsertTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoBulkInsertTests.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoBulkInsertTests.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoBulkInsertTests.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoFetchTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoFetchTests.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoFetchTests.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoFetchTests.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/AuditRepositoryTest.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/AuditRepositoryTest.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/AuditRepositoryTest.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/AuditRepositoryTest.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/CacheInstructionRepositoryTest.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/CacheInstructionRepositoryTest.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/CacheInstructionRepositoryTest.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/CacheInstructionRepositoryTest.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/ContentTypeRepositoryTest.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/ContentTypeRepositoryTest.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/ContentTypeRepositoryTest.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/ContentTypeRepositoryTest.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/DataTypeDefinitionRepositoryTest.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/DataTypeDefinitionRepositoryTest.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/DataTypeDefinitionRepositoryTest.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/DataTypeDefinitionRepositoryTest.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/DictionaryRepositoryTest.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/DictionaryRepositoryTest.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/DictionaryRepositoryTest.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/DictionaryRepositoryTest.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/DocumentRepositoryTest.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/DocumentRepositoryTest.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/DocumentRepositoryTest.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/DocumentRepositoryTest.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/DomainRepositoryTest.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/DomainRepositoryTest.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/DomainRepositoryTest.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/DomainRepositoryTest.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/EntityRepositoryTest.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/EntityRepositoryTest.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/EntityRepositoryTest.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/EntityRepositoryTest.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/KeyValueRepositoryTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/KeyValueRepositoryTests.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/KeyValueRepositoryTests.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/KeyValueRepositoryTests.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/LanguageRepositoryTest.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/LanguageRepositoryTest.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/LanguageRepositoryTest.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/LanguageRepositoryTest.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/MacroRepositoryTest.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/MacroRepositoryTest.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/MacroRepositoryTest.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/MacroRepositoryTest.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/MediaRepositoryTest.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/MediaRepositoryTest.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/MediaRepositoryTest.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/MediaRepositoryTest.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/MediaTypeRepositoryTest.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/MediaTypeRepositoryTest.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/MediaTypeRepositoryTest.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/MediaTypeRepositoryTest.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/MemberRepositoryTest.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/MemberRepositoryTest.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/MemberRepositoryTest.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/MemberRepositoryTest.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/MemberTypeRepositoryTest.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/MemberTypeRepositoryTest.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/MemberTypeRepositoryTest.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/MemberTypeRepositoryTest.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/NotificationsRepositoryTest.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/NotificationsRepositoryTest.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/NotificationsRepositoryTest.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/NotificationsRepositoryTest.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/PartialViewRepositoryTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/PartialViewRepositoryTests.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/PartialViewRepositoryTests.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/PartialViewRepositoryTests.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/PublicAccessRepositoryTest.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/PublicAccessRepositoryTest.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/PublicAccessRepositoryTest.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/PublicAccessRepositoryTest.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/RedirectUrlRepositoryTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/RedirectUrlRepositoryTests.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/RedirectUrlRepositoryTests.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/RedirectUrlRepositoryTests.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/RelationRepositoryTest.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/RelationRepositoryTest.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/RelationRepositoryTest.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/RelationRepositoryTest.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/RelationTypeRepositoryTest.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/RelationTypeRepositoryTest.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/RelationTypeRepositoryTest.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/RelationTypeRepositoryTest.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/ScriptRepositoryTest.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/ScriptRepositoryTest.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/ScriptRepositoryTest.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/ScriptRepositoryTest.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/ServerRegistrationRepositoryTest.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/ServerRegistrationRepositoryTest.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/ServerRegistrationRepositoryTest.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/ServerRegistrationRepositoryTest.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/SimilarNodeNameTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/SimilarNodeNameTests.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/SimilarNodeNameTests.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/SimilarNodeNameTests.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/StylesheetRepositoryTest.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/StylesheetRepositoryTest.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/StylesheetRepositoryTest.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/StylesheetRepositoryTest.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/TagRepositoryTest.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/TagRepositoryTest.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/TagRepositoryTest.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/TagRepositoryTest.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/TemplateRepositoryTest.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/TemplateRepositoryTest.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/TemplateRepositoryTest.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/TemplateRepositoryTest.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/UserGroupRepositoryTest.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/UserGroupRepositoryTest.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/UserGroupRepositoryTest.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/UserGroupRepositoryTest.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/UserRepositoryTest.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/UserRepositoryTest.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/UserRepositoryTest.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/UserRepositoryTest.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/SchemaValidationTest.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/SchemaValidationTest.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/SchemaValidationTest.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/SchemaValidationTest.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/SqlServerTableByTableTest.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/SqlServerTableByTableTest.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/SqlServerTableByTableTest.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/SqlServerTableByTableTest.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/SyntaxProvider/SqlServerSyntaxProviderTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/SyntaxProvider/SqlServerSyntaxProviderTests.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/SyntaxProvider/SqlServerSyntaxProviderTests.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/SyntaxProvider/SqlServerSyntaxProviderTests.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/UnitOfWorkTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/UnitOfWorkTests.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/UnitOfWorkTests.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/UnitOfWorkTests.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Scoping/ScopeFileSystemsTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Scoping/ScopeFileSystemsTests.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Scoping/ScopeFileSystemsTests.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Scoping/ScopeFileSystemsTests.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Scoping/ScopeTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Scoping/ScopeTests.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Scoping/ScopeTests.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Scoping/ScopeTests.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Scoping/ScopedRepositoryTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Scoping/ScopedRepositoryTests.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Scoping/ScopedRepositoryTests.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Scoping/ScopedRepositoryTests.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Scoping/SupressNotificationsTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Scoping/SupressNotificationsTests.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Scoping/SupressNotificationsTests.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Scoping/SupressNotificationsTests.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Security/BackOfficeUserStoreTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Security/BackOfficeUserStoreTests.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Security/BackOfficeUserStoreTests.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Security/BackOfficeUserStoreTests.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/AuditServiceTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/AuditServiceTests.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/AuditServiceTests.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/AuditServiceTests.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/CacheInstructionServiceTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/CacheInstructionServiceTests.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/CacheInstructionServiceTests.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/CacheInstructionServiceTests.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/CachedDataTypeServiceTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/CachedDataTypeServiceTests.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/CachedDataTypeServiceTests.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/CachedDataTypeServiceTests.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ConsentServiceTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ConsentServiceTests.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ConsentServiceTests.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ConsentServiceTests.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentEventsTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentEventsTests.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentEventsTests.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentEventsTests.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceNotificationTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceNotificationTests.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceNotificationTests.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceNotificationTests.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServicePerformanceTest.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServicePerformanceTest.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServicePerformanceTest.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServicePerformanceTest.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServicePublishBranchTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServicePublishBranchTests.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServicePublishBranchTests.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServicePublishBranchTests.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceTagsTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceTagsTests.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceTagsTests.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceTagsTests.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceTests.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceTests.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceTests.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentTypeServiceTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentTypeServiceTests.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentTypeServiceTests.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentTypeServiceTests.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentTypeServiceVariantsTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentTypeServiceVariantsTests.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentTypeServiceVariantsTests.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentTypeServiceVariantsTests.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/DataTypeServiceTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/DataTypeServiceTests.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/DataTypeServiceTests.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/DataTypeServiceTests.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/EntityServiceTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/EntityServiceTests.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/EntityServiceTests.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/EntityServiceTests.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/EntityXmlSerializerTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/EntityXmlSerializerTests.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/EntityXmlSerializerTests.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/EntityXmlSerializerTests.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ExternalLoginServiceTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ExternalLoginServiceTests.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ExternalLoginServiceTests.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ExternalLoginServiceTests.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/FileServiceTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/FileServiceTests.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/FileServiceTests.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/FileServiceTests.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/Importing/CheckboxList-Content-Package.xml b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/Importing/CheckboxList-Content-Package.xml similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/Importing/CheckboxList-Content-Package.xml rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/Importing/CheckboxList-Content-Package.xml diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/Importing/CompositionsTestPackage-Random.xml b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/Importing/CompositionsTestPackage-Random.xml similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/Importing/CompositionsTestPackage-Random.xml rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/Importing/CompositionsTestPackage-Random.xml diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/Importing/CompositionsTestPackage.xml b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/Importing/CompositionsTestPackage.xml similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/Importing/CompositionsTestPackage.xml rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/Importing/CompositionsTestPackage.xml diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/Importing/Dictionary-Package.xml b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/Importing/Dictionary-Package.xml similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/Importing/Dictionary-Package.xml rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/Importing/Dictionary-Package.xml diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/Importing/Fanoe-Package.xml b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/Importing/Fanoe-Package.xml similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/Importing/Fanoe-Package.xml rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/Importing/Fanoe-Package.xml diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/Importing/ImportResources.Designer.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/Importing/ImportResources.Designer.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/Importing/ImportResources.Designer.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/Importing/ImportResources.Designer.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/Importing/ImportResources.resx b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/Importing/ImportResources.resx similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/Importing/ImportResources.resx rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/Importing/ImportResources.resx diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/Importing/InheritedDocTypes-Package.xml b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/Importing/InheritedDocTypes-Package.xml similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/Importing/InheritedDocTypes-Package.xml rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/Importing/InheritedDocTypes-Package.xml diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/Importing/MediaTypesAndMedia-Package.xml b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/Importing/MediaTypesAndMedia-Package.xml similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/Importing/MediaTypesAndMedia-Package.xml rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/Importing/MediaTypesAndMedia-Package.xml diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/Importing/SingleDocType.xml b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/Importing/SingleDocType.xml similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/Importing/SingleDocType.xml rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/Importing/SingleDocType.xml diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/Importing/StandardMvc-Package.xml b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/Importing/StandardMvc-Package.xml similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/Importing/StandardMvc-Package.xml rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/Importing/StandardMvc-Package.xml diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/Importing/TemplateOnly-Package.xml b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/Importing/TemplateOnly-Package.xml similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/Importing/TemplateOnly-Package.xml rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/Importing/TemplateOnly-Package.xml diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/Importing/TemplateOnly-Updated-Package.xml b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/Importing/TemplateOnly-Updated-Package.xml similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/Importing/TemplateOnly-Updated-Package.xml rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/Importing/TemplateOnly-Updated-Package.xml diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/Importing/XsltSearch-Package.xml b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/Importing/XsltSearch-Package.xml similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/Importing/XsltSearch-Package.xml rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/Importing/XsltSearch-Package.xml diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/Importing/uBlogsy-Package.xml b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/Importing/uBlogsy-Package.xml similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/Importing/uBlogsy-Package.xml rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/Importing/uBlogsy-Package.xml diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/KeyValueServiceTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/KeyValueServiceTests.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/KeyValueServiceTests.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/KeyValueServiceTests.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/LocalizationServiceTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/LocalizationServiceTests.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/LocalizationServiceTests.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/LocalizationServiceTests.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MacroServiceTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MacroServiceTests.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MacroServiceTests.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MacroServiceTests.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MediaServiceTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MediaServiceTests.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MediaServiceTests.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MediaServiceTests.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MediaTypeServiceTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MediaTypeServiceTests.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MediaTypeServiceTests.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MediaTypeServiceTests.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MemberServiceTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MemberServiceTests.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MemberServiceTests.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MemberServiceTests.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MemberTypeServiceTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MemberTypeServiceTests.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MemberTypeServiceTests.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MemberTypeServiceTests.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/PublicAccessServiceTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/PublicAccessServiceTests.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/PublicAccessServiceTests.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/PublicAccessServiceTests.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/RedirectUrlServiceTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/RedirectUrlServiceTests.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/RedirectUrlServiceTests.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/RedirectUrlServiceTests.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/RelationServiceTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/RelationServiceTests.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/RelationServiceTests.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/RelationServiceTests.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/TagServiceTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/TagServiceTests.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/TagServiceTests.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/TagServiceTests.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ThreadSafetyServiceTest.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ThreadSafetyServiceTest.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ThreadSafetyServiceTest.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ThreadSafetyServiceTest.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/TrackRelationsTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/TrackRelationsTests.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/TrackRelationsTests.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/TrackRelationsTests.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/UserServiceTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/UserServiceTests.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/UserServiceTests.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/UserServiceTests.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj b/tests/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj similarity index 89% rename from src/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj rename to tests/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj index b311766c8ca2..36d012945f21 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj +++ b/tests/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj @@ -94,13 +94,13 @@ - - - + + + - - - + + + diff --git a/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/BackOfficeAssetsControllerTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/BackOfficeAssetsControllerTests.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/BackOfficeAssetsControllerTests.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/BackOfficeAssetsControllerTests.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/ContentControllerTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/ContentControllerTests.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/ContentControllerTests.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/ContentControllerTests.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/TemplateQueryControllerTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/TemplateQueryControllerTests.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/TemplateQueryControllerTests.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/TemplateQueryControllerTests.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/UsersControllerTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/UsersControllerTests.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/UsersControllerTests.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/UsersControllerTests.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Filters/ContentModelValidatorTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Filters/ContentModelValidatorTests.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Filters/ContentModelValidatorTests.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Filters/ContentModelValidatorTests.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/UmbracoBackOfficeServiceCollectionExtensionsTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/UmbracoBackOfficeServiceCollectionExtensionsTests.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/UmbracoBackOfficeServiceCollectionExtensionsTests.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/UmbracoBackOfficeServiceCollectionExtensionsTests.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Web.Common/MembersServiceCollectionExtensionsTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Web.Common/MembersServiceCollectionExtensionsTests.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Web.Common/MembersServiceCollectionExtensionsTests.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Web.Common/MembersServiceCollectionExtensionsTests.cs diff --git a/src/Umbraco.Tests.Integration/Umbraco.Web.Website/Routing/FrontEndRouteTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Web.Website/Routing/FrontEndRouteTests.cs similarity index 100% rename from src/Umbraco.Tests.Integration/Umbraco.Web.Website/Routing/FrontEndRouteTests.cs rename to tests/Umbraco.Tests.Integration/Umbraco.Web.Website/Routing/FrontEndRouteTests.cs diff --git a/src/Umbraco.Tests.Shared/Umbraco.Tests.Shared.csproj b/tests/Umbraco.Tests.Shared/Umbraco.Tests.Shared.csproj similarity index 65% rename from src/Umbraco.Tests.Shared/Umbraco.Tests.Shared.csproj rename to tests/Umbraco.Tests.Shared/Umbraco.Tests.Shared.csproj index 43cd79bd6eb5..aebe9d49ad8b 100644 --- a/src/Umbraco.Tests.Shared/Umbraco.Tests.Shared.csproj +++ b/tests/Umbraco.Tests.Shared/Umbraco.Tests.Shared.csproj @@ -17,9 +17,9 @@ - - - + + + diff --git a/src/Umbraco.Tests.UnitTests/AssemblyAttributes.cs b/tests/Umbraco.Tests.UnitTests/AssemblyAttributes.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/AssemblyAttributes.cs rename to tests/Umbraco.Tests.UnitTests/AssemblyAttributes.cs diff --git a/src/Umbraco.Tests.UnitTests/AutoFixture/AutoMoqDataAttribute.cs b/tests/Umbraco.Tests.UnitTests/AutoFixture/AutoMoqDataAttribute.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/AutoFixture/AutoMoqDataAttribute.cs rename to tests/Umbraco.Tests.UnitTests/AutoFixture/AutoMoqDataAttribute.cs diff --git a/src/Umbraco.Tests.UnitTests/AutoFixture/InlineAutoMoqDataAttribute.cs b/tests/Umbraco.Tests.UnitTests/AutoFixture/InlineAutoMoqDataAttribute.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/AutoFixture/InlineAutoMoqDataAttribute.cs rename to tests/Umbraco.Tests.UnitTests/AutoFixture/InlineAutoMoqDataAttribute.cs diff --git a/src/Umbraco.Tests.UnitTests/TestHelpers/Assets/UmbracoTraceLog.UNITTEST.20181112.json b/tests/Umbraco.Tests.UnitTests/TestHelpers/Assets/UmbracoTraceLog.UNITTEST.20181112.json similarity index 100% rename from src/Umbraco.Tests.UnitTests/TestHelpers/Assets/UmbracoTraceLog.UNITTEST.20181112.json rename to tests/Umbraco.Tests.UnitTests/TestHelpers/Assets/UmbracoTraceLog.UNITTEST.20181112.json diff --git a/src/Umbraco.Tests.UnitTests/TestHelpers/BaseUsingSqlSyntax.cs b/tests/Umbraco.Tests.UnitTests/TestHelpers/BaseUsingSqlSyntax.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/TestHelpers/BaseUsingSqlSyntax.cs rename to tests/Umbraco.Tests.UnitTests/TestHelpers/BaseUsingSqlSyntax.cs diff --git a/src/Umbraco.Tests.UnitTests/TestHelpers/CompositionExtensions.cs b/tests/Umbraco.Tests.UnitTests/TestHelpers/CompositionExtensions.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/TestHelpers/CompositionExtensions.cs rename to tests/Umbraco.Tests.UnitTests/TestHelpers/CompositionExtensions.cs diff --git a/src/Umbraco.Tests.UnitTests/TestHelpers/Objects/TestUmbracoContextFactory.cs b/tests/Umbraco.Tests.UnitTests/TestHelpers/Objects/TestUmbracoContextFactory.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/TestHelpers/Objects/TestUmbracoContextFactory.cs rename to tests/Umbraco.Tests.UnitTests/TestHelpers/Objects/TestUmbracoContextFactory.cs diff --git a/src/Umbraco.Tests.UnitTests/TestHelpers/TestHelper.cs b/tests/Umbraco.Tests.UnitTests/TestHelpers/TestHelper.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/TestHelpers/TestHelper.cs rename to tests/Umbraco.Tests.UnitTests/TestHelpers/TestHelper.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Configuration/Models/ConnectionStringsTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Configuration/Models/ConnectionStringsTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Configuration/Models/ConnectionStringsTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Configuration/Models/ConnectionStringsTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/AttemptTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/AttemptTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/AttemptTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/AttemptTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/BackOffice/IdentityExtensionsTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/BackOffice/IdentityExtensionsTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/BackOffice/IdentityExtensionsTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/BackOffice/IdentityExtensionsTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/BackOffice/UmbracoBackOfficeIdentityTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/BackOffice/UmbracoBackOfficeIdentityTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/BackOffice/UmbracoBackOfficeIdentityTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/BackOffice/UmbracoBackOfficeIdentityTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/AppCacheTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/AppCacheTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/AppCacheTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/AppCacheTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/DeepCloneAppCacheTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/DeepCloneAppCacheTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/DeepCloneAppCacheTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/DeepCloneAppCacheTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/DefaultCachePolicyTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/DefaultCachePolicyTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/DefaultCachePolicyTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/DefaultCachePolicyTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/DictionaryAppCacheTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/DictionaryAppCacheTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/DictionaryAppCacheTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/DictionaryAppCacheTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/DistributedCache/DistributedCacheTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/DistributedCache/DistributedCacheTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/DistributedCache/DistributedCacheTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/DistributedCache/DistributedCacheTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/FullDataSetCachePolicyTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/FullDataSetCachePolicyTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/FullDataSetCachePolicyTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/FullDataSetCachePolicyTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/HttpContextRequestAppCacheTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/HttpContextRequestAppCacheTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/HttpContextRequestAppCacheTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/HttpContextRequestAppCacheTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/ObjectAppCacheTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/ObjectAppCacheTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/ObjectAppCacheTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/ObjectAppCacheTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/RefresherTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/RefresherTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/RefresherTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/RefresherTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/RuntimeAppCacheTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/RuntimeAppCacheTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/RuntimeAppCacheTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/RuntimeAppCacheTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/SingleItemsOnlyCachePolicyTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/SingleItemsOnlyCachePolicyTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/SingleItemsOnlyCachePolicyTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/SingleItemsOnlyCachePolicyTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/ValueEditorCacheTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/ValueEditorCacheTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/ValueEditorCacheTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/ValueEditorCacheTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/ClaimsIdentityExtensionsTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/ClaimsIdentityExtensionsTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/ClaimsIdentityExtensionsTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/ClaimsIdentityExtensionsTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Collections/DeepCloneableListTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Collections/DeepCloneableListTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Collections/DeepCloneableListTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Collections/DeepCloneableListTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Collections/OrderedHashSetTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Collections/OrderedHashSetTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Collections/OrderedHashSetTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Collections/OrderedHashSetTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Components/ComponentTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Components/ComponentTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Components/ComponentTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Components/ComponentTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/CollectionBuildersTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/CollectionBuildersTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/CollectionBuildersTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/CollectionBuildersTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/ComposingTestBase.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/ComposingTestBase.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/ComposingTestBase.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/ComposingTestBase.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/LazyCollectionBuilderTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/LazyCollectionBuilderTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/LazyCollectionBuilderTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/LazyCollectionBuilderTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/TypeFinderTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/TypeFinderTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/TypeFinderTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/TypeFinderTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/TypeHelperTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/TypeHelperTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/TypeHelperTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/TypeHelperTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/TypeLoaderExtensions.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/TypeLoaderExtensions.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/TypeLoaderExtensions.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/TypeLoaderExtensions.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/TypeLoaderTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/TypeLoaderTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/TypeLoaderTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/TypeLoaderTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/Extensions/HealthCheckSettingsExtensionsTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/Extensions/HealthCheckSettingsExtensionsTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/Extensions/HealthCheckSettingsExtensionsTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/Extensions/HealthCheckSettingsExtensionsTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/GlobalSettingsTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/GlobalSettingsTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/GlobalSettingsTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/GlobalSettingsTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/Validation/ContentSettingsValidatorTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/Validation/ContentSettingsValidatorTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/Validation/ContentSettingsValidatorTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/Validation/ContentSettingsValidatorTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/Validation/GlobalSettingsValidatorTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/Validation/GlobalSettingsValidatorTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/Validation/GlobalSettingsValidatorTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/Validation/GlobalSettingsValidatorTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/Validation/HealthChecksSettingsValidatorTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/Validation/HealthChecksSettingsValidatorTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/Validation/HealthChecksSettingsValidatorTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/Validation/HealthChecksSettingsValidatorTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/Validation/RequestHandlerSettingsValidatorTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/Validation/RequestHandlerSettingsValidatorTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/Validation/RequestHandlerSettingsValidatorTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/Validation/RequestHandlerSettingsValidatorTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/NCronTabParserTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/NCronTabParserTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/NCronTabParserTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/NCronTabParserTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/CoreThings/ObjectExtensionsTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/CoreThings/ObjectExtensionsTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/CoreThings/ObjectExtensionsTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/CoreThings/ObjectExtensionsTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/CoreThings/TryConvertToTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/CoreThings/TryConvertToTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/CoreThings/TryConvertToTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/CoreThings/TryConvertToTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/CoreThings/UdiTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/CoreThings/UdiTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/CoreThings/UdiTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/CoreThings/UdiTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/CoreXml/FrameworkXmlTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/CoreXml/FrameworkXmlTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/CoreXml/FrameworkXmlTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/CoreXml/FrameworkXmlTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/CoreXml/NavigableNavigatorTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/CoreXml/NavigableNavigatorTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/CoreXml/NavigableNavigatorTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/CoreXml/NavigableNavigatorTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/CoreXml/RenamedRootNavigatorTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/CoreXml/RenamedRootNavigatorTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/CoreXml/RenamedRootNavigatorTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/CoreXml/RenamedRootNavigatorTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/DelegateExtensionsTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/DelegateExtensionsTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/DelegateExtensionsTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/DelegateExtensionsTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Deploy/ArtifactBaseTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Deploy/ArtifactBaseTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Deploy/ArtifactBaseTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Deploy/ArtifactBaseTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/EnumExtensionsTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/EnumExtensionsTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/EnumExtensionsTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/EnumExtensionsTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/EnumerableExtensionsTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/EnumerableExtensionsTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/EnumerableExtensionsTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/EnumerableExtensionsTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Events/EventAggregatorTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Events/EventAggregatorTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Events/EventAggregatorTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Events/EventAggregatorTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Extensions/ClaimsPrincipalExtensionsTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Extensions/ClaimsPrincipalExtensionsTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Extensions/ClaimsPrincipalExtensionsTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Extensions/ClaimsPrincipalExtensionsTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Extensions/UmbracoBuilderExtensionsTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Extensions/UmbracoBuilderExtensionsTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Extensions/UmbracoBuilderExtensionsTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Extensions/UmbracoBuilderExtensionsTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Extensions/UriExtensionsTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Extensions/UriExtensionsTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Extensions/UriExtensionsTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Extensions/UriExtensionsTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/GuidUtilsTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/GuidUtilsTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/GuidUtilsTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/GuidUtilsTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/HashCodeCombinerTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/HashCodeCombinerTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/HashCodeCombinerTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/HashCodeCombinerTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/HashGeneratorTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/HashGeneratorTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/HashGeneratorTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/HashGeneratorTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/HexEncoderTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/HexEncoderTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/HexEncoderTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/HexEncoderTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/IO/AbstractFileSystemTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/IO/AbstractFileSystemTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/IO/AbstractFileSystemTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/IO/AbstractFileSystemTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/IO/PhysicalFileSystemTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/IO/PhysicalFileSystemTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/IO/PhysicalFileSystemTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/IO/PhysicalFileSystemTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Manifest/ManifestContentAppTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Manifest/ManifestContentAppTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Manifest/ManifestContentAppTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Manifest/ManifestContentAppTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Manifest/ManifestParserTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Manifest/ManifestParserTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Manifest/ManifestParserTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Manifest/ManifestParserTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/Collections/Item.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/Collections/Item.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/Collections/Item.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/Collections/Item.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/Collections/OrderItem.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/Collections/OrderItem.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/Collections/OrderItem.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/Collections/OrderItem.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/Collections/PropertyCollectionTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/Collections/PropertyCollectionTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/Collections/PropertyCollectionTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/Collections/PropertyCollectionTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/Collections/SimpleOrder.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/Collections/SimpleOrder.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/Collections/SimpleOrder.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/Collections/SimpleOrder.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/ContentExtensionsTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/ContentExtensionsTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/ContentExtensionsTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/ContentExtensionsTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/ContentScheduleTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/ContentScheduleTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/ContentScheduleTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/ContentScheduleTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/ContentTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/ContentTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/ContentTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/ContentTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/ContentTypeTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/ContentTypeTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/ContentTypeTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/ContentTypeTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/CultureImpactTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/CultureImpactTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/CultureImpactTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/CultureImpactTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/DeepCloneHelperTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/DeepCloneHelperTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/DeepCloneHelperTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/DeepCloneHelperTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/DictionaryItemTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/DictionaryItemTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/DictionaryItemTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/DictionaryItemTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/DictionaryTranslationTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/DictionaryTranslationTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/DictionaryTranslationTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/DictionaryTranslationTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/DocumentEntityTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/DocumentEntityTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/DocumentEntityTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/DocumentEntityTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/LanguageTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/LanguageTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/LanguageTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/LanguageTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/MacroTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/MacroTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/MacroTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/MacroTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/MemberGroupTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/MemberGroupTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/MemberGroupTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/MemberGroupTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/MemberTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/MemberTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/MemberTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/MemberTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/PropertyGroupTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/PropertyGroupTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/PropertyGroupTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/PropertyGroupTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/PropertyTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/PropertyTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/PropertyTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/PropertyTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/PropertyTypeTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/PropertyTypeTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/PropertyTypeTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/PropertyTypeTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/RangeTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/RangeTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/RangeTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/RangeTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/RelationTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/RelationTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/RelationTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/RelationTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/RelationTypeTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/RelationTypeTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/RelationTypeTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/RelationTypeTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/StylesheetTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/StylesheetTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/StylesheetTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/StylesheetTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/TemplateTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/TemplateTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/TemplateTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/TemplateTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/UserExtensionsTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/UserExtensionsTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/UserExtensionsTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/UserExtensionsTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/UserGroupTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/UserGroupTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/UserGroupTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/UserGroupTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/UserTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/UserTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/UserTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/UserTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/VariationTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/VariationTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/VariationTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/VariationTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Packaging/PendingPackageMigrationsTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Packaging/PendingPackageMigrationsTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Packaging/PendingPackageMigrationsTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Packaging/PendingPackageMigrationsTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/BlockEditorComponentTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/BlockEditorComponentTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/BlockEditorComponentTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/BlockEditorComponentTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/BlockListPropertyValueConverterTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/BlockListPropertyValueConverterTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/BlockListPropertyValueConverterTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/BlockListPropertyValueConverterTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/ColorListValidatorTest.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/ColorListValidatorTest.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/ColorListValidatorTest.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/ColorListValidatorTest.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/ConvertersTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/ConvertersTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/ConvertersTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/ConvertersTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/DataValueReferenceFactoryCollectionTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/DataValueReferenceFactoryCollectionTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/DataValueReferenceFactoryCollectionTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/DataValueReferenceFactoryCollectionTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/EnsureUniqueValuesValidatorTest.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/EnsureUniqueValuesValidatorTest.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/EnsureUniqueValuesValidatorTest.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/EnsureUniqueValuesValidatorTest.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/MultiValuePropertyEditorTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/MultiValuePropertyEditorTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/MultiValuePropertyEditorTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/MultiValuePropertyEditorTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/NestedContentPropertyComponentTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/NestedContentPropertyComponentTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/NestedContentPropertyComponentTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/NestedContentPropertyComponentTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/PropertyEditorValueConverterTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/PropertyEditorValueConverterTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/PropertyEditorValueConverterTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/PropertyEditorValueConverterTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/PropertyEditorValueEditorTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/PropertyEditorValueEditorTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/PropertyEditorValueEditorTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/PropertyEditorValueEditorTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Published/ConvertersTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Published/ConvertersTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Published/ConvertersTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Published/ConvertersTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Published/ModelTypeTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Published/ModelTypeTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Published/ModelTypeTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Published/ModelTypeTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Published/NestedContentTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Published/NestedContentTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Published/NestedContentTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Published/NestedContentTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Published/PropertyCacheLevelTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Published/PropertyCacheLevelTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Published/PropertyCacheLevelTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Published/PropertyCacheLevelTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/ReflectionTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/ReflectionTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/ReflectionTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/ReflectionTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/ReflectionUtilitiesTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/ReflectionUtilitiesTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/ReflectionUtilitiesTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/ReflectionUtilitiesTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/ContentFinderByUrlAliasTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/ContentFinderByUrlAliasTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/ContentFinderByUrlAliasTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/ContentFinderByUrlAliasTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/SiteDomainMapperTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/SiteDomainMapperTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/SiteDomainMapperTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/SiteDomainMapperTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/UmbracoRequestPathsTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/UmbracoRequestPathsTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/UmbracoRequestPathsTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/UmbracoRequestPathsTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/UriUtilityTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/UriUtilityTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/UriUtilityTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/UriUtilityTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/WebPathTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/WebPathTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/WebPathTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/WebPathTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Scoping/EventNameExtractorTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Scoping/EventNameExtractorTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Scoping/EventNameExtractorTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Scoping/EventNameExtractorTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Scoping/ScopeEventDispatcherTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Scoping/ScopeEventDispatcherTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Scoping/ScopeEventDispatcherTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Scoping/ScopeEventDispatcherTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Scoping/ScopedNotificationPublisherTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Scoping/ScopedNotificationPublisherTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Scoping/ScopedNotificationPublisherTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Scoping/ScopedNotificationPublisherTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Security/ContentPermissionsTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Security/ContentPermissionsTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Security/ContentPermissionsTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Security/ContentPermissionsTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Security/LegacyPasswordSecurityTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Security/LegacyPasswordSecurityTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Security/LegacyPasswordSecurityTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Security/LegacyPasswordSecurityTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Security/MediaPermissionsTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Security/MediaPermissionsTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Security/MediaPermissionsTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Security/MediaPermissionsTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Services/BasicAuthServiceTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Services/BasicAuthServiceTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Services/BasicAuthServiceTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Services/BasicAuthServiceTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Services/ContentTypeServiceExtensionsTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Services/ContentTypeServiceExtensionsTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Services/ContentTypeServiceExtensionsTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Services/ContentTypeServiceExtensionsTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Services/UserDataServiceTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Services/UserDataServiceTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Services/UserDataServiceTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Services/UserDataServiceTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/CmsHelperCasingTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/CmsHelperCasingTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/CmsHelperCasingTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/CmsHelperCasingTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/DefaultShortStringHelperTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/DefaultShortStringHelperTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/DefaultShortStringHelperTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/DefaultShortStringHelperTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/DefaultShortStringHelperTestsWithoutSetup.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/DefaultShortStringHelperTestsWithoutSetup.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/DefaultShortStringHelperTestsWithoutSetup.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/DefaultShortStringHelperTestsWithoutSetup.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/MockShortStringHelper.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/MockShortStringHelper.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/MockShortStringHelper.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/MockShortStringHelper.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/StringExtensionsTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/StringExtensionsTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/StringExtensionsTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/StringExtensionsTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/StringValidationTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/StringValidationTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/StringValidationTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/StringValidationTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/StylesheetHelperTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/StylesheetHelperTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/StylesheetHelperTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/StylesheetHelperTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/TaskHelperTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/TaskHelperTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/TaskHelperTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/TaskHelperTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Templates/HtmlImageSourceParserTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Templates/HtmlImageSourceParserTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Templates/HtmlImageSourceParserTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Templates/HtmlImageSourceParserTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Templates/HtmlLocalLinkParserTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Templates/HtmlLocalLinkParserTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Templates/HtmlLocalLinkParserTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Templates/HtmlLocalLinkParserTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Templates/ViewHelperTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Templates/ViewHelperTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Templates/ViewHelperTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Templates/ViewHelperTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/VersionExtensionTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/VersionExtensionTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/VersionExtensionTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/VersionExtensionTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Web/Routing/PublishedRequestBuilderTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Web/Routing/PublishedRequestBuilderTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Web/Routing/PublishedRequestBuilderTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Web/Routing/PublishedRequestBuilderTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Xml/XmlHelperTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Xml/XmlHelperTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/Xml/XmlHelperTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/Xml/XmlHelperTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/XmlExtensionsTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/XmlExtensionsTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Core/XmlExtensionsTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Core/XmlExtensionsTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/BackOffice/BackOfficeClaimsPrincipalFactoryTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/BackOffice/BackOfficeClaimsPrincipalFactoryTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/BackOffice/BackOfficeClaimsPrincipalFactoryTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/BackOffice/BackOfficeClaimsPrincipalFactoryTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Editors/UserEditorAuthorizationHelperTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Editors/UserEditorAuthorizationHelperTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Editors/UserEditorAuthorizationHelperTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Editors/UserEditorAuthorizationHelperTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Examine/UmbracoContentValueSetValidatorTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Examine/UmbracoContentValueSetValidatorTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Examine/UmbracoContentValueSetValidatorTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Examine/UmbracoContentValueSetValidatorTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Extensions/EmailMessageExtensionsTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Extensions/EmailMessageExtensionsTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Extensions/EmailMessageExtensionsTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Extensions/EmailMessageExtensionsTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HealthChecks/HealthCheckResultsTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HealthChecks/HealthCheckResultsTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HealthChecks/HealthCheckResultsTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HealthChecks/HealthCheckResultsTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/HealthCheckNotifierTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/HealthCheckNotifierTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/HealthCheckNotifierTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/HealthCheckNotifierTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/KeepAliveTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/KeepAliveTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/KeepAliveTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/KeepAliveTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/LogScrubberTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/LogScrubberTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/LogScrubberTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/LogScrubberTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/ScheduledPublishingTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/ScheduledPublishingTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/ScheduledPublishingTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/ScheduledPublishingTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/ServerRegistration/InstructionProcessTaskTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/ServerRegistration/InstructionProcessTaskTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/ServerRegistration/InstructionProcessTaskTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/ServerRegistration/InstructionProcessTaskTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/ServerRegistration/TouchServerTaskTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/ServerRegistration/TouchServerTaskTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/ServerRegistration/TouchServerTaskTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/ServerRegistration/TouchServerTaskTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/TempFileCleanupTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/TempFileCleanupTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/TempFileCleanupTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/TempFileCleanupTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Logging/LogviewerTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Logging/LogviewerTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Logging/LogviewerTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Logging/LogviewerTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Mapping/MappingTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Mapping/MappingTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Mapping/MappingTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Mapping/MappingTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Media/ImageSharpImageUrlGeneratorTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Media/ImageSharpImageUrlGeneratorTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Media/ImageSharpImageUrlGeneratorTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Media/ImageSharpImageUrlGeneratorTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/AlterMigrationTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/AlterMigrationTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/AlterMigrationTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/AlterMigrationTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/MigrationPlanTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/MigrationPlanTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/MigrationPlanTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/MigrationPlanTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/MigrationTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/MigrationTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/MigrationTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/MigrationTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/PostMigrationTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/PostMigrationTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/PostMigrationTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/PostMigrationTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/AlterUserTableMigrationStub.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/AlterUserTableMigrationStub.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/AlterUserTableMigrationStub.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/AlterUserTableMigrationStub.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/DropForeignKeyMigrationStub.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/DropForeignKeyMigrationStub.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/DropForeignKeyMigrationStub.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/DropForeignKeyMigrationStub.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/Dummy.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/Dummy.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/Dummy.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/Dummy.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/FiveZeroMigration.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/FiveZeroMigration.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/FiveZeroMigration.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/FiveZeroMigration.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/FourElevenMigration.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/FourElevenMigration.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/FourElevenMigration.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/FourElevenMigration.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/SixZeroMigration1.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/SixZeroMigration1.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/SixZeroMigration1.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/SixZeroMigration1.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/SixZeroMigration2.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/SixZeroMigration2.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/SixZeroMigration2.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/SixZeroMigration2.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Upgrade/V_8_17_0/AddPropertyTypeGroupColumnsTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Upgrade/V_8_17_0/AddPropertyTypeGroupColumnsTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Upgrade/V_8_17_0/AddPropertyTypeGroupColumnsTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Upgrade/V_8_17_0/AddPropertyTypeGroupColumnsTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/DataTypeTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/DataTypeTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/DataTypeTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/DataTypeTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/PathValidationTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/PathValidationTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/PathValidationTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/PathValidationTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/BulkDataReaderTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/BulkDataReaderTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/BulkDataReaderTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/BulkDataReaderTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/DatabaseContextTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/DatabaseContextTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/DatabaseContextTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/DatabaseContextTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/ContentMapperTest.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/ContentMapperTest.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/ContentMapperTest.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/ContentMapperTest.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/ContentTypeMapperTest.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/ContentTypeMapperTest.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/ContentTypeMapperTest.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/ContentTypeMapperTest.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/DataTypeMapperTest.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/DataTypeMapperTest.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/DataTypeMapperTest.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/DataTypeMapperTest.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/DictionaryMapperTest.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/DictionaryMapperTest.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/DictionaryMapperTest.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/DictionaryMapperTest.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/DictionaryTranslationMapperTest.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/DictionaryTranslationMapperTest.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/DictionaryTranslationMapperTest.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/DictionaryTranslationMapperTest.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/LanguageMapperTest.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/LanguageMapperTest.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/LanguageMapperTest.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/LanguageMapperTest.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/MediaMapperTest.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/MediaMapperTest.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/MediaMapperTest.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/MediaMapperTest.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/PropertyGroupMapperTest.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/PropertyGroupMapperTest.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/PropertyGroupMapperTest.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/PropertyGroupMapperTest.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/PropertyTypeMapperTest.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/PropertyTypeMapperTest.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/PropertyTypeMapperTest.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/PropertyTypeMapperTest.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/RelationMapperTest.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/RelationMapperTest.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/RelationMapperTest.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/RelationMapperTest.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/RelationTypeMapperTest.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/RelationTypeMapperTest.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/RelationTypeMapperTest.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/RelationTypeMapperTest.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoSqlExtensionsTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoSqlExtensionsTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoSqlExtensionsTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoSqlExtensionsTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoSqlTemplateTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoSqlTemplateTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoSqlTemplateTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoSqlTemplateTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoSqlTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoSqlTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoSqlTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoSqlTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/ContentTypeRepositorySqlClausesTest.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/ContentTypeRepositorySqlClausesTest.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/ContentTypeRepositorySqlClausesTest.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/ContentTypeRepositorySqlClausesTest.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/DataTypeDefinitionRepositorySqlClausesTest.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/DataTypeDefinitionRepositorySqlClausesTest.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/DataTypeDefinitionRepositorySqlClausesTest.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/DataTypeDefinitionRepositorySqlClausesTest.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/ExpressionTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/ExpressionTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/ExpressionTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/ExpressionTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/MediaRepositorySqlClausesTest.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/MediaRepositorySqlClausesTest.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/MediaRepositorySqlClausesTest.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/MediaRepositorySqlClausesTest.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/MediaTypeRepositorySqlClausesTest.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/MediaTypeRepositorySqlClausesTest.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/MediaTypeRepositorySqlClausesTest.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/MediaTypeRepositorySqlClausesTest.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/QueryBuilderTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/QueryBuilderTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/QueryBuilderTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/QueryBuilderTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Scoping/ScopeUnitTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Scoping/ScopeUnitTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Scoping/ScopeUnitTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Scoping/ScopeUnitTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Security/MemberManagerTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Security/MemberManagerTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Security/MemberManagerTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Security/MemberManagerTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Security/MemberPasswordHasherTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Security/MemberPasswordHasherTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Security/MemberPasswordHasherTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Security/MemberPasswordHasherTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Security/MemberRoleStoreTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Security/MemberRoleStoreTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Security/MemberRoleStoreTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Security/MemberRoleStoreTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Security/MemberUserStoreTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Security/MemberUserStoreTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Security/MemberUserStoreTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Security/MemberUserStoreTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Security/NoOpLookupNormalizerTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Security/NoOpLookupNormalizerTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Security/NoOpLookupNormalizerTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Security/NoOpLookupNormalizerTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Serialization/JsonNetSerializerTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Serialization/JsonNetSerializerTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Serialization/JsonNetSerializerTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Serialization/JsonNetSerializerTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Services/AmbiguousEventTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Services/AmbiguousEventTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Services/AmbiguousEventTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Services/AmbiguousEventTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Services/LocalizedTextServiceTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Services/LocalizedTextServiceTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Services/LocalizedTextServiceTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Services/LocalizedTextServiceTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Services/PropertyValidationServiceTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Services/PropertyValidationServiceTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Services/PropertyValidationServiceTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Services/PropertyValidationServiceTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.ModelsBuilder.Embedded/BuilderTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.ModelsBuilder.Embedded/BuilderTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.ModelsBuilder.Embedded/BuilderTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.ModelsBuilder.Embedded/BuilderTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.ModelsBuilder.Embedded/StringExtensions.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.ModelsBuilder.Embedded/StringExtensions.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.ModelsBuilder.Embedded/StringExtensions.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.ModelsBuilder.Embedded/StringExtensions.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.ModelsBuilder.Embedded/UmbracoApplicationTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.ModelsBuilder.Embedded/UmbracoApplicationTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.ModelsBuilder.Embedded/UmbracoApplicationTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.ModelsBuilder.Embedded/UmbracoApplicationTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.PublishedCache.NuCache/SnapDictionaryTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.PublishedCache.NuCache/SnapDictionaryTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.PublishedCache.NuCache/SnapDictionaryTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.PublishedCache.NuCache/SnapDictionaryTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/AllowedContentTypeDetail.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/AllowedContentTypeDetail.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/AllowedContentTypeDetail.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/AllowedContentTypeDetail.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/ContentTypeBuilderTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/ContentTypeBuilderTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/ContentTypeBuilderTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/ContentTypeBuilderTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/DataTypeBuilderTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/DataTypeBuilderTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/DataTypeBuilderTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/DataTypeBuilderTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/DocumentEntitySlimBuilderTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/DocumentEntitySlimBuilderTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/DocumentEntitySlimBuilderTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/DocumentEntitySlimBuilderTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/LanguageBuilderTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/LanguageBuilderTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/LanguageBuilderTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/LanguageBuilderTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/MacroBuilderTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/MacroBuilderTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/MacroBuilderTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/MacroBuilderTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/MediaTypeBuilderTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/MediaTypeBuilderTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/MediaTypeBuilderTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/MediaTypeBuilderTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/MemberBuilderTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/MemberBuilderTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/MemberBuilderTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/MemberBuilderTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/MemberGroupBuilderTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/MemberGroupBuilderTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/MemberGroupBuilderTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/MemberGroupBuilderTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/MemberTypeBuilderTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/MemberTypeBuilderTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/MemberTypeBuilderTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/MemberTypeBuilderTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/PropertyBuilderTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/PropertyBuilderTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/PropertyBuilderTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/PropertyBuilderTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/PropertyGroupBuilderTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/PropertyGroupBuilderTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/PropertyGroupBuilderTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/PropertyGroupBuilderTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/PropertyTypeBuilderTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/PropertyTypeBuilderTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/PropertyTypeBuilderTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/PropertyTypeBuilderTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/PropertyTypeDetail.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/PropertyTypeDetail.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/PropertyTypeDetail.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/PropertyTypeDetail.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/RelationBuilderTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/RelationBuilderTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/RelationBuilderTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/RelationBuilderTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/RelationTypeBuilderTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/RelationTypeBuilderTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/RelationTypeBuilderTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/RelationTypeBuilderTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/StylesheetBuilderTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/StylesheetBuilderTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/StylesheetBuilderTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/StylesheetBuilderTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/TemplateBuilderTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/TemplateBuilderTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/TemplateBuilderTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/TemplateBuilderTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/TemplateDetail.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/TemplateDetail.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/TemplateDetail.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/TemplateDetail.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/UserBuilderTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/UserBuilderTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/UserBuilderTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/UserBuilderTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/UserGroupBuilderTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/UserGroupBuilderTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/UserGroupBuilderTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/UserGroupBuilderTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/XmlDocumentBuilderTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/XmlDocumentBuilderTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/XmlDocumentBuilderTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/XmlDocumentBuilderTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.UnitTests.csproj b/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.UnitTests.csproj similarity index 81% rename from src/Umbraco.Tests.UnitTests/Umbraco.Tests.UnitTests.csproj rename to tests/Umbraco.Tests.UnitTests/Umbraco.Tests.UnitTests.csproj index 5d5a3bbd1ec7..eee8083425b2 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.UnitTests.csproj +++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.UnitTests.csproj @@ -13,10 +13,10 @@ - + - - + + diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/AdminUsersHandlerTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/AdminUsersHandlerTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/AdminUsersHandlerTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/AdminUsersHandlerTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/BackOfficeHandlerTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/BackOfficeHandlerTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/BackOfficeHandlerTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/BackOfficeHandlerTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/ContentPermissionsPublishBranchHandlerTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/ContentPermissionsPublishBranchHandlerTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/ContentPermissionsPublishBranchHandlerTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/ContentPermissionsPublishBranchHandlerTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/ContentPermissionsQueryStringHandlerTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/ContentPermissionsQueryStringHandlerTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/ContentPermissionsQueryStringHandlerTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/ContentPermissionsQueryStringHandlerTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/ContentPermissionsResourceHandlerTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/ContentPermissionsResourceHandlerTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/ContentPermissionsResourceHandlerTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/ContentPermissionsResourceHandlerTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/DenyLocalLoginHandlerTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/DenyLocalLoginHandlerTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/DenyLocalLoginHandlerTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/DenyLocalLoginHandlerTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/MediaPermissionsQueryStringHandlerTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/MediaPermissionsQueryStringHandlerTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/MediaPermissionsQueryStringHandlerTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/MediaPermissionsQueryStringHandlerTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/MediaPermissionsResourceHandlerTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/MediaPermissionsResourceHandlerTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/MediaPermissionsResourceHandlerTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/MediaPermissionsResourceHandlerTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/SectionHandlerTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/SectionHandlerTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/SectionHandlerTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/SectionHandlerTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/TreeHandlerTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/TreeHandlerTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/TreeHandlerTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/TreeHandlerTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/UserGroupHandlerTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/UserGroupHandlerTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/UserGroupHandlerTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/UserGroupHandlerTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Controllers/ContentControllerTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Controllers/ContentControllerTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Controllers/ContentControllerTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Controllers/ContentControllerTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Controllers/MemberControllerUnitTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Controllers/MemberControllerUnitTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Controllers/MemberControllerUnitTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Controllers/MemberControllerUnitTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Controllers/UsersControllerTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Controllers/UsersControllerTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Controllers/UsersControllerTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Controllers/UsersControllerTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Extensions/ModelStateExtensionsTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Extensions/ModelStateExtensionsTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Extensions/ModelStateExtensionsTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Extensions/ModelStateExtensionsTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/AppendUserModifiedHeaderAttributeTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/AppendUserModifiedHeaderAttributeTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/AppendUserModifiedHeaderAttributeTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/AppendUserModifiedHeaderAttributeTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/ContentModelValidatorTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/ContentModelValidatorTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/ContentModelValidatorTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/ContentModelValidatorTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/FilterAllowedOutgoingContentAttributeTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/FilterAllowedOutgoingContentAttributeTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/FilterAllowedOutgoingContentAttributeTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/FilterAllowedOutgoingContentAttributeTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/ValidationFilterAttributeTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/ValidationFilterAttributeTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/ValidationFilterAttributeTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/ValidationFilterAttributeTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Security/BackOfficeCookieManagerTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Security/BackOfficeCookieManagerTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Security/BackOfficeCookieManagerTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Security/BackOfficeCookieManagerTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/AngularIntegration/ContentModelSerializationTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/AngularIntegration/ContentModelSerializationTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/AngularIntegration/ContentModelSerializationTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/AngularIntegration/ContentModelSerializationTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/AngularIntegration/JsInitializationTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/AngularIntegration/JsInitializationTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/AngularIntegration/JsInitializationTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/AngularIntegration/JsInitializationTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/AngularIntegration/ServerVariablesParserTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/AngularIntegration/ServerVariablesParserTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/AngularIntegration/ServerVariablesParserTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/AngularIntegration/ServerVariablesParserTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Extensions/HtmlHelperExtensionMethodsTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Extensions/HtmlHelperExtensionMethodsTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Extensions/HtmlHelperExtensionMethodsTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Extensions/HtmlHelperExtensionMethodsTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Extensions/HttpContextExtensionTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Extensions/HttpContextExtensionTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Extensions/HttpContextExtensionTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Extensions/HttpContextExtensionTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Extensions/ImageCropperTemplateCoreExtensionsTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Extensions/ImageCropperTemplateCoreExtensionsTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Extensions/ImageCropperTemplateCoreExtensionsTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Extensions/ImageCropperTemplateCoreExtensionsTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/FileNameTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/FileNameTests.cs similarity index 95% rename from src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/FileNameTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/FileNameTests.cs index 58cce954868f..2bf1dcb5c764 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/FileNameTests.cs +++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/FileNameTests.cs @@ -32,8 +32,8 @@ private string GetViewName(ViewResult viewResult, string separator = "/") private IEnumerable GetUiFiles(IEnumerable pathFromNetCore) { - var sourceRoot = TestContext.CurrentContext.TestDirectory.Split("Umbraco.Tests.UnitTests")[0]; - var pathToFiles = Path.Combine(sourceRoot, "Umbraco.Web.UI"); + var root = TestContext.CurrentContext.TestDirectory.Split("tests")[0]; + var pathToFiles = Path.Combine(root, "src", "Umbraco.Web.UI"); foreach (var pathSection in pathFromNetCore) { pathToFiles = Path.Combine(pathToFiles, pathSection); diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Filters/ValidateUmbracoFormRouteStringFilterTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Filters/ValidateUmbracoFormRouteStringFilterTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Filters/ValidateUmbracoFormRouteStringFilterTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Filters/ValidateUmbracoFormRouteStringFilterTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Formatters/IgnoreRequiredAttributesResolverUnitTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Formatters/IgnoreRequiredAttributesResolverUnitTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Formatters/IgnoreRequiredAttributesResolverUnitTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Formatters/IgnoreRequiredAttributesResolverUnitTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/ImageCropperTest.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/ImageCropperTest.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/ImageCropperTest.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/ImageCropperTest.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/ImageProcessors/CropWebProcessorTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/ImageProcessors/CropWebProcessorTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/ImageProcessors/CropWebProcessorTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/ImageProcessors/CropWebProcessorTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Macros/MacroParserTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Macros/MacroParserTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Macros/MacroParserTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Macros/MacroParserTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Macros/MacroTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Macros/MacroTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Macros/MacroTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Macros/MacroTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/ModelBinders/ContentModelBinderTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/ModelBinders/ContentModelBinderTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/ModelBinders/ContentModelBinderTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/ModelBinders/ContentModelBinderTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/ModelBinders/HttpQueryStringModelBinderTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/ModelBinders/HttpQueryStringModelBinderTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/ModelBinders/HttpQueryStringModelBinderTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/ModelBinders/HttpQueryStringModelBinderTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Mvc/HtmlStringUtilitiesTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Mvc/HtmlStringUtilitiesTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Mvc/HtmlStringUtilitiesTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Mvc/HtmlStringUtilitiesTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/BackOfficeAreaRoutesTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/BackOfficeAreaRoutesTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/BackOfficeAreaRoutesTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/BackOfficeAreaRoutesTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/EndpointRouteBuilderExtensionsTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/EndpointRouteBuilderExtensionsTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/EndpointRouteBuilderExtensionsTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/EndpointRouteBuilderExtensionsTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/InstallAreaRoutesTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/InstallAreaRoutesTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/InstallAreaRoutesTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/InstallAreaRoutesTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/PreviewRoutesTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/PreviewRoutesTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/PreviewRoutesTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/PreviewRoutesTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/RoutableDocumentFilterTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/RoutableDocumentFilterTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/RoutableDocumentFilterTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/RoutableDocumentFilterTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/TestRouteBuilder.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/TestRouteBuilder.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/TestRouteBuilder.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/TestRouteBuilder.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Security/EncryptionHelperTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Security/EncryptionHelperTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Security/EncryptionHelperTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Security/EncryptionHelperTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Security/MemberSignInManagerTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Security/MemberSignInManagerTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Security/MemberSignInManagerTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Security/MemberSignInManagerTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Security/PublicAccessCheckerTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Security/PublicAccessCheckerTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Security/PublicAccessCheckerTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Security/PublicAccessCheckerTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Views/UmbracoViewPageTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Views/UmbracoViewPageTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Views/UmbracoViewPageTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Views/UmbracoViewPageTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/AspNetCoreHostingEnvironmentTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Website/AspNetCoreHostingEnvironmentTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/AspNetCoreHostingEnvironmentTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Web.Website/AspNetCoreHostingEnvironmentTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Controllers/RenderNoContentControllerTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Controllers/RenderNoContentControllerTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Controllers/RenderNoContentControllerTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Controllers/RenderNoContentControllerTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Controllers/SurfaceControllerTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Controllers/SurfaceControllerTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Controllers/SurfaceControllerTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Controllers/SurfaceControllerTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Routing/ControllerActionSearcherTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Routing/ControllerActionSearcherTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Routing/ControllerActionSearcherTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Routing/ControllerActionSearcherTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Routing/UmbracoRouteValueTransformerTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Routing/UmbracoRouteValueTransformerTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Routing/UmbracoRouteValueTransformerTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Routing/UmbracoRouteValueTransformerTests.cs diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Routing/UmbracoRouteValuesFactoryTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Routing/UmbracoRouteValuesFactoryTests.cs similarity index 100% rename from src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Routing/UmbracoRouteValuesFactoryTests.cs rename to tests/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Routing/UmbracoRouteValuesFactoryTests.cs diff --git a/src/Umbraco.Tests/App.config b/tests/Umbraco.Tests/App.config similarity index 100% rename from src/Umbraco.Tests/App.config rename to tests/Umbraco.Tests/App.config diff --git a/src/Umbraco.Tests/Cache/PublishedCache/PublishedContentCacheTests.cs b/tests/Umbraco.Tests/Cache/PublishedCache/PublishedContentCacheTests.cs similarity index 100% rename from src/Umbraco.Tests/Cache/PublishedCache/PublishedContentCacheTests.cs rename to tests/Umbraco.Tests/Cache/PublishedCache/PublishedContentCacheTests.cs diff --git a/src/Umbraco.Tests/Cache/PublishedCache/PublishedMediaCacheTests.cs b/tests/Umbraco.Tests/Cache/PublishedCache/PublishedMediaCacheTests.cs similarity index 100% rename from src/Umbraco.Tests/Cache/PublishedCache/PublishedMediaCacheTests.cs rename to tests/Umbraco.Tests/Cache/PublishedCache/PublishedMediaCacheTests.cs diff --git a/src/Umbraco.Tests/Collections/StackQueueTests.cs b/tests/Umbraco.Tests/Collections/StackQueueTests.cs similarity index 100% rename from src/Umbraco.Tests/Collections/StackQueueTests.cs rename to tests/Umbraco.Tests/Collections/StackQueueTests.cs diff --git a/src/Umbraco.Tests/Issues/U9560.cs b/tests/Umbraco.Tests/Issues/U9560.cs similarity index 100% rename from src/Umbraco.Tests/Issues/U9560.cs rename to tests/Umbraco.Tests/Issues/U9560.cs diff --git a/src/Umbraco.Tests/LegacyXmlPublishedCache/ContentXmlDto.cs b/tests/Umbraco.Tests/LegacyXmlPublishedCache/ContentXmlDto.cs similarity index 100% rename from src/Umbraco.Tests/LegacyXmlPublishedCache/ContentXmlDto.cs rename to tests/Umbraco.Tests/LegacyXmlPublishedCache/ContentXmlDto.cs diff --git a/src/Umbraco.Tests/LegacyXmlPublishedCache/DictionaryPublishedContent.cs b/tests/Umbraco.Tests/LegacyXmlPublishedCache/DictionaryPublishedContent.cs similarity index 100% rename from src/Umbraco.Tests/LegacyXmlPublishedCache/DictionaryPublishedContent.cs rename to tests/Umbraco.Tests/LegacyXmlPublishedCache/DictionaryPublishedContent.cs diff --git a/src/Umbraco.Tests/LegacyXmlPublishedCache/DomainCache.cs b/tests/Umbraco.Tests/LegacyXmlPublishedCache/DomainCache.cs similarity index 100% rename from src/Umbraco.Tests/LegacyXmlPublishedCache/DomainCache.cs rename to tests/Umbraco.Tests/LegacyXmlPublishedCache/DomainCache.cs diff --git a/src/Umbraco.Tests/LegacyXmlPublishedCache/LegacyBackgroundTask/BackgroundTaskRunner.cs b/tests/Umbraco.Tests/LegacyXmlPublishedCache/LegacyBackgroundTask/BackgroundTaskRunner.cs similarity index 100% rename from src/Umbraco.Tests/LegacyXmlPublishedCache/LegacyBackgroundTask/BackgroundTaskRunner.cs rename to tests/Umbraco.Tests/LegacyXmlPublishedCache/LegacyBackgroundTask/BackgroundTaskRunner.cs diff --git a/src/Umbraco.Tests/LegacyXmlPublishedCache/LegacyBackgroundTask/BackgroundTaskRunnerOptions.cs b/tests/Umbraco.Tests/LegacyXmlPublishedCache/LegacyBackgroundTask/BackgroundTaskRunnerOptions.cs similarity index 100% rename from src/Umbraco.Tests/LegacyXmlPublishedCache/LegacyBackgroundTask/BackgroundTaskRunnerOptions.cs rename to tests/Umbraco.Tests/LegacyXmlPublishedCache/LegacyBackgroundTask/BackgroundTaskRunnerOptions.cs diff --git a/src/Umbraco.Tests/LegacyXmlPublishedCache/LegacyBackgroundTask/IBackgroundTask.cs b/tests/Umbraco.Tests/LegacyXmlPublishedCache/LegacyBackgroundTask/IBackgroundTask.cs similarity index 100% rename from src/Umbraco.Tests/LegacyXmlPublishedCache/LegacyBackgroundTask/IBackgroundTask.cs rename to tests/Umbraco.Tests/LegacyXmlPublishedCache/LegacyBackgroundTask/IBackgroundTask.cs diff --git a/src/Umbraco.Tests/LegacyXmlPublishedCache/LegacyBackgroundTask/IBackgroundTaskRunner.cs b/tests/Umbraco.Tests/LegacyXmlPublishedCache/LegacyBackgroundTask/IBackgroundTaskRunner.cs similarity index 100% rename from src/Umbraco.Tests/LegacyXmlPublishedCache/LegacyBackgroundTask/IBackgroundTaskRunner.cs rename to tests/Umbraco.Tests/LegacyXmlPublishedCache/LegacyBackgroundTask/IBackgroundTaskRunner.cs diff --git a/src/Umbraco.Tests/LegacyXmlPublishedCache/LegacyBackgroundTask/ILatchedBackgroundTask.cs b/tests/Umbraco.Tests/LegacyXmlPublishedCache/LegacyBackgroundTask/ILatchedBackgroundTask.cs similarity index 100% rename from src/Umbraco.Tests/LegacyXmlPublishedCache/LegacyBackgroundTask/ILatchedBackgroundTask.cs rename to tests/Umbraco.Tests/LegacyXmlPublishedCache/LegacyBackgroundTask/ILatchedBackgroundTask.cs diff --git a/src/Umbraco.Tests/LegacyXmlPublishedCache/LegacyBackgroundTask/LatchedBackgroundTaskBase.cs b/tests/Umbraco.Tests/LegacyXmlPublishedCache/LegacyBackgroundTask/LatchedBackgroundTaskBase.cs similarity index 100% rename from src/Umbraco.Tests/LegacyXmlPublishedCache/LegacyBackgroundTask/LatchedBackgroundTaskBase.cs rename to tests/Umbraco.Tests/LegacyXmlPublishedCache/LegacyBackgroundTask/LatchedBackgroundTaskBase.cs diff --git a/src/Umbraco.Tests/LegacyXmlPublishedCache/LegacyBackgroundTask/TaskEventArgs.cs b/tests/Umbraco.Tests/LegacyXmlPublishedCache/LegacyBackgroundTask/TaskEventArgs.cs similarity index 100% rename from src/Umbraco.Tests/LegacyXmlPublishedCache/LegacyBackgroundTask/TaskEventArgs.cs rename to tests/Umbraco.Tests/LegacyXmlPublishedCache/LegacyBackgroundTask/TaskEventArgs.cs diff --git a/src/Umbraco.Tests/LegacyXmlPublishedCache/LegacyBackgroundTask/ThreadingTaskImmutable.cs b/tests/Umbraco.Tests/LegacyXmlPublishedCache/LegacyBackgroundTask/ThreadingTaskImmutable.cs similarity index 100% rename from src/Umbraco.Tests/LegacyXmlPublishedCache/LegacyBackgroundTask/ThreadingTaskImmutable.cs rename to tests/Umbraco.Tests/LegacyXmlPublishedCache/LegacyBackgroundTask/ThreadingTaskImmutable.cs diff --git a/src/Umbraco.Tests/LegacyXmlPublishedCache/PreviewContent.cs b/tests/Umbraco.Tests/LegacyXmlPublishedCache/PreviewContent.cs similarity index 100% rename from src/Umbraco.Tests/LegacyXmlPublishedCache/PreviewContent.cs rename to tests/Umbraco.Tests/LegacyXmlPublishedCache/PreviewContent.cs diff --git a/src/Umbraco.Tests/LegacyXmlPublishedCache/PreviewXmlDto.cs b/tests/Umbraco.Tests/LegacyXmlPublishedCache/PreviewXmlDto.cs similarity index 100% rename from src/Umbraco.Tests/LegacyXmlPublishedCache/PreviewXmlDto.cs rename to tests/Umbraco.Tests/LegacyXmlPublishedCache/PreviewXmlDto.cs diff --git a/src/Umbraco.Tests/LegacyXmlPublishedCache/PublishedContentCache.cs b/tests/Umbraco.Tests/LegacyXmlPublishedCache/PublishedContentCache.cs similarity index 100% rename from src/Umbraco.Tests/LegacyXmlPublishedCache/PublishedContentCache.cs rename to tests/Umbraco.Tests/LegacyXmlPublishedCache/PublishedContentCache.cs diff --git a/src/Umbraco.Tests/LegacyXmlPublishedCache/PublishedMediaCache.cs b/tests/Umbraco.Tests/LegacyXmlPublishedCache/PublishedMediaCache.cs similarity index 100% rename from src/Umbraco.Tests/LegacyXmlPublishedCache/PublishedMediaCache.cs rename to tests/Umbraco.Tests/LegacyXmlPublishedCache/PublishedMediaCache.cs diff --git a/src/Umbraco.Tests/LegacyXmlPublishedCache/PublishedMember.cs b/tests/Umbraco.Tests/LegacyXmlPublishedCache/PublishedMember.cs similarity index 100% rename from src/Umbraco.Tests/LegacyXmlPublishedCache/PublishedMember.cs rename to tests/Umbraco.Tests/LegacyXmlPublishedCache/PublishedMember.cs diff --git a/src/Umbraco.Tests/LegacyXmlPublishedCache/PublishedMemberCache.cs b/tests/Umbraco.Tests/LegacyXmlPublishedCache/PublishedMemberCache.cs similarity index 100% rename from src/Umbraco.Tests/LegacyXmlPublishedCache/PublishedMemberCache.cs rename to tests/Umbraco.Tests/LegacyXmlPublishedCache/PublishedMemberCache.cs diff --git a/src/Umbraco.Tests/LegacyXmlPublishedCache/PublishedSnapshot.cs b/tests/Umbraco.Tests/LegacyXmlPublishedCache/PublishedSnapshot.cs similarity index 100% rename from src/Umbraco.Tests/LegacyXmlPublishedCache/PublishedSnapshot.cs rename to tests/Umbraco.Tests/LegacyXmlPublishedCache/PublishedSnapshot.cs diff --git a/src/Umbraco.Tests/LegacyXmlPublishedCache/RoutesCache.cs b/tests/Umbraco.Tests/LegacyXmlPublishedCache/RoutesCache.cs similarity index 100% rename from src/Umbraco.Tests/LegacyXmlPublishedCache/RoutesCache.cs rename to tests/Umbraco.Tests/LegacyXmlPublishedCache/RoutesCache.cs diff --git a/src/Umbraco.Tests/LegacyXmlPublishedCache/SafeXmlReaderWriter.cs b/tests/Umbraco.Tests/LegacyXmlPublishedCache/SafeXmlReaderWriter.cs similarity index 100% rename from src/Umbraco.Tests/LegacyXmlPublishedCache/SafeXmlReaderWriter.cs rename to tests/Umbraco.Tests/LegacyXmlPublishedCache/SafeXmlReaderWriter.cs diff --git a/src/Umbraco.Tests/LegacyXmlPublishedCache/UmbracoContextCache.cs b/tests/Umbraco.Tests/LegacyXmlPublishedCache/UmbracoContextCache.cs similarity index 100% rename from src/Umbraco.Tests/LegacyXmlPublishedCache/UmbracoContextCache.cs rename to tests/Umbraco.Tests/LegacyXmlPublishedCache/UmbracoContextCache.cs diff --git a/src/Umbraco.Tests/LegacyXmlPublishedCache/XmlPublishedContent.cs b/tests/Umbraco.Tests/LegacyXmlPublishedCache/XmlPublishedContent.cs similarity index 100% rename from src/Umbraco.Tests/LegacyXmlPublishedCache/XmlPublishedContent.cs rename to tests/Umbraco.Tests/LegacyXmlPublishedCache/XmlPublishedContent.cs diff --git a/src/Umbraco.Tests/LegacyXmlPublishedCache/XmlPublishedProperty.cs b/tests/Umbraco.Tests/LegacyXmlPublishedCache/XmlPublishedProperty.cs similarity index 100% rename from src/Umbraco.Tests/LegacyXmlPublishedCache/XmlPublishedProperty.cs rename to tests/Umbraco.Tests/LegacyXmlPublishedCache/XmlPublishedProperty.cs diff --git a/src/Umbraco.Tests/LegacyXmlPublishedCache/XmlPublishedSnapshotService.cs b/tests/Umbraco.Tests/LegacyXmlPublishedCache/XmlPublishedSnapshotService.cs similarity index 100% rename from src/Umbraco.Tests/LegacyXmlPublishedCache/XmlPublishedSnapshotService.cs rename to tests/Umbraco.Tests/LegacyXmlPublishedCache/XmlPublishedSnapshotService.cs diff --git a/src/Umbraco.Tests/LegacyXmlPublishedCache/XmlStore.cs b/tests/Umbraco.Tests/LegacyXmlPublishedCache/XmlStore.cs similarity index 100% rename from src/Umbraco.Tests/LegacyXmlPublishedCache/XmlStore.cs rename to tests/Umbraco.Tests/LegacyXmlPublishedCache/XmlStore.cs diff --git a/src/Umbraco.Tests/LegacyXmlPublishedCache/XmlStoreFilePersister.cs b/tests/Umbraco.Tests/LegacyXmlPublishedCache/XmlStoreFilePersister.cs similarity index 100% rename from src/Umbraco.Tests/LegacyXmlPublishedCache/XmlStoreFilePersister.cs rename to tests/Umbraco.Tests/LegacyXmlPublishedCache/XmlStoreFilePersister.cs diff --git a/src/Umbraco.Tests/Models/ContentXmlTest.cs b/tests/Umbraco.Tests/Models/ContentXmlTest.cs similarity index 100% rename from src/Umbraco.Tests/Models/ContentXmlTest.cs rename to tests/Umbraco.Tests/Models/ContentXmlTest.cs diff --git a/src/Umbraco.Tests/Models/MediaXmlTest.cs b/tests/Umbraco.Tests/Models/MediaXmlTest.cs similarity index 100% rename from src/Umbraco.Tests/Models/MediaXmlTest.cs rename to tests/Umbraco.Tests/Models/MediaXmlTest.cs diff --git a/src/Umbraco.Tests/Persistence/FaultHandling/ConnectionRetryTest.cs b/tests/Umbraco.Tests/Persistence/FaultHandling/ConnectionRetryTest.cs similarity index 100% rename from src/Umbraco.Tests/Persistence/FaultHandling/ConnectionRetryTest.cs rename to tests/Umbraco.Tests/Persistence/FaultHandling/ConnectionRetryTest.cs diff --git a/src/Umbraco.Tests/Persistence/Mappers/MapperTestBase.cs b/tests/Umbraco.Tests/Persistence/Mappers/MapperTestBase.cs similarity index 100% rename from src/Umbraco.Tests/Persistence/Mappers/MapperTestBase.cs rename to tests/Umbraco.Tests/Persistence/Mappers/MapperTestBase.cs diff --git a/src/Umbraco.Tests/Persistence/NPocoTests/PetaPocoCachesTest.cs b/tests/Umbraco.Tests/Persistence/NPocoTests/PetaPocoCachesTest.cs similarity index 100% rename from src/Umbraco.Tests/Persistence/NPocoTests/PetaPocoCachesTest.cs rename to tests/Umbraco.Tests/Persistence/NPocoTests/PetaPocoCachesTest.cs diff --git a/src/Umbraco.Tests/Persistence/Querying/ContentTypeSqlMappingTests.cs b/tests/Umbraco.Tests/Persistence/Querying/ContentTypeSqlMappingTests.cs similarity index 100% rename from src/Umbraco.Tests/Persistence/Querying/ContentTypeSqlMappingTests.cs rename to tests/Umbraco.Tests/Persistence/Querying/ContentTypeSqlMappingTests.cs diff --git a/src/Umbraco.Tests/Plugins/PluginManagerTests.cs b/tests/Umbraco.Tests/Plugins/PluginManagerTests.cs similarity index 100% rename from src/Umbraco.Tests/Plugins/PluginManagerTests.cs rename to tests/Umbraco.Tests/Plugins/PluginManagerTests.cs diff --git a/src/Umbraco.Tests/Properties/AssemblyInfo.cs b/tests/Umbraco.Tests/Properties/AssemblyInfo.cs similarity index 100% rename from src/Umbraco.Tests/Properties/AssemblyInfo.cs rename to tests/Umbraco.Tests/Properties/AssemblyInfo.cs diff --git a/src/Umbraco.Tests/Published/ModelTypeTests.cs b/tests/Umbraco.Tests/Published/ModelTypeTests.cs similarity index 100% rename from src/Umbraco.Tests/Published/ModelTypeTests.cs rename to tests/Umbraco.Tests/Published/ModelTypeTests.cs diff --git a/src/Umbraco.Tests/PublishedContent/ContentSerializationTests.cs b/tests/Umbraco.Tests/PublishedContent/ContentSerializationTests.cs similarity index 100% rename from src/Umbraco.Tests/PublishedContent/ContentSerializationTests.cs rename to tests/Umbraco.Tests/PublishedContent/ContentSerializationTests.cs diff --git a/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs b/tests/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs similarity index 100% rename from src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs rename to tests/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs diff --git a/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs b/tests/Umbraco.Tests/PublishedContent/NuCacheTests.cs similarity index 100% rename from src/Umbraco.Tests/PublishedContent/NuCacheTests.cs rename to tests/Umbraco.Tests/PublishedContent/NuCacheTests.cs diff --git a/src/Umbraco.Tests/PublishedContent/PublishedContentDataTableTests.cs b/tests/Umbraco.Tests/PublishedContent/PublishedContentDataTableTests.cs similarity index 100% rename from src/Umbraco.Tests/PublishedContent/PublishedContentDataTableTests.cs rename to tests/Umbraco.Tests/PublishedContent/PublishedContentDataTableTests.cs diff --git a/src/Umbraco.Tests/PublishedContent/PublishedContentExtensionTests.cs b/tests/Umbraco.Tests/PublishedContent/PublishedContentExtensionTests.cs similarity index 100% rename from src/Umbraco.Tests/PublishedContent/PublishedContentExtensionTests.cs rename to tests/Umbraco.Tests/PublishedContent/PublishedContentExtensionTests.cs diff --git a/src/Umbraco.Tests/PublishedContent/PublishedContentLanguageVariantTests.cs b/tests/Umbraco.Tests/PublishedContent/PublishedContentLanguageVariantTests.cs similarity index 100% rename from src/Umbraco.Tests/PublishedContent/PublishedContentLanguageVariantTests.cs rename to tests/Umbraco.Tests/PublishedContent/PublishedContentLanguageVariantTests.cs diff --git a/src/Umbraco.Tests/PublishedContent/PublishedContentMoreTests.cs b/tests/Umbraco.Tests/PublishedContent/PublishedContentMoreTests.cs similarity index 100% rename from src/Umbraco.Tests/PublishedContent/PublishedContentMoreTests.cs rename to tests/Umbraco.Tests/PublishedContent/PublishedContentMoreTests.cs diff --git a/src/Umbraco.Tests/PublishedContent/PublishedContentSnapshotTestBase.cs b/tests/Umbraco.Tests/PublishedContent/PublishedContentSnapshotTestBase.cs similarity index 100% rename from src/Umbraco.Tests/PublishedContent/PublishedContentSnapshotTestBase.cs rename to tests/Umbraco.Tests/PublishedContent/PublishedContentSnapshotTestBase.cs diff --git a/src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs b/tests/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs similarity index 100% rename from src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs rename to tests/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs diff --git a/src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs b/tests/Umbraco.Tests/PublishedContent/PublishedContentTests.cs similarity index 100% rename from src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs rename to tests/Umbraco.Tests/PublishedContent/PublishedContentTests.cs diff --git a/src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs b/tests/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs similarity index 100% rename from src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs rename to tests/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs diff --git a/src/Umbraco.Tests/PublishedContent/PublishedRouterTests.cs b/tests/Umbraco.Tests/PublishedContent/PublishedRouterTests.cs similarity index 100% rename from src/Umbraco.Tests/PublishedContent/PublishedRouterTests.cs rename to tests/Umbraco.Tests/PublishedContent/PublishedRouterTests.cs diff --git a/src/Umbraco.Tests/PublishedContent/RootNodeTests.cs b/tests/Umbraco.Tests/PublishedContent/RootNodeTests.cs similarity index 100% rename from src/Umbraco.Tests/PublishedContent/RootNodeTests.cs rename to tests/Umbraco.Tests/PublishedContent/RootNodeTests.cs diff --git a/src/Umbraco.Tests/PublishedContent/SolidPublishedSnapshot.cs b/tests/Umbraco.Tests/PublishedContent/SolidPublishedSnapshot.cs similarity index 100% rename from src/Umbraco.Tests/PublishedContent/SolidPublishedSnapshot.cs rename to tests/Umbraco.Tests/PublishedContent/SolidPublishedSnapshot.cs diff --git a/src/Umbraco.Tests/PublishedContent/StronglyTypedModels/Home.cs b/tests/Umbraco.Tests/PublishedContent/StronglyTypedModels/Home.cs similarity index 100% rename from src/Umbraco.Tests/PublishedContent/StronglyTypedModels/Home.cs rename to tests/Umbraco.Tests/PublishedContent/StronglyTypedModels/Home.cs diff --git a/src/Umbraco.Tests/Routing/BaseUrlProviderTest.cs b/tests/Umbraco.Tests/Routing/BaseUrlProviderTest.cs similarity index 100% rename from src/Umbraco.Tests/Routing/BaseUrlProviderTest.cs rename to tests/Umbraco.Tests/Routing/BaseUrlProviderTest.cs diff --git a/src/Umbraco.Tests/Routing/ContentFinderByAliasTests.cs b/tests/Umbraco.Tests/Routing/ContentFinderByAliasTests.cs similarity index 100% rename from src/Umbraco.Tests/Routing/ContentFinderByAliasTests.cs rename to tests/Umbraco.Tests/Routing/ContentFinderByAliasTests.cs diff --git a/src/Umbraco.Tests/Routing/ContentFinderByAliasWithDomainsTests.cs b/tests/Umbraco.Tests/Routing/ContentFinderByAliasWithDomainsTests.cs similarity index 100% rename from src/Umbraco.Tests/Routing/ContentFinderByAliasWithDomainsTests.cs rename to tests/Umbraco.Tests/Routing/ContentFinderByAliasWithDomainsTests.cs diff --git a/src/Umbraco.Tests/Routing/ContentFinderByIdTests.cs b/tests/Umbraco.Tests/Routing/ContentFinderByIdTests.cs similarity index 100% rename from src/Umbraco.Tests/Routing/ContentFinderByIdTests.cs rename to tests/Umbraco.Tests/Routing/ContentFinderByIdTests.cs diff --git a/src/Umbraco.Tests/Routing/ContentFinderByPageIdQueryTests.cs b/tests/Umbraco.Tests/Routing/ContentFinderByPageIdQueryTests.cs similarity index 100% rename from src/Umbraco.Tests/Routing/ContentFinderByPageIdQueryTests.cs rename to tests/Umbraco.Tests/Routing/ContentFinderByPageIdQueryTests.cs diff --git a/src/Umbraco.Tests/Routing/ContentFinderByUrlAndTemplateTests.cs b/tests/Umbraco.Tests/Routing/ContentFinderByUrlAndTemplateTests.cs similarity index 100% rename from src/Umbraco.Tests/Routing/ContentFinderByUrlAndTemplateTests.cs rename to tests/Umbraco.Tests/Routing/ContentFinderByUrlAndTemplateTests.cs diff --git a/src/Umbraco.Tests/Routing/ContentFinderByUrlTests.cs b/tests/Umbraco.Tests/Routing/ContentFinderByUrlTests.cs similarity index 100% rename from src/Umbraco.Tests/Routing/ContentFinderByUrlTests.cs rename to tests/Umbraco.Tests/Routing/ContentFinderByUrlTests.cs diff --git a/src/Umbraco.Tests/Routing/ContentFinderByUrlWithDomainsTests.cs b/tests/Umbraco.Tests/Routing/ContentFinderByUrlWithDomainsTests.cs similarity index 100% rename from src/Umbraco.Tests/Routing/ContentFinderByUrlWithDomainsTests.cs rename to tests/Umbraco.Tests/Routing/ContentFinderByUrlWithDomainsTests.cs diff --git a/src/Umbraco.Tests/Routing/DomainsAndCulturesTests.cs b/tests/Umbraco.Tests/Routing/DomainsAndCulturesTests.cs similarity index 100% rename from src/Umbraco.Tests/Routing/DomainsAndCulturesTests.cs rename to tests/Umbraco.Tests/Routing/DomainsAndCulturesTests.cs diff --git a/src/Umbraco.Tests/Routing/GetContentUrlsTests.cs b/tests/Umbraco.Tests/Routing/GetContentUrlsTests.cs similarity index 100% rename from src/Umbraco.Tests/Routing/GetContentUrlsTests.cs rename to tests/Umbraco.Tests/Routing/GetContentUrlsTests.cs diff --git a/src/Umbraco.Tests/Routing/MediaUrlProviderTests.cs b/tests/Umbraco.Tests/Routing/MediaUrlProviderTests.cs similarity index 100% rename from src/Umbraco.Tests/Routing/MediaUrlProviderTests.cs rename to tests/Umbraco.Tests/Routing/MediaUrlProviderTests.cs diff --git a/src/Umbraco.Tests/Routing/RouteTestExtensions.cs b/tests/Umbraco.Tests/Routing/RouteTestExtensions.cs similarity index 100% rename from src/Umbraco.Tests/Routing/RouteTestExtensions.cs rename to tests/Umbraco.Tests/Routing/RouteTestExtensions.cs diff --git a/src/Umbraco.Tests/Routing/RoutesCacheTests.cs b/tests/Umbraco.Tests/Routing/RoutesCacheTests.cs similarity index 100% rename from src/Umbraco.Tests/Routing/RoutesCacheTests.cs rename to tests/Umbraco.Tests/Routing/RoutesCacheTests.cs diff --git a/src/Umbraco.Tests/Routing/UrlProviderWithHideTopLevelNodeFromPathTests.cs b/tests/Umbraco.Tests/Routing/UrlProviderWithHideTopLevelNodeFromPathTests.cs similarity index 100% rename from src/Umbraco.Tests/Routing/UrlProviderWithHideTopLevelNodeFromPathTests.cs rename to tests/Umbraco.Tests/Routing/UrlProviderWithHideTopLevelNodeFromPathTests.cs diff --git a/src/Umbraco.Tests/Routing/UrlProviderWithoutHideTopLevelNodeFromPathTests.cs b/tests/Umbraco.Tests/Routing/UrlProviderWithoutHideTopLevelNodeFromPathTests.cs similarity index 100% rename from src/Umbraco.Tests/Routing/UrlProviderWithoutHideTopLevelNodeFromPathTests.cs rename to tests/Umbraco.Tests/Routing/UrlProviderWithoutHideTopLevelNodeFromPathTests.cs diff --git a/src/Umbraco.Tests/Routing/UrlRoutesTests.cs b/tests/Umbraco.Tests/Routing/UrlRoutesTests.cs similarity index 100% rename from src/Umbraco.Tests/Routing/UrlRoutesTests.cs rename to tests/Umbraco.Tests/Routing/UrlRoutesTests.cs diff --git a/src/Umbraco.Tests/Routing/UrlRoutingTestBase.cs b/tests/Umbraco.Tests/Routing/UrlRoutingTestBase.cs similarity index 100% rename from src/Umbraco.Tests/Routing/UrlRoutingTestBase.cs rename to tests/Umbraco.Tests/Routing/UrlRoutingTestBase.cs diff --git a/src/Umbraco.Tests/Routing/UrlsProviderWithDomainsTests.cs b/tests/Umbraco.Tests/Routing/UrlsProviderWithDomainsTests.cs similarity index 100% rename from src/Umbraco.Tests/Routing/UrlsProviderWithDomainsTests.cs rename to tests/Umbraco.Tests/Routing/UrlsProviderWithDomainsTests.cs diff --git a/src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs b/tests/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs similarity index 100% rename from src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs rename to tests/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs diff --git a/src/Umbraco.Tests/Scoping/PassThroughEventDispatcherTests.cs b/tests/Umbraco.Tests/Scoping/PassThroughEventDispatcherTests.cs similarity index 100% rename from src/Umbraco.Tests/Scoping/PassThroughEventDispatcherTests.cs rename to tests/Umbraco.Tests/Scoping/PassThroughEventDispatcherTests.cs diff --git a/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs b/tests/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs similarity index 100% rename from src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs rename to tests/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs diff --git a/src/Umbraco.Tests/Scoping/ScopedXmlTests.cs b/tests/Umbraco.Tests/Scoping/ScopedXmlTests.cs similarity index 100% rename from src/Umbraco.Tests/Scoping/ScopedXmlTests.cs rename to tests/Umbraco.Tests/Scoping/ScopedXmlTests.cs diff --git a/src/Umbraco.Tests/Serialization/AutoInterningStringConverterTests.cs b/tests/Umbraco.Tests/Serialization/AutoInterningStringConverterTests.cs similarity index 100% rename from src/Umbraco.Tests/Serialization/AutoInterningStringConverterTests.cs rename to tests/Umbraco.Tests/Serialization/AutoInterningStringConverterTests.cs diff --git a/src/Umbraco.Tests/Services/Importing/Dictionary-Package.xml b/tests/Umbraco.Tests/Services/Importing/Dictionary-Package.xml similarity index 100% rename from src/Umbraco.Tests/Services/Importing/Dictionary-Package.xml rename to tests/Umbraco.Tests/Services/Importing/Dictionary-Package.xml diff --git a/src/Umbraco.Tests/Services/TestWithSomeContentBase.cs b/tests/Umbraco.Tests/Services/TestWithSomeContentBase.cs similarity index 100% rename from src/Umbraco.Tests/Services/TestWithSomeContentBase.cs rename to tests/Umbraco.Tests/Services/TestWithSomeContentBase.cs diff --git a/src/Umbraco.Tests/TestHelpers/BaseUsingSqlCeSyntax.cs b/tests/Umbraco.Tests/TestHelpers/BaseUsingSqlCeSyntax.cs similarity index 100% rename from src/Umbraco.Tests/TestHelpers/BaseUsingSqlCeSyntax.cs rename to tests/Umbraco.Tests/TestHelpers/BaseUsingSqlCeSyntax.cs diff --git a/src/Umbraco.Tests/TestHelpers/BaseWebTest.cs b/tests/Umbraco.Tests/TestHelpers/BaseWebTest.cs similarity index 100% rename from src/Umbraco.Tests/TestHelpers/BaseWebTest.cs rename to tests/Umbraco.Tests/TestHelpers/BaseWebTest.cs diff --git a/src/Umbraco.Tests/TestHelpers/ControllerTesting/AuthenticateEverythingExtensions.cs b/tests/Umbraco.Tests/TestHelpers/ControllerTesting/AuthenticateEverythingExtensions.cs similarity index 100% rename from src/Umbraco.Tests/TestHelpers/ControllerTesting/AuthenticateEverythingExtensions.cs rename to tests/Umbraco.Tests/TestHelpers/ControllerTesting/AuthenticateEverythingExtensions.cs diff --git a/src/Umbraco.Tests/TestHelpers/ControllerTesting/AuthenticateEverythingMiddleware.cs b/tests/Umbraco.Tests/TestHelpers/ControllerTesting/AuthenticateEverythingMiddleware.cs similarity index 100% rename from src/Umbraco.Tests/TestHelpers/ControllerTesting/AuthenticateEverythingMiddleware.cs rename to tests/Umbraco.Tests/TestHelpers/ControllerTesting/AuthenticateEverythingMiddleware.cs diff --git a/src/Umbraco.Tests/TestHelpers/ControllerTesting/SpecificAssemblyResolver.cs b/tests/Umbraco.Tests/TestHelpers/ControllerTesting/SpecificAssemblyResolver.cs similarity index 100% rename from src/Umbraco.Tests/TestHelpers/ControllerTesting/SpecificAssemblyResolver.cs rename to tests/Umbraco.Tests/TestHelpers/ControllerTesting/SpecificAssemblyResolver.cs diff --git a/src/Umbraco.Tests/TestHelpers/ControllerTesting/TestControllerActivator.cs b/tests/Umbraco.Tests/TestHelpers/ControllerTesting/TestControllerActivator.cs similarity index 100% rename from src/Umbraco.Tests/TestHelpers/ControllerTesting/TestControllerActivator.cs rename to tests/Umbraco.Tests/TestHelpers/ControllerTesting/TestControllerActivator.cs diff --git a/src/Umbraco.Tests/TestHelpers/ControllerTesting/TestControllerActivatorBase.cs b/tests/Umbraco.Tests/TestHelpers/ControllerTesting/TestControllerActivatorBase.cs similarity index 100% rename from src/Umbraco.Tests/TestHelpers/ControllerTesting/TestControllerActivatorBase.cs rename to tests/Umbraco.Tests/TestHelpers/ControllerTesting/TestControllerActivatorBase.cs diff --git a/src/Umbraco.Tests/TestHelpers/ControllerTesting/TestStartup.cs b/tests/Umbraco.Tests/TestHelpers/ControllerTesting/TestStartup.cs similarity index 100% rename from src/Umbraco.Tests/TestHelpers/ControllerTesting/TestStartup.cs rename to tests/Umbraco.Tests/TestHelpers/ControllerTesting/TestStartup.cs diff --git a/src/Umbraco.Tests/TestHelpers/ControllerTesting/TraceExceptionLogger.cs b/tests/Umbraco.Tests/TestHelpers/ControllerTesting/TraceExceptionLogger.cs similarity index 100% rename from src/Umbraco.Tests/TestHelpers/ControllerTesting/TraceExceptionLogger.cs rename to tests/Umbraco.Tests/TestHelpers/ControllerTesting/TraceExceptionLogger.cs diff --git a/src/Umbraco.Tests/TestHelpers/Entities/MockedContent.cs b/tests/Umbraco.Tests/TestHelpers/Entities/MockedContent.cs similarity index 100% rename from src/Umbraco.Tests/TestHelpers/Entities/MockedContent.cs rename to tests/Umbraco.Tests/TestHelpers/Entities/MockedContent.cs diff --git a/src/Umbraco.Tests/TestHelpers/Entities/MockedContentTypes.cs b/tests/Umbraco.Tests/TestHelpers/Entities/MockedContentTypes.cs similarity index 100% rename from src/Umbraco.Tests/TestHelpers/Entities/MockedContentTypes.cs rename to tests/Umbraco.Tests/TestHelpers/Entities/MockedContentTypes.cs diff --git a/src/Umbraco.Tests/TestHelpers/Entities/MockedEntity.cs b/tests/Umbraco.Tests/TestHelpers/Entities/MockedEntity.cs similarity index 100% rename from src/Umbraco.Tests/TestHelpers/Entities/MockedEntity.cs rename to tests/Umbraco.Tests/TestHelpers/Entities/MockedEntity.cs diff --git a/src/Umbraco.Tests/TestHelpers/Entities/MockedMedia.cs b/tests/Umbraco.Tests/TestHelpers/Entities/MockedMedia.cs similarity index 100% rename from src/Umbraco.Tests/TestHelpers/Entities/MockedMedia.cs rename to tests/Umbraco.Tests/TestHelpers/Entities/MockedMedia.cs diff --git a/src/Umbraco.Tests/TestHelpers/Entities/MockedMember.cs b/tests/Umbraco.Tests/TestHelpers/Entities/MockedMember.cs similarity index 100% rename from src/Umbraco.Tests/TestHelpers/Entities/MockedMember.cs rename to tests/Umbraco.Tests/TestHelpers/Entities/MockedMember.cs diff --git a/src/Umbraco.Tests/TestHelpers/Entities/MockedPropertyTypes.cs b/tests/Umbraco.Tests/TestHelpers/Entities/MockedPropertyTypes.cs similarity index 100% rename from src/Umbraco.Tests/TestHelpers/Entities/MockedPropertyTypes.cs rename to tests/Umbraco.Tests/TestHelpers/Entities/MockedPropertyTypes.cs diff --git a/src/Umbraco.Tests/TestHelpers/Entities/MockedUser.cs b/tests/Umbraco.Tests/TestHelpers/Entities/MockedUser.cs similarity index 100% rename from src/Umbraco.Tests/TestHelpers/Entities/MockedUser.cs rename to tests/Umbraco.Tests/TestHelpers/Entities/MockedUser.cs diff --git a/src/Umbraco.Tests/TestHelpers/Entities/MockedUserGroup.cs b/tests/Umbraco.Tests/TestHelpers/Entities/MockedUserGroup.cs similarity index 100% rename from src/Umbraco.Tests/TestHelpers/Entities/MockedUserGroup.cs rename to tests/Umbraco.Tests/TestHelpers/Entities/MockedUserGroup.cs diff --git a/src/Umbraco.Tests/TestHelpers/FakeHttpContextFactory.cs b/tests/Umbraco.Tests/TestHelpers/FakeHttpContextFactory.cs similarity index 100% rename from src/Umbraco.Tests/TestHelpers/FakeHttpContextFactory.cs rename to tests/Umbraco.Tests/TestHelpers/FakeHttpContextFactory.cs diff --git a/src/Umbraco.Tests/TestHelpers/Stubs/TestControllerFactory.cs b/tests/Umbraco.Tests/TestHelpers/Stubs/TestControllerFactory.cs similarity index 100% rename from src/Umbraco.Tests/TestHelpers/Stubs/TestControllerFactory.cs rename to tests/Umbraco.Tests/TestHelpers/Stubs/TestControllerFactory.cs diff --git a/src/Umbraco.Tests/TestHelpers/Stubs/TestExamineManager.cs b/tests/Umbraco.Tests/TestHelpers/Stubs/TestExamineManager.cs similarity index 100% rename from src/Umbraco.Tests/TestHelpers/Stubs/TestExamineManager.cs rename to tests/Umbraco.Tests/TestHelpers/Stubs/TestExamineManager.cs diff --git a/src/Umbraco.Tests/TestHelpers/Stubs/TestLastChanceFinder.cs b/tests/Umbraco.Tests/TestHelpers/Stubs/TestLastChanceFinder.cs similarity index 100% rename from src/Umbraco.Tests/TestHelpers/Stubs/TestLastChanceFinder.cs rename to tests/Umbraco.Tests/TestHelpers/Stubs/TestLastChanceFinder.cs diff --git a/src/Umbraco.Tests/TestHelpers/Stubs/TestUserPasswordConfig.cs b/tests/Umbraco.Tests/TestHelpers/Stubs/TestUserPasswordConfig.cs similarity index 100% rename from src/Umbraco.Tests/TestHelpers/Stubs/TestUserPasswordConfig.cs rename to tests/Umbraco.Tests/TestHelpers/Stubs/TestUserPasswordConfig.cs diff --git a/src/Umbraco.Tests/TestHelpers/TestHelper.cs b/tests/Umbraco.Tests/TestHelpers/TestHelper.cs similarity index 100% rename from src/Umbraco.Tests/TestHelpers/TestHelper.cs rename to tests/Umbraco.Tests/TestHelpers/TestHelper.cs diff --git a/src/Umbraco.Tests/TestHelpers/TestObjects-Mocks.cs b/tests/Umbraco.Tests/TestHelpers/TestObjects-Mocks.cs similarity index 100% rename from src/Umbraco.Tests/TestHelpers/TestObjects-Mocks.cs rename to tests/Umbraco.Tests/TestHelpers/TestObjects-Mocks.cs diff --git a/src/Umbraco.Tests/TestHelpers/TestObjects.cs b/tests/Umbraco.Tests/TestHelpers/TestObjects.cs similarity index 100% rename from src/Umbraco.Tests/TestHelpers/TestObjects.cs rename to tests/Umbraco.Tests/TestHelpers/TestObjects.cs diff --git a/src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs b/tests/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs similarity index 100% rename from src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs rename to tests/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs diff --git a/src/Umbraco.Tests/Testing/Objects/Accessors/NoHttpContextAccessor.cs b/tests/Umbraco.Tests/Testing/Objects/Accessors/NoHttpContextAccessor.cs similarity index 100% rename from src/Umbraco.Tests/Testing/Objects/Accessors/NoHttpContextAccessor.cs rename to tests/Umbraco.Tests/Testing/Objects/Accessors/NoHttpContextAccessor.cs diff --git a/src/Umbraco.Tests/Testing/Objects/TestDataSource.cs b/tests/Umbraco.Tests/Testing/Objects/TestDataSource.cs similarity index 100% rename from src/Umbraco.Tests/Testing/Objects/TestDataSource.cs rename to tests/Umbraco.Tests/Testing/Objects/TestDataSource.cs diff --git a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs b/tests/Umbraco.Tests/Testing/UmbracoTestBase.cs similarity index 100% rename from src/Umbraco.Tests/Testing/UmbracoTestBase.cs rename to tests/Umbraco.Tests/Testing/UmbracoTestBase.cs diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/tests/Umbraco.Tests/Umbraco.Tests.csproj similarity index 97% rename from src/Umbraco.Tests/Umbraco.Tests.csproj rename to tests/Umbraco.Tests/Umbraco.Tests.csproj index 1daa6c2395fb..75f2e0a805b5 100644 --- a/src/Umbraco.Tests/Umbraco.Tests.csproj +++ b/tests/Umbraco.Tests/Umbraco.Tests.csproj @@ -309,23 +309,23 @@ - + {29aa69d9-b597-4395-8d42-43b1263c240a} Umbraco.Core - + {0fad7d2a-d7dd-45b1-91fd-488bb6cdacea} Umbraco.Examine.Lucene - + {3ae7bf57-966b-45a5-910a-954d7c554441} Umbraco.Infrastructure - + {33085570-9bf2-4065-a9b0-a29d920d13ba} Umbraco.Persistence.SqlCe - + {f6de8da0-07cc-4ef2-8a59-2bc81dbb3830} Umbraco.PublishedCache.NuCache @@ -333,7 +333,7 @@ {a499779c-1b3b-48a8-b551-458e582e6e96} Umbraco.Tests.Common - + {651E1350-91B6-44B7-BD60-7207006D7003} Umbraco.Web diff --git a/src/Umbraco.Tests/Web/Controllers/AuthenticationControllerTests.cs b/tests/Umbraco.Tests/Web/Controllers/AuthenticationControllerTests.cs similarity index 100% rename from src/Umbraco.Tests/Web/Controllers/AuthenticationControllerTests.cs rename to tests/Umbraco.Tests/Web/Controllers/AuthenticationControllerTests.cs diff --git a/src/Umbraco.Tests/Web/HttpCookieExtensionsTests.cs b/tests/Umbraco.Tests/Web/HttpCookieExtensionsTests.cs similarity index 100% rename from src/Umbraco.Tests/Web/HttpCookieExtensionsTests.cs rename to tests/Umbraco.Tests/Web/HttpCookieExtensionsTests.cs diff --git a/src/Umbraco.Tests/Web/Mvc/ViewDataDictionaryExtensionTests.cs b/tests/Umbraco.Tests/Web/Mvc/ViewDataDictionaryExtensionTests.cs similarity index 100% rename from src/Umbraco.Tests/Web/Mvc/ViewDataDictionaryExtensionTests.cs rename to tests/Umbraco.Tests/Web/Mvc/ViewDataDictionaryExtensionTests.cs diff --git a/src/Umbraco.Tests/masterpages/site1/template2.master b/tests/Umbraco.Tests/masterpages/site1/template2.master similarity index 100% rename from src/Umbraco.Tests/masterpages/site1/template2.master rename to tests/Umbraco.Tests/masterpages/site1/template2.master diff --git a/src/Umbraco.Tests/unit-test-log4net.CI.config b/tests/Umbraco.Tests/unit-test-log4net.CI.config similarity index 100% rename from src/Umbraco.Tests/unit-test-log4net.CI.config rename to tests/Umbraco.Tests/unit-test-log4net.CI.config diff --git a/src/Umbraco.Tests/unit-test-logger.config b/tests/Umbraco.Tests/unit-test-logger.config similarity index 100% rename from src/Umbraco.Tests/unit-test-logger.config rename to tests/Umbraco.Tests/unit-test-logger.config diff --git a/linting/codeanalysis.tests.ruleset b/tests/codeanalysis.ruleset similarity index 89% rename from linting/codeanalysis.tests.ruleset rename to tests/codeanalysis.ruleset index 0ac055b3283c..010b77c241a1 100644 --- a/linting/codeanalysis.tests.ruleset +++ b/tests/codeanalysis.ruleset @@ -1,6 +1,6 @@ - + - + @@ -23,4 +23,4 @@ - \ No newline at end of file + diff --git a/umbraco-netcore-only.sln b/umbraco-netcore-only.sln index 17591c8c556f..80a688bde54f 100644 --- a/umbraco-netcore-only.sln +++ b/umbraco-netcore-only.sln @@ -7,16 +7,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Web.UI", "src\Umbra EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{2849E9D4-3B4E-40A3-A309-F3CB4F0E125F}" ProjectSection(SolutionItems) = preProject - linting\.editorconfig = linting\.editorconfig build\azure-pipelines.yml = build\azure-pipelines.yml build\build-bootstrap.ps1 = build\build-bootstrap.ps1 build\build.ps1 = build\build.ps1 - linting\codeanalysis.ruleset = linting\codeanalysis.ruleset - linting\codeanalysis.tests.ruleset = linting\codeanalysis.tests.ruleset - Directory.Build.props = Directory.Build.props - Directory.Build.targets = Directory.Build.targets - NuGet.Config = NuGet.Config - linting\stylecop.json = linting\stylecop.json EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{FD962632-184C-4005-A5F3-E705D92FC645}" @@ -70,41 +63,24 @@ Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "Umbraco.Tests.AcceptanceTes UseIISExpress = "true" TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.5" Debug.AspNetCompiler.VirtualPath = "/localhost_62926" - Debug.AspNetCompiler.PhysicalPath = "src\Umbraco.Tests.AcceptanceTest\" + Debug.AspNetCompiler.PhysicalPath = "tests\Umbraco.Tests.AcceptanceTest\" Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\localhost_62926\" Debug.AspNetCompiler.Updateable = "true" Debug.AspNetCompiler.ForceOverwrite = "true" Debug.AspNetCompiler.FixedNames = "false" Debug.AspNetCompiler.Debug = "True" Release.AspNetCompiler.VirtualPath = "/localhost_62926" - Release.AspNetCompiler.PhysicalPath = "src\Umbraco.Tests.AcceptanceTest\" + Release.AspNetCompiler.PhysicalPath = "tests\Umbraco.Tests.AcceptanceTest\" Release.AspNetCompiler.TargetPath = "PrecompiledWeb\localhost_62926\" Release.AspNetCompiler.Updateable = "true" Release.AspNetCompiler.ForceOverwrite = "true" Release.AspNetCompiler.FixedNames = "false" Release.AspNetCompiler.Debug = "False" - SlnRelativePath = "src\Umbraco.Tests.AcceptanceTest\" + SlnRelativePath = "tests\Umbraco.Tests.AcceptanceTest\" DefaultWebSiteLanguage = "Visual C#" StartServerOnDebug = "false" EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{E3F9F378-AFE1-40A5-90BD-82833375DBFE}" - ProjectSection(SolutionItems) = preProject - build\NuSpecs\tools\applications.config.install.xdt = build\NuSpecs\tools\applications.config.install.xdt - build\NuSpecs\tools\ClientDependency.config.install.xdt = build\NuSpecs\tools\ClientDependency.config.install.xdt - build\NuSpecs\tools\install.ps1 = build\NuSpecs\tools\install.ps1 - build\NuSpecs\tools\Readme.txt = build\NuSpecs\tools\Readme.txt - build\NuSpecs\tools\ReadmeUpgrade.txt = build\NuSpecs\tools\ReadmeUpgrade.txt - build\NuSpecs\tools\serilog.config.install.xdt = build\NuSpecs\tools\serilog.config.install.xdt - build\NuSpecs\tools\Web.config.install.xdt = build\NuSpecs\tools\Web.config.install.xdt - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{5B03EF4E-E0AC-4905-861B-8C3EC1A0D458}" - ProjectSection(SolutionItems) = preProject - build\NuSpecs\build\Umbraco.Cms.props = build\NuSpecs\build\Umbraco.Cms.props - build\NuSpecs\build\Umbraco.Cms.targets = build\NuSpecs\build\Umbraco.Cms.targets - EndProjectSection -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DocTools", "DocTools", "{53594E5B-64A2-4545-8367-E3627D266AE8}" ProjectSection(SolutionItems) = preProject src\ApiDocs\docfx.filter.yml = src\ApiDocs\docfx.filter.yml @@ -132,21 +108,29 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Web.BackOffice", "s EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Web.Website", "src\Umbraco.Web.Website\Umbraco.Web.Website.csproj", "{5A246D54-3109-4D2B-BE7D-FC0787D126AE}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Tests.Common", "src\Umbraco.Tests.Common\Umbraco.Tests.Common.csproj", "{A499779C-1B3B-48A8-B551-458E582E6E96}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Tests.Common", "tests\Umbraco.Tests.Common\Umbraco.Tests.Common.csproj", "{A499779C-1B3B-48A8-B551-458E582E6E96}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Tests.UnitTests", "src\Umbraco.Tests.UnitTests\Umbraco.Tests.UnitTests.csproj", "{9102ABDF-E537-4E46-B525-C9ED4833EED0}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Tests.UnitTests", "tests\Umbraco.Tests.UnitTests\Umbraco.Tests.UnitTests.csproj", "{9102ABDF-E537-4E46-B525-C9ED4833EED0}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Web.Common", "src\Umbraco.Web.Common\Umbraco.Web.Common.csproj", "{79E4293D-C92C-4649-AEC8-F1EFD95BDEB1}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Tests.Integration", "src\Umbraco.Tests.Integration\Umbraco.Tests.Integration.csproj", "{1B885D2F-1599-4557-A4EC-474CC74DEB10}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Tests.Integration", "tests\Umbraco.Tests.Integration\Umbraco.Tests.Integration.csproj", "{1B885D2F-1599-4557-A4EC-474CC74DEB10}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Tests.Integration.SqlCe", "src\Umbraco.Tests.Integration.SqlCe\Umbraco.Tests.Integration.SqlCe.csproj", "{7A58F7CB-786F-43D6-A946-7BFA1B70D0AA}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Tests.Integration.SqlCe", "tests\Umbraco.Tests.Integration.SqlCe\Umbraco.Tests.Integration.SqlCe.csproj", "{7A58F7CB-786F-43D6-A946-7BFA1B70D0AA}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Examine.Lucene", "src\Umbraco.Examine.Lucene\Umbraco.Examine.Lucene.csproj", "{96EF355C-A7C8-460E-96D7-ABCE0D489762}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.TestData", "src\Umbraco.TestData\Umbraco.TestData.csproj", "{C44B4389-6E2A-441E-9A10-7CE818CA63A9}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.TestData", "tests\Umbraco.TestData\Umbraco.TestData.csproj", "{C44B4389-6E2A-441E-9A10-7CE818CA63A9}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Tests.Benchmarks", "tests\Umbraco.Tests.Benchmarks\Umbraco.Tests.Benchmarks.csproj", "{37B6264F-A279-42A6-AB83-CC3A3950C3E2}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "buildTransitive", "buildTransitive", "{81D03F06-94BE-4246-8F52-A68B58486F94}" + ProjectSection(SolutionItems) = preProject + build\NuSpecs\buildTransitive\Umbraco.Cms.StaticAssets.props = build\NuSpecs\buildTransitive\Umbraco.Cms.StaticAssets.props + build\NuSpecs\buildTransitive\Umbraco.Cms.StaticAssets.targets = build\NuSpecs\buildTransitive\Umbraco.Cms.StaticAssets.targets + EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Tests.Benchmarks", "src\Umbraco.Tests.Benchmarks\Umbraco.Tests.Benchmarks.csproj", "{37B6264F-A279-42A6-AB83-CC3A3950C3E2}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JsonSchema", "src\JsonSchema\JsonSchema.csproj", "{B172BC0E-B535-4CEF-9204-F3F397003829}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -214,6 +198,10 @@ Global {37B6264F-A279-42A6-AB83-CC3A3950C3E2}.Debug|Any CPU.Build.0 = Debug|Any CPU {37B6264F-A279-42A6-AB83-CC3A3950C3E2}.Release|Any CPU.ActiveCfg = Release|Any CPU {37B6264F-A279-42A6-AB83-CC3A3950C3E2}.Release|Any CPU.Build.0 = Release|Any CPU + {B172BC0E-B535-4CEF-9204-F3F397003829}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B172BC0E-B535-4CEF-9204-F3F397003829}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B172BC0E-B535-4CEF-9204-F3F397003829}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B172BC0E-B535-4CEF-9204-F3F397003829}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -221,8 +209,6 @@ Global GlobalSection(NestedProjects) = preSolution {227C3B55-80E5-4E7E-A802-BE16C5128B9D} = {2849E9D4-3B4E-40A3-A309-F3CB4F0E125F} {9E4C8A12-FBE0-4673-8CE2-DF99D5D57817} = {B5BD12C1-A454-435E-8A46-FF4A364C0382} - {E3F9F378-AFE1-40A5-90BD-82833375DBFE} = {227C3B55-80E5-4E7E-A802-BE16C5128B9D} - {5B03EF4E-E0AC-4905-861B-8C3EC1A0D458} = {227C3B55-80E5-4E7E-A802-BE16C5128B9D} {53594E5B-64A2-4545-8367-E3627D266AE8} = {FD962632-184C-4005-A5F3-E705D92FC645} {C7311C00-2184-409B-B506-52A5FAEA8736} = {FD962632-184C-4005-A5F3-E705D92FC645} {A499779C-1B3B-48A8-B551-458E582E6E96} = {B5BD12C1-A454-435E-8A46-FF4A364C0382} @@ -231,6 +217,7 @@ Global {7A58F7CB-786F-43D6-A946-7BFA1B70D0AA} = {B5BD12C1-A454-435E-8A46-FF4A364C0382} {C44B4389-6E2A-441E-9A10-7CE818CA63A9} = {B5BD12C1-A454-435E-8A46-FF4A364C0382} {37B6264F-A279-42A6-AB83-CC3A3950C3E2} = {B5BD12C1-A454-435E-8A46-FF4A364C0382} + {81D03F06-94BE-4246-8F52-A68B58486F94} = {227C3B55-80E5-4E7E-A802-BE16C5128B9D} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {7A0F2E34-D2AF-4DAB-86A0-7D7764B3D0EC} diff --git a/umbraco.sln b/umbraco.sln index ae3c52d67b47..0018c9104181 100644 --- a/umbraco.sln +++ b/umbraco.sln @@ -7,16 +7,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Web.UI", "src\Umbra EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{2849E9D4-3B4E-40A3-A309-F3CB4F0E125F}" ProjectSection(SolutionItems) = preProject - linting\.editorconfig = linting\.editorconfig build\azure-pipelines.yml = build\azure-pipelines.yml build\build-bootstrap.ps1 = build\build-bootstrap.ps1 build\build.ps1 = build\build.ps1 - linting\codeanalysis.ruleset = linting\codeanalysis.ruleset - linting\codeanalysis.tests.ruleset = linting\codeanalysis.tests.ruleset - Directory.Build.props = Directory.Build.props - Directory.Build.targets = Directory.Build.targets - NuGet.Config = NuGet.Config - linting\stylecop.json = linting\stylecop.json EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{FD962632-184C-4005-A5F3-E705D92FC645}" @@ -70,39 +63,28 @@ Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "Umbraco.Tests.AcceptanceTes UseIISExpress = "true" TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.5" Debug.AspNetCompiler.VirtualPath = "/localhost_62926" - Debug.AspNetCompiler.PhysicalPath = "src\Umbraco.Tests.AcceptanceTest\" + Debug.AspNetCompiler.PhysicalPath = "tests\Umbraco.Tests.AcceptanceTest\" Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\localhost_62926\" Debug.AspNetCompiler.Updateable = "true" Debug.AspNetCompiler.ForceOverwrite = "true" Debug.AspNetCompiler.FixedNames = "false" Debug.AspNetCompiler.Debug = "True" Release.AspNetCompiler.VirtualPath = "/localhost_62926" - Release.AspNetCompiler.PhysicalPath = "src\Umbraco.Tests.AcceptanceTest\" + Release.AspNetCompiler.PhysicalPath = "tests\Umbraco.Tests.AcceptanceTest\" Release.AspNetCompiler.TargetPath = "PrecompiledWeb\localhost_62926\" Release.AspNetCompiler.Updateable = "true" Release.AspNetCompiler.ForceOverwrite = "true" Release.AspNetCompiler.FixedNames = "false" Release.AspNetCompiler.Debug = "False" - SlnRelativePath = "src\Umbraco.Tests.AcceptanceTest\" + SlnRelativePath = "tests\Umbraco.Tests.AcceptanceTest\" DefaultWebSiteLanguage = "Visual C#" StartServerOnDebug = "false" EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{E3F9F378-AFE1-40A5-90BD-82833375DBFE}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "buildTransitive", "buildTransitive", "{5B03EF4E-E0AC-4905-861B-8C3EC1A0D458}" ProjectSection(SolutionItems) = preProject - build\NuSpecs\tools\applications.config.install.xdt = build\NuSpecs\tools\applications.config.install.xdt - build\NuSpecs\tools\ClientDependency.config.install.xdt = build\NuSpecs\tools\ClientDependency.config.install.xdt - build\NuSpecs\tools\install.ps1 = build\NuSpecs\tools\install.ps1 - build\NuSpecs\tools\Readme.txt = build\NuSpecs\tools\Readme.txt - build\NuSpecs\tools\ReadmeUpgrade.txt = build\NuSpecs\tools\ReadmeUpgrade.txt - build\NuSpecs\tools\serilog.config.install.xdt = build\NuSpecs\tools\serilog.config.install.xdt - build\NuSpecs\tools\Web.config.install.xdt = build\NuSpecs\tools\Web.config.install.xdt - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{5B03EF4E-E0AC-4905-861B-8C3EC1A0D458}" - ProjectSection(SolutionItems) = preProject - build\NuSpecs\build\Umbraco.Cms.StaticAssets.props = build\NuSpecs\build\Umbraco.Cms.StaticAssets.props - build\NuSpecs\build\Umbraco.Cms.StaticAssets.targets = build\NuSpecs\build\Umbraco.Cms.StaticAssets.targets + build\NuSpecs\buildTransitive\Umbraco.Cms.StaticAssets.props = build\NuSpecs\buildTransitive\Umbraco.Cms.StaticAssets.props + build\NuSpecs\buildTransitive\Umbraco.Cms.StaticAssets.targets = build\NuSpecs\buildTransitive\Umbraco.Cms.StaticAssets.targets EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DocTools", "DocTools", "{53594E5B-64A2-4545-8367-E3627D266AE8}" @@ -113,7 +95,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DocTools", "DocTools", "{53 src\ApiDocs\toc.yml = src\ApiDocs\toc.yml EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Tests.Benchmarks", "src\Umbraco.Tests.Benchmarks\Umbraco.Tests.Benchmarks.csproj", "{3A33ADC9-C6C0-4DB1-A613-A9AF0210DF3D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Tests.Benchmarks", "tests\Umbraco.Tests.Benchmarks\Umbraco.Tests.Benchmarks.csproj", "{3A33ADC9-C6C0-4DB1-A613-A9AF0210DF3D}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "IssueTemplates", "IssueTemplates", "{C7311C00-2184-409B-B506-52A5FAEA8736}" ProjectSection(SolutionItems) = preProject @@ -130,7 +112,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Infrastructure", "s EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Persistence.SqlCe", "src\Umbraco.Persistence.SqlCe\Umbraco.Persistence.SqlCe.csproj", "{33085570-9BF2-4065-A9B0-A29D920D13BA}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.TestData", "src\Umbraco.TestData\Umbraco.TestData.csproj", "{FB5676ED-7A69-492C-B802-E7B24144C0FC}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.TestData", "tests\Umbraco.TestData\Umbraco.TestData.csproj", "{FB5676ED-7A69-492C-B802-E7B24144C0FC}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.PublishedCache.NuCache", "src\Umbraco.PublishedCache.NuCache\Umbraco.PublishedCache.NuCache.csproj", "{F6DE8DA0-07CC-4EF2-8A59-2BC81DBB3830}" EndProject @@ -140,17 +122,17 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Web.BackOffice", "s EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Web.Website", "src\Umbraco.Web.Website\Umbraco.Web.Website.csproj", "{5A246D54-3109-4D2B-BE7D-FC0787D126AE}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Tests.Integration", "src\Umbraco.Tests.Integration\Umbraco.Tests.Integration.csproj", "{D6319409-777A-4BD0-93ED-B2DFD805B32C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Tests.Integration", "tests\Umbraco.Tests.Integration\Umbraco.Tests.Integration.csproj", "{D6319409-777A-4BD0-93ED-B2DFD805B32C}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Tests.Common", "src\Umbraco.Tests.Common\Umbraco.Tests.Common.csproj", "{A499779C-1B3B-48A8-B551-458E582E6E96}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Tests.Common", "tests\Umbraco.Tests.Common\Umbraco.Tests.Common.csproj", "{A499779C-1B3B-48A8-B551-458E582E6E96}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Tests.UnitTests", "src\Umbraco.Tests.UnitTests\Umbraco.Tests.UnitTests.csproj", "{9102ABDF-E537-4E46-B525-C9ED4833EED0}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Tests.UnitTests", "tests\Umbraco.Tests.UnitTests\Umbraco.Tests.UnitTests.csproj", "{9102ABDF-E537-4E46-B525-C9ED4833EED0}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Web.Common", "src\Umbraco.Web.Common\Umbraco.Web.Common.csproj", "{79E4293D-C92C-4649-AEC8-F1EFD95BDEB1}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JsonSchema", "src\JsonSchema\JsonSchema.csproj", "{2A5027D9-F71D-4957-929E-F7A56AA1B95A}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Tests.Integration.SqlCe", "src\Umbraco.Tests.Integration.SqlCe\Umbraco.Tests.Integration.SqlCe.csproj", "{1B28FC3E-3D5B-4A46-8961-5483835548D7}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Tests.Integration.SqlCe", "tests\Umbraco.Tests.Integration.SqlCe\Umbraco.Tests.Integration.SqlCe.csproj", "{1B28FC3E-3D5B-4A46-8961-5483835548D7}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -233,7 +215,6 @@ Global GlobalSection(NestedProjects) = preSolution {227C3B55-80E5-4E7E-A802-BE16C5128B9D} = {2849E9D4-3B4E-40A3-A309-F3CB4F0E125F} {9E4C8A12-FBE0-4673-8CE2-DF99D5D57817} = {B5BD12C1-A454-435E-8A46-FF4A364C0382} - {E3F9F378-AFE1-40A5-90BD-82833375DBFE} = {227C3B55-80E5-4E7E-A802-BE16C5128B9D} {5B03EF4E-E0AC-4905-861B-8C3EC1A0D458} = {227C3B55-80E5-4E7E-A802-BE16C5128B9D} {53594E5B-64A2-4545-8367-E3627D266AE8} = {FD962632-184C-4005-A5F3-E705D92FC645} {3A33ADC9-C6C0-4DB1-A613-A9AF0210DF3D} = {B5BD12C1-A454-435E-8A46-FF4A364C0382}