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
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="SKCanvasElementShowcase (Desktop)" type="LaunchSettings" factoryName=".NET Launch Settings Profile">
<option name="LAUNCH_PROFILE_PROJECT_FILE_PATH" value="$PROJECT_DIR$/SKCanvasElementShowcase/SKCanvasElementShowcase.csproj" />
<option name="LAUNCH_PROFILE_TFM" value="net9.0-desktop" />
<option name="LAUNCH_PROFILE_TFM" value="net10.0-desktop" />
<option name="LAUNCH_PROFILE_NAME" value="SKCanvasElementShowcase (Desktop)" />
<option name="USE_EXTERNAL_CONSOLE" value="0" />
<option name="USE_MONO" value="0" />
Expand All @@ -16,7 +16,7 @@
</configuration>
<configuration default="false" name="SKCanvasElementShowcase (WebAssembly IIS Express)" type="LaunchSettings" factoryName=".NET Launch Settings Profile">
<option name="LAUNCH_PROFILE_PROJECT_FILE_PATH" value="$PROJECT_DIR$/SKCanvasElementShowcase/SKCanvasElementShowcase.csproj" />
<option name="LAUNCH_PROFILE_TFM" value="net9.0-browserwasm" />
<option name="LAUNCH_PROFILE_TFM" value="net10.0-browserwasm" />
<option name="LAUNCH_PROFILE_NAME" value="SKCanvasElementShowcase (WebAssembly IIS Express)" />
<option name="USE_EXTERNAL_CONSOLE" value="0" />
<option name="USE_MONO" value="0" />
Expand All @@ -31,7 +31,7 @@
</configuration>
<configuration default="false" name="SKCanvasElementShowcase (WebAssembly)" type="LaunchSettings" factoryName=".NET Launch Settings Profile">
<option name="LAUNCH_PROFILE_PROJECT_FILE_PATH" value="$PROJECT_DIR$/SKCanvasElementShowcase/SKCanvasElementShowcase.csproj" />
<option name="LAUNCH_PROFILE_TFM" value="net9.0-browserwasm" />
<option name="LAUNCH_PROFILE_TFM" value="net10.0-browserwasm" />
<option name="LAUNCH_PROFILE_NAME" value="SKCanvasElementShowcase (WebAssembly)" />
<option name="USE_EXTERNAL_CONSOLE" value="0" />
<option name="USE_MONO" value="0" />
Expand All @@ -46,7 +46,7 @@
</configuration>
<configuration default="false" name="SKCanvasElementShowcase (WinAppSDK Unpackaged)" type="LaunchSettings" factoryName=".NET Launch Settings Profile">
<option name="LAUNCH_PROFILE_PROJECT_FILE_PATH" value="$PROJECT_DIR$/SKCanvasElementShowcase/SKCanvasElementShowcase.csproj" />
<option name="LAUNCH_PROFILE_TFM" value="net9.0-windows10.0.26100.0" />
<option name="LAUNCH_PROFILE_TFM" value="net10.0-windows10.0.26100.0" />
<option name="LAUNCH_PROFILE_NAME" value="SKCanvasElementShowcase (WinAppSDK Unpackaged)" />
<option name="USE_EXTERNAL_CONSOLE" value="0" />
<option name="USE_MONO" value="0" />
Expand Down
6 changes: 3 additions & 3 deletions UI/SKCanvasElementShowcase/.vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"server": {
"runtimeExecutable": "dotnet",
"program": "run",
"args": ["--no-build","-f","net9.0-browserwasm","--launch-profile", "SKCanvasElementShowcase (WebAssembly)"],
"args": ["--no-build","-f","net10.0-browserwasm","--launch-profile", "SKCanvasElementShowcase (WebAssembly)"],
"outputCapture": "std",
"timeout": 30000,
"cwd": "${workspaceFolder}/SKCanvasElementShowcase"
Expand All @@ -47,7 +47,7 @@
"server": {
"runtimeExecutable": "dotnet",
"program": "run",
"args": ["--no-build","-f","net9.0-browserwasm","--launch-profile", "SKCanvasElementShowcase (WebAssembly)"],
"args": ["--no-build","-f","net10.0-browserwasm","--launch-profile", "SKCanvasElementShowcase (WebAssembly)"],
"outputCapture": "std",
"timeout": 30000,
"cwd": "${workspaceFolder}/SKCanvasElementShowcase"
Expand All @@ -62,7 +62,7 @@
"request": "launch",
"preLaunchTask": "build-desktop",
// If you have changed target frameworks, make sure to update the program path.
"program": "${workspaceFolder}/SKCanvasElementShowcase/bin/Debug/net9.0-desktop/SKCanvasElementShowcase.dll",
"program": "${workspaceFolder}/SKCanvasElementShowcase/bin/Debug/net10.0-desktop/SKCanvasElementShowcase.dll",
"args": [],
"launchSettingsProfile": "SKCanvasElementShowcase (Desktop)",
"env": {
Expand Down
8 changes: 4 additions & 4 deletions UI/SKCanvasElementShowcase/.vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"build",
"${workspaceFolder}/SKCanvasElementShowcase/SKCanvasElementShowcase.csproj",
"/property:GenerateFullPaths=true",
"/property:TargetFramework=net9.0-browserwasm",
"/property:TargetFramework=net10.0-browserwasm",
"/consoleloggerparameters:NoSummary"
],
"problemMatcher": "$msCompile"
Expand All @@ -22,7 +22,7 @@
"publish",
"${workspaceFolder}/SKCanvasElementShowcase/SKCanvasElementShowcase.csproj",
"/property:GenerateFullPaths=true",
"/property:TargetFramework=net9.0-browserwasm",
"/property:TargetFramework=net10.0-browserwasm",
"/consoleloggerparameters:NoSummary"
],
"problemMatcher": "$msCompile"
Expand All @@ -35,7 +35,7 @@
"build",
"${workspaceFolder}/SKCanvasElementShowcase/SKCanvasElementShowcase.csproj",
"/property:GenerateFullPaths=true",
"/property:TargetFramework=net9.0-desktop",
"/property:TargetFramework=net10.0-desktop",
"/consoleloggerparameters:NoSummary"
],
"problemMatcher": "$msCompile"
Expand All @@ -48,7 +48,7 @@
"publish",
"${workspaceFolder}/SKCanvasElementShowcase/SKCanvasElementShowcase.csproj",
"/property:GenerateFullPaths=true",
"/property:TargetFramework=net9.0-desktop",
"/property:TargetFramework=net10.0-desktop",
"/consoleloggerparameters:NoSummary"
],
"problemMatcher": "$msCompile"
Expand Down
89 changes: 0 additions & 89 deletions UI/SKCanvasElementShowcase/SKCanvasElementShowcase.sln

This file was deleted.

23 changes: 23 additions & 0 deletions UI/SKCanvasElementShowcase/SKCanvasElementShowcase.slnx
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<Solution>
<Configurations>
<Platform Name="Any CPU" />
<Platform Name="ARM" />
<Platform Name="ARM64" />
<Platform Name="iPhone" />
<Platform Name="iPhoneSimulator" />
<Platform Name="x64" />
<Platform Name="x86" />
</Configurations>
<Folder Name="/Solution Items/">
<File Path=".editorconfig" />
<File Path=".gitignore" />
<File Path=".vsconfig" />
<File Path="Directory.Build.props" />
<File Path="Directory.Build.targets" />
<File Path="Directory.Packages.props" />
<File Path="global.json" />
</Folder>
<Project Path="SKCanvasElementShowcase/SKCanvasElementShowcase.csproj">
<Deploy />
</Project>
</Solution>
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ private void SampleChanged(int newIndex)
Invalidate();
}

protected override void RenderOverride(SKCanvas canvas, Size area)
{
protected override void RenderOverride(SKCanvas canvas, Size area)
{
var minDim = Math.Min(area.Width, area.Height);
// rescale to fit the given area, assuming each drawing is 260x260
canvas.Scale((float)(minDim / 260), (float)(minDim / 260));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
},
"SKCanvasElementShowcase (Desktop WSL2)": {
"commandName": "WSL2",
"commandLineArgs": "{ProjectDir}/bin/Debug/net9.0-desktop/SKCanvasElementShowcase.dll",
"commandLineArgs": "{ProjectDir}/bin/Debug/net10.0-desktop/SKCanvasElementShowcase.dll",
"distributionName": "",
"compatibleTargetFramework": "desktop"
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Uno.Sdk">
<PropertyGroup>
<TargetFrameworks>net9.0-android;net9.0-ios;net9.0-windows10.0.26100;net9.0-browserwasm;net9.0-desktop</TargetFrameworks>
<TargetFrameworks>net10.0-desktop;net10.0-android;net10.0-ios;net10.0-windows10.0.26100;net10.0-browserwasm</TargetFrameworks>

<OutputType>Exe</OutputType>
<UnoSingleProject>true</UnoSingleProject>
Expand Down
2 changes: 1 addition & 1 deletion UI/SKCanvasElementShowcase/global.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
// To update the version of Uno please update the version of the Uno.Sdk here. See https://aka.platform.uno/upgrade-uno-packages for more information.
"msbuild-sdks": {
"Uno.Sdk": "6.2.29"
"Uno.Sdk": "6.4.42"
},
"sdk": {
"allowPrerelease": false
Expand Down