From 7e27c8d702c38d1011b408a3c42a0c7bbfe46e5e Mon Sep 17 00:00:00 2001
From: Jerome Laban <jerome.laban@nventive.com>
Date: Mon, 17 May 2021 09:45:35 -0400
Subject: [PATCH] ci: Build sync generator on net 5

---
 build/ci/.azure-devops-package-net6-win.yml | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/build/ci/.azure-devops-package-net6-win.yml b/build/ci/.azure-devops-package-net6-win.yml
index addfa54b8287..426325763e43 100644
--- a/build/ci/.azure-devops-package-net6-win.yml
+++ b/build/ci/.azure-devops-package-net6-win.yml
@@ -69,15 +69,23 @@ jobs:
     condition: and(succeeded(), eq(variables['UNO_UWP_BUILD'], 'false'))
     displayName: Convert source tree to WinUI 3 structure
 
+  # Required to build on net5 because of uwp compatibility (until 16.10 gets published)
+  - task: MSBuild@1
+    inputs:
+      solution: Build/Uno.UI.Build.csproj
+      msbuildLocationMethod: version
+      msbuildVersion: latest
+      msbuildArchitecture: x86
+      msbuildArguments: /r /m /t:BuildNet6 "/p:CombinedConfiguration=$(CombinedConfiguration)" /detailedsummary /bl:$(build.artifactstagingdirectory)\build-$(GitVersion.FullSemVer)-net6-$(UNO_UWP_BUILD).binlog
+      clean: false
+      restoreNugetPackages: false
+      logProjectEvents: false
+      createLogFile: false
+
   - powershell: |
         cp $(build.sourcesdirectory)\src\global-net6.json $(build.sourcesdirectory)\src\global.json
     displayName: Change active .NET SDK
 
-  - task: DotNetCoreCLI@2
-    inputs:
-      workingDirectory: Build
-      arguments: Uno.UI.Build.csproj /r /m /t:BuildNet6 "/p:CombinedConfiguration=$(CombinedConfiguration)" /detailedsummary /bl:$(build.artifactstagingdirectory)\build-$(GitVersion.FullSemVer)-net6-$(UNO_UWP_BUILD).binlog
-
   - task: DotNetCoreCLI@2
     inputs:
       workingDirectory: Build