From 9a0b43f07a5476426c691152b205948d109498d0 Mon Sep 17 00:00:00 2001
From: Arlo Godfrey <arlo.godfrey@outlook.com>
Date: Wed, 28 Feb 2024 15:28:01 -0600
Subject: [PATCH 1/2] Fixed PackageId being overridden by MSBuild.Sdk.Extras
 import

---
 MultiTarget/Library.props            |  2 --
 ToolkitComponent.SampleProject.props |  2 ++
 ToolkitComponent.SourceProject.props | 13 +++++++++----
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/MultiTarget/Library.props b/MultiTarget/Library.props
index c9610ed9..2967239e 100644
--- a/MultiTarget/Library.props
+++ b/MultiTarget/Library.props
@@ -28,6 +28,4 @@
 
   <!-- Import Uno and native dependencies for all multitargeted library projects. -->
   <Import Project="$(MSBuildProjectDirectory)\Dependencies.props" Condition="Exists('$(MSBuildProjectDirectory)\Dependencies.props')" />
-  
-  <Sdk Condition="'$(IsUwp)' == 'true'" Name="MSBuild.Sdk.Extras" Version="3.0.23" />
 </Project>
diff --git a/ToolkitComponent.SampleProject.props b/ToolkitComponent.SampleProject.props
index d0d45e6c..d1c5e023 100644
--- a/ToolkitComponent.SampleProject.props
+++ b/ToolkitComponent.SampleProject.props
@@ -6,6 +6,8 @@
   <!-- Set up the MultiTarget system -->
   <Import Project="$(ToolingDirectory)\MultiTarget\Library.props" />
 
+  <Sdk Condition="'$(IsUwp)' == 'true'" Name="MSBuild.Sdk.Extras" Version="3.0.23" />
+
   <!-- Import this component's source project -->
   <ItemGroup>
     <ProjectReference Include="$(MSBuildProjectDirectory)\..\src\*.csproj" />
diff --git a/ToolkitComponent.SourceProject.props b/ToolkitComponent.SourceProject.props
index 5fac813f..9b6bbbe6 100644
--- a/ToolkitComponent.SourceProject.props
+++ b/ToolkitComponent.SourceProject.props
@@ -3,18 +3,23 @@
     <Error Condition="$(ToolkitComponentName) == ''" Message="ToolkitComponentName is not defined. Please check your csproj." />
   </Target>
 
-  <!-- Set up the MultiTarget system -->
-  <Import Project="$(ToolingDirectory)\MultiTarget\Library.props" />
-
   <PropertyGroup>
     <DateForVersion Condition="'$(DateForVersion)' == ''">$([System.DateTime]::UtcNow.ToString(yyMMdd))</DateForVersion>
     <Version Condition="'$(Version)' == ''">$(MajorVersion).$(MinorVersion).$(DateForVersion)</Version>
     <Version Condition="'$(PreviewVersion)' != ''">$(Version)-$(PreviewVersion)</Version>
+  </PropertyGroup>
+
+  <!-- Set up the MultiTarget system -->
+  <Import Project="$(ToolingDirectory)\MultiTarget\Library.props" />
+
+  <PropertyGroup>
     <PackageId Condition="'$(PackageId)' == ''">$(PackageIdPrefix).$(PackageIdVariant).$(ToolkitComponentName)</PackageId>
   </PropertyGroup>
 
+  <Sdk Condition="'$(IsUwp)' == 'true'" Name="MSBuild.Sdk.Extras" Version="3.0.23" />
+
   <!-- Auto Generate our own Assembly Info -->
-    <PropertyGroup>
+  <PropertyGroup>
     <!-- Turn-off .NET based AssemblyInfo.cs generator, see below -->
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>

From 673142cb621b5cc09a7b51bc0f9c2fb3b4e896ba Mon Sep 17 00:00:00 2001
From: Arlo Godfrey <arlo.godfrey@outlook.com>
Date: Thu, 29 Feb 2024 11:05:30 -0600
Subject: [PATCH 2/2] Minor cleanup

---
 ToolkitComponent.SourceProject.props | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/ToolkitComponent.SourceProject.props b/ToolkitComponent.SourceProject.props
index 9b6bbbe6..84ffd26c 100644
--- a/ToolkitComponent.SourceProject.props
+++ b/ToolkitComponent.SourceProject.props
@@ -3,16 +3,13 @@
     <Error Condition="$(ToolkitComponentName) == ''" Message="ToolkitComponentName is not defined. Please check your csproj." />
   </Target>
 
-  <PropertyGroup>
-    <DateForVersion Condition="'$(DateForVersion)' == ''">$([System.DateTime]::UtcNow.ToString(yyMMdd))</DateForVersion>
-    <Version Condition="'$(Version)' == ''">$(MajorVersion).$(MinorVersion).$(DateForVersion)</Version>
-    <Version Condition="'$(PreviewVersion)' != ''">$(Version)-$(PreviewVersion)</Version>
-  </PropertyGroup>
-
   <!-- Set up the MultiTarget system -->
   <Import Project="$(ToolingDirectory)\MultiTarget\Library.props" />
 
   <PropertyGroup>
+    <DateForVersion Condition="'$(DateForVersion)' == ''">$([System.DateTime]::UtcNow.ToString(yyMMdd))</DateForVersion>
+    <Version Condition="'$(Version)' == ''">$(MajorVersion).$(MinorVersion).$(DateForVersion)</Version>
+    <Version Condition="'$(PreviewVersion)' != ''">$(Version)-$(PreviewVersion)</Version>
     <PackageId Condition="'$(PackageId)' == ''">$(PackageIdPrefix).$(PackageIdVariant).$(ToolkitComponentName)</PackageId>
   </PropertyGroup>