Moved everything to Directory.Build.props

jsuarezruiz · Jul 4, 2024 · b5e7847 · b5e7847
1 parent 1f2c149
commit b5e7847
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 39 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -28,18 +28,26 @@
 		<VSTestResultsDirectory>$(MSBuildThisFileDirectory)TestResults</VSTestResultsDirectory>
 	</PropertyGroup>
 
+	<PropertyGroup>
+	  <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="$(TargetFramework.Contains('-windows'))">10.0.17763.0</SupportedOSPlatformVersion>		
+		<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'ios'">14.2</SupportedOSPlatformVersion>
+		<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'maccatalyst'">14.0</SupportedOSPlatformVersion>
+		<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'android'">21.0</SupportedOSPlatformVersion>	
+		<TargetPlatformMinVersion Condition="$(TargetFramework.Contains('-windows'))">10.0.17763.0</TargetPlatformMinVersion>
+	</PropertyGroup>
+
 	<ItemGroup>
 		<None Include="$(MSBuildThisFileDirectory)icon.png" Pack="true" PackagePath="\" />
 		<None Include="$(MSBuildThisFileDirectory)LICENSE" Pack="true" PackagePath="\" />
 		<None Include="$(MSBuildThisFileDirectory)README.md" Pack="true" PackagePath="\" />
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Nerdbank.GitVersioning" 
-											Version="3.6.139"
-											PrivateAssets="all" />
-		<PackageReference Include="Microsoft.SourceLink.GitHub"
-											Version="8.0.0"
-											PrivateAssets="all" />
+		<PackageReference Include="Nerdbank.GitVersioning" Version="3.6.139" PrivateAssets="all" />
+		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="all" />
+		<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.61" PrivateAssets="all" />	 
 	</ItemGroup>
 </Project>
diff --git a/src/AlohaKit.Gallery/AlohaKit.Gallery.csproj b/src/AlohaKit.Gallery/AlohaKit.Gallery.csproj
@@ -22,13 +22,8 @@
 		<ApplicationVersion>1</ApplicationVersion>
 
 		<!-- Required for C# Hot Reload -->
-		<UseInterpreter Condition="'$(Configuration)' == 'Debug'">True</UseInterpreter>
-
-		<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="$(TargetFramework.Contains('-windows'))">10.0.17763.0</SupportedOSPlatformVersion>
-		<TargetPlatformMinVersion Condition="$(TargetFramework.Contains('-windows'))">10.0.17763.0</TargetPlatformMinVersion>
+		<UseInterpreter Condition="'$(Configuration)' == 'Debug'">True</UseInterpreter>	
+
 	</PropertyGroup>
 
 	<ItemGroup>
@@ -55,14 +50,7 @@
 
 	<ItemGroup>
 	  <ProjectReference Include="..\AlohaKit\AlohaKit.csproj" />
-	</ItemGroup>
-
-	<ItemGroup>
-	  <PackageReference Include="Microsoft.Maui.Controls" Version="8.0.61" />
-	  <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.61" />
-	  <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
-	  <PackageReference Include="Nerdbank.GitVersioning" Version="3.6.139" />
-	</ItemGroup>
+	</ItemGroup>	
 	<PropertyGroup Condition="$(TargetFramework.Contains('-windows'))">
 		<OutputType>WinExe</OutputType>
 		<RuntimeIdentifier>win10-x64</RuntimeIdentifier>

diff --git a/src/AlohaKit/AlohaKit.csproj b/src/AlohaKit/AlohaKit.csproj
@@ -4,12 +4,7 @@
 		<TargetFrameworks>net8.0;net8.0-android;net8.0-ios;net8.0-maccatalyst</TargetFrameworks>
 		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows')) and '$(MSBuildRuntimeType)' == 'Full'">$(TargetFrameworks);net8.0-windows10.0.19041</TargetFrameworks>
 		<UseMaui>true</UseMaui>
-		<SingleProject>true</SingleProject>
-		<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'ios'">14.2</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'maccatalyst'">14.0</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'android'">21.0</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="$(TargetFramework.Contains('-windows'))">10.0.17763.0</SupportedOSPlatformVersion>
-		<TargetPlatformMinVersion Condition="$(TargetFramework.Contains('-windows'))">10.0.17763.0</TargetPlatformMinVersion>
+		<SingleProject>true</SingleProject>		
 		<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
 		<Title>AlohaKit</Title>
 		<PackageId>AlohaKit</PackageId>
@@ -34,16 +29,5 @@
 	    <Pack>True</Pack>
 	    <PackagePath>\</PackagePath>
 	  </None>
-	</ItemGroup>
-
-	<ItemGroup>
-	  <PackageReference Include="Microsoft.Maui.Controls" Version="8.0.61" />
-	  <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.61" />
-	  <PackageReference Include="Nerdbank.GitVersioning" Version="3.6.139" />
-	</ItemGroup>
-	<ItemGroup>
-	  <PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
-	  <PackageReference Update="Nerdbank.GitVersioning" Version="3.6.139" />
-	</ItemGroup>
-
+	</ItemGroup>	
 </Project>