Merge pull request unoplatform#17061 from Youssef1313/ios-net7

build: Cleanup net7.0-ios
jeromelaban · Jun 9, 2024 · 2e81c9f · 2e81c9f
2 parents 95ae2db + ee0d759
commit 2e81c9f
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 51 deletions.
diff --git a/build/ci/.azure-devops-ios-tests-run.yml b/build/ci/.azure-devops-ios-tests-run.yml
@@ -96,7 +96,6 @@ jobs:
       UITEST_RUNTIME_TEST_GROUP_COUNT: "${{ parameters.UITEST_RUNTIME_TEST_GROUP_COUNT }}"
       UITEST_TEST_TIMEOUT: "${{ parameters.UITEST_TEST_TIMEOUT }}"
       UNO_UITEST_IOSBUNDLE_PATH: "$(build.sourcesdirectory)/build/ios-uitest-build/SamplesApp.app"
-      UnoTargetFrameworkOverride: "net7.0-ios"
 
   - task: PublishTestResults@2
     condition: always()
@@ -126,7 +125,6 @@ jobs:
       UITEST_RUNTIME_TEST_GROUP_COUNT: "${{ parameters.UITEST_RUNTIME_TEST_GROUP_COUNT }}"
       UITEST_TEST_TIMEOUT: "${{ parameters.UITEST_TEST_TIMEOUT }}"
       UNO_UITEST_IOSBUNDLE_PATH: "$(build.sourcesdirectory)/build/ios-uitest-build/SamplesApp.app"
-      UnoTargetFrameworkOverride: "net7.0-ios"
 
   - task: PublishTestResults@2
     condition: eq(variables.UITEST_ALLOW_RERUN, 'true')

diff --git a/build/ci/templates/dotnet7-mobile-install-mac.yml b/build/ci/templates/dotnet7-mobile-install-mac.yml
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -73,9 +73,6 @@
 
 	<PropertyGroup>
 		<MicrosoftNetCompilersToolsetVersion>4.10.0-3.final</MicrosoftNetCompilersToolsetVersion>
-		<!-- Because Xamarin.UITest doesn't work for net7.0, we keep building iOS SamplesApp for tests with .NET 7 SDK -->
-		<!-- Using Roslyn 4.10 with .NET 7 SDK is not supported because of https://github.com/dotnet/roslyn/pull/71507 -->
-		<MicrosoftNetCompilersToolsetVersion Condition="'$(UnoTargetFrameworkOverride)'=='net7.0-ios'">4.9.2</MicrosoftNetCompilersToolsetVersion>
 	</PropertyGroup>
 
   <ItemGroup>

diff --git a/src/SamplesApp/SamplesApp.UITests/SamplesApp.UITests.csproj b/src/SamplesApp/SamplesApp.UITests/SamplesApp.UITests.csproj
@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<!-- Ideally, this should be $(NetPrevious), but as we still build iOS tests on net7.0, we have to match here. -->
-		<TargetFramework>net7.0</TargetFramework>
+		<TargetFramework>$(NetPrevious)</TargetFramework>
 
 		<DefineConstants Condition="$(UnoTargetFrameworkOverride.ToLowerInvariant().EndsWith('-android'))">$(DefineConstants);TARGET_FRAMEWORK_OVERRIDE_ANDROID</DefineConstants>
 

diff --git a/src/Uno.Foundation.Logging/Uno.Foundation.Logging.csproj b/src/Uno.Foundation.Logging/Uno.Foundation.Logging.csproj
@@ -5,12 +5,6 @@
 		<!-- Though we could use UnoTargetFrameworkOverride to choose between NetPrevious and NetCurrent -->
 		<!-- As of writing this comment, we don't see a need to do that, so we keep it simple -->
 		<TargetFrameworks>$(NetPrevious)</TargetFrameworks>
-
-		<!-- We check specifically for net7.0-ios -->
-		<!-- Our builds are now all net8.0+ -->
-		<!-- However, Xamarin.UITest doesn't (probably won't) support net8.0+ -->
-		<!-- So, we still build SamplesApp in net7.0-ios in CI to be able to run UI tests -->
-		<TargetFrameworks Condition="'$(UnoTargetFrameworkOverride)'=='net7.0-ios'">net7.0</TargetFrameworks>
 	</PropertyGroup>
 
 	<PropertyGroup>

diff --git a/src/Uno.NUnitTransformTool/Uno.NUnitTransformTool.csproj b/src/Uno.NUnitTransformTool/Uno.NUnitTransformTool.csproj
@@ -6,8 +6,7 @@
 		<!-- We keep it on the oldest supported TFM -->
 		<!-- Though we could use UnoTargetFrameworkOverride to choose between NetPrevious and NetCurrent -->
 		<!-- As of writing this comment, we don't see a need to do that, so we keep it simple -->
-		<!-- Ideally, this should be $(NetPrevious), but as we still build iOS tests on net7.0, we have to match here. -->
-		<TargetFramework>net7.0</TargetFramework>
+		<TargetFramework>$(NetPrevious)</TargetFramework>
 		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
 		<RollForward>major</RollForward>
 	</PropertyGroup>

diff --git a/src/targetframework-override-noplatform.props b/src/targetframework-override-noplatform.props
@@ -14,15 +14,6 @@
 				<TargetFrameworks>net8.0</TargetFrameworks>
 			</PropertyGroup>
 		</When>
-		<!-- We check specifically for net7.0-ios -->
-		<!-- Our builds are now all net8.0+ -->
-		<!-- However, Xamarin.UITest doesn't (probably won't) support net8.0+ -->
-		<!-- So, we still build SamplesApp in net7.0-ios in CI to be able to run UI tests -->
-		<When Condition="'$(UnoTargetFrameworkOverride)' == 'net7.0-ios'">
-			<PropertyGroup>
-				<TargetFrameworks>net7.0</TargetFrameworks>
-			</PropertyGroup>
-		</When>
 	</Choose>
 
 </Project>