From ad227fc695ba1ef68bec387d89a4ec6525b19355 Mon Sep 17 00:00:00 2001
From: Carl Mathieu <carlh.mathieu@gmail.com>
Date: Thu, 11 Jan 2024 14:50:51 -0500
Subject: [PATCH] fix: fix canary builds and refactor dotnet version number

---
 CHANGELOG.md                       |  1 +
 build/canary-merge.yml             | 11 ++++++-----
 build/templates/dotnet-install.yml |  5 ++---
 build/variables.yml                |  3 +++
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5f8dd164..5a59046b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ Prefix your items with `(Template)` if the change is about the template and not
 
 ## 3.0.X
 - Updated to Uno 5.
+- Fix canary builds by updating canary merge yml
 
 ## 2.2.X
 - Added hooks for default analytics (page views and command invocations).
diff --git a/build/canary-merge.yml b/build/canary-merge.yml
index 29f37bc3..8bf2da1b 100644
--- a/build/canary-merge.yml
+++ b/build/canary-merge.yml
@@ -23,9 +23,10 @@ steps:
   persistCredentials: true
 
 - task: UseDotNet@2
-  displayName: 'Use .Net Core runtime 2.2.x'
+  displayName: 'Use .NET SDK $(DotNetVersion)'
   inputs:
-    version: 2.2.x
+    packageType: 'sdk'
+    version: $(DotNetVersion)
 
 - task: nventiveCanaryUpdater@5
   env:
@@ -42,11 +43,11 @@ steps:
     pushBranch: true
     gitUserName: 'nventive DevOps'
     gitUserEmail: 'devops@nventive.com'
-    nugetUpdaterVersion: '2.1.1'
+    nugetUpdaterVersion: '2.3.0-alpha.46'
     nugetVersion: 'dev,beta,stable'
     allowDowngrade: true
-    packageAuthor: 'nventive'
-    ignorePackages: 'GeneratedSerializers.Json;Nventive.View.Uno;BiometryService'
+    packageAuthor: 'nventive,uno platform,unoplatform'
+    ignorePackages: 'GeneratedSerializers.Json;BiometryService'
     useVersionOverrides: true
     versionOverridesFile: 'https://raw.githubusercontent.com/nventive/Canary/master/version-overrides.json'
 
diff --git a/build/templates/dotnet-install.yml b/build/templates/dotnet-install.yml
index 2978eb09..4f99983b 100644
--- a/build/templates/dotnet-install.yml
+++ b/build/templates/dotnet-install.yml
@@ -1,14 +1,13 @@
 parameters:
-  DotNetVersion: '7.0.400'
   UnoCheck_Version: '1.17.0'
   UnoCheck_Manifest: 'https://raw.githubusercontent.com/unoplatform/uno.check/262bebd06e916ec022b8fdc4a2a9df14f0554b92/manifests/uno.ui.manifest.json'
 
 steps:
 - task: UseDotNet@2
-  displayName: 'Use .NET SDK ${{ parameters.DotNetVersion }}'
+  displayName: 'Use .NET SDK $(DotNetVersion)'
   inputs:
     packageType: 'sdk'
-    version: ${{ parameters.DotNetVersion }}
+    version: $(DotNetVersion)
 
 - powershell: |
     & dotnet tool update --global uno.check --version ${{ parameters.UnoCheck_Version }} --add-source https://api.nuget.org/v3/index.json
diff --git a/build/variables.yml b/build/variables.yml
index 66d56911..d7404583 100644
--- a/build/variables.yml
+++ b/build/variables.yml
@@ -75,6 +75,9 @@
   windowsHostedAgentImage: 'windows-2022'
   macOSHostedAgentImage: 'macOS-12'
 
+  # SDK versions
+  DotNetVersion: '7.0.400'
+
   # Name of the folder where the artefacts will be placed. Variable used in build and release phases.
   # We make seperate folders so that releases can each download only the folder they need.
   AndroidArtifactName: Android