diff --git a/Directory.Build.props b/Directory.Build.props index 99af673d9059..4e3adb3834c3 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -11,6 +11,9 @@ false $(MSBuildThisFileDirectory) $(MSBuildThisFileDirectory)src/ + false + false + false @@ -115,6 +118,7 @@ $(DefineConstants);WINDOWS $(DefineConstants);COMPATIBILITY_ENABLED + $(DefineConstants);ENABLE_PREVIOUS_TFM_BUILDS snupkg diff --git a/src/BlazorWebView/samples/MauiRazorClassLibrarySample/MauiRazorClassLibrarySample.csproj b/src/BlazorWebView/samples/MauiRazorClassLibrarySample/MauiRazorClassLibrarySample.csproj index d1770c42be44..4f6d21573020 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..5a530b48d967 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..58c9560f4aa2 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..751ab6878119 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..bfaae807eca3 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..469306cfd7c5 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..51663e1473e2 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..58deb310a4c7 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..41396d6d4af5 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..b0b994403492 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 181da40c07a2..7c500859f43a 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..81121e7302eb 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..375f8505a939 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..049f1e6e1602 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..0b0e6d54f72b 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..fda39d5db850 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..059629864d62 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..ce0b53395120 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 diff --git a/src/TestUtils/src/Microsoft.Maui.IntegrationTests/SimpleTemplateTest.cs b/src/TestUtils/src/Microsoft.Maui.IntegrationTests/SimpleTemplateTest.cs index 0e7af03dfa36..8f2abd3002ed 100644 --- a/src/TestUtils/src/Microsoft.Maui.IntegrationTests/SimpleTemplateTest.cs +++ b/src/TestUtils/src/Microsoft.Maui.IntegrationTests/SimpleTemplateTest.cs @@ -130,6 +130,7 @@ public void BuildWithMauiVersion(string id, string framework, string config, boo $"Project {Path.GetFileName(projectFile)} failed to build. Check test output/attachments for errors."); } +#if ENABLE_PREVIOUS_TFM_BUILDS [Test] [TestCase("maui", "Debug", false)] [TestCase("maui", "Release", false)] @@ -168,6 +169,7 @@ public void PreviousDotNetCanUseLatestMaui(string id, string config, bool should Assert.IsTrue(DotnetInternal.Build(projectFile, config, target: target, properties: BuildProps), $"Project {Path.GetFileName(projectFile)} failed to build. Check test output/attachments for errors."); } +#endif [Test] public void BuildHandlesBadFilesInImages()