[workload] create $(MauiVersion) property (dotnet#2282)

jonathanpeppers · Sep 15, 2021 · 974cac4 · 974cac4
1 parent 638c2ff
commit 974cac4
Show file tree

Hide file tree

Showing 34 changed files with 202 additions and 188 deletions.
diff --git a/.nuspec/Microsoft.Maui.Controls.props b/.nuspec/Microsoft.Maui.Controls.props
@@ -1,16 +1,5 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
-	<!--
-	When using Sdk-style projects and default embedded resource items are enabled, automatically
-	add the XAML files and fix up item metadata to pair them with code files.
-	This is in the props file, not the targets file, so that projects can remove/update these items.
-	The default value for EnableDefaultXamlItems is set in the targets, which works because
-	the property evaluation pass comes before the item evaluation pass.
-	The actual item groups are in a separate conditionally-imported file as they use constructs that
-	are not compatible with older MSBuild versions.
-	-->
-	<Import Project="$(MSBuildThisFileDirectory)Microsoft.Maui.Controls.DefaultItems.props" Condition="'$(UsingMicrosoftMauiControlsSdk)' != 'true' and '$(MSBuildSDKsPath)' != ''" />
-
 	<PropertyGroup>
 		<_IsHotRestartDefined>$([System.Text.RegularExpressions.Regex]::IsMatch('$(DefineConstants.Trim())', '(^|;)HOTRESTART($|;)'))</_IsHotRestartDefined>
 		<DefineConstants Condition="!$(_IsHotRestartDefined) And '$(IsHotRestartBuild)' == 'true'">HOTRESTART;$(DefineConstants)</DefineConstants>

diff --git a/.nuspec/Microsoft.Maui.Controls.targets b/.nuspec/Microsoft.Maui.Controls.targets
@@ -3,6 +3,7 @@
 	<UsingTask TaskName="Microsoft.Maui.Controls.Build.Tasks.XamlCTask" AssemblyFile="$(MSBuildThisFileDirectory)Microsoft.Maui.Controls.Build.Tasks.dll" />
 
 	<PropertyGroup>
+		<_MinimumMauiWorkloadVersion>6.0.100-rc.2</_MinimumMauiWorkloadVersion>
 		<SynthesizeLinkMetadata>true</SynthesizeLinkMetadata>
 		<EnableDefaultXamlItems Condition="'$(EnableDefaultXamlItems)'==''">True</EnableDefaultXamlItems>
 		<EnableDefaultCssItems Condition="'$(EnableDefaultCssItems)'==''">True</EnableDefaultCssItems>
@@ -19,6 +20,10 @@
 		<AvailableItemName Include="MauiCss" />
 	</ItemGroup>
 
+	<ItemGroup Condition=" '$(DisableMauiAnalyzers)' != 'true' ">
+		<Analyzer Include="$(MSBuildThisFileDirectory)Microsoft.Maui.Controls.SourceGen.dll" />
+	</ItemGroup>
+
 	<!-- Check Tasks ABI and other validations -->
 	<PropertyGroup>
 		<_MauiTargetsImportedAgain Condition="'$(_MauiTargetsImported)'=='True'">True</_MauiTargetsImportedAgain>
@@ -37,6 +42,9 @@
 		<Error Code="XF003"
 			Text="Microsoft.Maui requires msbuild. xbuild is no longer supported."
 			Condition="'$(IsXBuild)' == 'true'" />
+		<Error Code="MAUI004"
+			Text="At least version '$(_MinimumMauiWorkloadVersion)' of the .NET MAUI workload is required to use &lt;MauiVersion&gt;$(MauiVersion)&lt;/MauiVersion&gt;."
+			Condition="'$(MauiWorkloadVersion)' != '' and '$(MauiVersion)' != '' and $([MSBuild]::VersionLessThan($(MauiWorkloadVersion), $(_MinimumMauiWorkloadVersion)))" />
 	</Target>
 
 	<Target Name="_ValidateNETFrameworkVersion"

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -80,7 +80,7 @@
     <PackageProjectUrl>https://github.com/dotnet/maui</PackageProjectUrl>
     <PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
     <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
-    <PackageVersion>0.0.1-alpha1</PackageVersion>
+    <PackageVersion>6.0.100-dev</PackageVersion>
     <PackageOutputPath>$(MSBuildThisFileDirectory)artifacts</PackageOutputPath>
   </PropertyGroup>
   <!-- This target is replaced by GitInfo when restored. Allows Versions.targets to rely on it before restore. -->

diff --git a/Microsoft.Maui-net6.sln b/Microsoft.Maui-net6.sln
@@ -98,8 +98,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Maui.Essentials.R
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Maui.Essentials.Runtime", "src\Workload\Microsoft.Maui.Essentials.Runtime\Microsoft.Maui.Essentials.Runtime.csproj", "{C69336DF-EE56-4236-8188-06B2A8AD8A36}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Maui.Resizetizer.Sdk", "src\Workload\Microsoft.Maui.Resizetizer.Sdk\Microsoft.Maui.Resizetizer.Sdk.csproj", "{02414DF4-FBE9-400B-8F3F-40DDC7F8FEFC}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.NET.Sdk.Maui", "src\Workload\Microsoft.NET.Sdk.Maui\Microsoft.NET.Sdk.Maui.csproj", "{081EE5E5-69D4-493C-9EB4-47423C4728AB}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Maui.Extensions", "src\Workload\Microsoft.Maui.Extensions\Microsoft.Maui.Extensions.csproj", "{6EDE0C1B-B718-4331-99BA-423042CDBE24}"
@@ -331,10 +329,6 @@ Global
 		{C69336DF-EE56-4236-8188-06B2A8AD8A36}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C69336DF-EE56-4236-8188-06B2A8AD8A36}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C69336DF-EE56-4236-8188-06B2A8AD8A36}.Release|Any CPU.Build.0 = Release|Any CPU
-		{02414DF4-FBE9-400B-8F3F-40DDC7F8FEFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{02414DF4-FBE9-400B-8F3F-40DDC7F8FEFC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{02414DF4-FBE9-400B-8F3F-40DDC7F8FEFC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{02414DF4-FBE9-400B-8F3F-40DDC7F8FEFC}.Release|Any CPU.Build.0 = Release|Any CPU
 		{081EE5E5-69D4-493C-9EB4-47423C4728AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{081EE5E5-69D4-493C-9EB4-47423C4728AB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{081EE5E5-69D4-493C-9EB4-47423C4728AB}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -495,7 +489,6 @@ Global
 		{582BA9EC-420C-4512-8892-37E8F6D1E70F} = {EC63FD88-5E12-46D7-B440-68F70241D987}
 		{28B1E6A8-4EB7-4B82-9552-10C418692496} = {EC63FD88-5E12-46D7-B440-68F70241D987}
 		{C69336DF-EE56-4236-8188-06B2A8AD8A36} = {EC63FD88-5E12-46D7-B440-68F70241D987}
-		{02414DF4-FBE9-400B-8F3F-40DDC7F8FEFC} = {EC63FD88-5E12-46D7-B440-68F70241D987}
 		{081EE5E5-69D4-493C-9EB4-47423C4728AB} = {EC63FD88-5E12-46D7-B440-68F70241D987}
 		{6EDE0C1B-B718-4331-99BA-423042CDBE24} = {EC63FD88-5E12-46D7-B440-68F70241D987}
 		{316C0861-069B-4572-879F-F01E568F33A2} = {7AC28763-9C68-4BF9-A1BA-25CBFFD2D15C}

diff --git a/Microsoft.Maui.Packages-net6.slnf b/Microsoft.Maui.Packages-net6.slnf
@@ -26,7 +26,6 @@
       "src\\Workload\\Microsoft.Maui.Essentials.Ref\\Microsoft.Maui.Essentials.Ref.csproj",
       "src\\Workload\\Microsoft.Maui.Essentials.Runtime\\Microsoft.Maui.Essentials.Runtime.csproj",
       "src\\Workload\\Microsoft.Maui.Extensions\\Microsoft.Maui.Extensions.csproj",
-      "src\\Workload\\Microsoft.Maui.Resizetizer.Sdk\\Microsoft.Maui.Resizetizer.Sdk.csproj",
       "src\\Workload\\Microsoft.NET.Sdk.Maui\\Microsoft.NET.Sdk.Maui.csproj"
     ]
   }

diff --git a/src/Compatibility/ControlGallery/src/Core/Directory.Build.props b/src/Compatibility/ControlGallery/src/Core/Directory.Build.props
@@ -1,5 +1,6 @@
 <Project>
   <Import Project="..\..\..\..\..\Directory.Build.props" />
   <Import Project="$(_MauiBuildTasksLocation)Microsoft.Maui.Core.props"/>
+  <Import Project="$(_MauiBuildTasksLocation)Microsoft.Maui.Controls.DefaultItems.props"/>
   <Import Project="$(_MauiBuildTasksLocation)Microsoft.Maui.Controls.props"/>
 </Project> 
diff --git a/src/Compatibility/ControlGallery/src/Core/Directory.Build.targets b/src/Compatibility/ControlGallery/src/Core/Directory.Build.targets
@@ -5,11 +5,4 @@
   <Import Project="$(_MauiBuildTasksLocation)Microsoft.Maui.Resizetizer.targets" Condition="'$(BuildingInsideVisualStudio)' != 'true'" />
   <Import Project="$(_MauiBuildTasksLocation)Microsoft.Maui.Core.targets"  />
   <Import Project="..\..\..\..\..\Directory.Build.targets" />
-
-  <ItemGroup Condition="'$(BuildForNet6)' != 'true'">
-    <ProjectReference Include="$(MSBuildThisFileDirectory)\..\..\..\..\..\src\Controls\src\SourceGen\Controls.SourceGen.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(BuildForNet6)' == 'true'">
-    <ProjectReference Include="$(MSBuildThisFileDirectory)\..\..\..\..\..\src\Controls\src\SourceGen\Controls.SourceGen-net6.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
-  </ItemGroup>
 </Project>
diff --git a/src/Compatibility/ControlGallery/src/WinUI/Directory.Build.props b/src/Compatibility/ControlGallery/src/WinUI/Directory.Build.props
@@ -4,5 +4,6 @@
   </PropertyGroup>
   <Import Project="..\..\..\..\..\Directory.Build.props" />
   <Import Project="$(_MauiBuildTasksLocation)Microsoft.Maui.Core.props"/>
+  <Import Project="$(_MauiBuildTasksLocation)Microsoft.Maui.Controls.DefaultItems.props"/>
   <Import Project="$(_MauiBuildTasksLocation)Microsoft.Maui.Controls.props"/>
 </Project>
diff --git a/src/Controls/samples/Maui.InTree.props b/src/Controls/samples/Maui.InTree.props
@@ -1,4 +1,5 @@
 <Project>
   <Import Project="$(_MauiBuildTasksLocation)Microsoft.Maui.Core.props"/>
+  <Import Project="$(_MauiBuildTasksLocation)Microsoft.Maui.Controls.DefaultItems.props"/>
   <Import Project="$(_MauiBuildTasksLocation)Microsoft.Maui.Controls.props"/>
 </Project>
diff --git a/src/Controls/samples/Maui.InTree.targets b/src/Controls/samples/Maui.InTree.targets
@@ -4,10 +4,4 @@
   <Import Project="$(_MauiBuildTasksLocation)Microsoft.Maui.Resizetizer.targets" Condition="'$(BuildingInsideVisualStudio)' == 'true' AND Exists('$(_MauiBuildTasksLocation)Microsoft.Maui.Resizetizer.dll')" />
   <Import Project="$(_MauiBuildTasksLocation)Microsoft.Maui.Resizetizer.targets" Condition="'$(BuildingInsideVisualStudio)' != 'true'" />
   <Import Project="$(_MauiBuildTasksLocation)Microsoft.Maui.Core.targets"  />
-  <ItemGroup Condition="'$(BuildForNet6)' != 'true'">
-    <ProjectReference Include="$(MSBuildThisFileDirectory)\..\src\SourceGen\Controls.SourceGen.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(BuildForNet6)' == 'true'">
-    <ProjectReference Include="$(MSBuildThisFileDirectory)\..\src\SourceGen\Controls.SourceGen-net6.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
-  </ItemGroup>
 </Project>
diff --git a/src/Controls/src/Build.Tasks/Controls.Build.Tasks-net6.csproj b/src/Controls/src/Build.Tasks/Controls.Build.Tasks-net6.csproj
@@ -1,4 +1,5 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<!-- NOTE: This project is temporarily replacing part of Microsoft.Maui.Controls.Sdk -->
+<Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
 		<SignAssembly>false</SignAssembly>
 		<_DisableStrongNamer>True</_DisableStrongNamer>
@@ -7,9 +8,10 @@
 
 	<PropertyGroup>
 		<!-- <_DisableStrongNamer Condition=" '$(_DisableStrongNamer)' != 'True' ">False</_DisableStrongNamer> -->
+		<PackageId>Microsoft.Maui.Controls.Build.Tasks</PackageId>
 		<AssemblyName>Microsoft.Maui.Controls.Build.Tasks</AssemblyName>
 		<RootNamespace>Microsoft.Maui.Controls.Build.Tasks</RootNamespace>
-		<Description>Microsoft MAUI Build Task</Description>
+		<Description>.NET MAUI MSBuild tasks. Enabled via &lt;UseMaui&gt;true&lt;/UseMaui&gt;.</Description>
 		<TargetFramework>netstandard2.0</TargetFramework>
 		<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
 		<!-- <SignAssembly Condition=" '$(_DisableStrongNamer)' != 'True' ">True</SignAssembly>
@@ -19,7 +21,9 @@
 		<StrongNamerKeyFile>..\..\..\..\eng\microsoft.maui.controls.snk</StrongNamerKeyFile>
 		<DefineConstants Condition=" '$(_DisableStrongNamer)' != 'True' ">$(DefineConstants);STRONG_NAME</DefineConstants> -->
 		<IsTrimmable>false</IsTrimmable>
-		<IsPackable>false</IsPackable>
+		<IncludeSymbols>false</IncludeSymbols>
+		<IncludeBuildOutput>false</IncludeBuildOutput>
+		<NoWarn>NU5128</NoWarn>
 	</PropertyGroup>
 
 	<ItemGroup>
@@ -35,31 +39,38 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<None Include="$(TargetPath)" Visible="False" Pack="True" PackagePath="buildTransitive" />
-
-		<None Include="..\..\..\..\.nuspec\Microsoft.Maui.Controls.props" Visible="False" Pack="True" PackagePath="buildTransitive\Microsoft.Maui.Controls.Build.Tasks.props" />
-		<None Include="..\..\..\..\.nuspec\Microsoft.Maui.Controls.targets" Visible="False" Pack="True" PackagePath="buildTransitive\Microsoft.Maui.Controls.Build.Tasks.targets" />
-		<None Include="..\..\..\..\.nuspec\Microsoft.Maui.Controls.SingleProject.props" Visible="False" Pack="True" PackagePath="buildTransitive" />
-		<None Include="..\..\..\..\.nuspec\Microsoft.Maui.Controls.SingleProject.targets" Visible="False" Pack="True" PackagePath="buildTransitive" />
-
-		<None Include="..\..\..\..\.nuspec\Microsoft.Maui.Controls.DefaultItems.props" Visible="False" Pack="True" PackagePath="buildTransitive" />
-		<None Include="..\..\..\..\.nuspec\Microsoft.Maui.Controls.DefaultItems.targets" Visible="False" Pack="True" PackagePath="buildTransitive" />
-
-		<None Include="$(PkgMicrosoft_Maui_Graphics)\lib\netstandard2.0\Microsoft.Maui.Graphics.dll" Visible="False" Pack="True" PackagePath="buildTransitive" />
-		<None Include="$(PkgMono_Cecil)\lib\netstandard2.0\Mono.Cecil.dll" Visible="False" Pack="True" PackagePath="buildTransitive" />
-		<None Include="$(PkgMono_Cecil)\lib\netstandard2.0\Mono.Cecil.Mdb.dll" Visible="False" Pack="True" PackagePath="buildTransitive" />
-		<None Include="$(PkgMono_Cecil)\lib\netstandard2.0\Mono.Cecil.Pdb.dll" Visible="False" Pack="True" PackagePath="buildTransitive" />
-		<None Include="$(PkgMono_Cecil)\lib\netstandard2.0\Mono.Cecil.Rocks.dll" Visible="False" Pack="True" PackagePath="buildTransitive" />
-		<None Include="$(PkgSystem_CodeDom)\lib\netstandard2.0\System.CodeDom.dll" Visible="False" Pack="True" PackagePath="buildTransitive" />
-
-		<None Include="..\Core\bin\$(Configuration)\netstandard2.0\Microsoft.Maui.dll" Visible="False" Pack="True" PackagePath="buildTransitive" />
-		<None Include="..\Core\bin\$(Configuration)\netstandard2.0\Microsoft.Maui.Controls.dll" Visible="False" Pack="True" PackagePath="buildTransitive" />
-		<None Include="..\Xaml\bin\$(Configuration)\netstandard2.0\Microsoft.Maui.Controls.Xaml.dll" Visible="False" Pack="True" PackagePath="buildTransitive" />
+		<_Files Include="$(MauiNuSpecDirectory)Microsoft.Maui.Controls.SingleProject.targets" />
+		<_Files Include="$(MauiNuSpecDirectory)Microsoft.Maui.Controls.DefaultItems.targets" />
+		<_Files Include="$(PkgMicrosoft_Maui_Graphics)\lib\netstandard2.0\Microsoft.Maui.Graphics.dll" />
+		<_Files Include="$(PkgMicrosoft_Maui_Graphics)\lib\netstandard2.0\Microsoft.Maui.Graphics.pdb" />
+		<_Files Include="$(PkgMono_Cecil)\lib\netstandard2.0\Mono.Cecil.dll" />
+		<_Files Include="$(PkgMono_Cecil)\lib\netstandard2.0\Mono.Cecil.pdb" />
+		<_Files Include="$(PkgMono_Cecil)\lib\netstandard2.0\Mono.Cecil.Mdb.dll" />
+		<_Files Include="$(PkgMono_Cecil)\lib\netstandard2.0\Mono.Cecil.Mdb.pdb" />
+		<_Files Include="$(PkgMono_Cecil)\lib\netstandard2.0\Mono.Cecil.Pdb.dll" />
+		<_Files Include="$(PkgMono_Cecil)\lib\netstandard2.0\Mono.Cecil.Pdb.pdb" />
+		<_Files Include="$(PkgMono_Cecil)\lib\netstandard2.0\Mono.Cecil.Rocks.dll" />
+		<_Files Include="$(PkgMono_Cecil)\lib\netstandard2.0\Mono.Cecil.Rocks.pdb" />
+		<_Files Include="$(PkgSystem_CodeDom)\lib\netstandard2.0\System.CodeDom.dll" />
+		<_Files Include="..\Core\bin\$(Configuration)\netstandard2.0\Microsoft.Maui.dll" />
+		<_Files Include="..\Core\bin\$(Configuration)\netstandard2.0\Microsoft.Maui.pdb" />
+		<_Files Include="..\Core\bin\$(Configuration)\netstandard2.0\Microsoft.Maui.Controls.dll" />
+		<_Files Include="..\Core\bin\$(Configuration)\netstandard2.0\Microsoft.Maui.Controls.pdb" />
+		<_Files Include="..\Xaml\bin\$(Configuration)\netstandard2.0\Microsoft.Maui.Controls.Xaml.dll" />
+		<_Files Include="..\Xaml\bin\$(Configuration)\netstandard2.0\Microsoft.Maui.Controls.Xaml.pdb" />
+		<_Files Include="..\SourceGen\bin\$(Configuration)\netstandard2.0\Microsoft.Maui.Controls.SourceGen.dll" />
+		<_Files Include="..\SourceGen\bin\$(Configuration)\netstandard2.0\Microsoft.Maui.Controls.SourceGen.pdb" />
+		<None Include="@(_Files)" Visible="false" Pack="true" PackagePath="build" CopyToOutputDirectory="PreserveNewest" />
+		<None Include="$(OutputPath)$(AssemblyName).dll" Visible="false" Pack="true" PackagePath="build" />
+		<None Include="$(OutputPath)$(AssemblyName).pdb" Visible="false" Pack="true" PackagePath="build" />
+		<None Include="$(MauiNuSpecDirectory)Microsoft.Maui.Controls.props" Visible="false" Pack="true" PackagePath="build\$(PackageId).props" CopyToOutputDirectory="PreserveNewest" />
+		<None Include="$(MauiNuSpecDirectory)Microsoft.Maui.Controls.targets" Visible="false" Pack="true" PackagePath="build\$(PackageId).targets" CopyToOutputDirectory="PreserveNewest" />
 	</ItemGroup>
 
 	<ItemGroup>
 		<ProjectReference Include="..\Core\Controls.Core-net6.csproj" PrivateAssets="all" />
 		<ProjectReference Include="..\Xaml\Controls.Xaml-net6.csproj" PrivateAssets="all" />
+		<ProjectReference Include="..\SourceGen\Controls.SourceGen-net6.csproj" PrivateAssets="all" ReferenceOutputAssembly="false" />
 	</ItemGroup>
 
 	<ItemGroup>
@@ -79,9 +90,13 @@
 
 	<Target Name="_CopyToNuspecDir" AfterTargets="Build">
 		<ItemGroup>
+			<!-- The satellite assemblies need to be added after Build, so they exist -->
+			<None Include="$(OutputPath)*\$(AssemblyName).resources.dll" Visible="false" Pack="true" PackagePath="build" />
 			<_CopyItems Include="$(TargetDir)*.dll" Exclude="$(TargetDir)System.*.dll" />
 		</ItemGroup>
-		<Copy SourceFiles="@(_CopyItems)" DestinationFolder="..\..\..\..\.nuspec\" ContinueOnError="true" Retries="0" />
+		<Copy SourceFiles="@(_CopyItems)" DestinationFolder="$(MauiNuSpecDirectory)" ContinueOnError="true" Retries="0" />
 	</Target>
 
+	<Import Project="$(MauiRootDirectory)src\Workload\Shared\LibraryPacks.targets" />
+
 </Project>
diff --git a/src/Controls/tests/Xaml.UnitTests/Directory.Build.props b/src/Controls/tests/Xaml.UnitTests/Directory.Build.props
@@ -1,4 +1,5 @@
 <Project>
+  <Import Project="..\..\..\..\.nuspec\Microsoft.Maui.Controls.DefaultItems.props" />
   <Import Project="..\..\..\..\.nuspec\Microsoft.Maui.Controls.props" />
   <Import Project="..\..\..\..\Directory.Build.props" />
 </Project>
diff --git a/src/Controls/tests/Xaml.UnitTests/Directory.Build.targets b/src/Controls/tests/Xaml.UnitTests/Directory.Build.targets
@@ -2,11 +2,4 @@
   <Import Project="..\..\..\..\Directory.Build.targets" />
   <Import Project="..\..\..\..\.nuspec\Microsoft.Maui.Controls.Debug.targets" Condition="'$(BuildingInsideVisualStudio)' == 'true' AND Exists('$(_MauiBuildTasksLocation)Microsoft.Maui.Controls.Build.Tasks.dll')" />
   <Import Project="..\..\..\..\.nuspec\Microsoft.Maui.Controls.Debug.targets" Condition="'$(BuildingInsideVisualStudio)' != 'true'" />
-
-  <ItemGroup Condition="'$(BuildForNet6)' != 'true'">
-    <ProjectReference Include="$(MSBuildThisFileDirectory)\..\..\src\SourceGen\Controls.SourceGen.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(BuildForNet6)' == 'true'">
-    <ProjectReference Include="$(MSBuildThisFileDirectory)\..\..\src\SourceGen\Controls.SourceGen-net6.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
-  </ItemGroup>
 </Project>
diff --git a/src/Controls/tests/Xaml.UnitTests/MSBuild/_Directory.Build.props b/src/Controls/tests/Xaml.UnitTests/MSBuild/_Directory.Build.props
@@ -1,4 +1,5 @@
 <Project>
+  <Import Project="..\..\..\..\..\..\..\..\..\.nuspec\Microsoft.Maui.Controls.DefaultItems.props" />
   <Import Project="..\..\..\..\..\..\..\..\..\.nuspec\Microsoft.Maui.Controls.props" />
   <Import Project="..\..\..\..\..\..\..\..\..\Directory.Build.props" />
 </Project> 
diff --git a/src/Core/tests/DeviceTests/Core.DeviceTests.csproj b/src/Core/tests/DeviceTests/Core.DeviceTests.csproj
@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="..\..\..\..\.nuspec\Microsoft.Maui.Core.props" />
-  <Import Project="..\..\..\..\.nuspec\Microsoft.Maui.Controls.props" />
+  <Import Project="$(MauiNuSpecDirectory)Microsoft.Maui.Core.props" />
+  <Import Project="$(MauiNuSpecDirectory)Microsoft.Maui.Controls.DefaultItems.props" />
+  <Import Project="$(MauiNuSpecDirectory)Microsoft.Maui.Controls.props" />
 
   <PropertyGroup>
     <TargetFrameworks>$(MauiPlatformsNoMacCat)</TargetFrameworks>
@@ -45,7 +46,6 @@
     <ProjectReference Include="..\..\..\Controls\src\Xaml\Controls.Xaml-net6.csproj" />
     <ProjectReference Include="..\..\..\Controls\src\Core\Controls.Core-net6.csproj" />
     <ProjectReference Include="..\..\..\Essentials\src\Essentials-net6.csproj" />
-    <ProjectReference Include="..\..\..\Controls\src\SourceGen\Controls.SourceGen-net6.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
   </ItemGroup>
 
   <PropertyGroup>

diff --git a/src/Essentials/samples/Maui.InTree.props b/src/Essentials/samples/Maui.InTree.props
@@ -1,4 +1,5 @@
 <Project>
   <Import Project="$(_MauiBuildTasksLocation)Microsoft.Maui.Core.props"/>
+  <Import Project="$(_MauiBuildTasksLocation)Microsoft.Maui.Controls.DefaultItems.props"/>
   <Import Project="$(_MauiBuildTasksLocation)Microsoft.Maui.Controls.props"/>
 </Project>
diff --git a/src/Essentials/samples/Maui.InTree.targets b/src/Essentials/samples/Maui.InTree.targets
@@ -4,10 +4,4 @@
   <Import Project="$(_MauiBuildTasksLocation)Microsoft.Maui.Resizetizer.targets" Condition="'$(BuildingInsideVisualStudio)' == 'true' AND Exists('$(_MauiBuildTasksLocation)Microsoft.Maui.Resizetizer.dll')" />
   <Import Project="$(_MauiBuildTasksLocation)Microsoft.Maui.Resizetizer.targets" Condition="'$(BuildingInsideVisualStudio)' != 'true'" />
   <Import Project="$(_MauiBuildTasksLocation)Microsoft.Maui.Core.targets"  />
-  <ItemGroup Condition="'$(BuildForNet6)' != 'true'">
-    <ProjectReference Include="$(MSBuildThisFileDirectory)\..\..\Controls\src\SourceGen\Controls.SourceGen.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(BuildForNet6)' == 'true'">
-    <ProjectReference Include="$(MSBuildThisFileDirectory)\..\..\Controls\src\SourceGen\Controls.SourceGen-net6.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
-  </ItemGroup>
 </Project>