Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update SDK, workloads and projects #2971

Merged
merged 18 commits into from
Aug 16, 2024
Merged

Update SDK, workloads and projects #2971

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
7df61a2
Install a slightly older SDK
mattleibow Jul 29, 2024
67c1fa1
new xcode for new ios sdk
mattleibow Aug 14, 2024
6f03e12
Use TPV in libraries
mattleibow Aug 14, 2024
4d8ab2f
10047156
mattleibow Aug 14, 2024
bb61c67
this
mattleibow Aug 14, 2024
7127c5f
Use rollback for now
mattleibow Aug 15, 2024
a529a73
72
mattleibow Aug 15, 2024
dff25e4
this
mattleibow Aug 15, 2024
12161f4
this
mattleibow Aug 16, 2024
7778234
better
mattleibow Aug 16, 2024
9826186
maui version
mattleibow Aug 16, 2024
8d4a17a
https://github.com/dotnet/maui/pull/24263
mattleibow Aug 16, 2024
a3fe5a5
just give up
mattleibow Aug 16, 2024
5e774ee
wow
mattleibow Aug 16, 2024
712c6df
sigh
mattleibow Aug 16, 2024
fa07665
https://github.com/dotnet/maui/pull/24263
mattleibow Aug 16, 2024
ce2815c
121726
mattleibow Aug 16, 2024
9234c38
never going green without a fight
mattleibow Aug 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions binding/HarfBuzzSharp.NativeAssets.Android/HarfBuzzSharp.NativeAssets.Android.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>$(TFMCurrent)-android</TargetFrameworks>
<TargetFrameworks Condition="'$(TFMNext)' != ''">$(TargetFrameworks);$(TFMNext)-android</TargetFrameworks>
<TargetFrameworks>$(TFMCurrent)-android$(TPVAndroidCurrent)</TargetFrameworks>
<TargetFrameworks Condition="'$(TFMNext)' != ''">$(TargetFrameworks);$(TFMNext)-android$(TPVAndroidNext)</TargetFrameworks>
<PackagingGroup>HarfBuzzSharp</PackagingGroup>
<Title>$(PackagingGroup) - Native Assets for Android</Title>
</PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions binding/HarfBuzzSharp.NativeAssets.MacCatalyst/HarfBuzzSharp.NativeAssets.MacCatalyst.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>$(TFMCurrent)-maccatalyst</TargetFrameworks>
<TargetFrameworks Condition="'$(TFMNext)' != ''">$(TargetFrameworks);$(TFMNext)-maccatalyst</TargetFrameworks>
<TargetFrameworks>$(TFMCurrent)-maccatalyst$(TPVMacCatalystCurrent)</TargetFrameworks>
<TargetFrameworks Condition="'$(TFMNext)' != ''">$(TargetFrameworks);$(TFMNext)-maccatalyst$(TPVMacCatalystNext)</TargetFrameworks>
<PackagingGroup>HarfBuzzSharp</PackagingGroup>
<Title>$(PackagingGroup) - Native Assets for Mac Catalyst</Title>
</PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions binding/HarfBuzzSharp.NativeAssets.Tizen/HarfBuzzSharp.NativeAssets.Tizen.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>$(TFMCurrent)-tizen</TargetFrameworks>
<TargetFrameworks Condition="'$(TFMNext)' != ''">$(TargetFrameworks);$(TFMNext)-tizen</TargetFrameworks>
<TargetFrameworks>$(TFMCurrent)-tizen$(TPVTizenCurrent)</TargetFrameworks>
<TargetFrameworks Condition="'$(TFMNext)' != ''">$(TargetFrameworks);$(TFMNext)-tizen$(TPVTizenNext)</TargetFrameworks>
<PackagingGroup>HarfBuzzSharp</PackagingGroup>
<Title>$(PackagingGroup) - Native Assets for Tizen</Title>
</PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions binding/HarfBuzzSharp.NativeAssets.iOS/HarfBuzzSharp.NativeAssets.iOS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>$(TFMCurrent)-ios</TargetFrameworks>
<TargetFrameworks Condition="'$(TFMNext)' != ''">$(TargetFrameworks);$(TFMNext)-ios</TargetFrameworks>
<TargetFrameworks>$(TFMCurrent)-ios$(TPViOSCurrent)</TargetFrameworks>
<TargetFrameworks Condition="'$(TFMNext)' != ''">$(TargetFrameworks);$(TFMNext)-ios$(TPViOSNext)</TargetFrameworks>
<PackagingGroup>HarfBuzzSharp</PackagingGroup>
<Title>$(PackagingGroup) - Native Assets for iOS</Title>
</PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions binding/HarfBuzzSharp.NativeAssets.macOS/HarfBuzzSharp.NativeAssets.macOS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>$(BasicTargetFrameworks)</TargetFrameworks>
<TargetFrameworks Condition="!$(IsLinux)">$(TargetFrameworks);$(TFMCurrent)-macos</TargetFrameworks>
<TargetFrameworks Condition="!$(IsLinux) and '$(TFMNext)' != ''">$(TargetFrameworks);$(TFMNext)-macos</TargetFrameworks>
<TargetFrameworks Condition="!$(IsLinux)">$(TargetFrameworks);$(TFMCurrent)-macos$(TPVmacOSCurrent)</TargetFrameworks>
<TargetFrameworks Condition="!$(IsLinux) and '$(TFMNext)' != ''">$(TargetFrameworks);$(TFMNext)-macos$(TPVmacOSNext)</TargetFrameworks>
<PackagingGroup>HarfBuzzSharp</PackagingGroup>
<Title>$(PackagingGroup) - Native Assets for macOS</Title>
</PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions binding/HarfBuzzSharp.NativeAssets.tvOS/HarfBuzzSharp.NativeAssets.tvOS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>$(TFMCurrent)-tvos</TargetFrameworks>
<TargetFrameworks Condition="'$(TFMNext)' != ''">$(TargetFrameworks);$(TFMNext)-tvos</TargetFrameworks>
<TargetFrameworks>$(TFMCurrent)-tvos$(TPVtvOSCurrent)</TargetFrameworks>
<TargetFrameworks Condition="'$(TFMNext)' != ''">$(TargetFrameworks);$(TFMNext)-tvos$(TPVtvOSNext)</TargetFrameworks>
<PackagingGroup>HarfBuzzSharp</PackagingGroup>
<Title>$(PackagingGroup) - Native Assets for tvOS</Title>
</PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions binding/SkiaSharp.NativeAssets.Android/SkiaSharp.NativeAssets.Android.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>$(TFMCurrent)-android</TargetFrameworks>
<TargetFrameworks Condition="'$(TFMNext)' != ''">$(TargetFrameworks);$(TFMNext)-android</TargetFrameworks>
<TargetFrameworks>$(TFMCurrent)-android$(TPVAndroidCurrent)</TargetFrameworks>
<TargetFrameworks Condition="'$(TFMNext)' != ''">$(TargetFrameworks);$(TFMNext)-android$(TPVAndroidNext)</TargetFrameworks>
<PackagingGroup>SkiaSharp</PackagingGroup>
<Title>$(PackagingGroup) - Native Assets for Android</Title>
</PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions binding/SkiaSharp.NativeAssets.MacCatalyst/SkiaSharp.NativeAssets.MacCatalyst.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>$(TFMCurrent)-maccatalyst</TargetFrameworks>
<TargetFrameworks Condition="'$(TFMNext)' != ''">$(TargetFrameworks);$(TFMNext)-maccatalyst</TargetFrameworks>
<TargetFrameworks>$(TFMCurrent)-maccatalyst$(TPVMacCatalystCurrent)</TargetFrameworks>
<TargetFrameworks Condition="'$(TFMNext)' != ''">$(TargetFrameworks);$(TFMNext)-maccatalyst$(TPVMacCatalystNext)</TargetFrameworks>
<PackagingGroup>SkiaSharp</PackagingGroup>
<Title>$(PackagingGroup) - Native Assets for Mac Catalyst</Title>
</PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions binding/SkiaSharp.NativeAssets.Tizen/SkiaSharp.NativeAssets.Tizen.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>$(TFMCurrent)-tizen</TargetFrameworks>
<TargetFrameworks Condition="'$(TFMNext)' != ''">$(TargetFrameworks);$(TFMNext)-tizen</TargetFrameworks>
<TargetFrameworks>$(TFMCurrent)-tizen$(TPVTizenCurrent)</TargetFrameworks>
<TargetFrameworks Condition="'$(TFMNext)' != ''">$(TargetFrameworks);$(TFMNext)-tizen$(TPVTizenNext)</TargetFrameworks>
<PackagingGroup>SkiaSharp</PackagingGroup>
<Title>$(PackagingGroup) - Native Assets for Tizen</Title>
</PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions binding/SkiaSharp.NativeAssets.iOS/SkiaSharp.NativeAssets.iOS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>$(TFMCurrent)-ios</TargetFrameworks>
<TargetFrameworks Condition="'$(TFMNext)' != ''">$(TargetFrameworks);$(TFMNext)-ios</TargetFrameworks>
<TargetFrameworks>$(TFMCurrent)-ios$(TPViOSCurrent)</TargetFrameworks>
<TargetFrameworks Condition="'$(TFMNext)' != ''">$(TargetFrameworks);$(TFMNext)-ios$(TPViOSNext)</TargetFrameworks>
<PackagingGroup>SkiaSharp</PackagingGroup>
<Title>$(PackagingGroup) - Native Assets for iOS</Title>
</PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions binding/SkiaSharp.NativeAssets.macOS/SkiaSharp.NativeAssets.macOS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>$(BasicTargetFrameworks)</TargetFrameworks>
<TargetFrameworks Condition="!$(IsLinux)">$(TargetFrameworks);$(TFMCurrent)-macos</TargetFrameworks>
<TargetFrameworks Condition="!$(IsLinux) and '$(TFMNext)' != ''">$(TargetFrameworks);$(TFMNext)-macos</TargetFrameworks>
<TargetFrameworks Condition="!$(IsLinux)">$(TargetFrameworks);$(TFMCurrent)-macos$(TPVmacOSCurrent)</TargetFrameworks>
<TargetFrameworks Condition="!$(IsLinux) and '$(TFMNext)' != ''">$(TargetFrameworks);$(TFMNext)-macos$(TPVmacOSNext)</TargetFrameworks>
<PackagingGroup>SkiaSharp</PackagingGroup>
<Title>$(PackagingGroup) - Native Assets for macOS</Title>
</PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions binding/SkiaSharp.NativeAssets.tvOS/SkiaSharp.NativeAssets.tvOS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>$(TFMCurrent)-tvos</TargetFrameworks>
<TargetFrameworks Condition="'$(TFMNext)' != ''">$(TargetFrameworks);$(TFMNext)-tvos</TargetFrameworks>
<TargetFrameworks>$(TFMCurrent)-tvos$(TPVtvOSCurrent)</TargetFrameworks>
<TargetFrameworks Condition="'$(TFMNext)' != ''">$(TargetFrameworks);$(TFMNext)-tvos$(TPVtvOSNext)</TargetFrameworks>
<PackagingGroup>SkiaSharp</PackagingGroup>
<Title>$(PackagingGroup) - Native Assets for tvOS</Title>
</PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions scripts/azure-pipelines-variables.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ variables:
BUILD_COUNTER: $[counter('global_counter', 1)]
TIZEN_LINUX_PACKAGES: libxcb-icccm4 libxcb-render-util0 gettext libxcb-image0 libsdl1.2debian libv4l-0 libxcb-randr0 bridge-utils libxcb-shape0 libpython2.7 openvpn libkf5itemmodels5 libkf5kiowidgets5 libkchart2
MANAGED_LINUX_PACKAGES: ttf-ancient-fonts ninja-build
XCODE_VERSION: '15.2'
XCODE_VERSION: '15.4'
XCODE_VERSION_NATIVE: '14.3.1'
VISUAL_STUDIO_VERSION: ''
DOTNET_VERSION: '8.0.x'
DOTNET_VERSION: '8.0.304'
DOTNET_VERSION_PREVIEW: ''
DOTNET_WORKLOAD_SOURCE: ''
DOTNET_WORKLOAD_TIZEN: '8.0.149'
Expand Down
36 changes: 36 additions & 0 deletions scripts/install-android-sdk.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,32 @@ function Get-SdkManager {
return $sdkmanager
}

function Get-Adb {
param (
[string] $SdkPath,
[string] $Indent = " "
)

Write-Host "${Indent}Looking for ADB in $SdkPath..."

$platformtools = Join-Path "$SdkPath" "platform-tools"
if (Test-Path $platformtools) {
Write-Host "${Indent} Found platform tools: $platformtools"
}

$adbExt = if (-not $IsMacOS -and -not $IsLinux) { ".exe" } else { "" }
$adb = Get-ChildItem $platformtools | Where-Object { $_.Name -eq "adb$adbExt" }

if (-not $adb) {
Write-Host "${Indent}No ADB found."
return ""
}

Write-Host "${Indent}Found ADB at $adb."

return $adb
}

function Get-AndroidSdk {
param (
[string] $SdkPath,
Expand All @@ -72,6 +98,12 @@ function Get-AndroidSdk {
return ""
}

$adb = Get-Adb -SdkPath "$SdkPath"
if (-not (Test-Path $adb)) {
Write-Host "${Indent}No ADB found, not going to use this one."
return ""
}

Write-Host "${Indent}Using the Android SDK at $SdkPath."

return "$SdkPath"
Expand Down Expand Up @@ -154,6 +186,7 @@ if (-not $sdk) {
}

$sdkmanager = Get-SdkManager -SdkPath "$sdk" -Indent ""
$adb = Get-Adb -SdkPath "$sdk" -Indent ""

Write-Host "Using Android SDK at $sdk."

Expand All @@ -167,13 +200,16 @@ Write-Host "Setting environment variable ANDROID_HOME=$sdk"
Write-Host "Setting environment variable ANDROID_SDK_ROOT=$sdk"
Write-Host "Setting environment variable AndroidSdkDirectory=$sdk"
Write-Host "Setting environment variable ANDROID_SDK_MANAGER_PATH=$sdkmanager"
Write-Host "Setting environment variable ANDROID_ADB_PATH=$adb"
Write-Host "##vso[task.setvariable variable=ANDROID_SDK_ROOT;]$sdk";
Write-Host "##vso[task.setvariable variable=ANDROID_HOME;]$sdk";
Write-Host "##vso[task.setvariable variable=AndroidSdkDirectory;]$sdk";
Write-Host "##vso[task.setvariable variable=ANDROID_SDK_MANAGER_PATH;]$sdkmanager";
Write-Host "##vso[task.setvariable variable=ANDROID_ADB_PATH;]$adb";
$env:ANDROID_SDK_ROOT = $sdk
$env:ANDROID_HOME = $sdk
$env:AndroidSdkDirectory = $sdk
$env:ANDROID_SDK_MANAGER_PATH = $sdkmanager
$env:ANDROID_ADB_PATH = $adb

exit $LASTEXITCODE
Loading
Loading