Skip to content

Commit

Permalink
Remove netPrevious TFMs from RC/GA
Browse files Browse the repository at this point in the history
  • Loading branch information
@mattleibow
mattleibow committed Aug 28, 2024
1 parent e1a78f4 commit c1a3028
Show file tree
Hide file tree
Showing 15 changed files with 30 additions and 14 deletions.
3 changes: 3 additions & 0 deletions Directory.Build.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@
<SignAssembly>false</SignAssembly>
<MauiRootDirectory>$(MSBuildThisFileDirectory)</MauiRootDirectory>
<MauiSrcDirectory>$(MSBuildThisFileDirectory)src/</MauiSrcDirectory>
<IncludePreviousTfms>false</IncludePreviousTfms>
<IncludePreviousTfmsEssentials>false</IncludePreviousTfmsEssentials>
<IncludePreviousTfmsGraphics>false</IncludePreviousTfmsGraphics>
</PropertyGroup>

<PropertyGroup>
Expand Down
3 changes: 2 additions & 1 deletion src/BlazorWebView/samples/MauiRazorClassLibrarySample/MauiRazorClassLibrarySample.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">

<PropertyGroup>
<TargetFrameworks>$(_MauiDotNetTfm);$(_MauiPreviousDotNetTfm)</TargetFrameworks>
<TargetFrameworks>$(_MauiDotNetTfm)</TargetFrameworks>
<TargetFrameworks Condition="'$(IncludePreviousTfms)' != 'false'">$(TargetFrameworks);$(_MauiPreviousDotNetTfm)</TargetFrameworks>
<IsPackable>false</IsPackable>
</PropertyGroup>

Expand Down
3 changes: 2 additions & 1 deletion src/BlazorWebView/src/Maui/Microsoft.AspNetCore.Components.WebView.Maui.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>$(_MauiDotNetTfm);$(MauiPlatforms);$(_MauiPreviousDotNetTfm);$(MauiPreviousPlatforms)</TargetFrameworks>
<TargetFrameworks>netstandard2.1;netstandard2.0;$(_MauiDotNetTfm);$(MauiPlatforms)</TargetFrameworks>
<TargetFrameworks Condition="'$(IncludePreviousTfms)' != 'false'">$(TargetFrameworks);$(_MauiPreviousDotNetTfm);$(MauiPreviousPlatforms)</TargetFrameworks>
<Nullable>enable</Nullable>
<DefineConstants>$(DefineConstants);WEBVIEW2_MAUI</DefineConstants>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
Expand Down
3 changes: 2 additions & 1 deletion src/Compatibility/Core/src/Compatibility.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.1;netstandard2.0;$(_MauiDotNetTfm);$(MauiPlatforms);$(_MauiPreviousDotNetTfm);$(MauiPreviousPlatforms)</TargetFrameworks>
<TargetFrameworks>netstandard2.1;netstandard2.0;$(_MauiDotNetTfm);$(MauiPlatforms)</TargetFrameworks>
<TargetFrameworks Condition="'$(IncludePreviousTfms)' != 'false'">$(TargetFrameworks);$(_MauiPreviousDotNetTfm);$(MauiPreviousPlatforms)</TargetFrameworks>
<RootNamespace>Microsoft.Maui.Controls.Compatibility</RootNamespace>
<AssemblyName>Microsoft.Maui.Controls.Compatibility</AssemblyName>
<Nullable>disable</Nullable>
Expand Down
3 changes: 2 additions & 1 deletion src/Controls/Foldable/src/Controls.Foldable.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>$(_MauiDotNetTfm);$(MauiPlatforms);$(_MauiPreviousDotNetTfm);$(MauiPreviousPlatforms)</TargetFrameworks>
<TargetFrameworks>$(_MauiDotNetTfm);$(MauiPlatforms)</TargetFrameworks>
<TargetFrameworks Condition="'$(IncludePreviousTfms)' != 'false'">$(TargetFrameworks);$(_MauiPreviousDotNetTfm);$(MauiPreviousPlatforms)</TargetFrameworks>
<AssemblyName>Microsoft.Maui.Controls.Foldable</AssemblyName>
<RootNamespace>Microsoft.Maui.Controls.Foldable</RootNamespace>
<WarningsNotAsErrors>BI1234</WarningsNotAsErrors>
Expand Down
3 changes: 2 additions & 1 deletion src/Controls/Maps/src/Controls.Maps.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.1;netstandard2.0;$(_MauiDotNetTfm);$(MauiPlatforms);$(_MauiPreviousDotNetTfm);$(MauiPreviousPlatforms)</TargetFrameworks>
<TargetFrameworks>netstandard2.1;netstandard2.0;$(_MauiDotNetTfm);$(MauiPlatforms)</TargetFrameworks>
<TargetFrameworks Condition="'$(IncludePreviousTfms)' != 'false'">$(TargetFrameworks);$(_MauiPreviousDotNetTfm);$(MauiPreviousPlatforms)</TargetFrameworks>
<AssemblyName>Microsoft.Maui.Controls.Maps</AssemblyName>
<RootNamespace>Microsoft.Maui.Controls.Maps</RootNamespace>
<IsTrimmable>false</IsTrimmable>
Expand Down
2 changes: 1 addition & 1 deletion src/Controls/samples/Controls.Sample/Maui.Controls.Sample.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<PropertyGroup>
<TargetFrameworks>$(MauiSamplePlatforms);$(_MauiDotNetTfm)</TargetFrameworks>
<TargetFrameworks Condition=" '$(UseMaui)' != 'true' ">$(TargetFrameworks);$(_MauiPreviousDotNetTfm);$(MauiSamplePreviousPlatforms)</TargetFrameworks>
<TargetFrameworks Condition=" '$(UseMaui)' != 'true' and '$(IncludePreviousTfms)' != 'false' ">$(TargetFrameworks);$(_MauiPreviousDotNetTfm);$(MauiSamplePreviousPlatforms)</TargetFrameworks>
<OutputType Condition="$(TargetFramework.Contains('-'))">Exe</OutputType>
<SingleProject>true</SingleProject>
<RootNamespace>Maui.Controls.Sample</RootNamespace>
Expand Down
3 changes: 2 additions & 1 deletion src/Controls/src/Core/Controls.Core.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.1;netstandard2.0;$(_MauiDotNetTfm);$(MauiPlatforms);$(_MauiPreviousDotNetTfm);$(MauiPreviousPlatforms)</TargetFrameworks>
<TargetFrameworks>netstandard2.1;netstandard2.0;$(_MauiDotNetTfm);$(MauiPlatforms)</TargetFrameworks>
<TargetFrameworks Condition="'$(IncludePreviousTfms)' != 'false'">$(TargetFrameworks);$(_MauiPreviousDotNetTfm);$(MauiPreviousPlatforms)</TargetFrameworks>
<RootNamespace>Microsoft.Maui.Controls</RootNamespace>
<AssemblyName>Microsoft.Maui.Controls</AssemblyName>
<Nullable>enable</Nullable>
Expand Down
3 changes: 2 additions & 1 deletion src/Controls/src/NuGet/Controls.NuGet.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.1;netstandard2.0;$(_MauiDotNetTfm);$(MauiPlatforms);$(_MauiPreviousDotNetTfm);$(MauiPreviousPlatforms)</TargetFrameworks>
<TargetFrameworks>netstandard2.1;netstandard2.0;$(_MauiDotNetTfm);$(MauiPlatforms)</TargetFrameworks>
<TargetFrameworks Condition="'$(IncludePreviousTfms)' != 'false'">$(TargetFrameworks);$(_MauiPreviousDotNetTfm);$(MauiPreviousPlatforms)</TargetFrameworks>
<!-- Suppresses the warnings about the package not having assemblies in lib/*/.dll.-->
<NoPackageAnalysis>true</NoPackageAnalysis>
<!-- Do not include any assemblies from this project as it is a "meta" project -->
Expand Down
3 changes: 2 additions & 1 deletion src/Controls/src/Xaml/Controls.Xaml.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.1;netstandard2.0;$(_MauiDotNetTfm);$(MauiPlatforms);$(_MauiPreviousDotNetTfm);$(MauiPreviousPlatforms)</TargetFrameworks>
<TargetFrameworks>netstandard2.1;netstandard2.0;$(_MauiDotNetTfm);$(MauiPlatforms)</TargetFrameworks>
<TargetFrameworks Condition="'$(IncludePreviousTfms)' != 'false'">$(TargetFrameworks);$(_MauiPreviousDotNetTfm);$(MauiPreviousPlatforms)</TargetFrameworks>
<AssemblyName>Microsoft.Maui.Controls.Xaml</AssemblyName>
<RootNamespace>Microsoft.Maui.Controls.Xaml</RootNamespace>
<IsTrimmable>false</IsTrimmable>
Expand Down
3 changes: 2 additions & 1 deletion src/Core/maps/src/Maps.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.1;netstandard2.0;$(_MauiDotNetTfm);$(MauiPlatforms);$(_MauiPreviousDotNetTfm);$(MauiPreviousPlatforms)</TargetFrameworks>
<TargetFrameworks>netstandard2.1;netstandard2.0;$(_MauiDotNetTfm);$(MauiPlatforms)</TargetFrameworks>
<TargetFrameworks Condition="'$(IncludePreviousTfms)' != 'false'">$(TargetFrameworks);$(_MauiPreviousDotNetTfm);$(MauiPreviousPlatforms)</TargetFrameworks>
<RootNamespace>Microsoft.Maui.Maps</RootNamespace>
<AssemblyName>Microsoft.Maui.Maps</AssemblyName>
<Nullable>enable</Nullable>
Expand Down
3 changes: 2 additions & 1 deletion src/Core/src/Core.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.1;netstandard2.0;$(_MauiDotNetTfm);$(MauiPlatforms);$(_MauiPreviousDotNetTfm);$(MauiPreviousPlatforms)</TargetFrameworks>
<TargetFrameworks>netstandard2.1;netstandard2.0;$(_MauiDotNetTfm);$(MauiPlatforms)</TargetFrameworks>
<TargetFrameworks Condition="'$(IncludePreviousTfms)' != 'false'">$(TargetFrameworks);$(_MauiPreviousDotNetTfm);$(MauiPreviousPlatforms)</TargetFrameworks>
<RootNamespace>Microsoft.Maui</RootNamespace>
<AssemblyName>Microsoft.Maui</AssemblyName>
<Nullable>enable</Nullable>
Expand Down
3 changes: 2 additions & 1 deletion src/Essentials/src/Essentials.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.1;netstandard2.0;$(_MauiDotNetTfm);$(MauiPlatforms);$(_MauiPreviousDotNetTfm);$(MauiPreviousPlatforms)</TargetFrameworks>
<TargetFrameworks>netstandard2.1;netstandard2.0;$(_MauiDotNetTfm);$(MauiPlatforms)</TargetFrameworks>
<TargetFrameworks Condition="'$(IncludePreviousTfmsEssentials)' != 'false'">$(TargetFrameworks);$(_MauiPreviousDotNetTfm);$(MauiPreviousPlatforms)</TargetFrameworks>
<AssemblyName>Microsoft.Maui.Essentials</AssemblyName>
<RootNamespace>Microsoft.Maui.Essentials</RootNamespace>
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
Expand Down
3 changes: 2 additions & 1 deletion src/Graphics/src/Graphics.Skia/Graphics.Skia.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.1;netstandard2.0;$(_MauiDotNetTfm);$(MauiGraphicsPlatforms);$(_MauiPreviousDotNetTfm);$(MauiGraphicsPreviousPlatforms)</TargetFrameworks>
<TargetFrameworks>netstandard2.1;netstandard2.0;$(_MauiDotNetTfm);$(MauiGraphicsPlatforms)</TargetFrameworks>
<TargetFrameworks Condition="'$(IncludePreviousTfmsGraphics)' != 'false'">$(TargetFrameworks);$(_MauiPreviousDotNetTfm);$(MauiGraphicsPreviousPlatforms)</TargetFrameworks>
<RootNamespace>Microsoft.Maui.Graphics.Skia</RootNamespace>
<AssemblyName>Microsoft.Maui.Graphics.Skia</AssemblyName>
<IsTrimmable>false</IsTrimmable>
Expand Down
3 changes: 2 additions & 1 deletion src/Graphics/src/Graphics/Graphics.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.1;netstandard2.0;$(_MauiDotNetTfm);$(MauiGraphicsPlatforms);$(_MauiPreviousDotNetTfm);$(MauiGraphicsPreviousPlatforms)</TargetFrameworks>
<TargetFrameworks>netstandard2.1;netstandard2.0;$(_MauiDotNetTfm);$(MauiGraphicsPlatforms)</TargetFrameworks>
<TargetFrameworks Condition="'$(IncludePreviousTfmsGraphics)' != 'false'">$(TargetFrameworks);$(_MauiPreviousDotNetTfm);$(MauiGraphicsPreviousPlatforms)</TargetFrameworks>
<!-- Optional: Build symbol package (.snupkg) to distribute the PDB containing Source Link -->
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
Expand Down

0 comments on commit c1a3028

Please sign in to comment.