Merge pull request #575 from AndreasReitberger/574-improve-commonprops

Improved `common.porps`
AndreasReitberger · Oct 11, 2024 · ea5c73a · ea5c73a
2 parents e65beb0 + a1b5d34
commit ea5c73a
Show file tree

Hide file tree

Showing 6 changed files with 66 additions and 70 deletions.
diff --git a/common.props b/common.props
@@ -1,5 +1,6 @@
 
 <Project>
+	<Import Project="framework.maui.props" />
     <PropertyGroup>
         <Version>1.2.13.2</Version>
         <PackageIcon>ar_128.png</PackageIcon>
@@ -15,12 +16,6 @@
         <PublishReadyToRun>false</PublishReadyToRun>
 		<LangVersion>12</LangVersion>
 
-		<TargetFrameworks>net8.0-android;net8.0-ios;net8.0-maccatalyst</TargetFrameworks>
-		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041.0</TargetFrameworks>
-		<!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
-		<!-- <TargetFrameworks>$(TargetFrameworks);net8.0-tizen</TargetFrameworks> -->
-		<WindowsSdkPackageVersion>10.0.19041.41</WindowsSdkPackageVersion>
-
         <!--Source-Linking-->
         <PublishRepositoryUrl>true</PublishRepositoryUrl>
         <EmbedUntrackedSources>true</EmbedUntrackedSources>
@@ -31,6 +26,7 @@
 		<!-- https://github.com/dotnet/maui/pull/19360 
 	    <WarningsAsErrors>XC0022,XC0023</WarningsAsErrors>
 		-->
+
     </PropertyGroup>
 
     <ItemGroup>
@@ -41,9 +37,9 @@
    </ItemGroup>
 
   <ItemGroup>
-	<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.70" />
-	<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.70" />
-	<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
+	<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.91" />
+	<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.91" />
+	<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.1" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All"/>
   </ItemGroup>
 </Project>
diff --git a/framework.maui.props b/framework.maui.props
@@ -0,0 +1,35 @@
+
+<Project>
+    <PropertyGroup>
+		<TargetFrameworks>net8.0-android</TargetFrameworks>
+		<!-- Needed for GitHub action, iOS and MacOS is not workig on Linux -->
+		<TargetFrameworks Condition="!$([MSBuild]::IsOSPlatform('linux'))">$(TargetFrameworks);net8.0-ios;net8.0-maccatalyst</TargetFrameworks>
+		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041.0</TargetFrameworks>
+
+		<!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
+		<!-- <TargetFrameworks>$(TargetFrameworks);net8.0-tizen</TargetFrameworks> -->
+		<WindowsSdkPackageVersion>10.0.19041.41</WindowsSdkPackageVersion>
+
+		<!-- General -->
+		<UseMaui>true</UseMaui>
+		<SingleProject>true</SingleProject>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<PublishReadyToRun>false</PublishReadyToRun>
+		<IsRidAgnostic Condition="'$(OutputType)' == 'Library'">true</IsRidAgnostic>
+
+		<!-- Needed with latest SDK 8 version? -->
+		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+
+		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">14.2</SupportedOSPlatformVersion>
+		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">14.0</SupportedOSPlatformVersion>
+		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
+		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
+		<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
+		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
+    </PropertyGroup>
+
+	<!-- https://github.com/dotnet/maui/issues/9299 -->
+	<PropertyGroup Condition=" $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows' and '$(Configuration)' == 'Release' ">
+		<PublishReadyToRun>true</PublishReadyToRun>
+	</PropertyGroup>
+</Project>
diff --git a/src/SharedMauiXamlStylesLibrary.SampleApp/SharedMauiXamlStylesLibrary.SampleApp.csproj b/src/SharedMauiXamlStylesLibrary.SampleApp/SharedMauiXamlStylesLibrary.SampleApp.csproj
@@ -1,17 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<Import Project="..\..\common.props" />
 	<PropertyGroup>
-		<!-- Moved to common.props 
-		<TargetFrameworks>net8.0-android;net8.0-ios;net8.0-maccatalyst</TargetFrameworks>
-		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041.0</TargetFrameworks>
-		-->
-		<!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
-		<!-- <TargetFrameworks>$(TargetFrameworks);net8.0-tizen</TargetFrameworks> -->
 		<OutputType>Exe</OutputType>
 		<RootNamespace>SharedMauiXamlStylesLibrary.SampleApp</RootNamespace>
-		<UseMaui>true</UseMaui>
-		<SingleProject>true</SingleProject>
-		<ImplicitUsings>enable</ImplicitUsings>
 
 		<!-- Display name -->
 		<ApplicationTitle>SharedMauiXamlStylesLibrary.SampleApp</ApplicationTitle>
@@ -24,12 +15,6 @@
 		<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
 		<ApplicationVersion>1</ApplicationVersion>
 
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">11.0</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">13.1</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
-		<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
 		<UserSecretsId>2be31e8c-9662-4012-a2ef-27b9db67db75</UserSecretsId>
 	</PropertyGroup>
 
@@ -207,12 +192,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-	  <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0" />
-	  <PackageReference Include="System.Text.Json" Version="8.0.4" />
-	</ItemGroup>
-
-	<ItemGroup>
-	  <PackageReference Update="Microsoft.Maui.Controls" Version="8.0.91" />
-	  <PackageReference Update="Microsoft.Maui.Controls.Compatibility" Version="8.0.91" />
+	  <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.1" />
+	  <PackageReference Include="System.Text.Json" Version="8.0.5" />
 	</ItemGroup>
 </Project>
diff --git a/src/SharedMauiXamlStylesLibrary.Syncfusion/SharedMauiXamlStylesLibrary.Syncfusion.csproj b/src/SharedMauiXamlStylesLibrary.Syncfusion/SharedMauiXamlStylesLibrary.Syncfusion.csproj
@@ -2,34 +2,16 @@
  <Import Project="..\..\common.props" />
 
 	<PropertyGroup>
-		<!-- Moved to common.props 
-		<TargetFrameworks>net8.0-android;net8.0-ios;net8.0-maccatalyst</TargetFrameworks>
-		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041.0</TargetFrameworks>
-		-->
-		<UseMaui>true</UseMaui>
-		<SingleProject>true</SingleProject>
-		<ImplicitUsings>enable</ImplicitUsings>
-		<PublishReadyToRun>false</PublishReadyToRun>
+		<TargetFrameworks>$(TargetFrameworks);net8.0</TargetFrameworks>
 		<OutputType>Library</OutputType>
 
-		<IsRidAgnostic Condition="'$(OutputType)' == 'Library'">true</IsRidAgnostic>
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">14.2</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">14.0</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
-		<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
 		<RootNamespace>AndreasReitberger.Shared.Syncfusion</RootNamespace>	
 		<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
 
 		<Title>MAUI Shared Syncfusion Styles Library</Title>
 		<PackageTags>MAUI, Styles, Shared, Syncfusion, XAML</PackageTags>
 		<Description>A collection of predefined Control styles for MAUI and Syncfusion.</Description>
 
-		<!--Source-Linking-->
-        <PublishRepositoryUrl>true</PublishRepositoryUrl>
-        <EmbedUntrackedSources>true</EmbedUntrackedSources>
-        <IncludeSymbols>true</IncludeSymbols>
         <Platforms>AnyCPU;x64</Platforms>
 	</PropertyGroup>
 
@@ -52,19 +34,37 @@
 
 	<ItemGroup>
 		<ProjectReference Include="..\SharedMauiXamlStylesLibrary\SharedMauiXamlStylesLibrary.csproj" />
+		<PackageReference Include="Syncfusion.Maui.AIAssistView" Version="27.1.52" />
+		<PackageReference Include="Syncfusion.Maui.Backdrop" Version="27.1.52" />
 		<PackageReference Include="Syncfusion.Maui.Barcode" Version="27.1.52" />
 		<PackageReference Include="Syncfusion.Maui.Buttons" Version="27.1.52" />
+		<PackageReference Include="Syncfusion.Maui.Calendar" Version="27.1.52" />
+		<PackageReference Include="Syncfusion.Maui.Cards" Version="27.1.52" />
+		<PackageReference Include="Syncfusion.Maui.Carousel" Version="27.1.52" />
 		<PackageReference Include="Syncfusion.Maui.Charts" Version="27.1.52" />
 		<PackageReference Include="Syncfusion.Maui.Core" Version="27.1.52" />
+		<PackageReference Include="Syncfusion.Maui.DataForm" Version="27.1.52" />
 		<PackageReference Include="Syncfusion.Maui.DataGrid" Version="27.1.52" />
 		<PackageReference Include="Syncfusion.Maui.Expander" Version="27.1.52" />
 		<PackageReference Include="Syncfusion.Maui.Gauges" Version="27.1.52" />
+		<PackageReference Include="Syncfusion.Maui.ImageEditor" Version="27.1.52" />
 		<PackageReference Include="Syncfusion.Maui.Inputs" Version="27.1.52" />
+		<PackageReference Include="Syncfusion.Maui.Kanban" Version="27.1.52" />
 		<PackageReference Include="Syncfusion.Maui.ListView" Version="27.1.52" />
+		<PackageReference Include="Syncfusion.Maui.NavigationDrawer" Version="27.1.52" />
+		<PackageReference Include="Syncfusion.Maui.ParallaxView" Version="27.1.52" />
+		<PackageReference Include="Syncfusion.Maui.PdfViewer" Version="27.1.52" />
 		<PackageReference Include="Syncfusion.Maui.Picker" Version="27.1.52" />
+		<PackageReference Include="Syncfusion.Maui.ProgressBar" Version="27.1.52" />
+		<PackageReference Include="Syncfusion.Maui.PullToRefresh" Version="27.1.52" />
+		<PackageReference Include="Syncfusion.Maui.RadialMenu" Version="27.1.52" />
+		<PackageReference Include="Syncfusion.Maui.Rotator" Version="27.1.52" />
 		<PackageReference Include="Syncfusion.Maui.Scheduler" Version="27.1.52" />
+		<PackageReference Include="Syncfusion.Maui.SignaturePad" Version="27.1.52" />
 		<PackageReference Include="Syncfusion.Maui.Sliders" Version="27.1.52" />
+		<PackageReference Include="Syncfusion.Maui.SunburstChart" Version="27.1.52" />
 		<PackageReference Include="Syncfusion.Maui.TabView" Version="27.1.52" />
+		<PackageReference Include="Syncfusion.Maui.TreeMap" Version="27.1.52" />
 		<PackageReference Include="Syncfusion.Maui.TreeView" Version="27.1.52" />
 	</ItemGroup>
 
@@ -247,6 +247,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
+	  <PackageReference Update="Microsoft.Extensions.Logging.Debug" Version="8.0.1" />
 	  <PackageReference Update="Microsoft.Maui.Controls" Version="8.0.91" />
 	  <PackageReference Update="Microsoft.Maui.Controls.Compatibility" Version="8.0.91" />
 	</ItemGroup>

diff --git a/src/SharedMauiXamlStylesLibrary.sln b/src/SharedMauiXamlStylesLibrary.sln
@@ -10,6 +10,7 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{92DEA009-5D62-4FDC-B16E-11E927D1F279}"
 	ProjectSection(SolutionItems) = preProject
 		..\common.props = ..\common.props
+		..\framework.maui.props = ..\framework.maui.props
 		..\SharedMauiXamlStylesLibrary.Syncfusion.targets = ..\SharedMauiXamlStylesLibrary.Syncfusion.targets
 		..\SharedMauiXamlStylesLibrary.targets = ..\SharedMauiXamlStylesLibrary.targets
 	EndProjectSection

diff --git a/src/SharedMauiXamlStylesLibrary/SharedMauiXamlStylesLibrary.csproj b/src/SharedMauiXamlStylesLibrary/SharedMauiXamlStylesLibrary.csproj
@@ -2,33 +2,15 @@
 	<Import Project="..\..\common.props" />
 
 	<PropertyGroup>
-		<!-- Moved to common.props 
-		<TargetFrameworks>net8.0-android;net8.0-ios;net8.0-maccatalyst</TargetFrameworks>
-		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041.0</TargetFrameworks>
-		-->
-		<UseMaui>true</UseMaui>
-		<SingleProject>true</SingleProject>
-		<ImplicitUsings>enable</ImplicitUsings>
-		<PublishReadyToRun>false</PublishReadyToRun>
+		<TargetFrameworks>$(TargetFrameworks);net8.0</TargetFrameworks>
 		<OutputType>Library</OutputType>
-
-		<IsRidAgnostic Condition="'$(OutputType)' == 'Library'">true</IsRidAgnostic>
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">14.2</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">14.0</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
-		<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
+
 		<RootNamespace>AndreasReitberger.Shared</RootNamespace>
 		<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
 		<Title>MAUI Shared Styles Library</Title>	
 		<PackageTags>MAUI, Styles, Shared, Syncfusion, XAML</PackageTags>
 		<Description>A collection of predefined Control styles for MAUI and Syncfusion.</Description>
 
-		<!--Source-Linking-->
-		<PublishRepositoryUrl>true</PublishRepositoryUrl>
-		<EmbedUntrackedSources>true</EmbedUntrackedSources>
-		<IncludeSymbols>true</IncludeSymbols>
 		<Platforms>AnyCPU;x64</Platforms>
 	</PropertyGroup>
 
@@ -170,6 +152,7 @@
 	  <Folder Include="Licenses\LicenseFiles\" />
 	</ItemGroup>
 	<ItemGroup>
+	  <PackageReference Update="Microsoft.Extensions.Logging.Debug" Version="8.0.1" />
 	  <PackageReference Update="Microsoft.Maui.Controls" Version="8.0.91" />
 	  <PackageReference Update="Microsoft.Maui.Controls.Compatibility" Version="8.0.91" />
 	</ItemGroup>