diff --git a/packages/Avalonia/Avalonia.csproj b/packages/Avalonia/Avalonia.csproj
index ebfa325067..333b21718d 100644
--- a/packages/Avalonia/Avalonia.csproj
+++ b/packages/Avalonia/Avalonia.csproj
@@ -60,6 +60,10 @@
       <Pack>true</Pack>
       <PackagePath>build\;buildTransitive\</PackagePath>
     </Content>
+    <Content Include="AvaloniaRules.Project.xml">
+      <Pack>true</Pack>
+      <PackagePath>build\;buildTransitive\</PackagePath>
+    </Content>
   </ItemGroup>
   <Import Project="..\..\build\SharedVersion.props" />
   <Import Project="..\..\build\NetFX.props" />
diff --git a/packages/Avalonia/Avalonia.props b/packages/Avalonia/Avalonia.props
index a2da228887..b6316939af 100644
--- a/packages/Avalonia/Avalonia.props
+++ b/packages/Avalonia/Avalonia.props
@@ -5,6 +5,9 @@
     <AvaloniaBuildTasksLocation>$(MSBuildThisFileDirectory)\..\tools\netstandard2.0\Avalonia.Build.Tasks.dll</AvaloniaBuildTasksLocation>
     <AvaloniaUseExternalMSBuild>false</AvaloniaUseExternalMSBuild>
     <UsedAvaloniaProducts>$(UsedAvaloniaProducts);AvaloniaUI</UsedAvaloniaProducts>
+    <EnableAvaloniaXamlCompilation Condition="'$(EnableAvaloniaXamlCompilation)'==''">true</EnableAvaloniaXamlCompilation>
+    <AvaloniaXamlIlVerifyIl Condition="'$(AvaloniaXamlIlVerifyIl)'==''">false</AvaloniaXamlIlVerifyIl>
+    <AvaloniaUseCompiledBindingsByDefault Condition="'$(AvaloniaUseCompiledBindingsByDefault)'==''">true</AvaloniaUseCompiledBindingsByDefault>
   </PropertyGroup>
   <Import Project="$(MSBuildThisFileDirectory)\AvaloniaBuildTasks.props"/>
   <Import Project="$(MSBuildThisFileDirectory)\Avalonia.Generators.props"/>
diff --git a/packages/Avalonia/AvaloniaBuildTasks.targets b/packages/Avalonia/AvaloniaBuildTasks.targets
index 6af35ff0d2..451b1b16f0 100644
--- a/packages/Avalonia/AvaloniaBuildTasks.targets
+++ b/packages/Avalonia/AvaloniaBuildTasks.targets
@@ -6,6 +6,19 @@
     <_AvaloniaSkipXamlCompilation Condition="'$(_AvaloniaSkipXamlCompilation)' == ''">false</_AvaloniaSkipXamlCompilation>
     <AvaloniaUseCompiledBindingsByDefault Condition="'$(AvaloniaUseCompiledBindingsByDefault)' == ''">false</AvaloniaUseCompiledBindingsByDefault>
   </PropertyGroup>
+  
+  
+
+  <PropertyGroup>
+    <!-- Enable property page if VisualStudioVersion is great or equal 17.0 and Language is'not VB.NET -->
+    <AvaloniaEnablePropertyPage Condition="'$(AvaloniaEnablePropertyPage)' == '' and '$(VisualStudioVersion)' &gt;= '17.0' and '$(Language)' != 'VB'">true</AvaloniaEnablePropertyPage>
+  </PropertyGroup>
+
+  <ItemGroup Label="Avalonia Property Page">
+    <PropertyPageSchema Include="$(MSBuildThisFileDirectory)\AvaloniaRules.Project.xml" Condition="'$(AvaloniaEnablePropertyPage)' == 'true'">
+      <Context>Project</Context>
+    </PropertyPageSchema>
+  </ItemGroup>
 
   <!-- Unfortunately we have to update default items in .targets since custom nuget props are improted before Microsoft.NET.Sdk.DefaultItems.props -->
   <ItemGroup Condition="'$(EnableDefaultItems)'=='True'">
diff --git a/packages/Avalonia/AvaloniaRules.Project.xml b/packages/Avalonia/AvaloniaRules.Project.xml
new file mode 100644
index 0000000000..5b02223e08
--- /dev/null
+++ b/packages/Avalonia/AvaloniaRules.Project.xml
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Rule Name="Avalonia" DisplayName="Avalonia" Order="70" PageTemplate="generic" xmlns="http://schemas.microsoft.com/build/2009/properties">
+
+  <Rule.Categories>
+    <Category Name="Compile" DisplayName="Compiling" />
+    <Category Name="Debug" DisplayName="Debug" />
+    <Category Name="NameGenerator" DisplayName="Name Generator" />
+  </Rule.Categories>
+
+  <Rule.DataSource>
+    <DataSource Persistence="ProjectFile" HasConfigurationCondition="false" Label="Avalonia" />
+  </Rule.DataSource>
+
+  <!-- Compile -->
+  
+  <BoolProperty Name="EnableAvaloniaXamlCompilation"
+                DisplayName="XAML Compiling"
+                Description="Enable/Disable XAML Compiling"
+                Category="Compile" />
+
+  <BoolProperty Name="AvaloniaXamlIlVerifyIl"
+                DisplayName="Verify IL"
+                Description="Enable/Disable Verify IL after XAML Compiling"
+                Category="Compile" />
+
+  <BoolProperty Name="AvaloniaUseCompiledBindingsByDefault"
+              DisplayName="Use CompiledBindings"
+              Description="Use compiled bindings by default"
+              HelpUrl="https://docs.avaloniaui.net/docs/next/basics/data/data-binding/compiled-bindings"
+              Category="Compile" />
+
+  <!-- Debug -->
+
+  <BoolProperty Name="AvaloniaXamlIlDebuggerLaunch"
+          DisplayName="Debug XAML Compiler"
+          Description="Allow debug XAML compilation"
+          Category="Debug" />
+
+  <EnumProperty Name="AvaloniaXamlReportImportance"
+                DisplayName="XAML Report Importance"
+                Description="Provides levels of importance for XAML Compiler messages"
+                Category="Debug">
+    <EnumValue Name="Low" DisplayName="Low" Description="Set XAML Compiler report message to Low importance" />
+    <EnumValue Name="Normal" DisplayName="Normal" Description="Set XAML Compiler report message to Normal importance" />
+    <EnumValue Name="High" DisplayName="High" Description="Set XAML Compiler report message to High importance" />
+  </EnumProperty>
+
+  <!-- NameGenerator -->
+
+  <BoolProperty Name="AvaloniaNameGeneratorIsEnabled"
+              DisplayName="Use Name Generator"
+              Description="Enable/Disable Avalonia Name Source Generator"
+              HelpUrl="https://github.com/AvaloniaUI/Avalonia/blob/master/src/tools/Avalonia.Generators/README.md"
+              Category="NameGenerator" />
+
+  <EnumProperty Name="AvaloniaNameGeneratorBehavior"
+                DisplayName="Generator Behavior"
+                Description="Customize behavior of name generator"
+                Category="NameGenerator">
+    <EnumValue Name="InitializeComponent" DisplayName="InitializeComponent" Description="Generates get-only properties to access controls by name and an InitializeComponent method to set them automatically. This is closest to other XAML UI framework functionality" />
+    <EnumValue Name="OnlyProperties" DisplayName="OnlyProperties" Description="Generates get-only properties to access controls by name but does not generate an InitializeComponent method to set them. This allows custom InitializeComponent method implementations" />
+    <EnumProperty.Metadata>
+      <NameValuePair Name="DependsOn" Value="Avalonia::AvaloniaNameGeneratorIsEnabled" />
+      <NameValuePair Name="VisibilityCondition">
+        <NameValuePair.Value>(has-evaluated-value  "Avalonia" "AvaloniaNameGeneratorIsEnabled" True)</NameValuePair.Value>
+      </NameValuePair>
+    </EnumProperty.Metadata>
+  </EnumProperty>
+
+  <EnumProperty Name="AvaloniaNameGeneratorDefaultFieldModifier"
+              DisplayName="Default Class Field/Property Modifier"
+              Description="Defines the access modifiers used for generated members"
+              Category="NameGenerator">
+    <EnumValue Name="Internal" DisplayName="Internal" Description="The type or member can be accessed by any code in the same assembly, but not from another assembly. In other words, internal types or members can be accessed from code that is part of the same compilation" />
+    <EnumValue Name="Public" DisplayName="Public" Description="The type or member can be accessed by any other code in the same assembly or another assembly that references it. The accessibility level of public members of a type is controlled by the accessibility level of the type itself" />
+    <EnumValue Name="Protected" DisplayName="Protected" Description="The type or member can be accessed only by code in the same class, or in a class that is derived from that class" />
+    <EnumValue Name="Private" DisplayName="Private" Description="TThe type or member can be accessed by types derived from the class that are declared within its containing assembly" />
+    <EnumProperty.Metadata>
+      <NameValuePair Name="DependsOn" Value="Avalonia::AvaloniaNameGeneratorIsEnabled" />
+      <NameValuePair Name="VisibilityCondition">
+        <NameValuePair.Value>(has-evaluated-value  "Avalonia" "AvaloniaNameGeneratorIsEnabled" True)</NameValuePair.Value>
+      </NameValuePair>
+    </EnumProperty.Metadata>
+  </EnumProperty>
+
+  <StringProperty Name="AvaloniaNameGeneratorFilterByPath"
+                  DisplayName="Filter By Path"
+                  Description="The generator will process only XAML files with paths matching the specified glob pattern(s). Example: */Views/*View.xaml, *View.axaml;*Control.axaml"
+                  Category="NameGenerator">
+    <StringProperty.Metadata>
+      <NameValuePair Name="DependsOn" Value="Avalonia::AvaloniaNameGeneratorIsEnabled" />
+      <NameValuePair Name="VisibilityCondition">
+        <NameValuePair.Value>(has-evaluated-value  "Avalonia" "AvaloniaNameGeneratorIsEnabled" True)</NameValuePair.Value>
+      </NameValuePair>
+    </StringProperty.Metadata>
+  </StringProperty>
+
+  <StringProperty Name="AvaloniaNameGeneratorFilterByNamespace"
+                DisplayName="Filter By Namespace"
+                Description="The generator will process only XAML files with base classes' namespaces matching the specified glob pattern(s).
+Example: MyApp.Presentation.*, MyApp.Presentation.Views;MyApp.Presentation.Controls"
+                Category="NameGenerator">
+    <StringProperty.Metadata>
+      <NameValuePair Name="DependsOn" Value="Avalonia::AvaloniaNameGeneratorIsEnabled" />
+      <NameValuePair Name="VisibilityCondition">
+        <NameValuePair.Value>(has-evaluated-value  "Avalonia" "AvaloniaNameGeneratorIsEnabled" True)</NameValuePair.Value>
+      </NameValuePair>
+    </StringProperty.Metadata>
+  </StringProperty>
+
+  <EnumProperty Name="AvaloniaNameGeneratorViewFileNamingStrategy"
+              DisplayName="File Naming Strategy"
+              Description="Determines how the automatically generated view files should be named"
+              Category="NameGenerator">
+    <EnumValue Name="ClassName" DisplayName="ClassName" Description="Only Class name" />
+    <EnumValue Name="NamespaceAndClassName" DisplayName="NamespaceAndClassName" Description="Namespace And ClassName" />
+    <EnumProperty.Metadata>
+      <NameValuePair Name="DependsOn" Value="Avalonia::AvaloniaNameGeneratorIsEnabled" />
+      <NameValuePair Name="VisibilityCondition">
+        <NameValuePair.Value>(has-evaluated-value  "Avalonia" "AvaloniaNameGeneratorIsEnabled" True)</NameValuePair.Value>
+      </NameValuePair>
+    </EnumProperty.Metadata>
+  </EnumProperty>
+
+</Rule>
diff --git a/src/tools/Avalonia.Generators/Avalonia.Generators.props b/src/tools/Avalonia.Generators/Avalonia.Generators.props
index 08cbeff1ba..565b6d3898 100644
--- a/src/tools/Avalonia.Generators/Avalonia.Generators.props
+++ b/src/tools/Avalonia.Generators/Avalonia.Generators.props
@@ -5,6 +5,7 @@
     <AvaloniaNameGeneratorDefaultFieldModifier Condition="'$(AvaloniaNameGeneratorDefaultFieldModifier)' == ''">internal</AvaloniaNameGeneratorDefaultFieldModifier>
     <AvaloniaNameGeneratorFilterByPath Condition="'$(AvaloniaNameGeneratorFilterByPath)' == ''">*</AvaloniaNameGeneratorFilterByPath>
     <AvaloniaNameGeneratorFilterByNamespace Condition="'$(AvaloniaNameGeneratorFilterByNamespace)' == ''">*</AvaloniaNameGeneratorFilterByNamespace>
+    <AvaloniaNameGeneratorViewFileNamingStrategy Condition="'$(AvaloniaNameGeneratorViewFileNamingStrategy)' == ''">NamespaceAndClassName</AvaloniaNameGeneratorViewFileNamingStrategy>
   </PropertyGroup>
   <ItemGroup>
     <CompilerVisibleItemMetadata Include="AdditionalFiles" MetadataName="SourceItemGroup"/>
@@ -13,6 +14,7 @@
     <CompilerVisibleProperty Include="AvaloniaNameGeneratorDefaultFieldModifier" />
     <CompilerVisibleProperty Include="AvaloniaNameGeneratorFilterByPath" />
     <CompilerVisibleProperty Include="AvaloniaNameGeneratorFilterByNamespace" />
+    <CompilerVisibleProperty Include="AvaloniaNameGeneratorViewFileNamingStrategy" />
   </ItemGroup>
   <Target Name="_InjectAdditionalFiles" BeforeTargets="GenerateMSBuildEditorConfigFileShouldRun">
     <ItemGroup>