From 211cf68e1f2bee95912bd16cacddb1dcb2ff923f Mon Sep 17 00:00:00 2001
From: Youssef Victor <youssefvictor00@gmail.com>
Date: Tue, 8 Aug 2023 12:15:27 +0300
Subject: [PATCH] build: Few build adjustments to reduce flakiness

---
 build/workflow/stage-build-packages.yml                     | 1 -
 samples/Directory.Packages.props                            | 2 +-
 samples/Uno.Toolkit.Samples/Directory.Build.targets         | 2 ++
 src/Directory.Packages.props                                | 2 +-
 .../Uno.Toolkit.Cupertino/Uno.Toolkit.UI.Cupertino.csproj   | 4 ++++
 .../Uno.Toolkit.WinUI.Cupertino.csproj                      | 6 +++++-
 6 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/build/workflow/stage-build-packages.yml b/build/workflow/stage-build-packages.yml
index 83dc63859..85ebef33c 100644
--- a/build/workflow/stage-build-packages.yml
+++ b/build/workflow/stage-build-packages.yml
@@ -14,7 +14,6 @@ jobs:
 
     - task: MSBuild@1
       displayName: 'Build solution'
-      retryCountOnTaskFailure: 3
       inputs:
         solution: src/Uno.Toolkit.sln
         configuration: Release
diff --git a/samples/Directory.Packages.props b/samples/Directory.Packages.props
index 48bd526fe..0dd63dfbb 100644
--- a/samples/Directory.Packages.props
+++ b/samples/Directory.Packages.props
@@ -7,7 +7,7 @@
 		<PackageVersion Include="Microsoft.Extensions.Logging" Version="5.0.0" />
 		<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
 		<PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="5.0.0" />
-		<PackageVersion Include="Microsoft.Net.Compilers.Toolset" Version="4.5.0-2.final" />
+		<PackageVersion Include="Microsoft.Net.Compilers.Toolset" Version="4.7.0-2.final" />
 		<!--
 			If, in the same solution, you are referencing a project that uses https://github.com/onovotny/MSBuildSdkExtras,
 			you need to make sure that the version provided here matches https://github.com/novotnyllc/MSBuildSdkExtras/blob/main/Source/MSBuild.Sdk.Extras/DefaultItems/ImplicitPackages.targets#L11.
diff --git a/samples/Uno.Toolkit.Samples/Directory.Build.targets b/samples/Uno.Toolkit.Samples/Directory.Build.targets
index 7daa20833..52ebb1bfd 100644
--- a/samples/Uno.Toolkit.Samples/Directory.Build.targets
+++ b/samples/Uno.Toolkit.Samples/Directory.Build.targets
@@ -1,4 +1,6 @@
 <Project ToolsVersion="15.0">
+	<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))" />
+
 	<ItemGroup>
 		<!-- Remove WinUI files (Ctrl+F: UWP_WinUI_Removal) -->
 		<Page Remove="$(MSBuildThisFileDirectory)**\*.WinUI.xaml" Condition="'$(FrameworkLineage)' == 'UWP'" />
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
index fb790e16b..af9104460 100644
--- a/src/Directory.Packages.props
+++ b/src/Directory.Packages.props
@@ -35,7 +35,7 @@
 		<PackageVersion Include="Uno.UITest.Xamarin" Version="1.1.0-dev.32" />
 		<PackageVersion Include="Xamarin.UITest" Version="4.1.0" />
 		<PackageVersion Include="MSTest.TestFramework" Version="2.1.2" />
-		<PackageVersion Include="Microsoft.Net.Compilers.Toolset" Version="4.5.0-2.final" />
+		<PackageVersion Include="Microsoft.Net.Compilers.Toolset" Version="4.7.0-2.final" />
 		<PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.0-preview1.22518.1" />
 	</ItemGroup>
 </Project>
diff --git a/src/library/Uno.Toolkit.Cupertino/Uno.Toolkit.UI.Cupertino.csproj b/src/library/Uno.Toolkit.Cupertino/Uno.Toolkit.UI.Cupertino.csproj
index 12a302337..24ab798c5 100644
--- a/src/library/Uno.Toolkit.Cupertino/Uno.Toolkit.UI.Cupertino.csproj
+++ b/src/library/Uno.Toolkit.Cupertino/Uno.Toolkit.UI.Cupertino.csproj
@@ -29,6 +29,10 @@
 
 	<ItemGroup>
 		<UpToDateCheckInput Include="**\*.xaml" Exclude="bin\**\*.xaml;obj\**\*.xaml" />
+		<!-- This is a workaround -->
+		<!-- Without this, the build gets flaky and sometimes fails with this error -->
+		<!-- C:\hostedtoolcache\windows\dotnet\sdk\7.0.306\Sdks\NuGet.Build.Tasks.Pack\buildCrossTargeting\NuGet.Build.Tasks.Pack.targets(221,5): error NU5019: File not found: 'D:\a\1\s\src\library\Uno.Toolkit.Cupertino\bin\Uno.Toolkit.WinUI.Cupertino\Release\net7.0-ios\Uno.Toolkit.UI.Cupertino.uprimarker'. [D:\a\1\s\src\library\Uno.Toolkit.Cupertino\Uno.Toolkit.UI.Cupertino.csproj] -->
+		<Content Include="..\..\Uno.Toolkit.UI\Assets\**\*.png" />
 	</ItemGroup>
 
 	<ItemGroup Condition="$(IsXamarinIOS) or $(IsMonoAndroid) or $(IsXamarinMac)">
diff --git a/src/library/Uno.Toolkit.Cupertino/Uno.Toolkit.WinUI.Cupertino.csproj b/src/library/Uno.Toolkit.Cupertino/Uno.Toolkit.WinUI.Cupertino.csproj
index 0dc45f393..3bc9da3da 100644
--- a/src/library/Uno.Toolkit.Cupertino/Uno.Toolkit.WinUI.Cupertino.csproj
+++ b/src/library/Uno.Toolkit.Cupertino/Uno.Toolkit.WinUI.Cupertino.csproj
@@ -33,12 +33,16 @@
 	<ItemGroup Condition="$(_IsWindowsWinUI)">
 		<PackageReference Include="Microsoft.WindowsAppSDK" />
 		<PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
-		
+
 		<Page Remove="Generated\*.xaml" />
 	</ItemGroup>
 
 	<ItemGroup>
 		<UpToDateCheckInput Include="**\*.xaml" Exclude="bin\**\*.xaml;obj\**\*.xaml" />
+		<!-- This is a workaround -->
+		<!-- Without this, the build gets flaky and sometimes fails with this error -->
+		<!-- C:\hostedtoolcache\windows\dotnet\sdk\7.0.306\Sdks\NuGet.Build.Tasks.Pack\buildCrossTargeting\NuGet.Build.Tasks.Pack.targets(221,5): error NU5019: File not found: 'D:\a\1\s\src\library\Uno.Toolkit.Cupertino\bin\Uno.Toolkit.WinUI.Cupertino\Release\net7.0-ios\Uno.Toolkit.WinUI.Cupertino.uprimarker'. [D:\a\1\s\src\library\Uno.Toolkit.Cupertino\Uno.Toolkit.WinUI.Cupertino.csproj] -->
+		<Content Include="..\..\Uno.Toolkit.UI\Assets\**\*.png" />
 	</ItemGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\..\Uno.Toolkit.UI\Uno.Toolkit.WinUI.csproj" />