diff --git a/Directory.Build.props b/Directory.Build.props
index 99af673d9059..3b6f96925c16 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -11,6 +11,9 @@
false
$(MSBuildThisFileDirectory)
$(MSBuildThisFileDirectory)src/
+ false
+ false
+ false
diff --git a/src/BlazorWebView/samples/MauiRazorClassLibrarySample/MauiRazorClassLibrarySample.csproj b/src/BlazorWebView/samples/MauiRazorClassLibrarySample/MauiRazorClassLibrarySample.csproj
index d1770c42be44..8cbd9dd86c2d 100644
--- a/src/BlazorWebView/samples/MauiRazorClassLibrarySample/MauiRazorClassLibrarySample.csproj
+++ b/src/BlazorWebView/samples/MauiRazorClassLibrarySample/MauiRazorClassLibrarySample.csproj
@@ -1,7 +1,8 @@
- $(_MauiDotNetTfm);$(_MauiPreviousDotNetTfm)
+ $(_MauiDotNetTfm)
+ $(TargetFrameworks);$(_MauiPreviousDotNetTfm)
false
diff --git a/src/BlazorWebView/src/Maui/Microsoft.AspNetCore.Components.WebView.Maui.csproj b/src/BlazorWebView/src/Maui/Microsoft.AspNetCore.Components.WebView.Maui.csproj
index 4a656d9d6b01..75935102a596 100644
--- a/src/BlazorWebView/src/Maui/Microsoft.AspNetCore.Components.WebView.Maui.csproj
+++ b/src/BlazorWebView/src/Maui/Microsoft.AspNetCore.Components.WebView.Maui.csproj
@@ -1,7 +1,8 @@
- $(_MauiDotNetTfm);$(MauiPlatforms);$(_MauiPreviousDotNetTfm);$(MauiPreviousPlatforms)
+ $(_MauiDotNetTfm);$(MauiPlatforms)
+ $(TargetFrameworks);$(_MauiPreviousDotNetTfm);$(MauiPreviousPlatforms)
enable
$(DefineConstants);WEBVIEW2_MAUI
true
diff --git a/src/Compatibility/Core/src/Compatibility.csproj b/src/Compatibility/Core/src/Compatibility.csproj
index f62fd4ed80d6..a4504db9c745 100644
--- a/src/Compatibility/Core/src/Compatibility.csproj
+++ b/src/Compatibility/Core/src/Compatibility.csproj
@@ -1,6 +1,7 @@
- netstandard2.1;netstandard2.0;$(_MauiDotNetTfm);$(MauiPlatforms);$(_MauiPreviousDotNetTfm);$(MauiPreviousPlatforms)
+ netstandard2.1;netstandard2.0;$(_MauiDotNetTfm);$(MauiPlatforms)
+ $(TargetFrameworks);$(_MauiPreviousDotNetTfm);$(MauiPreviousPlatforms)
Microsoft.Maui.Controls.Compatibility
Microsoft.Maui.Controls.Compatibility
disable
diff --git a/src/Controls/Foldable/src/Controls.Foldable.csproj b/src/Controls/Foldable/src/Controls.Foldable.csproj
index 842262cc9d8a..bd65840e9426 100644
--- a/src/Controls/Foldable/src/Controls.Foldable.csproj
+++ b/src/Controls/Foldable/src/Controls.Foldable.csproj
@@ -1,6 +1,7 @@
- $(_MauiDotNetTfm);$(MauiPlatforms);$(_MauiPreviousDotNetTfm);$(MauiPreviousPlatforms)
+ $(_MauiDotNetTfm);$(MauiPlatforms)
+ $(TargetFrameworks);$(_MauiPreviousDotNetTfm);$(MauiPreviousPlatforms)
Microsoft.Maui.Controls.Foldable
Microsoft.Maui.Controls.Foldable
BI1234
diff --git a/src/Controls/Maps/src/Controls.Maps.csproj b/src/Controls/Maps/src/Controls.Maps.csproj
index d8cbbfeb85a9..56b285aa11ff 100644
--- a/src/Controls/Maps/src/Controls.Maps.csproj
+++ b/src/Controls/Maps/src/Controls.Maps.csproj
@@ -1,7 +1,8 @@
- netstandard2.1;netstandard2.0;$(_MauiDotNetTfm);$(MauiPlatforms);$(_MauiPreviousDotNetTfm);$(MauiPreviousPlatforms)
+ netstandard2.1;netstandard2.0;$(_MauiDotNetTfm);$(MauiPlatforms)
+ $(TargetFrameworks);$(_MauiPreviousDotNetTfm);$(MauiPreviousPlatforms)
Microsoft.Maui.Controls.Maps
Microsoft.Maui.Controls.Maps
false
diff --git a/src/Controls/samples/Controls.Sample.Sandbox/Maui.Controls.Sample.Sandbox.csproj b/src/Controls/samples/Controls.Sample.Sandbox/Maui.Controls.Sample.Sandbox.csproj
index c78fd62f610d..b8bcc243f33b 100644
--- a/src/Controls/samples/Controls.Sample.Sandbox/Maui.Controls.Sample.Sandbox.csproj
+++ b/src/Controls/samples/Controls.Sample.Sandbox/Maui.Controls.Sample.Sandbox.csproj
@@ -2,7 +2,7 @@
$(MauiSamplePlatforms)
- $(TargetFrameworks);$(MauiSamplePreviousPlatforms)
+ $(TargetFrameworks);$(MauiSamplePreviousPlatforms)
Exe
true
enable
diff --git a/src/Controls/samples/Controls.Sample/Maui.Controls.Sample.csproj b/src/Controls/samples/Controls.Sample/Maui.Controls.Sample.csproj
index 7ea833ea4add..fb89359b44ea 100644
--- a/src/Controls/samples/Controls.Sample/Maui.Controls.Sample.csproj
+++ b/src/Controls/samples/Controls.Sample/Maui.Controls.Sample.csproj
@@ -4,7 +4,7 @@
$(MauiSamplePlatforms);$(_MauiDotNetTfm)
- $(TargetFrameworks);$(_MauiPreviousDotNetTfm);$(MauiSamplePreviousPlatforms)
+ $(TargetFrameworks);$(_MauiPreviousDotNetTfm);$(MauiSamplePreviousPlatforms)
Exe
true
Maui.Controls.Sample
diff --git a/src/Controls/src/Core/Controls.Core.csproj b/src/Controls/src/Core/Controls.Core.csproj
index 4343a8288909..fac3acd758b9 100644
--- a/src/Controls/src/Core/Controls.Core.csproj
+++ b/src/Controls/src/Core/Controls.Core.csproj
@@ -1,7 +1,8 @@
- netstandard2.1;netstandard2.0;$(_MauiDotNetTfm);$(MauiPlatforms);$(_MauiPreviousDotNetTfm);$(MauiPreviousPlatforms)
+ netstandard2.1;netstandard2.0;$(_MauiDotNetTfm);$(MauiPlatforms)
+ $(TargetFrameworks);$(_MauiPreviousDotNetTfm);$(MauiPreviousPlatforms)
Microsoft.Maui.Controls
Microsoft.Maui.Controls
enable
diff --git a/src/Controls/src/NuGet/Controls.NuGet.csproj b/src/Controls/src/NuGet/Controls.NuGet.csproj
index 3bdc0bfa7881..5672c930fd86 100644
--- a/src/Controls/src/NuGet/Controls.NuGet.csproj
+++ b/src/Controls/src/NuGet/Controls.NuGet.csproj
@@ -1,7 +1,8 @@
- netstandard2.1;netstandard2.0;$(_MauiDotNetTfm);$(MauiPlatforms);$(_MauiPreviousDotNetTfm);$(MauiPreviousPlatforms)
+ netstandard2.1;netstandard2.0;$(_MauiDotNetTfm);$(MauiPlatforms)
+ $(TargetFrameworks);$(_MauiPreviousDotNetTfm);$(MauiPreviousPlatforms)
true
diff --git a/src/Controls/src/Xaml/Controls.Xaml.csproj b/src/Controls/src/Xaml/Controls.Xaml.csproj
index 41ca17cc172f..e41f3cbefd29 100644
--- a/src/Controls/src/Xaml/Controls.Xaml.csproj
+++ b/src/Controls/src/Xaml/Controls.Xaml.csproj
@@ -1,7 +1,8 @@
- netstandard2.1;netstandard2.0;$(_MauiDotNetTfm);$(MauiPlatforms);$(_MauiPreviousDotNetTfm);$(MauiPreviousPlatforms)
+ netstandard2.1;netstandard2.0;$(_MauiDotNetTfm);$(MauiPlatforms)
+ $(TargetFrameworks);$(_MauiPreviousDotNetTfm);$(MauiPreviousPlatforms)
Microsoft.Maui.Controls.Xaml
Microsoft.Maui.Controls.Xaml
false
diff --git a/src/Controls/tests/TestCases.HostApp/Controls.TestCases.HostApp.csproj b/src/Controls/tests/TestCases.HostApp/Controls.TestCases.HostApp.csproj
index f50fd17d2e8d..4c5f53d85dfc 100644
--- a/src/Controls/tests/TestCases.HostApp/Controls.TestCases.HostApp.csproj
+++ b/src/Controls/tests/TestCases.HostApp/Controls.TestCases.HostApp.csproj
@@ -2,7 +2,7 @@
$(MauiSamplePlatforms)
- $(TargetFrameworks);$(MauiSamplePreviousPlatforms)
+ $(TargetFrameworks);$(MauiSamplePreviousPlatforms)
Exe
true
false
diff --git a/src/Core/maps/src/Maps.csproj b/src/Core/maps/src/Maps.csproj
index 950de572dec6..b5957da54f63 100644
--- a/src/Core/maps/src/Maps.csproj
+++ b/src/Core/maps/src/Maps.csproj
@@ -1,7 +1,8 @@
- netstandard2.1;netstandard2.0;$(_MauiDotNetTfm);$(MauiPlatforms);$(_MauiPreviousDotNetTfm);$(MauiPreviousPlatforms)
+ netstandard2.1;netstandard2.0;$(_MauiDotNetTfm);$(MauiPlatforms)
+ $(TargetFrameworks);$(_MauiPreviousDotNetTfm);$(MauiPreviousPlatforms)
Microsoft.Maui.Maps
Microsoft.Maui.Maps
enable
diff --git a/src/Core/src/Core.csproj b/src/Core/src/Core.csproj
index b85bb6639128..04cc37499d98 100644
--- a/src/Core/src/Core.csproj
+++ b/src/Core/src/Core.csproj
@@ -1,7 +1,8 @@
- netstandard2.1;netstandard2.0;$(_MauiDotNetTfm);$(MauiPlatforms);$(_MauiPreviousDotNetTfm);$(MauiPreviousPlatforms)
+ netstandard2.1;netstandard2.0;$(_MauiDotNetTfm);$(MauiPlatforms)
+ $(TargetFrameworks);$(_MauiPreviousDotNetTfm);$(MauiPreviousPlatforms)
Microsoft.Maui
Microsoft.Maui
enable
diff --git a/src/Essentials/samples/Samples/Essentials.Sample.csproj b/src/Essentials/samples/Samples/Essentials.Sample.csproj
index 03335edc3fe2..b111f6c603c8 100644
--- a/src/Essentials/samples/Samples/Essentials.Sample.csproj
+++ b/src/Essentials/samples/Samples/Essentials.Sample.csproj
@@ -2,7 +2,7 @@
$(MauiSamplePlatforms)
- $(TargetFrameworks);$(MauiSamplePreviousPlatforms)
+ $(TargetFrameworks);$(MauiSamplePreviousPlatforms)
Maui.Essentials.Sample
Microsoft.Maui.Essentials.Sample
Exe
diff --git a/src/Essentials/src/Essentials.csproj b/src/Essentials/src/Essentials.csproj
index 3efcb139e14c..d4e5e2cfc732 100644
--- a/src/Essentials/src/Essentials.csproj
+++ b/src/Essentials/src/Essentials.csproj
@@ -1,6 +1,7 @@
- netstandard2.1;netstandard2.0;$(_MauiDotNetTfm);$(MauiPlatforms);$(_MauiPreviousDotNetTfm);$(MauiPreviousPlatforms)
+ netstandard2.1;netstandard2.0;$(_MauiDotNetTfm);$(MauiPlatforms)
+ $(TargetFrameworks);$(_MauiPreviousDotNetTfm);$(MauiPreviousPlatforms)
Microsoft.Maui.Essentials
Microsoft.Maui.Essentials
false
diff --git a/src/Graphics/src/Graphics.Skia/Graphics.Skia.csproj b/src/Graphics/src/Graphics.Skia/Graphics.Skia.csproj
index 4822a52ee844..516a465b212b 100644
--- a/src/Graphics/src/Graphics.Skia/Graphics.Skia.csproj
+++ b/src/Graphics/src/Graphics.Skia/Graphics.Skia.csproj
@@ -1,7 +1,8 @@
- netstandard2.1;netstandard2.0;$(_MauiDotNetTfm);$(MauiGraphicsPlatforms);$(_MauiPreviousDotNetTfm);$(MauiGraphicsPreviousPlatforms)
+ netstandard2.1;netstandard2.0;$(_MauiDotNetTfm);$(MauiGraphicsPlatforms)
+ $(TargetFrameworks);$(_MauiPreviousDotNetTfm);$(MauiGraphicsPreviousPlatforms)
Microsoft.Maui.Graphics.Skia
Microsoft.Maui.Graphics.Skia
false
diff --git a/src/Graphics/src/Graphics.Win2D/Graphics.Win2D.csproj b/src/Graphics/src/Graphics.Win2D/Graphics.Win2D.csproj
index dd910c2c61fe..5147c0ab9d4f 100644
--- a/src/Graphics/src/Graphics.Win2D/Graphics.Win2D.csproj
+++ b/src/Graphics/src/Graphics.Win2D/Graphics.Win2D.csproj
@@ -1,7 +1,8 @@
- $(WindowsMauiPlatforms);$(WindowsMauiPreviousPlatforms)
+ $(WindowsMauiPlatforms)
+ $(TargetFrameworks);$(WindowsMauiPreviousPlatforms)
Microsoft.Maui.Graphics.Win2D.WinUI.Desktop
Microsoft.Maui.Graphics.Win2D.WinUI.Desktop
false
diff --git a/src/Graphics/src/Graphics/Graphics.csproj b/src/Graphics/src/Graphics/Graphics.csproj
index 58d5d417275d..9d41ae749689 100644
--- a/src/Graphics/src/Graphics/Graphics.csproj
+++ b/src/Graphics/src/Graphics/Graphics.csproj
@@ -1,7 +1,8 @@
- netstandard2.1;netstandard2.0;$(_MauiDotNetTfm);$(MauiGraphicsPlatforms);$(_MauiPreviousDotNetTfm);$(MauiGraphicsPreviousPlatforms)
+ netstandard2.1;netstandard2.0;$(_MauiDotNetTfm);$(MauiGraphicsPlatforms)
+ $(TargetFrameworks);$(_MauiPreviousDotNetTfm);$(MauiGraphicsPreviousPlatforms)
true
snupkg