From 845c220c153d2a1ce832ddd0f566b1779e9b94b0 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Fri, 21 Apr 2023 19:56:43 +0100
Subject: [PATCH 01/11] Add avalonia version property to nuget package.

---
 packages/Avalonia/Avalonia.csproj | 33 +++++++++++++++++++++++++++++++
 packages/Avalonia/Avalonia.props  |  1 +
 2 files changed, 34 insertions(+)

diff --git a/packages/Avalonia/Avalonia.csproj b/packages/Avalonia/Avalonia.csproj
index f21d6fefb4..4cd4983b55 100644
--- a/packages/Avalonia/Avalonia.csproj
+++ b/packages/Avalonia/Avalonia.csproj
@@ -5,6 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+      <PackageReference Include="Avalonia.BuildServices" Version="0.0.2" />
       <ProjectReference Include="../../src/Avalonia.Remote.Protocol/Avalonia.Remote.Protocol.csproj" />
       <ProjectReference Include="../../src/Avalonia.Build.Tasks/Avalonia.Build.Tasks.csproj">
         <PrivateAssets>all</PrivateAssets>
@@ -60,4 +61,36 @@
   <Import Project="..\..\build\NetFX.props" />
   <Import Project="..\..\build\CoreLibraries.props" />
   <Import Project="..\..\build\SourceLink.props" Condition="'$(DisableSourceLink)' == ''" />
+
+  <UsingTask TaskName="WriteCurrentPackageVersionPropsTask" TaskFactory="RoslynCodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll">
+    <ParameterGroup>
+      <Filename ParameterType="System.String" Required="true" />
+      <Version ParameterType="System.String" Required="true" />
+      <IsLocalCache ParameterType="System.Boolean" Required="false" />
+    </ParameterGroup>
+    <Task>
+      <Using Namespace="System" />
+      <Using Namespace="System.IO" />
+      <Code Type="Fragment" Language="cs">
+        <![CDATA[
+                File.WriteAllText(Filename, "<Project><PropertyGroup>" + 
+                "<AvaloniaMainPackageVersion>" + Version + "</AvaloniaMainPackageVersion>" +
+                "</PropertyGroup></Project>");
+]]>
+      </Code>
+    </Task>
+  </UsingTask>
+
+  <Target Name="WriteCurrentPackageVersionProps" BeforeTargets="_GetPackageFiles">
+    <PropertyGroup>
+      <PackageVersionPropsPath>$(IntermediateOutputPath)/AvaloniaVersion.props</PackageVersionPropsPath>
+    </PropertyGroup>
+    <WriteCurrentPackageVersionPropsTask Filename="$(PackageVersionPropsPath)" Version="$(PackageVersion)" />
+    <ItemGroup>
+      <Content Include="$(PackageVersionPropsPath)">
+        <Pack>true</Pack>
+        <PackagePath>build</PackagePath>
+      </Content>
+    </ItemGroup>
+  </Target>
 </Project>
diff --git a/packages/Avalonia/Avalonia.props b/packages/Avalonia/Avalonia.props
index 2334aa91bc..37263a07ed 100644
--- a/packages/Avalonia/Avalonia.props
+++ b/packages/Avalonia/Avalonia.props
@@ -7,6 +7,7 @@
   </PropertyGroup>
   <Import Project="$(MSBuildThisFileDirectory)\AvaloniaBuildTasks.props"/>
   <Import Project="$(MSBuildThisFileDirectory)\Avalonia.Generators.props"/>
+  <Import Project="$(MSBuildThisFileDirectory)..\build\AvaloniaVersion.props" />
 
   <!-- Allow loading the AvaloniaVS extension when referencing the Avalonia nuget package -->
   <ItemGroup>

From 6e2dc88622d791b405dea9459003e7b20e24af95 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Fri, 21 Apr 2023 20:10:24 +0100
Subject: [PATCH 02/11] add UsedAvaloniaProducts property

---
 packages/Avalonia/Avalonia.props | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/Avalonia/Avalonia.props b/packages/Avalonia/Avalonia.props
index 37263a07ed..a2da228887 100644
--- a/packages/Avalonia/Avalonia.props
+++ b/packages/Avalonia/Avalonia.props
@@ -4,6 +4,7 @@
     <AvaloniaPreviewerNetFullToolPath>$(MSBuildThisFileDirectory)\..\tools\net461\designer\Avalonia.Designer.HostApp.exe</AvaloniaPreviewerNetFullToolPath>
     <AvaloniaBuildTasksLocation>$(MSBuildThisFileDirectory)\..\tools\netstandard2.0\Avalonia.Build.Tasks.dll</AvaloniaBuildTasksLocation>
     <AvaloniaUseExternalMSBuild>false</AvaloniaUseExternalMSBuild>
+    <UsedAvaloniaProducts>$(UsedAvaloniaProducts);AvaloniaUI</UsedAvaloniaProducts>
   </PropertyGroup>
   <Import Project="$(MSBuildThisFileDirectory)\AvaloniaBuildTasks.props"/>
   <Import Project="$(MSBuildThisFileDirectory)\Avalonia.Generators.props"/>

From bf8bf14c549745a2a5ac495ad743a3e544b915b2 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Sun, 23 Apr 2023 17:31:47 +0100
Subject: [PATCH 03/11] write the version number more simply.

---
 packages/Avalonia/Avalonia.csproj | 35 +++++--------------------------
 1 file changed, 5 insertions(+), 30 deletions(-)

diff --git a/packages/Avalonia/Avalonia.csproj b/packages/Avalonia/Avalonia.csproj
index 4cd4983b55..8d56b557b3 100644
--- a/packages/Avalonia/Avalonia.csproj
+++ b/packages/Avalonia/Avalonia.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-      <PackageReference Include="Avalonia.BuildServices" Version="0.0.2" />
+      <PackageReference Include="Avalonia.BuildServices" Version="0.0.3" />
       <ProjectReference Include="../../src/Avalonia.Remote.Protocol/Avalonia.Remote.Protocol.csproj" />
       <ProjectReference Include="../../src/Avalonia.Build.Tasks/Avalonia.Build.Tasks.csproj">
         <PrivateAssets>all</PrivateAssets>
@@ -62,35 +62,10 @@
   <Import Project="..\..\build\CoreLibraries.props" />
   <Import Project="..\..\build\SourceLink.props" Condition="'$(DisableSourceLink)' == ''" />
 
-  <UsingTask TaskName="WriteCurrentPackageVersionPropsTask" TaskFactory="RoslynCodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll">
-    <ParameterGroup>
-      <Filename ParameterType="System.String" Required="true" />
-      <Version ParameterType="System.String" Required="true" />
-      <IsLocalCache ParameterType="System.Boolean" Required="false" />
-    </ParameterGroup>
-    <Task>
-      <Using Namespace="System" />
-      <Using Namespace="System.IO" />
-      <Code Type="Fragment" Language="cs">
-        <![CDATA[
-                File.WriteAllText(Filename, "<Project><PropertyGroup>" + 
-                "<AvaloniaMainPackageVersion>" + Version + "</AvaloniaMainPackageVersion>" +
-                "</PropertyGroup></Project>");
-]]>
-      </Code>
-    </Task>
-  </UsingTask>
-
   <Target Name="WriteCurrentPackageVersionProps" BeforeTargets="_GetPackageFiles">
-    <PropertyGroup>
-      <PackageVersionPropsPath>$(IntermediateOutputPath)/AvaloniaVersion.props</PackageVersionPropsPath>
-    </PropertyGroup>
-    <WriteCurrentPackageVersionPropsTask Filename="$(PackageVersionPropsPath)" Version="$(PackageVersion)" />
-    <ItemGroup>
-      <Content Include="$(PackageVersionPropsPath)">
-        <Pack>true</Pack>
-        <PackagePath>build</PackagePath>
-      </Content>
-    </ItemGroup>
+    <WriteLinesToFile
+      File="$(PackageVersionPropsPath)"
+      Overwrite="true"
+      Lines="&lt;Project&gt;&lt;PropertyGroup&gt;&lt;AvaloniaMainPackageVersion&gt;$(PackageVersion)&lt;/AvaloniaMainPackageVersion&gt;&lt;/PropertyGroup&gt;&lt;/Project&gt;" />
   </Target>
 </Project>

From 51ba74fb4687a06daf9fef24ca950c2e0066e438 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Sun, 23 Apr 2023 17:57:09 +0100
Subject: [PATCH 04/11] fix build.

---
 packages/Avalonia/Avalonia.csproj | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/Avalonia/Avalonia.csproj b/packages/Avalonia/Avalonia.csproj
index 8d56b557b3..39120f64f5 100644
--- a/packages/Avalonia/Avalonia.csproj
+++ b/packages/Avalonia/Avalonia.csproj
@@ -63,6 +63,9 @@
   <Import Project="..\..\build\SourceLink.props" Condition="'$(DisableSourceLink)' == ''" />
 
   <Target Name="WriteCurrentPackageVersionProps" BeforeTargets="_GetPackageFiles">
+    <PropertyGroup>
+      <PackageVersionPropsPath>$(IntermediateOutputPath)/AvaloniaVersion.props</PackageVersionPropsPath>
+    </PropertyGroup>
     <WriteLinesToFile
       File="$(PackageVersionPropsPath)"
       Overwrite="true"

From abea867df662a9ec810f86eb150643b1848c9dad Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Sun, 23 Apr 2023 18:29:28 +0100
Subject: [PATCH 05/11] fix including version file in nuget package.

---
 packages/Avalonia/Avalonia.csproj | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/Avalonia/Avalonia.csproj b/packages/Avalonia/Avalonia.csproj
index 39120f64f5..db5721b0ab 100644
--- a/packages/Avalonia/Avalonia.csproj
+++ b/packages/Avalonia/Avalonia.csproj
@@ -70,5 +70,11 @@
       File="$(PackageVersionPropsPath)"
       Overwrite="true"
       Lines="&lt;Project&gt;&lt;PropertyGroup&gt;&lt;AvaloniaMainPackageVersion&gt;$(PackageVersion)&lt;/AvaloniaMainPackageVersion&gt;&lt;/PropertyGroup&gt;&lt;/Project&gt;" />
+    <ItemGroup>
+      <Content Include="$(PackageVersionPropsPath)">
+        <Pack>true</Pack>
+        <PackagePath>build</PackagePath>
+      </Content>
+    </ItemGroup>
   </Target>
 </Project>

From 3c85bcc15e9f8a3693c271b142c45f518104a3f9 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Sun, 23 Apr 2023 21:41:58 +0100
Subject: [PATCH 06/11] update.

---
 packages/Avalonia/Avalonia.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/Avalonia/Avalonia.csproj b/packages/Avalonia/Avalonia.csproj
index db5721b0ab..a024e0155a 100644
--- a/packages/Avalonia/Avalonia.csproj
+++ b/packages/Avalonia/Avalonia.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-      <PackageReference Include="Avalonia.BuildServices" Version="0.0.3" />
+      <PackageReference Include="Avalonia.BuildServices" Version="0.0.4" />
       <ProjectReference Include="../../src/Avalonia.Remote.Protocol/Avalonia.Remote.Protocol.csproj" />
       <ProjectReference Include="../../src/Avalonia.Build.Tasks/Avalonia.Build.Tasks.csproj">
         <PrivateAssets>all</PrivateAssets>

From ce8c3be43fa40d23f9aecb76598c4064adcac640 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Mon, 24 Apr 2023 10:45:20 +0100
Subject: [PATCH 07/11] update

---
 packages/Avalonia/Avalonia.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/Avalonia/Avalonia.csproj b/packages/Avalonia/Avalonia.csproj
index a024e0155a..26bf7dbeaa 100644
--- a/packages/Avalonia/Avalonia.csproj
+++ b/packages/Avalonia/Avalonia.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-      <PackageReference Include="Avalonia.BuildServices" Version="0.0.4" />
+      <PackageReference Include="Avalonia.BuildServices" Version="0.0.5" />
       <ProjectReference Include="../../src/Avalonia.Remote.Protocol/Avalonia.Remote.Protocol.csproj" />
       <ProjectReference Include="../../src/Avalonia.Build.Tasks/Avalonia.Build.Tasks.csproj">
         <PrivateAssets>all</PrivateAssets>

From 990b1341597e2a54fee514741953b30fa4343334 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Mon, 24 Apr 2023 11:54:54 +0100
Subject: [PATCH 08/11] update

---
 packages/Avalonia/Avalonia.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/Avalonia/Avalonia.csproj b/packages/Avalonia/Avalonia.csproj
index 26bf7dbeaa..dcef4cb7c8 100644
--- a/packages/Avalonia/Avalonia.csproj
+++ b/packages/Avalonia/Avalonia.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-      <PackageReference Include="Avalonia.BuildServices" Version="0.0.5" />
+      <PackageReference Include="Avalonia.BuildServices" Version="0.0.8" />
       <ProjectReference Include="../../src/Avalonia.Remote.Protocol/Avalonia.Remote.Protocol.csproj" />
       <ProjectReference Include="../../src/Avalonia.Build.Tasks/Avalonia.Build.Tasks.csproj">
         <PrivateAssets>all</PrivateAssets>

From 6b4d286f4318e3ebd18ffa0a7f9190bf66bd6e96 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Mon, 24 Apr 2023 13:53:02 +0100
Subject: [PATCH 09/11] update

---
 packages/Avalonia/Avalonia.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/Avalonia/Avalonia.csproj b/packages/Avalonia/Avalonia.csproj
index dcef4cb7c8..f309a5b711 100644
--- a/packages/Avalonia/Avalonia.csproj
+++ b/packages/Avalonia/Avalonia.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-      <PackageReference Include="Avalonia.BuildServices" Version="0.0.8" />
+      <PackageReference Include="Avalonia.BuildServices" Version="0.0.10" />
       <ProjectReference Include="../../src/Avalonia.Remote.Protocol/Avalonia.Remote.Protocol.csproj" />
       <ProjectReference Include="../../src/Avalonia.Build.Tasks/Avalonia.Build.Tasks.csproj">
         <PrivateAssets>all</PrivateAssets>

From 66f07356bf4ef2a876281f58b3b45996fdf09e6d Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Mon, 24 Apr 2023 17:00:38 +0100
Subject: [PATCH 10/11] update.

---
 packages/Avalonia/Avalonia.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/Avalonia/Avalonia.csproj b/packages/Avalonia/Avalonia.csproj
index f309a5b711..27b9453103 100644
--- a/packages/Avalonia/Avalonia.csproj
+++ b/packages/Avalonia/Avalonia.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-      <PackageReference Include="Avalonia.BuildServices" Version="0.0.10" />
+      <PackageReference Include="Avalonia.BuildServices" Version="0.0.11" />
       <ProjectReference Include="../../src/Avalonia.Remote.Protocol/Avalonia.Remote.Protocol.csproj" />
       <ProjectReference Include="../../src/Avalonia.Build.Tasks/Avalonia.Build.Tasks.csproj">
         <PrivateAssets>all</PrivateAssets>

From a3917d6b73b703c739ff888cee5db471e05c4ec7 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Mon, 24 Apr 2023 18:05:02 +0100
Subject: [PATCH 11/11] update

---
 packages/Avalonia/Avalonia.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/Avalonia/Avalonia.csproj b/packages/Avalonia/Avalonia.csproj
index 27b9453103..547af5d0dc 100644
--- a/packages/Avalonia/Avalonia.csproj
+++ b/packages/Avalonia/Avalonia.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-      <PackageReference Include="Avalonia.BuildServices" Version="0.0.11" />
+      <PackageReference Include="Avalonia.BuildServices" Version="0.0.12" />
       <ProjectReference Include="../../src/Avalonia.Remote.Protocol/Avalonia.Remote.Protocol.csproj" />
       <ProjectReference Include="../../src/Avalonia.Build.Tasks/Avalonia.Build.Tasks.csproj">
         <PrivateAssets>all</PrivateAssets>