Skip to content

Commit

Permalink
feat: Add support for net6 mobile targets, bump to uno 4.2-dev
Browse files Browse the repository at this point in the history
  • Loading branch information
jeromelaban committed Mar 30, 2022
1 parent a293f5e commit c911f37
Show file tree
Hide file tree
Showing 19 changed files with 509 additions and 124 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/azure-static-webapp.yml
@@ -1,4 +1,4 @@
name: Azure Static Web Apps CI/CD
name: Azure Static Web Apps CI/CD

on:
push:
Expand Down Expand Up @@ -38,14 +38,14 @@ jobs:
useConfigFile: true
configFilePath: build/gitversion.yml

- name: Setup dotnet 5.0.x
- name: Setup dotnet 6.0.200
uses: actions/setup-dotnet@v1.7.2
with:
dotnet-version: '5.0.x'
dotnet-version: '6.0.200'

- run: |
cd src/samples/Uno.Themes.Samples/Uno.Themes.Samples.Wasm
dotnet build -c Release "/p:PackageVersion=${{ steps.gitversion.outputs.fullSemVer }}"
dotnet build -c Release "/p:PackageVersion=${{ steps.gitversion.outputs.fullSemVer }}" /p:DisableNet6MobileTargets=true
- uses: actions/upload-artifact@v2
with:
Expand Down
10 changes: 7 additions & 3 deletions azure-pipelines.yml
Expand Up @@ -21,21 +21,23 @@ jobs:
UWP:
ApplicationPlatform: UWP_x64
ArtifactName: UWP
DisableNet6MobileTargets: true
Android:
ApplicationPlatform: Android
ArtifactName: Android
DisableNet6MobileTargets: true
Packages:
ApplicationPlatform: Packages
GeneratePackageOnBuild: true
ArtifactName: Packages
GeneratePackageOnBuild: true
Packages_WinUI:
ApplicationPlatform: Packages
GeneratePackageOnBuild: true
ArtifactName: Packages
UseWinUI: true
GeneratePackageOnBuild: true

pool:
vmImage: windows-2019
vmImage: windows-2022

steps:
- template: build/stage-build.yml
Expand All @@ -48,9 +50,11 @@ jobs:
iOS:
ApplicationPlatform: iPhone
ArtifactName: iOS
DisableNet6MobileTargets: true
macOS:
ApplicationPlatform: macOS
ArtifactName: macOS
DisableNet6MobileTargets: true
pool:
vmImage: macOS-10.15

Expand Down
308 changes: 308 additions & 0 deletions build/Install-WindowsSdkISO.ps1
@@ -0,0 +1,308 @@
[CmdletBinding()]
param([Parameter(Mandatory=$true)]
[string]$buildNumber)

# Ensure the error action preference is set to the default for PowerShell3, 'Stop'
$ErrorActionPreference = 'Stop'

# Constants
$WindowsSDKOptions = @("OptionId.UWPCpp")
$WindowsSDKRegPath = "HKLM:\Software\Microsoft\Windows Kits\Installed Roots"
$WindowsSDKRegRootKey = "KitsRoot10"
$WindowsSDKVersion = "10.0.$buildNumber.0"
$WindowsSDKInstalledRegPath = "$WindowsSDKRegPath\$WindowsSDKVersion\Installed Options"
$StrongNameRegPath = "HKLM:\SOFTWARE\Microsoft\StrongName\Verification"
$PublicKeyTokens = @("31bf3856ad364e35")

function Download-File
{
param ([string] $outDir,
[string] $downloadUrl,
[string] $downloadName)

$downloadPath = Join-Path $outDir "$downloadName.download"
$downloadDest = Join-Path $outDir $downloadName
$downloadDestTemp = Join-Path $outDir "$downloadName.tmp"

Write-Host -NoNewline "Downloading $downloadName..."

try
{
$webclient = new-object System.Net.WebClient
$webclient.DownloadFile($downloadUrl, $downloadPath)
}
catch [System.Net.WebException]
{
Write-Host
Write-Warning "Failed to fetch updated file from $downloadUrl"
if (!(Test-Path $downloadDest))
{
throw "$downloadName was not found at $downloadDest"
}
else
{
Write-Warning "$downloadName may be out of date"
}
}

Unblock-File $downloadPath

$downloadDestTemp = $downloadPath;

# Delete and rename to final dest
if (Test-Path -PathType Container $downloadDest)
{
[System.IO.Directory]::Delete($downloadDest, $true)
}

Move-Item -Force $downloadDestTemp $downloadDest
Write-Host "Done"

return $downloadDest
}

function Get-ISODriveLetter
{
param ([string] $isoPath)

$diskImage = Get-DiskImage -ImagePath $isoPath
if ($diskImage)
{
$volume = Get-Volume -DiskImage $diskImage

if ($volume)
{
$driveLetter = $volume.DriveLetter
if ($driveLetter)
{
$driveLetter += ":"
return $driveLetter
}
}
}

return $null
}

function Mount-ISO
{
param ([string] $isoPath)

# Check if image is already mounted
$isoDrive = Get-ISODriveLetter $isoPath

if (!$isoDrive)
{
Mount-DiskImage -ImagePath $isoPath -StorageType ISO | Out-Null
}

$isoDrive = Get-ISODriveLetter $isoPath
Write-Verbose "$isoPath mounted to ${isoDrive}:"
}

function Dismount-ISO
{
param ([string] $isoPath)

$isoDrive = (Get-DiskImage -ImagePath $isoPath | Get-Volume).DriveLetter

if ($isoDrive)
{
Write-Verbose "$isoPath dismounted"
Dismount-DiskImage -ImagePath $isoPath | Out-Null
}
}

function Disable-StrongName
{
param ([string] $publicKeyToken = "*")

reg ADD "HKLM\SOFTWARE\Microsoft\StrongName\Verification\*,$publicKeyToken" /f | Out-Null
if ($env:PROCESSOR_ARCHITECTURE -eq "AMD64")
{
reg ADD "HKLM\SOFTWARE\Wow6432Node\Microsoft\StrongName\Verification\*,$publicKeyToken" /f | Out-Null
}
}

function Test-Admin
{
$identity = [Security.Principal.WindowsIdentity]::GetCurrent()
$principal = New-Object Security.Principal.WindowsPrincipal $identity
$principal.IsInRole([Security.Principal.WindowsBuiltInRole]::Administrator)
}

function Test-RegistryPathAndValue
{
param (
[parameter(Mandatory=$true)]
[ValidateNotNullOrEmpty()]
[string] $path,
[parameter(Mandatory=$true)]
[ValidateNotNullOrEmpty()]
[string] $value)

try
{
if (Test-Path $path)
{
Get-ItemProperty -Path $path | Select-Object -ExpandProperty $value -ErrorAction Stop | Out-Null
return $true
}
}
catch
{
}

return $false
}

function Test-InstallWindowsSDK
{
$retval = $true

if (Test-RegistryPathAndValue -Path $WindowsSDKRegPath -Value $WindowsSDKRegRootKey)
{
# A Windows SDK is installed
# Is an SDK of our version installed with the options we need?
if (Test-RegistryPathAndValue -Path $WindowsSDKInstalledRegPath -Value "$WindowsSDKOptions")
{
# It appears we have what we need. Double check the disk
$sdkRoot = Get-ItemProperty -Path $WindowsSDKRegPath | Select-Object -ExpandProperty $WindowsSDKRegRootKey
if ($sdkRoot)
{
if (Test-Path $sdkRoot)
{
$refPath = Join-Path $sdkRoot "References\$WindowsSDKVersion"
if (Test-Path $refPath)
{
$umdPath = Join-Path $sdkRoot "UnionMetadata\$WindowsSDKVersion"
if (Test-Path $umdPath)
{
# Pretty sure we have what we need
$retval = $false
}
}
}
}
}
}

return $retval
}

function Test-InstallStrongNameHijack
{
foreach($publicKeyToken in $PublicKeyTokens)
{
$key = "$StrongNameRegPath\*,$publicKeyToken"
if (!(Test-Path $key))
{
return $true
}
}

return $false
}

Write-Host -NoNewline "Checking for installed Windows SDK $WindowsSDKVersion..."
$InstallWindowsSDK = Test-InstallWindowsSDK
if ($InstallWindowsSDK)
{
Write-Host "Installation required"
}
else
{
Write-Host "INSTALLED"
}

$StrongNameHijack = Test-InstallStrongNameHijack
Write-Host -NoNewline "Checking if StrongName bypass required..."

if ($StrongNameHijack)
{
Write-Host "REQUIRED"
}
else
{
Write-Host "Done"
}

if ($StrongNameHijack -or $InstallWindowsSDK)
{
if (!(Test-Admin))
{
Write-Host
throw "ERROR: Elevation required"
}
}

if ($InstallWindowsSDK)
{
# Static(ish) link for Windows SDK
# Note: there is a delay from Windows SDK announcements to availability via the static link
$uri = "https://go.microsoft.com/fwlink/?prd=11966&pver=1.0&plcid=0x409&clcid=0x409&ar=Flight&sar=Sdsurl&o1=$buildNumber"

if($buildNumber -eq 19041)
{
# Workaround for missing SDK
$uri = "https://software-download.microsoft.com/download/pr/19041.1.191206-1406.vb_release_WindowsSDK.iso";
}

if ($env:TEMP -eq $null)
{
$env:TEMP = Join-Path $env:SystemDrive 'temp'
}

$winsdkTempDir = Join-Path $env:TEMP "WindowsSDK"

if (![System.IO.Directory]::Exists($winsdkTempDir))
{
[void][System.IO.Directory]::CreateDirectory($winsdkTempDir)
}

$file = "winsdk_$buildNumber.iso"

Write-Verbose "Getting WinSDK from $uri"
$downloadFile = Download-File $winsdkTempDir $uri $file

# TODO Check if zip, exe, iso, etc.
try
{
Write-Host -NoNewline "Mounting ISO $file..."
Mount-ISO $downloadFile
Write-Host "Done"

$isoDrive = Get-ISODriveLetter $downloadFile

if (Test-Path $isoDrive)
{
Write-Host -NoNewLine "Installing WinSDK..."

$setupPath = Join-Path "$isoDrive" "WinSDKSetup.exe"
Start-Process -Wait $setupPath "/features $WindowsSDKOptions /q"
Write-Host "Done"
}
else
{
throw "Could not find mounted ISO at ${isoDrive}"
}
}
finally
{
Write-Host -NoNewline "Dismounting ISO $file..."
#Dismount-ISO $downloadFile
Write-Host "Done"
}
}

if ($StrongNameHijack)
{
Write-Host -NoNewline "Disabling StrongName for Windows SDK..."

foreach($key in $PublicKeyTokens)
{
Disable-StrongName $key
}

Write-Host "Done"
}

0 comments on commit c911f37

Please sign in to comment.