Merge pull request #18035 from unoplatform/dev/mazi/ios-adjust

unoplatform · Aug 28, 2024 · c2a3133 · c2a3133
2 parents ff2f3f2 + 567f933
commit c2a3133
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/build/ci/.azure-devops-ios-tests.yml b/build/ci/.azure-devops-ios-tests.yml
@@ -149,7 +149,7 @@ jobs:
   - bash: |
       cd $(BUILD.SOURCESDIRECTORY)/src/SamplesApp/SamplesApp.netcoremobile
       dotnet publish \
-        -f net8.0-ios17.0 \
+        -f net8.0-ios \
         -c Release \
         -p:BuildForTestFlight=true \
         -p:UnoTargetFrameworkOverride=net8.0-ios17.0 \

diff --git a/src/SamplesApp/SamplesApp.netcoremobile/SamplesApp.netcoremobile.csproj b/src/SamplesApp/SamplesApp.netcoremobile/SamplesApp.netcoremobile.csproj
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
 		<TargetFrameworks>$(NetMobilePreviousAndCurrent)</TargetFrameworks>
+		<OutputType>Exe</OutputType>
 	</PropertyGroup>
 
 	<Import Project="../../targetframework-override.props" />
 
 	<PropertyGroup>
 		<SingleProject>true</SingleProject>
 
-		<OutputType>Exe</OutputType>
 		<AssemblyName>SamplesApp</AssemblyName>
 		<DefineConstants>$(DefineConstants);XAMARIN;HAS_UNO</DefineConstants>
 		<IsUnoHead>true</IsUnoHead>

diff --git a/src/targetframework-override-netprevious.props b/src/targetframework-override-netprevious.props
@@ -4,8 +4,8 @@
 	<TargetFrameworks>$(UnoTargetFrameworkOverride.Replace('$(NetCurrent)', '$(NetPrevious)'))</TargetFrameworks>
 
 	<TargetFrameworks Condition="'$(TargetFrameworks)'=='net8.0-macos'">net8.0-macos14.0</TargetFrameworks>
-	<TargetFrameworks Condition="'$(TargetFrameworks)'=='net8.0-ios'">net8.0-ios17.0</TargetFrameworks>
-	<TargetFrameworks Condition="'$(TargetFrameworks)'=='net8.0-maccatalyst'">net8.0-maccatalyst17.0</TargetFrameworks>
+	<TargetFrameworks Condition="'$(TargetFrameworks)'=='net8.0-ios' and '$(OutputType)'!='Exe'">net8.0-ios17.0</TargetFrameworks>
+	<TargetFrameworks Condition="'$(TargetFrameworks)'=='net8.0-maccatalyst' and '$(OutputType)'!='Exe'">net8.0-maccatalyst17.0</TargetFrameworks>
   </PropertyGroup>
 
 </Project>
diff --git a/src/targetframework-override.props b/src/targetframework-override.props
@@ -2,10 +2,10 @@
 
   <PropertyGroup Condition="'$(UnoTargetFrameworkOverride)'!=''">
 	<TargetFrameworks>$(UnoTargetFrameworkOverride)</TargetFrameworks>
-	<TargetFrameworks Condition="'$(TargetFrameworks)'=='net8.0-ios'">net8.0-ios17.0</TargetFrameworks>
-	<TargetFrameworks Condition="'$(TargetFrameworks)'=='net9.0-ios'">net9.0-ios17.2</TargetFrameworks>
-	<TargetFrameworks Condition="'$(TargetFrameworks)'=='net8.0-maccatalyst'">net8.0-maccatalyst17.0</TargetFrameworks>
-	<TargetFrameworks Condition="'$(TargetFrameworks)'=='net9.0-maccatalyst'">net9.0-maccatalyst17.2</TargetFrameworks>
+	<TargetFrameworks Condition="'$(TargetFrameworks)'=='net8.0-ios' and '$(OutputType)'!='Exe'">net8.0-ios17.0</TargetFrameworks>
+	<TargetFrameworks Condition="'$(TargetFrameworks)'=='net9.0-ios' and '$(OutputType)'!='Exe'">net9.0-ios17.2</TargetFrameworks>
+	<TargetFrameworks Condition="'$(TargetFrameworks)'=='net8.0-maccatalyst' and '$(OutputType)'!='Exe'">net8.0-maccatalyst17.0</TargetFrameworks>
+	<TargetFrameworks Condition="'$(TargetFrameworks)'=='net9.0-maccatalyst' and '$(OutputType)'!='Exe'">net9.0-maccatalyst17.2</TargetFrameworks>
 	<TargetFrameworks Condition="'$(TargetFrameworks)'=='net8.0-macos'">net8.0-macos14.0</TargetFrameworks>
 	<TargetFrameworks Condition="'$(TargetFrameworks)'=='net9.0-macos'">net9.0-macos14.2</TargetFrameworks>
   </PropertyGroup>