Skip to content

Commit da58190

Browse files
mgoertz-msftrmarinho
authored andcommitted
Restructured CodeBehindGenerator pipeline (#20524)
* - Restructured CodeBehindGenerator pipeline to maximize SourceGen cachability - Split out CSS SourceGen, which does not depend on Compilation at all - Added TrackingNames to support new SourceGen unit test project Fixes Issue #12978 CodeBehindGenerator has improper pipeline Fixes AB#1947659: `CodeBehindGenerator` has improper pipeline * - Use file-scoped namespaces throughout PR - Use raw string literals for SourceGen tests
1 parent 09dd676 commit da58190

File tree

9 files changed

+1168
-414
lines changed

9 files changed

+1168
-414
lines changed

Microsoft.Maui-dev.sln

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -241,6 +241,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UITest.Appium", "src\TestUt
241241
EndProject
242242
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UITest.NUnit", "src\TestUtils\src\UITest.NUnit\UITest.NUnit.csproj", "{A307B624-48D4-494E-A70D-5B3CDF6620CF}"
243243
EndProject
244+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Controls.SourceGen.UnitTests", "src\Controls\tests\SourceGen.UnitTests\Conrtrols.SourceGen.UnitTests\Controls.SourceGen.UnitTests.csproj", "{06747B55-91DB-47F5-B7A2-56526C28A0D3}"
245+
EndProject
246+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SourceGen.UnitTests", "src\Controls\tests\SourceGen.UnitTests\SourceGen.UnitTests.csproj", "{BC7F7C82-694F-4B97-86FC-273FB3FACA25}"
247+
EndProject
244248
Global
245249
GlobalSection(SolutionConfigurationPlatforms) = preSolution
246250
Debug|Any CPU = Debug|Any CPU
@@ -610,6 +614,14 @@ Global
610614
{A307B624-48D4-494E-A70D-5B3CDF6620CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
611615
{A307B624-48D4-494E-A70D-5B3CDF6620CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
612616
{A307B624-48D4-494E-A70D-5B3CDF6620CF}.Release|Any CPU.Build.0 = Release|Any CPU
617+
{06747B55-91DB-47F5-B7A2-56526C28A0D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
618+
{06747B55-91DB-47F5-B7A2-56526C28A0D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
619+
{06747B55-91DB-47F5-B7A2-56526C28A0D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
620+
{06747B55-91DB-47F5-B7A2-56526C28A0D3}.Release|Any CPU.Build.0 = Release|Any CPU
621+
{BC7F7C82-694F-4B97-86FC-273FB3FACA25}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
622+
{BC7F7C82-694F-4B97-86FC-273FB3FACA25}.Debug|Any CPU.Build.0 = Debug|Any CPU
623+
{BC7F7C82-694F-4B97-86FC-273FB3FACA25}.Release|Any CPU.ActiveCfg = Release|Any CPU
624+
{BC7F7C82-694F-4B97-86FC-273FB3FACA25}.Release|Any CPU.Build.0 = Release|Any CPU
613625
EndGlobalSection
614626
GlobalSection(SolutionProperties) = preSolution
615627
HideSolutionNode = FALSE
@@ -721,6 +733,8 @@ Global
721733
{8F7B825D-24A8-4E09-AC5B-9117926B7BF3} = {7AC28763-9C68-4BF9-A1BA-25CBFFD2D15C}
722734
{26379D0E-4D4D-48CA-94B1-A2C1972AB335} = {7AC28763-9C68-4BF9-A1BA-25CBFFD2D15C}
723735
{A307B624-48D4-494E-A70D-5B3CDF6620CF} = {7AC28763-9C68-4BF9-A1BA-25CBFFD2D15C}
736+
{06747B55-91DB-47F5-B7A2-56526C28A0D3} = {25D0D27A-C5FE-443D-8B65-D6C987F4A80E}
737+
{BC7F7C82-694F-4B97-86FC-273FB3FACA25} = {25D0D27A-C5FE-443D-8B65-D6C987F4A80E}
724738
EndGlobalSection
725739
GlobalSection(ExtensibilityGlobals) = postSolution
726740
SolutionGuid = {0B8ABEAD-D2B5-4370-A187-62B5ABE4EE50}

Microsoft.Maui-windows.slnf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
"src\\Controls\\tests\\Core.UnitTests\\Controls.Core.UnitTests.csproj",
2828
"src\\Controls\\tests\\CustomAttributes\\Controls.CustomAttributes.csproj",
2929
"src\\Controls\\tests\\DeviceTests\\Controls.DeviceTests.csproj",
30+
"src\\Controls\\tests\\SourceGen.UnitTests\\SourceGen.UnitTests.csproj",
3031
"src\\Controls\\tests\\UITests\\Controls.AppiumTests.csproj",
3132
"src\\Controls\\tests\\Xaml.UnitTests.ExternalAssembly\\Controls.Xaml.UnitTests.ExternalAssembly.csproj",
3233
"src\\Controls\\tests\\Xaml.UnitTests.InternalsHiddenAssembly\\Controls.Xaml.UnitTests.InternalsHiddenAssembly.csproj",
@@ -47,7 +48,6 @@
4748
"src\\Graphics\\samples\\GraphicsTester.Android\\GraphicsTester.Android.csproj",
4849
"src\\Graphics\\samples\\GraphicsTester.Portable\\GraphicsTester.Portable.csproj",
4950
"src\\Graphics\\samples\\GraphicsTester.Skia.Console\\GraphicsTester.Skia.Console.csproj",
50-
"src\\Graphics\\samples\\GraphicsTester.Skia.Tizen\\GraphicsTester.Skia.Tizen.csproj",
5151
"src\\Graphics\\samples\\GraphicsTester.Skia.Windows\\GraphicsTester.Skia.Windows.csproj",
5252
"src\\Graphics\\samples\\GraphicsTester.WinUI.Desktop\\GraphicsTester.WinUI.Desktop.csproj",
5353
"src\\Graphics\\samples\\GraphicsTester.iOS\\GraphicsTester.iOS.csproj",
@@ -63,14 +63,14 @@
6363
"src\\SingleProject\\Resizetizer\\test\\UnitTests\\Resizetizer.UnitTests.csproj",
6464
"src\\Templates\\src\\Microsoft.Maui.Templates.csproj",
6565
"src\\TestUtils\\samples\\DeviceTests.Sample\\TestUtils.DeviceTests.Sample.csproj",
66-
"src\\TestUtils\\src\\UITest.Core\\UITest.Core.csproj",
67-
"src\\TestUtils\\src\\UITest.Appium\\UITest.Appium.csproj",
68-
"src\\TestUtils\\src\\UITest.NUnit\\UITest.NUnit.csproj",
6966
"src\\TestUtils\\src\\DeviceTests.Runners.SourceGen\\TestUtils.DeviceTests.Runners.SourceGen.csproj",
7067
"src\\TestUtils\\src\\DeviceTests.Runners\\TestUtils.DeviceTests.Runners.csproj",
7168
"src\\TestUtils\\src\\DeviceTests\\TestUtils.DeviceTests.csproj",
7269
"src\\TestUtils\\src\\Microsoft.Maui.IntegrationTests\\Microsoft.Maui.IntegrationTests.csproj",
7370
"src\\TestUtils\\src\\TestUtils\\TestUtils.csproj",
71+
"src\\TestUtils\\src\\UITest.Appium\\UITest.Appium.csproj",
72+
"src\\TestUtils\\src\\UITest.Core\\UITest.Core.csproj",
73+
"src\\TestUtils\\src\\UITest.NUnit\\UITest.NUnit.csproj",
7474
"src\\Workload\\Microsoft.Maui.Sdk\\Microsoft.Maui.Sdk.csproj",
7575
"src\\Workload\\Microsoft.NET.Sdk.Maui.Manifest\\Microsoft.NET.Sdk.Maui.Manifest.csproj"
7676
]

0 commit comments

Comments
 (0)