csproj cleanup (#12657)

2 years ago · 691b9102bb
33 changed files with 91 additions and 116 deletions
--- a/samples/ReactiveUIDemo/ReactiveUIDemo.csproj
+++ b/samples/ReactiveUIDemo/ReactiveUIDemo.csproj
@ -4,14 +4,14 @@
    <TargetFramework>net6.0</TargetFramework>
    <Nullable>enable</Nullable>
  </PropertyGroup>
-  
+
  <ItemGroup>
    <ProjectReference Include="..\..\src\Avalonia.Diagnostics\Avalonia.Diagnostics.csproj" />
    <ProjectReference Include="..\..\src\Avalonia.Fonts.Inter\Avalonia.Fonts.Inter.csproj" />
    <ProjectReference Include="..\..\src\Avalonia.ReactiveUI\Avalonia.ReactiveUI.csproj" />
    <ProjectReference Include="..\..\src\Avalonia.Themes.Fluent\Avalonia.Themes.Fluent.csproj" />
  </ItemGroup>
-  
+
  <ItemGroup>
    <Compile Update="Views\BarView.axaml.cs">
      <DependentUpon>BarView.axaml</DependentUpon>
--- a/samples/SafeAreaDemo/SafeAreaDemo.csproj
+++ b/samples/SafeAreaDemo/SafeAreaDemo.csproj
@ -6,7 +6,6 @@
    <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
  </PropertyGroup>

-  
  <ItemGroup>
    <Compile Update="**\*.xaml.cs">
      <DependentUpon>%(Filename)</DependentUpon>
--- a/samples/SampleControls/ControlSamples.csproj
+++ b/samples/SampleControls/ControlSamples.csproj
@ -13,11 +13,11 @@
      <SubType>Designer</SubType>
    </AvaloniaResource>
  </ItemGroup>
-  
+
  <ItemGroup>
    <ProjectReference Include="..\..\packages\Avalonia\Avalonia.csproj" />
  </ItemGroup>
-  
+
  <Import Project="..\..\build\BuildTargets.targets" />

 </Project>
--- a/src/Avalonia.Base/Avalonia.Base.csproj
+++ b/src/Avalonia.Base/Avalonia.Base.csproj
@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
-    <AssemblyName>Avalonia.Base</AssemblyName>
    <RootNamespace>Avalonia</RootNamespace>
    <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
    <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
--- a/src/Avalonia.Controls.ColorPicker/Avalonia.Controls.ColorPicker.csproj
+++ b/src/Avalonia.Controls.ColorPicker/Avalonia.Controls.ColorPicker.csproj
@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
-    <PackageId>Avalonia.Controls.ColorPicker</PackageId>
  </PropertyGroup>
  <ItemGroup>
    <Compile Include="..\Avalonia.Base\Metadata\NullableAttributes.cs" Link="NullableAttributes.cs" />
--- a/src/Avalonia.Controls.DataGrid/Avalonia.Controls.DataGrid.csproj
+++ b/src/Avalonia.Controls.DataGrid/Avalonia.Controls.DataGrid.csproj
@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
-    <PackageId>Avalonia.Controls.DataGrid</PackageId>
  </PropertyGroup>
  <ItemGroup>
    <ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj" />
--- a/src/Avalonia.Controls.ItemsRepeater/Avalonia.Controls.ItemsRepeater.csproj
+++ b/src/Avalonia.Controls.ItemsRepeater/Avalonia.Controls.ItemsRepeater.csproj
@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
-    <PackageId>Avalonia.Controls.ItemsRepeater</PackageId>
    <RootNamespace>Avalonia</RootNamespace>
  </PropertyGroup>
  <ItemGroup>
--- a/src/Avalonia.Desktop/Avalonia.Desktop.csproj
+++ b/src/Avalonia.Desktop/Avalonia.Desktop.csproj
@ -1,17 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
-      <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
-      <PackageId>Avalonia.Desktop</PackageId>
+    <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
  </PropertyGroup>

  <ItemGroup>
-      <ProjectReference Include="../../src/Windows/Avalonia.Win32/Avalonia.Win32.csproj" />      
-      <ProjectReference Include="../../src/Skia/Avalonia.Skia/Avalonia.Skia.csproj" />
-      <ProjectReference Include="../../src/Avalonia.Native/Avalonia.Native.csproj" />
-      <ProjectReference Include="../../packages/Avalonia/Avalonia.csproj" />
-      <ProjectReference Include="../Avalonia.X11/Avalonia.X11.csproj" />
+    <ProjectReference Include="../../src/Windows/Avalonia.Win32/Avalonia.Win32.csproj" />      
+    <ProjectReference Include="../../src/Skia/Avalonia.Skia/Avalonia.Skia.csproj" />
+    <ProjectReference Include="../../src/Avalonia.Native/Avalonia.Native.csproj" />
+    <ProjectReference Include="../../packages/Avalonia/Avalonia.csproj" />
+    <ProjectReference Include="../Avalonia.X11/Avalonia.X11.csproj" />
  </ItemGroup>
-  
+
  <Import Project="..\..\build\TrimmingEnable.props" />
  <Import Project="..\..\build\NullableEnable.props" />
 </Project>
--- a/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj
+++ b/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj
@ -2,7 +2,6 @@
  <PropertyGroup>
    <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
    <RootNamespace>Avalonia</RootNamespace>
-    <PackageId>Avalonia.Diagnostics</PackageId>
  </PropertyGroup>
  <ItemGroup>
    <Compile Update="**\*.xaml.cs">
--- a/src/Avalonia.Dialogs/Avalonia.Dialogs.csproj
+++ b/src/Avalonia.Dialogs/Avalonia.Dialogs.csproj
@ -18,7 +18,7 @@
    <!-- For managed dialogs dev testing -->
    <InternalsVisibleTo Include="ControlCatalog, PublicKey=$(AvaloniaPublicKey)" />    
  </ItemGroup>
-  
+
  <Import Project="..\..\build\DevAnalyzers.props" />
  <Import Project="..\..\build\TrimmingEnable.props" />
 </Project>
--- a/src/Avalonia.Fonts.Inter/Avalonia.Fonts.Inter.csproj
+++ b/src/Avalonia.Fonts.Inter/Avalonia.Fonts.Inter.csproj
@ -1,10 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
-    <PackageId>Avalonia.Fonts.Inter</PackageId>
  </PropertyGroup>
  <ItemGroup>
-    <AvaloniaResource Include="Assets\*" />  
+    <AvaloniaResource Include="Assets\*" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj" />
--- a/src/Avalonia.MicroCom/Avalonia.MicroCom.csproj
+++ b/src/Avalonia.MicroCom/Avalonia.MicroCom.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
-      <TargetFramework>netstandard2.0</TargetFramework>
-      <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
  </PropertyGroup>
  <ItemGroup>
    <PackageReference Include="MicroCom.Runtime" Version="0.11.0" />
--- a/src/Avalonia.Native/Avalonia.Native.csproj
+++ b/src/Avalonia.Native/Avalonia.Native.csproj
@ -16,7 +16,7 @@
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </Content>
  </ItemGroup>
-  
+
  <ItemGroup>
    <ProjectReference Include="..\..\packages\Avalonia\Avalonia.csproj" />
    <ProjectReference Include="..\Avalonia.Dialogs\Avalonia.Dialogs.csproj" />
--- a/src/Avalonia.OpenGL/Avalonia.OpenGL.csproj
+++ b/src/Avalonia.OpenGL/Avalonia.OpenGL.csproj
@ -1,19 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">

-    <PropertyGroup>
-        <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
-        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    </PropertyGroup>
+  <PropertyGroup>
+    <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>

-    <ItemGroup>
-      <ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj" />
-      <ProjectReference Include="..\Avalonia.Controls\Avalonia.Controls.csproj" />
-    </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj" />
+    <ProjectReference Include="..\Avalonia.Controls\Avalonia.Controls.csproj" />
+  </ItemGroup>

-    <Import Project="..\..\build\DevAnalyzers.props" />
-    <Import Project="..\..\build\SourceGenerators.props" />
-    <Import Project="..\..\build\TrimmingEnable.props" />
-    <Import Project="..\..\build\NullableEnable.props" />
+  <Import Project="..\..\build\DevAnalyzers.props" />
+  <Import Project="..\..\build\SourceGenerators.props" />
+  <Import Project="..\..\build\TrimmingEnable.props" />
+  <Import Project="..\..\build\NullableEnable.props" />

  <ItemGroup>
    <Compile Remove="..\Shared\SourceGeneratorAttributes.cs" />
--- a/src/Avalonia.ReactiveUI/Avalonia.ReactiveUI.csproj
+++ b/src/Avalonia.ReactiveUI/Avalonia.ReactiveUI.csproj
@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
-    <PackageId>Avalonia.ReactiveUI</PackageId>
    <SignAssembly>false</SignAssembly>
  </PropertyGroup>
  <ItemGroup>
--- a/src/Avalonia.Remote.Protocol/Avalonia.Remote.Protocol.csproj
+++ b/src/Avalonia.Remote.Protocol/Avalonia.Remote.Protocol.csproj
@ -4,7 +4,6 @@
    <DefineConstants>AVALONIA_REMOTE_PROTOCOL;$(DefineConstants)</DefineConstants>
    <SignAssembly>true</SignAssembly>
    <AssemblyOriginatorKeyFile>Key.snk</AssemblyOriginatorKeyFile>
-    <PackageId>Avalonia.Remote.Protocol</PackageId>
  </PropertyGroup>
  <ItemGroup>
    <Compile Include="..\Avalonia.Base\Input\Key.cs" />
--- a/src/Avalonia.Themes.Fluent/Avalonia.Themes.Fluent.csproj
+++ b/src/Avalonia.Themes.Fluent/Avalonia.Themes.Fluent.csproj
@ -7,7 +7,7 @@
    <ProjectReference Include="..\Avalonia.Controls\Avalonia.Controls.csproj" />
    <ProjectReference Include="..\Avalonia.Dialogs\Avalonia.Dialogs.csproj" />
    <ProjectReference Include="..\Markup\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj" />
-    <AvaloniaResource Include="**/*.xaml" />  
+    <AvaloniaResource Include="**/*.xaml" />
  </ItemGroup>
  <Import Project="..\..\build\NullableEnable.props" />
  <Import Project="..\..\build\BuildTargets.targets" />
--- a/src/Avalonia.X11/Avalonia.X11.csproj
+++ b/src/Avalonia.X11/Avalonia.X11.csproj
@ -1,15 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <PropertyGroup>
-        <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
-        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-        <PackageId>Avalonia.X11</PackageId>
-    </PropertyGroup>
+  <PropertyGroup>
+    <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>

-    <ItemGroup>
-        <ProjectReference Include="..\..\packages\Avalonia\Avalonia.csproj" />
-        <ProjectReference Include="..\Skia\Avalonia.Skia\Avalonia.Skia.csproj" />
-        <ProjectReference Include="..\Avalonia.FreeDesktop\Avalonia.FreeDesktop.csproj" />
-        <Compile Include="..\Shared\RawEventGrouping.cs" />
+  <ItemGroup>
+    <ProjectReference Include="..\..\packages\Avalonia\Avalonia.csproj" />
+    <ProjectReference Include="..\Skia\Avalonia.Skia\Avalonia.Skia.csproj" />
+    <ProjectReference Include="..\Avalonia.FreeDesktop\Avalonia.FreeDesktop.csproj" />
+    <Compile Include="..\Shared\RawEventGrouping.cs" />
  </ItemGroup>
  <Import Project="..\..\build\SourceGenerators.props" />
  <Import Project="..\..\build\TrimmingEnable.props" />
--- a/src/Browser/Avalonia.Browser.Blazor/Avalonia.Browser.Blazor.csproj
+++ b/src/Browser/Avalonia.Browser.Blazor/Avalonia.Browser.Blazor.csproj
@ -2,7 +2,6 @@

  <PropertyGroup>
    <TargetFramework>net7.0</TargetFramework>
-    <PackageId>Avalonia.Browser.Blazor</PackageId>
    <ResolveStaticWebAssetsInputsDependsOn>_IncludeGeneratedAvaloniaStaticFiles;$(ResolveStaticWebAssetsInputsDependsOn)</ResolveStaticWebAssetsInputsDependsOn>
  </PropertyGroup>

--- a/src/Browser/Avalonia.Browser/Avalonia.Browser.csproj
+++ b/src/Browser/Avalonia.Browser/Avalonia.Browser.csproj
@ -52,5 +52,5 @@
  <ItemGroup Label="InternalsVisibleTo">
    <InternalsVisibleTo Include="Avalonia.Browser.Blazor, PublicKey=$(AvaloniaPublicKey)" />
  </ItemGroup>
-  
+
 </Project>
--- a/src/Linux/Avalonia.LinuxFramebuffer/Avalonia.LinuxFramebuffer.csproj
+++ b/src/Linux/Avalonia.LinuxFramebuffer/Avalonia.LinuxFramebuffer.csproj
@ -2,7 +2,6 @@
  <PropertyGroup>
    <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <PackageId>Avalonia.LinuxFramebuffer</PackageId>
  </PropertyGroup>
  <ItemGroup>
    <ProjectReference Include="..\..\..\packages\Avalonia\Avalonia.csproj" />
--- a/src/Markup/Avalonia.Markup.Xaml.Loader/Avalonia.Markup.Xaml.Loader.csproj
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/Avalonia.Markup.Xaml.Loader.csproj
@ -3,7 +3,6 @@
  <PropertyGroup>
    <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
    <IsPackable>true</IsPackable>
-    <PackageId>Avalonia.Markup.Xaml.Loader</PackageId>
    <DefineConstants>$(DefineConstants);XAMLX_INTERNAL</DefineConstants>
  </PropertyGroup>
  <!--Disable Net Perf. analyzer for submodule to avoid commit issue -->
--- a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
+++ b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
@ -9,56 +9,56 @@
    <NoWarn>$(NoWarn);CS1591</NoWarn>
  </PropertyGroup>
    <ItemGroup>
-        <Compile Include="AvaloniaXamlLoader.cs" />
-        <Compile Include="Converters\AvaloniaUriTypeConverter.cs" />
-        <Compile Include="Converters\ColorToBrushConverter.cs" />
-        <Compile Include="Converters\FontFamilyTypeConverter.cs" />
-        <Compile Include="Converters\TimeSpanTypeConverter.cs" />
-        <Compile Include="Extensions.cs" />
-        <Compile Include="MarkupExtension.cs" />
-        <Compile Include="MarkupExtensions\CompiledBindingExtension.cs" />
-        <Compile Include="MarkupExtensions\CompiledBindings\ArrayElementPlugin.cs" />
-        <Compile Include="MarkupExtensions\CompiledBindings\CommandAccessorPlugin.cs" />
-        <Compile Include="MarkupExtensions\CompiledBindings\CompiledBindingPath.cs" />
-        <Compile Include="MarkupExtensions\CompiledBindings\FindVisualAncestorNode.cs" />
-        <Compile Include="MarkupExtensions\CompiledBindings\MethodAccessorPlugin.cs" />
-        <Compile Include="MarkupExtensions\CompiledBindings\ObservableStreamPlugin.cs" />
-        <Compile Include="MarkupExtensions\CompiledBindings\PropertyInfoAccessorFactory.cs" />
-        <Compile Include="MarkupExtensions\CompiledBindings\PropertyInfoAccessorPlugin.cs" />
-        <Compile Include="MarkupExtensions\CompiledBindings\StrongTypeCastNode.cs" />
-        <Compile Include="MarkupExtensions\CompiledBindings\TaskStreamPlugin.cs" />
-        <Compile Include="MarkupExtensions\DynamicResourceExtension.cs" />
-        <Compile Include="MarkupExtensions\On.cs" />
-        <Compile Include="MarkupExtensions\OnFormFactorExtension.cs" />
-        <Compile Include="MarkupExtensions\OnPlatformExtension.cs" />
-        <Compile Include="MarkupExtensions\ResolveByNameExtension.cs" />
-        <Compile Include="MarkupExtensions\StaticResourceExtension.cs" />
-        <Compile Include="Parsers\PropertyParser.cs" />
-        <Compile Include="Converters\BitmapTypeConverter.cs" />
-        <Compile Include="Converters\IconTypeConverter.cs" />
-        <Compile Include="Converters\AvaloniaPropertyTypeConverter.cs" />
-        <Compile Include="Converters\PointsListTypeConverter.cs" />
-        <Compile Include="MarkupExtensions\ReflectionBindingExtension.cs" />
-        <Compile Include="MarkupExtensions\RelativeSourceExtension.cs" />
-        <Compile Include="Properties\AssemblyInfo.cs" />
-        <Compile Include="RuntimeXamlLoaderConfiguration.cs" />
-        <Compile Include="RuntimeXamlLoaderDocument.cs" />
-        <Compile Include="Styling\MergeResourceInclude.cs" />
-        <Compile Include="Styling\ResourceInclude.cs" />
-        <Compile Include="Styling\StyleInclude.cs" />
-        <Compile Include="Templates\ControlTemplate.cs" />
-        <Compile Include="Templates\DataTemplate.cs" />
-        <Compile Include="Templates\FocusAdornerTemplate.cs" />
-        <Compile Include="Templates\ItemsPanelTemplate.cs" />
-        <Compile Include="Templates\Template.cs" />
-        <Compile Include="Templates\TemplateContent.cs" />
-        <Compile Include="Templates\TreeDataTemplate.cs" />
-        <Compile Include="XamlIl\Runtime\IAvaloniaXamlIlControlTemplateProvider.cs" />
-        <Compile Include="XamlIl\Runtime\IAvaloniaXamlIlParentStackProvider.cs" />
-        <Compile Include="XamlIl\Runtime\IAvaloniaXamlIlXmlNamespaceInfoProviderV1.cs" />
-        <Compile Include="XamlIl\Runtime\XamlIlRuntimeHelpers.cs" />
-        <Compile Include="XamlLoadException.cs" />
-        <Compile Include="XamlTypes.cs" />
+      <Compile Include="AvaloniaXamlLoader.cs" />
+      <Compile Include="Converters\AvaloniaUriTypeConverter.cs" />
+      <Compile Include="Converters\ColorToBrushConverter.cs" />
+      <Compile Include="Converters\FontFamilyTypeConverter.cs" />
+      <Compile Include="Converters\TimeSpanTypeConverter.cs" />
+      <Compile Include="Extensions.cs" />
+      <Compile Include="MarkupExtension.cs" />
+      <Compile Include="MarkupExtensions\CompiledBindingExtension.cs" />
+      <Compile Include="MarkupExtensions\CompiledBindings\ArrayElementPlugin.cs" />
+      <Compile Include="MarkupExtensions\CompiledBindings\CommandAccessorPlugin.cs" />
+      <Compile Include="MarkupExtensions\CompiledBindings\CompiledBindingPath.cs" />
+      <Compile Include="MarkupExtensions\CompiledBindings\FindVisualAncestorNode.cs" />
+      <Compile Include="MarkupExtensions\CompiledBindings\MethodAccessorPlugin.cs" />
+      <Compile Include="MarkupExtensions\CompiledBindings\ObservableStreamPlugin.cs" />
+      <Compile Include="MarkupExtensions\CompiledBindings\PropertyInfoAccessorFactory.cs" />
+      <Compile Include="MarkupExtensions\CompiledBindings\PropertyInfoAccessorPlugin.cs" />
+      <Compile Include="MarkupExtensions\CompiledBindings\StrongTypeCastNode.cs" />
+      <Compile Include="MarkupExtensions\CompiledBindings\TaskStreamPlugin.cs" />
+      <Compile Include="MarkupExtensions\DynamicResourceExtension.cs" />
+      <Compile Include="MarkupExtensions\On.cs" />
+      <Compile Include="MarkupExtensions\OnFormFactorExtension.cs" />
+      <Compile Include="MarkupExtensions\OnPlatformExtension.cs" />
+      <Compile Include="MarkupExtensions\ResolveByNameExtension.cs" />
+      <Compile Include="MarkupExtensions\StaticResourceExtension.cs" />
+      <Compile Include="Parsers\PropertyParser.cs" />
+      <Compile Include="Converters\BitmapTypeConverter.cs" />
+      <Compile Include="Converters\IconTypeConverter.cs" />
+      <Compile Include="Converters\AvaloniaPropertyTypeConverter.cs" />
+      <Compile Include="Converters\PointsListTypeConverter.cs" />
+      <Compile Include="MarkupExtensions\ReflectionBindingExtension.cs" />
+      <Compile Include="MarkupExtensions\RelativeSourceExtension.cs" />
+      <Compile Include="Properties\AssemblyInfo.cs" />
+      <Compile Include="RuntimeXamlLoaderConfiguration.cs" />
+      <Compile Include="RuntimeXamlLoaderDocument.cs" />
+      <Compile Include="Styling\MergeResourceInclude.cs" />
+      <Compile Include="Styling\ResourceInclude.cs" />
+      <Compile Include="Styling\StyleInclude.cs" />
+      <Compile Include="Templates\ControlTemplate.cs" />
+      <Compile Include="Templates\DataTemplate.cs" />
+      <Compile Include="Templates\FocusAdornerTemplate.cs" />
+      <Compile Include="Templates\ItemsPanelTemplate.cs" />
+      <Compile Include="Templates\Template.cs" />
+      <Compile Include="Templates\TemplateContent.cs" />
+      <Compile Include="Templates\TreeDataTemplate.cs" />
+      <Compile Include="XamlIl\Runtime\IAvaloniaXamlIlControlTemplateProvider.cs" />
+      <Compile Include="XamlIl\Runtime\IAvaloniaXamlIlParentStackProvider.cs" />
+      <Compile Include="XamlIl\Runtime\IAvaloniaXamlIlXmlNamespaceInfoProviderV1.cs" />
+      <Compile Include="XamlIl\Runtime\XamlIlRuntimeHelpers.cs" />
+      <Compile Include="XamlLoadException.cs" />
+      <Compile Include="XamlTypes.cs" />
    </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\..\Avalonia.Base\Avalonia.Base.csproj" />
--- a/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj
+++ b/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj
@ -5,8 +5,6 @@
  </PropertyGroup>
  <ItemGroup>
    <None Remove="Markup\Parsers\Nodes\ExpressionGrammer" />
-  </ItemGroup>
-  <ItemGroup>
    <None Include="Markup\Parsers\BindingExpressionGrammar.cs" />
  </ItemGroup>
  <ItemGroup>
--- a/src/Skia/Avalonia.Skia/Avalonia.Skia.csproj
+++ b/src/Skia/Avalonia.Skia/Avalonia.Skia.csproj
@ -1,9 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
-    <RootNamespace>Avalonia.Skia</RootNamespace>
-    <AssemblyName>Avalonia.Skia</AssemblyName>
-    <PackageId>Avalonia.Skia</PackageId>
    <IncludeLinuxSkia>true</IncludeLinuxSkia>
    <IncludeWasmSkia>true</IncludeWasmSkia>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
--- a/src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj
+++ b/src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj
@ -2,7 +2,6 @@
  <PropertyGroup>
    <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <PackageId>Avalonia.Direct2D1</PackageId>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
  </PropertyGroup>
  <ItemGroup>
--- a/src/Windows/Avalonia.Win32.Interoperability/Avalonia.Win32.Interoperability.csproj
+++ b/src/Windows/Avalonia.Win32.Interoperability/Avalonia.Win32.Interoperability.csproj
@ -4,7 +4,6 @@
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    <UseWindowsForms>true</UseWindowsForms>
    <EnableWindowsTargeting>true</EnableWindowsTargeting>
-    <PackageId>Avalonia.Win32.Interoperability</PackageId>
  </PropertyGroup>

  <ItemGroup>
--- a/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj
+++ b/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj
@ -2,7 +2,6 @@
  <PropertyGroup>
    <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <PackageId>Avalonia.Win32</PackageId>
  </PropertyGroup>
  <ItemGroup>
    <PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
--- a/src/iOS/Avalonia.iOS/Avalonia.iOS.csproj
+++ b/src/iOS/Avalonia.iOS/Avalonia.iOS.csproj
@ -8,7 +8,7 @@
    <ProjectReference Include="..\..\Avalonia.Base\Avalonia.Base.csproj" />
    <ProjectReference Include="..\..\Skia\Avalonia.Skia\Avalonia.Skia.csproj" />
  </ItemGroup>
-  
+
  <Import Project="..\..\..\build\DevAnalyzers.props" />
  <Import Project="..\..\..\build\TrimmingEnable.props" />
 </Project>
--- a/src/tools/Avalonia.Analyzers/Avalonia.Analyzers.csproj
+++ b/src/tools/Avalonia.Analyzers/Avalonia.Analyzers.csproj
@ -2,7 +2,6 @@
  <PropertyGroup>
    <TargetFramework>netstandard2.0</TargetFramework>
    <IncludeBuildOutput>false</IncludeBuildOutput>
-    <PackageId>Avalonia.Analyzers</PackageId>
    <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
    <DebugType>embedded</DebugType>
    <IsPackable>true</IsPackable>
--- a/src/tools/Avalonia.Designer.HostApp/Avalonia.Designer.HostApp.csproj
+++ b/src/tools/Avalonia.Designer.HostApp/Avalonia.Designer.HostApp.csproj
@ -6,7 +6,7 @@
  <!--Disable Net Perf. analyzer for submodule to avoid commit issue -->
  <PropertyGroup>
    <EnableNETAnalyzers>false</EnableNETAnalyzers>
-  </PropertyGroup>  
+  </PropertyGroup>
  <ItemGroup>
    <ProjectReference Include="..\..\Avalonia.DesignerSupport\Avalonia.DesignerSupport.csproj" />
    <ProjectReference Include="..\..\Avalonia.Base\Avalonia.Base.csproj" />
--- a/src/tools/Avalonia.Generators/Avalonia.Generators.csproj
+++ b/src/tools/Avalonia.Generators/Avalonia.Generators.csproj
@ -2,7 +2,6 @@
  <PropertyGroup>
    <TargetFramework>netstandard2.0</TargetFramework>
    <IncludeBuildOutput>false</IncludeBuildOutput>
-    <PackageId>Avalonia.Generators</PackageId>
    <DefineConstants>$(DefineConstants);XAMLX_INTERNAL</DefineConstants>
    <DebugType>embedded</DebugType>
    <IsPackable>true</IsPackable>
--- a/tests/Avalonia.Generators.Tests/Avalonia.Generators.Tests.csproj
+++ b/tests/Avalonia.Generators.Tests/Avalonia.Generators.Tests.csproj
@ -2,7 +2,6 @@
  <PropertyGroup>
    <OutputType>Exe</OutputType>
    <TargetFramework>net6.0</TargetFramework>
-    <RootNamespace>Avalonia.Generators.Tests</RootNamespace>
    <IsTestProject>true</IsTestProject>
  </PropertyGroup>
  <ItemGroup>