From 691b9102bb05fad95ba900a3621fc7eee1b2b9b7 Mon Sep 17 00:00:00 2001
From: Simon Cropp <simon.cropp@gmail.com>
Date: Sun, 24 Sep 2023 12:38:12 +1000
Subject: [PATCH] csproj cleanup (#12657)

---
 samples/ReactiveUIDemo/ReactiveUIDemo.csproj  |   4 +-
 samples/SafeAreaDemo/SafeAreaDemo.csproj      |   1 -
 samples/SampleControls/ControlSamples.csproj  |   4 +-
 src/Avalonia.Base/Avalonia.Base.csproj        |   1 -
 .../Avalonia.Controls.ColorPicker.csproj      |   1 -
 .../Avalonia.Controls.DataGrid.csproj         |   1 -
 .../Avalonia.Controls.ItemsRepeater.csproj    |   1 -
 src/Avalonia.Desktop/Avalonia.Desktop.csproj  |  15 ++-
 .../Avalonia.Diagnostics.csproj               |   1 -
 src/Avalonia.Dialogs/Avalonia.Dialogs.csproj  |   2 +-
 .../Avalonia.Fonts.Inter.csproj               |   3 +-
 .../Avalonia.MicroCom.csproj                  |   4 +-
 src/Avalonia.Native/Avalonia.Native.csproj    |   2 +-
 src/Avalonia.OpenGL/Avalonia.OpenGL.csproj    |  24 ++---
 .../Avalonia.ReactiveUI.csproj                |   1 -
 .../Avalonia.Remote.Protocol.csproj           |   1 -
 .../Avalonia.Themes.Fluent.csproj             |   2 +-
 src/Avalonia.X11/Avalonia.X11.csproj          |  19 ++--
 .../Avalonia.Browser.Blazor.csproj            |   1 -
 .../Avalonia.Browser/Avalonia.Browser.csproj  |   2 +-
 .../Avalonia.LinuxFramebuffer.csproj          |   1 -
 .../Avalonia.Markup.Xaml.Loader.csproj        |   1 -
 .../Avalonia.Markup.Xaml.csproj               | 100 +++++++++---------
 .../Avalonia.Markup/Avalonia.Markup.csproj    |   2 -
 src/Skia/Avalonia.Skia/Avalonia.Skia.csproj   |   3 -
 .../Avalonia.Direct2D1.csproj                 |   1 -
 .../Avalonia.Win32.Interoperability.csproj    |   1 -
 .../Avalonia.Win32/Avalonia.Win32.csproj      |   1 -
 src/iOS/Avalonia.iOS/Avalonia.iOS.csproj      |   2 +-
 .../Avalonia.Analyzers.csproj                 |   1 -
 .../Avalonia.Designer.HostApp.csproj          |   2 +-
 .../Avalonia.Generators.csproj                |   1 -
 .../Avalonia.Generators.Tests.csproj          |   1 -
 33 files changed, 91 insertions(+), 116 deletions(-)

diff --git a/samples/ReactiveUIDemo/ReactiveUIDemo.csproj b/samples/ReactiveUIDemo/ReactiveUIDemo.csproj
index 0e054d6c36..33ec820889 100644
--- 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>
diff --git a/samples/SafeAreaDemo/SafeAreaDemo.csproj b/samples/SafeAreaDemo/SafeAreaDemo.csproj
index 20bc5ec8fe..f8eca5f5ba 100644
--- 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>
diff --git a/samples/SampleControls/ControlSamples.csproj b/samples/SampleControls/ControlSamples.csproj
index 6eaf11a0fc..99ac655584 100644
--- 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>
diff --git a/src/Avalonia.Base/Avalonia.Base.csproj b/src/Avalonia.Base/Avalonia.Base.csproj
index 9aeb71f649..10f424d560 100644
--- 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>
diff --git a/src/Avalonia.Controls.ColorPicker/Avalonia.Controls.ColorPicker.csproj b/src/Avalonia.Controls.ColorPicker/Avalonia.Controls.ColorPicker.csproj
index 8a36e6900a..0c11339be8 100644
--- 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" />
diff --git a/src/Avalonia.Controls.DataGrid/Avalonia.Controls.DataGrid.csproj b/src/Avalonia.Controls.DataGrid/Avalonia.Controls.DataGrid.csproj
index 6c1e019603..b003dcf7a4 100644
--- 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" />
diff --git a/src/Avalonia.Controls.ItemsRepeater/Avalonia.Controls.ItemsRepeater.csproj b/src/Avalonia.Controls.ItemsRepeater/Avalonia.Controls.ItemsRepeater.csproj
index b7739bda8d..60bceabc1f 100644
--- 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>
diff --git a/src/Avalonia.Desktop/Avalonia.Desktop.csproj b/src/Avalonia.Desktop/Avalonia.Desktop.csproj
index 12cc977c84..78623ab84b 100644
--- 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>
diff --git a/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj b/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj
index 135bc1b685..289f239ec1 100644
--- 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">
diff --git a/src/Avalonia.Dialogs/Avalonia.Dialogs.csproj b/src/Avalonia.Dialogs/Avalonia.Dialogs.csproj
index 3a2c18ac24..1b0efed66f 100644
--- 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>
diff --git a/src/Avalonia.Fonts.Inter/Avalonia.Fonts.Inter.csproj b/src/Avalonia.Fonts.Inter/Avalonia.Fonts.Inter.csproj
index c18c07d347..a17f7decd8 100644
--- 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" />
diff --git a/src/Avalonia.MicroCom/Avalonia.MicroCom.csproj b/src/Avalonia.MicroCom/Avalonia.MicroCom.csproj
index b801f8401a..f6a0f6e859 100644
--- 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" />
diff --git a/src/Avalonia.Native/Avalonia.Native.csproj b/src/Avalonia.Native/Avalonia.Native.csproj
index e69c39a41e..73c7990d75 100644
--- 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" />
diff --git a/src/Avalonia.OpenGL/Avalonia.OpenGL.csproj b/src/Avalonia.OpenGL/Avalonia.OpenGL.csproj
index 4dd7432082..b0b558172f 100644
--- 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" />
diff --git a/src/Avalonia.ReactiveUI/Avalonia.ReactiveUI.csproj b/src/Avalonia.ReactiveUI/Avalonia.ReactiveUI.csproj
index 30b5d80fbc..3f6a5451b3 100644
--- 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>
diff --git a/src/Avalonia.Remote.Protocol/Avalonia.Remote.Protocol.csproj b/src/Avalonia.Remote.Protocol/Avalonia.Remote.Protocol.csproj
index 13d1ff9651..4a35bb2ca1 100644
--- 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" />
diff --git a/src/Avalonia.Themes.Fluent/Avalonia.Themes.Fluent.csproj b/src/Avalonia.Themes.Fluent/Avalonia.Themes.Fluent.csproj
index e62abff18b..9864cf24e0 100644
--- 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" />
diff --git a/src/Avalonia.X11/Avalonia.X11.csproj b/src/Avalonia.X11/Avalonia.X11.csproj
index 061c516ef6..2432fea15f 100644
--- 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" />
diff --git a/src/Browser/Avalonia.Browser.Blazor/Avalonia.Browser.Blazor.csproj b/src/Browser/Avalonia.Browser.Blazor/Avalonia.Browser.Blazor.csproj
index 9017ce1546..c2c2754de3 100644
--- 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>
 
diff --git a/src/Browser/Avalonia.Browser/Avalonia.Browser.csproj b/src/Browser/Avalonia.Browser/Avalonia.Browser.csproj
index 2fc3cc885a..4424dada94 100644
--- 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>
diff --git a/src/Linux/Avalonia.LinuxFramebuffer/Avalonia.LinuxFramebuffer.csproj b/src/Linux/Avalonia.LinuxFramebuffer/Avalonia.LinuxFramebuffer.csproj
index 366669d10d..35c8895120 100644
--- 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" />
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/Avalonia.Markup.Xaml.Loader.csproj b/src/Markup/Avalonia.Markup.Xaml.Loader/Avalonia.Markup.Xaml.Loader.csproj
index d74cc0b747..eadaed435e 100644
--- 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 -->
diff --git a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
index d827530207..20de1db090 100644
--- 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" />
diff --git a/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj b/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj
index 29583b6cb8..0fad13d0f0 100644
--- 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>
diff --git a/src/Skia/Avalonia.Skia/Avalonia.Skia.csproj b/src/Skia/Avalonia.Skia/Avalonia.Skia.csproj
index ab9f9ea413..9bdddd98c3 100644
--- 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>
diff --git a/src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj b/src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj
index 78da843f42..c7d08eb1e4 100644
--- 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>
diff --git a/src/Windows/Avalonia.Win32.Interoperability/Avalonia.Win32.Interoperability.csproj b/src/Windows/Avalonia.Win32.Interoperability/Avalonia.Win32.Interoperability.csproj
index 68c6fa69c9..8796374e52 100644
--- 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>
diff --git a/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj b/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj
index 2384ef6b6c..aef89908c8 100644
--- 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" />
diff --git a/src/iOS/Avalonia.iOS/Avalonia.iOS.csproj b/src/iOS/Avalonia.iOS/Avalonia.iOS.csproj
index c116709d79..f39070befc 100644
--- 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>
diff --git a/src/tools/Avalonia.Analyzers/Avalonia.Analyzers.csproj b/src/tools/Avalonia.Analyzers/Avalonia.Analyzers.csproj
index d6538fba13..6eb398cbd4 100644
--- 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>
diff --git a/src/tools/Avalonia.Designer.HostApp/Avalonia.Designer.HostApp.csproj b/src/tools/Avalonia.Designer.HostApp/Avalonia.Designer.HostApp.csproj
index ae2d3dd847..abdd19bf58 100644
--- 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" />
diff --git a/src/tools/Avalonia.Generators/Avalonia.Generators.csproj b/src/tools/Avalonia.Generators/Avalonia.Generators.csproj
index a7653562e8..bfc0458ef6 100644
--- 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>
diff --git a/tests/Avalonia.Generators.Tests/Avalonia.Generators.Tests.csproj b/tests/Avalonia.Generators.Tests/Avalonia.Generators.Tests.csproj
index ec4cbcafb7..001d0a31ef 100644
--- 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>