Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/azure-static-webapp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
- name: Setup dotnet
uses: actions/setup-dotnet@v1.7.2
with:
dotnet-version: '9.0.200'
dotnet-version: '9.0.305'

- uses: dotnet/nbgv@f088059084cb5d872e9d1a994433ca6440c2bf72 # v0.4.2
id: nbgv
Expand Down
4 changes: 2 additions & 2 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"args": ["--no-build","-f","net9.0-browserwasm","--launch-profile", "Chefs (WebAssembly)"],
"outputCapture": "std",
"timeout": 30000,
"cwd": "${workspaceFolder}/samples/Uno.Toolkit.Samples"
"cwd": "${workspaceFolder}/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples"
}
},
{
Expand All @@ -50,7 +50,7 @@
"args": ["--no-build","-f","net9.0-browserwasm","--launch-profile", "Chefs (WebAssembly)"],
"outputCapture": "std",
"timeout": 30000,
"cwd": "${workspaceFolder}/samples/Uno.Toolkit.Samples"
"cwd": "${workspaceFolder}/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples"
}
},
{
Expand Down
8 changes: 4 additions & 4 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"type": "process",
"args": [
"build",
"${workspaceFolder}/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.csproj",
"${workspaceFolder}/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.csproj",
"/property:GenerateFullPaths=true",
"/property:TargetFramework=net9.0-browserwasm",
"/consoleloggerparameters:NoSummary"
Expand All @@ -20,7 +20,7 @@
"type": "process",
"args": [
"publish",
"${workspaceFolder}/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.csproj",
"${workspaceFolder}/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.csproj",
"/property:GenerateFullPaths=true",
"/property:TargetFramework=net9.0-browserwasm",
"/consoleloggerparameters:NoSummary"
Expand All @@ -33,7 +33,7 @@
"type": "process",
"args": [
"build",
"${workspaceFolder}/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.csproj",
"${workspaceFolder}/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.csproj",
"/property:GenerateFullPaths=true",
"/property:TargetFramework=net9.0-desktop",
"/consoleloggerparameters:NoSummary"
Expand All @@ -46,7 +46,7 @@
"type": "process",
"args": [
"publish",
"${workspaceFolder}/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.csproj",
"${workspaceFolder}/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.csproj",
"/property:GenerateFullPaths=true",
"/property:TargetFramework=net9.0-desktop",
"/consoleloggerparameters:NoSummary"
Expand Down
4 changes: 2 additions & 2 deletions build/workflow/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ variables:

IsCanaryBranch: $[startsWith(variables['Build.SourceBranch'], 'refs/heads/canaries/')]
IsReleaseBranch: $[or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), startsWith(variables['Build.SourceBranch'], 'refs/heads/feature/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'))]
XCODE_ROOT: '/Applications/Xcode_16.3.app'
XCODE_ROOT_UITESTS: '/Applications/Xcode_16.3.app'
XCODE_ROOT: '/Applications/Xcode_16.4.app'
XCODE_ROOT_UITESTS: '/Applications/Xcode_16.4.app'

stages:
- stage: Determine_Changes
Expand Down
40 changes: 30 additions & 10 deletions build/workflow/scripts/ios-uitest-run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
set -euo pipefail
IFS=$'\n\t'

# Ensure this script has no BOM even if it ever gets committed with one again
# (the BOM only breaks the shebang at exec time, but this is a safety net).
sed -i '' $'1s/^\xEF\xBB\xBF//' "$0"


if [ "$UITEST_TEST_MODE_NAME" == 'Automated' ];
then
Expand Down Expand Up @@ -58,19 +62,35 @@ cp "$UITEST_IOSDEVICE_DATA_PATH/../device.plist" $UNO_UITEST_SCREENSHOT_PATH/_lo

echo "Starting simulator: [$UITEST_IOSDEVICE_ID] ($UNO_UITEST_SIMULATOR_VERSION / $UNO_UITEST_SIMULATOR_NAME)"

# check for the presence of idb, and install it if it's not present
# Check for the presence of idb, and install it if it's not present
# NOTE: fb-idb currently breaks under Python 3.14 (asyncio get_event_loop change),
# so we pin fb-idb to Python 3.12 to avoid "There is no current event loop in thread 'MainThread'".
# Historical context: prior installs referenced an App Center issue/workaround.
# https://github.com/microsoft/appcenter/issues/2605#issuecomment-1854414963
export PATH=$PATH:~/.local/bin

if ! command -v idb &> /dev/null
then
echo "Installing idb"
brew install pipx
# # https://github.com/microsoft/appcenter/issues/2605#issuecomment-1854414963
brew tap facebook/fb
brew install idb-companion
pipx install fb-idb
if ! command -v idb >/dev/null 2>&1; then
echo "Installing idb (fb-idb + idb-companion) pinned to Python 3.12"

# 1) Make sure we have a usable python3.12, but don't fail if Homebrew linking conflicts
if ! command -v python3.12 >/dev/null 2>&1; then
# Install, but ignore link-step failure; we'll use the keg path explicitly
brew list --versions python@3.12 >/dev/null 2>&1 || brew install python@3.12 || true
fi
# Prefer an existing python3.12 on PATH; otherwise use the keg path
PY312_BIN="$(command -v python3.12 || echo "$(brew --prefix)/opt/python@3.12/bin/python3.12")"
export PIPX_DEFAULT_PYTHON="$PY312_BIN"
echo "Using Python for pipx: $PIPX_DEFAULT_PYTHON"

# 2) Install helpers
brew list --versions pipx >/dev/null 2>&1 || brew install pipx
brew tap facebook/fb >/dev/null 2>&1 || true
brew list --versions idb-companion >/dev/null 2>&1 || brew install idb-companion

# 3) Install fb-idb under Python 3.12
pipx install --force fb-idb
else
echo "Using idb from:" `command -v idb`
echo "Using idb from: $(command -v idb)"
fi

xcrun simctl boot "$UITEST_IOSDEVICE_ID" || true
Expand Down
17 changes: 17 additions & 0 deletions build/workflow/stage-uitests-wasm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,23 @@
build/workflow/scripts/wasm-uitest-run.sh
displayName: Run WASM UITests ($(XAML_FLAVOR_BUILD) / $(UITEST_TEST_MODE_NAME))

- task: CopyFiles@2
displayName: 'Publish Binaries'
retryCountOnTaskFailure: 3
inputs:
SourceFolder: $(build.sourcesdirectory)/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/bin/Release/net9.0-browserwasm/publish/wwwroot
Contents: '**/*.*'
TargetFolder: $(build.artifactstagingdirectory)/wwwroot
CleanTargetFolder: false
OverWrite: false
flattenFolders: false

- task: PublishBuildArtifacts@1
retryCountOnTaskFailure: 3
condition: always()
inputs:
ArtifactName: wasm-uitest-build

- task: PublishTestResults@2
condition: always()
retryCountOnTaskFailure: 3
Expand Down
4 changes: 2 additions & 2 deletions build/workflow/templates/dotnet-workload-install-linux.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
parameters:
DotNetVersion: '9.0.200'
UnoCheck_Version: '1.30.1'
DotNetVersion: '9.0.305'
UnoCheck_Version: '1.32.17'
Dotnet_Tools: '~/.dotnet/tools'
UnoCheckParameters: ''

Expand Down
4 changes: 2 additions & 2 deletions build/workflow/templates/dotnet-workload-install-mac.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
parameters:
DotNetVersion: '9.0.200'
UnoCheck_Version: '1.30.1'
DotNetVersion: '9.0.305'
UnoCheck_Version: '1.32.17'
Dotnet_Root: '/usr/local/share/dotnet/'
Dotnet_Tools: '~/.dotnet/tools'
UnoCheckParameters: ''
Expand Down
4 changes: 2 additions & 2 deletions build/workflow/templates/dotnet-workload-install-windows.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
parameters:
DotNetVersion: '9.0.200'
UnoCheck_Version: '1.30.1'
DotNetVersion: '9.0.305'
UnoCheck_Version: '1.32.17'
UnoCheckParameters: ''

steps:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using System.Reflection;
using System.Reflection;

Check warning on line 2 in samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/App.xaml.Navigation.cs

View workflow job for this annotation

GitHub Actions / Build and Deploy Job

The using directive for 'System.Reflection' appeared previously in this namespace
using Uno.Extensions;

using MUXC = Microsoft.UI.Xaml.Controls;
Expand Down Expand Up @@ -135,9 +135,9 @@
.ThenBy(x => x.SortOrder)
.ThenBy(x => x.Title)
.GroupBy(x => x.Category)
#if !DEBUG
.Where(x => x.Key != SampleCategory.Tests)
#endif
// #if !DEBUG
// .Where(x => x.Key != SampleCategory.Tests)
// #endif
;

foreach (var category in categories.OrderBy(x => x.Key))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public ShadowContainerRectangleTestPage()
this.InitializeComponent();
}

private void runButton_Click(object sender, RoutedEventArgs e)
private async void runButton_Click(object sender, RoutedEventArgs e)
{
statusText.Text = "Running";
shadowContainer.Shadows.Clear();
Expand All @@ -38,6 +38,7 @@ private void runButton_Click(object sender, RoutedEventArgs e)
Color = Colors.Red,
});

await Task.Delay(2000);
statusText.Text = "Verify";
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public ShadowContainerTestPage()
this.InitializeComponent();
}

private void runButton_Click(object sender, RoutedEventArgs e)
private async void runButton_Click(object sender, RoutedEventArgs e)
{
UpdateVisibilityElement();
statusText.Text = "Running";
Expand Down Expand Up @@ -61,6 +61,7 @@ private void runButton_Click(object sender, RoutedEventArgs e)

}

await Task.Delay(2000);
statusText.Text = "Verify";
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<TargetFrameworks Condition="'$(TargetFrameworkOverride)'!=''">$(TargetFrameworkOverride)</TargetFrameworks>
<TargetFrameworks Condition="'$(TargetFrameworkOverride)'==''">net9.0-desktop;net9.0-browserwasm</TargetFrameworks>
<TargetFrameworks Condition="'$(TargetFrameworkOverride)'=='' and '$(DisableMobileTargets)'==''">$(TargetFrameworks);net9.0-ios;net9.0-macos;net9.0-android;net9.0-maccatalyst</TargetFrameworks>
<TargetFrameworks Condition="'$(TargetFrameworkOverride)'=='' and '$(DisableMobileTargets)'==''">$(TargetFrameworks);net9.0-ios;net9.0-android;net9.0-maccatalyst</TargetFrameworks>
<TargetFrameworks Condition="'$(TargetFrameworkOverride)'=='' and '$(OS)'=='Windows_NT'">$(TargetFrameworks);net9.0-windows10.0.26100</TargetFrameworks>
<UnoSingleProject>true</UnoSingleProject>
<OutputType>Library</OutputType>
Expand Down
2 changes: 1 addition & 1 deletion src/Uno.Toolkit.UI/Uno.Toolkit.UI.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<PropertyGroup>
<TargetFrameworks Condition="'$(TargetFrameworkOverride)'!=''">$(TargetFrameworkOverride)</TargetFrameworks>
<TargetFrameworks Condition="'$(TargetFrameworkOverride)'==''">net8.0</TargetFrameworks>
<TargetFrameworks Condition="'$(TargetFrameworkOverride)'=='' and '$(DisableMobileTargets)'==''">$(TargetFrameworks);net8.0-ios;net8.0-macos;net8.0-android;net8.0-maccatalyst</TargetFrameworks>
<TargetFrameworks Condition="'$(TargetFrameworkOverride)'=='' and '$(DisableMobileTargets)'==''">$(TargetFrameworks);net8.0-ios;net8.0-android;net8.0-maccatalyst</TargetFrameworks>
<TargetFrameworks Condition="'$(TargetFrameworkOverride)'=='' and '$(OS)'=='Windows_NT'">$(TargetFrameworks);uap10.0.19041</TargetFrameworks>
<!-- Ensures the .xr.xml files are generated in a proper layout folder -->
<GenerateLibraryLayout>true</GenerateLibraryLayout>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<PropertyGroup>
<TargetFrameworks Condition="'$(TargetFrameworkOverride)'!=''">$(TargetFrameworkOverride)</TargetFrameworks>
<TargetFrameworks Condition="'$(TargetFrameworkOverride)'==''">net8.0</TargetFrameworks>
<TargetFrameworks Condition="'$(TargetFrameworkOverride)'=='' and '$(DisableMobileTargets)'==''">$(TargetFrameworks);net8.0-ios;net8.0-macos;net8.0-android;net8.0-maccatalyst</TargetFrameworks>
<TargetFrameworks Condition="'$(TargetFrameworkOverride)'=='' and '$(DisableMobileTargets)'==''">$(TargetFrameworks);net8.0-ios;net8.0-android;net8.0-maccatalyst</TargetFrameworks>
<TargetFrameworks Condition="'$(TargetFrameworkOverride)'=='' and '$(OS)'=='Windows_NT'">$(TargetFrameworks);uap10.0.19041</TargetFrameworks>
<!-- Ensures the .xr.xml files are generated in a proper layout folder -->
<GenerateLibraryLayout>true</GenerateLibraryLayout>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<PropertyGroup>
<TargetFrameworks Condition="'$(TargetFrameworkOverride)'!=''">$(TargetFrameworkOverride)</TargetFrameworks>
<TargetFrameworks Condition="'$(TargetFrameworkOverride)'==''">net8.0</TargetFrameworks>
<TargetFrameworks Condition="'$(TargetFrameworkOverride)'=='' and '$(DisableMobileTargets)'==''">$(TargetFrameworks);net8.0-ios;net8.0-macos;net8.0-android;net8.0-maccatalyst</TargetFrameworks>
<TargetFrameworks Condition="'$(TargetFrameworkOverride)'=='' and '$(DisableMobileTargets)'==''">$(TargetFrameworks);net8.0-ios;net8.0-android;net8.0-maccatalyst</TargetFrameworks>
<TargetFrameworks Condition="'$(TargetFrameworkOverride)'=='' and '$(OS)'=='Windows_NT'">$(TargetFrameworks);uap10.0.19041</TargetFrameworks>
<!-- Ensures the .xr.xml files are generated in a proper layout folder -->
<GenerateLibraryLayout>true</GenerateLibraryLayout>
Expand Down
3 changes: 1 addition & 2 deletions src/tfms.props
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,10 @@
<NetCurrentAndroid Condition="'$(TargetFrameworkOverride)'==''">$(NetCurrent)-android</NetCurrentAndroid>
<NetCurrentiOS Condition="'$(TargetFrameworkOverride)'==''">$(NetCurrent)-ios</NetCurrentiOS>
<NetCurrentMacCatalyst Condition="'$(TargetFrameworkOverride)'==''">$(NetCurrent)-maccatalyst</NetCurrentMacCatalyst>
<NetCurrentMacOS Condition="'$(TargetFrameworkOverride)'==''">$(NetCurrent)-macos</NetCurrentMacOS>
<NetCurrentWindows Condition="'$(TargetFrameworkOverride)'=='' and '$(OS)'=='Windows_NT'">$(NetCurrent)-windows10.0.19041</NetCurrentWindows>


<NetCurrentMobile Condition="'$(DisableMobileTargets)'==''">$(NetCurrentAndroid);$(NetCurrentiOS);$(NetCurrentMacCatalyst);$(NetCurrentMacOS)</NetCurrentMobile>
<NetCurrentMobile Condition="'$(DisableMobileTargets)'==''">$(NetCurrentAndroid);$(NetCurrentiOS);$(NetCurrentMacCatalyst)</NetCurrentMobile>
<NetCurrentAll>$(TargetFrameworkOverride);$(NetCurrent);$(NetCurrentMobile);$(NetCurrentWindows);</NetCurrentAll>
</PropertyGroup>

Expand Down
Loading