fix: markup dependencies (#878)

* fix: markup dependencies

Directory.Build.props

@@ -1,10 +1,11 @@
 <Project ToolsVersion="15.0">
 
 	<PropertyGroup>
-    <Authors>Uno Platform</Authors>
-    <PackageProjectUrl>https://github.com/unoplatform/uno.themes</PackageProjectUrl>
-    <PackageIconUrl>https://nv-assets.azurewebsites.net/logos/uno.png</PackageIconUrl>
-    <RepositoryUrl>https://github.com/unoplatform/uno.themes</RepositoryUrl>
+		<LangVersion>10.0</LangVersion>
+		<Authors>Uno Platform</Authors>
+		<PackageProjectUrl>https://github.com/unoplatform/uno.themes</PackageProjectUrl>
+		<PackageIconUrl>https://nv-assets.azurewebsites.net/logos/uno.png</PackageIconUrl>
+		<RepositoryUrl>https://github.com/unoplatform/uno.themes</RepositoryUrl>
 		<RepositoryUrl>$(BUILD_REPOSITORY_URI)</RepositoryUrl>
 		<Copyright>Copyright (C) 2015-$([System.DateTime]::Now.ToString(`yyyy`)) Uno Platform Inc. - all rights reserved</Copyright>
 		<Product>$(AssemblyName) ($(TargetFramework))</Product>
@@ -13,22 +14,22 @@
 		<PackageReadmeFile>README.md</PackageReadmeFile>
 		<UseWinUI Condition="'$(UseWinUI)'==''">false</UseWinUI>
 	</PropertyGroup>
-	
+
 	<PropertyGroup Condition="'$(TF_BUILD)' == 'true'">
 		<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
 	</PropertyGroup>
-	
+
 	<PropertyGroup>
 		<GeneratePackageOnBuild Condition="'$(Configuration)'=='Release'">true</GeneratePackageOnBuild>
 		<IsTestProject>$(MSBuildProjectName.Contains('Test'))</IsTestProject>
 		<IsSampleProject>$(MSBuildProjectName.Contains('Sample'))</IsSampleProject>
 	</PropertyGroup>
-	
+
 	<ItemGroup>
 		<None Include="$(MSBuildThisFileDirectory)build\uno-logo.png" Pack="true" Visible="false" PackagePath="\"/>
 		<None Include="$(MSBuildThisFileDirectory)README.md" Pack="true" PackagePath="/" />
 	</ItemGroup>
-	
+
 	<Choose>
 		<When Condition="'$(IsTestProject)' != 'true' and '$(SourceLinkEnabled)' != 'false' and '$(IsSampleProject)' != 'true'">
 			<PropertyGroup>

azure-pipelines.yml

@@ -75,8 +75,8 @@ jobs:
     vmImage: windows-2022
 
   steps:
-    - template: build/gitversion.yml
-    - template: build/dotnet-install-windows.yml
+    - template: build/templates/gitversion.yml
+    - template: build/templates/dotnet-install-windows.yml
 
      # This SDK version is needed as long as `uap10.0` will be supported in Uno.Core
     - powershell: ./build/Install-WindowsSdkISO.ps1 18362
@@ -100,9 +100,13 @@ jobs:
         DisableNet6MobileTargets: true
         UseWinUI: false
   pool:
-    vmImage: macOS-11
+    vmImage: macOS-12
 
   variables:
+  - name: XCODE_ROOT
+    value: '/Applications/Xcode_13.2.1.app'
+  - name: XamarinSDKVersion
+    value: 6_12_12
   - name: SkipUnknownFrameworks
     value: true # Used by TargetFrameworks.Filtering package
   - group: unoplatform.apple.ios.appstore.distribution
@@ -122,9 +126,37 @@ jobs:
       provisioningProfileLocation: 'secureFiles'
       provProfileSecureFile: 'Uno_Themes.mobileprovision'
 
-  - template: build/gitversion.yml
-  - template: build/dotnet-install-macos.yml
-  - template: build/stage-build.yml
+  - template: build/templates/canary-updater.yml
+  - template: build/templates/gitversion.yml
+  - template: build/templates/dotnet-install-macos.yml
+
+  - bash: /bin/bash -c "sudo $AGENT_HOMEDIRECTORY/scripts/select-xamarin-sdk.sh $(XamarinSDKVersion)"
+    displayName: Select Xamarin Version
+
+  - bash: |
+      echo 'xCode Root to ${XCODE_ROOT}'
+      echo '##vso[task.setvariable variable=MD_APPLE_SDK_ROOT;]'${XCODE_ROOT}
+      sudo xcode-select --switch ${XCODE_ROOT}/Contents/Developer
+
+    displayName: Select Xcode
+
+  - bash: |
+      rm -f ${HOME}/Library/Preferences/Xamarin/Settings.plist
+
+    # https://github.com/actions/virtual-environments/issues/1932
+    displayName: Apply workaround for Azure Devops issue 1932
+
+  - bash: |
+      chmod +x $(build.sourcesdirectory)/build/scripts/macos-build.sh
+      $(build.sourcesdirectory)/build/scripts/macos-build.sh
+    displayName: 'Build solution in Release | $(ApplicationPlatform)'
+    retryCountOnTaskFailure: 3
+    env:
+      BUILD_PLATFORM: "$(ApplicationPlatform)"
+      BUILD_APPLICATIONVERSION: "$(MajorMinorPatch)"
+      BUILD_PACKAGEVERSION: "$(SemVer)"
+      BUILD_SOLUTION: "Uno.Themes.sln"
+      BUILD_BINLOG: "$(build.artifactstagingdirectory)/themes-build-$(ApplicationPlatform).binlog"
 
 - job: Linux
 
@@ -139,5 +171,5 @@ jobs:
     UseWinUI: false
 
   steps:
-  - template: build/gitversion.yml
+  - template: build/templates/gitversion.yml
   - template: build/stage-build-wasm.yml

build/scripts/macos-build.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+set -euo pipefail
+IFS=$'\n\t'
+
+cd $BUILD_SOURCESDIRECTORY
+
+mono "/Applications/Visual Studio.app/Contents/MonoBundle/MSBuild/Current/bin/MSBuild.dll" /m /r /p:UnoUIUseRoslynSourceGenerators=False /p:Configuration=Release /p:Platform=$BUILD_PLATFORM /p:PackageVersion=$BUILD_PACKAGEVERSION /p:ApplicationVersion=$BUILD_APPLICATIONVERSION /detailedsummary /p:AotAssemblies=false /p:RestoreConfigFile=$BUILD_SOURCESDIRECTORY/nuget.config /bl:$BUILD_BINLOG $BUILD_SOLUTION

build/stage-build.yml

@@ -1,22 +1,7 @@
 steps:
-- task: UseDotNet@2
-  condition: eq(variables['IsCanaryBranch'], true)
-  retryCountOnTaskFailure: 3
-  inputs:
-    packageType: runtime
-    version: 2.2.x
 
-- task: nventiveCanaryUpdater@5
-  condition: eq(variables['IsCanaryBranch'], true)
-  retryCountOnTaskFailure: 3
-  inputs:
-    solution: Uno.Themes.sln
-    useNuGetOrg: true
-    usePrivateFeed: false
-    mergeBranch: true
-    branchToMerge: master
-    nugetUpdaterVersion: 2.1.1
-    packageAuthor: nventive
+- template: templates/canary-updater.yml
+
 - bash: |
     npm install -g conventional-changelog-cli@2.2.2
     conventional-changelog -p angular -u -r 1 -o "build/CHANGELOG.md"

build/templates/canary-updater.yml

@@ -0,0 +1,31 @@
+steps:
+
+  - task: UseDotNet@2
+    condition: eq(variables['IsCanaryBranch'], true)
+    displayName: 'Use .NET 5.0.406'
+    retryCountOnTaskFailure: 3
+    inputs:
+      packageType: runtime
+      version: 5.0.15
+
+  - task: UseDotNet@2
+    condition: eq(variables['IsCanaryBranch'], true)
+    displayName: 'Use .NET runtime 2.2.x'
+    retryCountOnTaskFailure: 3
+    inputs:
+      packageType: runtime
+      version: 2.2.x
+
+  - task: nventiveCanaryUpdater@5
+    condition: eq(variables['IsCanaryBranch'], true)
+    retryCountOnTaskFailure: 3
+    inputs:
+      solution: Uno.Themes.sln
+      useNuGetOrg: true
+      usePrivateFeed: false
+      mergeBranch: true
+      branchToMerge: master
+      nugetUpdaterVersion: 2.1.1
+      packageAuthor: nventive
+      summaryFile: '$(Build.ArtifactStagingDirectory)/Canary.md'
+      resultFile: '$(Build.ArtifactStagingDirectory)/Results.json'

build/dotnet-install-macos.yml → build/templates/dotnet-install-macos.yml

@@ -1,7 +1,7 @@
 parameters:
-  DotNetVersion: '6.0.300'
-  UnoCheck_Version: '1.4.1'
-  UnoCheck_Manifest: 'https://raw.githubusercontent.com/unoplatform/uno.check/b58b891361591bc19d856dea0fbe15ff213e5f50/manifests/uno.ui-preview.manifest.json'
+  DotNetVersion: '6.0.401'
+  UnoCheck_Version: '1.5.4'
+  UnoCheck_Manifest: 'https://raw.githubusercontent.com/unoplatform/uno.check/34b1a60f5c1c51604b47362781969dde46979fd5/manifests/uno.ui.manifest.json'
   Dotnet_Root: '/usr/local/share/dotnet/'
   Dotnet_Tools: '~/.dotnet/tools'
 

build/dotnet-install-windows.yml → build/templates/dotnet-install-windows.yml

@@ -1,7 +1,7 @@
 parameters:
-  DotNetVersion: '6.0.300'
-  UnoCheck_Version: '1.4.1'
-  UnoCheck_Manifest: 'https://raw.githubusercontent.com/unoplatform/uno.check/b58b891361591bc19d856dea0fbe15ff213e5f50/manifests/uno.ui-preview.manifest.json'
+  DotNetVersion: '6.0.401'
+  UnoCheck_Version: '1.5.4'
+  UnoCheck_Manifest: 'https://raw.githubusercontent.com/unoplatform/uno.check/34b1a60f5c1c51604b47362781969dde46979fd5/manifests/uno.ui.manifest.json'
 
 steps:
   - task: UseDotNet@2

src/library/Uno.Material.WinUI.Markup/Uno.Material.WinUI.Markup.csproj

@@ -15,17 +15,14 @@
 	</PropertyGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\Uno.Material\Uno.Material.csproj" />
-		<ProjectReference Include="..\Uno.Themes.Markup.WinUI\Uno.Themes.WinUI.Markup.csproj" />
+		<ProjectReference Include="..\Uno.Themes.WinUI.Markup\Uno.Themes.WinUI.Markup.csproj" />
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Uno.Extensions.Markup.WinUI" Version="1.0.0-dev.120" />
-		<PackageReference Include="Uno.Extensions.Markup.Generators" Version="1.0.0-dev.120" />
-		<PackageReference Include="Uno.WinUI" Version="4.5.12" />
+		<PackageReference Include="Uno.Extensions.Markup.Generators" PrivateAssets="All" Version="1.0.0-dev.121" />
 	</ItemGroup>
 
 	<ItemGroup Condition="$(TargetFramework.Contains('-windows10'))">
-		<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.1.0" />
 		<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" RuntimeFrameworkVersion="10.0.22000.24" />
 		<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" TargetingPackVersion="10.0.22000.24" />
 	</ItemGroup>

src/library/Uno.Themes.WinUI.Markup/Uno.Themes.WinUI.Markup.csproj

@@ -15,12 +15,10 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Uno.Extensions.Markup.WinUI" Version="1.0.0-dev.120" />
-		<PackageReference Include="Uno.WinUI" Version="4.5.12" />
+		<PackageReference Include="Uno.WinUI.Markup" Version="4.6.0-dev.11" />
 	</ItemGroup>
 
 	<ItemGroup Condition="$(TargetFramework.Contains('-windows10'))">
-		<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.1.0" />
 		<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" RuntimeFrameworkVersion="10.0.22000.24" />
 		<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" TargetingPackVersion="10.0.22000.24" />
 	</ItemGroup>