diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index 4002ea32..b976fa49 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -19,6 +19,12 @@
"commands": [
"vs"
]
+ },
+ "boots": {
+ "version": "1.0.4.624",
+ "commands": [
+ "boots"
+ ]
}
}
-}
+}
\ No newline at end of file
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 2e80d61b..fe318fe0 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -5,6 +5,7 @@ variables:
DotNet.Cli.Telemetry.OptOut: true
MauiCheck.Version: 0.6.1
Maui.Version: --preview
+ Tizen.Version: 6.5.100-preview.5.57
parameters:
- name: BuildConfigurations
@@ -85,6 +86,10 @@ stages:
- pwsh: dotnet tool restore
displayName: install dotnet tools
+ - pwsh:
+ dotnet boots --url https://workload-bin.s3.ap-northeast-2.amazonaws.com/windows/Samsung.NET.Workload.Tizen.$(Tizen.Version).msi
+ displayName: install tizen
+
- pwsh: |
# Update the installer installer
Invoke-WebRequest -UseBasicParsing -Uri "https://aka.ms/vs/install/latest/vs_setup.exe" -OutFile vs_setup.exe
diff --git a/build/Build.Microsoft.Maui.Graphics.Windows.sln b/build/Build.Microsoft.Maui.Graphics.Windows.sln
index 96cfdd52..9156c866 100644
--- a/build/Build.Microsoft.Maui.Graphics.Windows.sln
+++ b/build/Build.Microsoft.Maui.Graphics.Windows.sln
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30523.141
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.31509.46
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Maui.Graphics", "..\src\Microsoft.Maui.Graphics\Microsoft.Maui.Graphics.csproj", "{76F3031E-341E-43CC-BD92-B23F83495DB7}"
EndProject
@@ -15,6 +15,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Maui.Graphics.Win
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Maui.Graphics.Win2D.WinUI.Desktop", "..\src\Microsoft.Maui.Graphics.Win2D.WinUI.Desktop\Microsoft.Maui.Graphics.Win2D.WinUI.Desktop.csproj", "{98851CCB-2A9B-4FDE-8D2A-4F6139EA5A9F}"
EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Maui.Graphics.Skia", "..\src\Microsoft.Maui.Graphics.Skia\Microsoft.Maui.Graphics.Skia.csproj", "{6738582B-6246-486B-B90E-6C80799736B5}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -91,6 +93,22 @@ Global
{98851CCB-2A9B-4FDE-8D2A-4F6139EA5A9F}.Release|x64.Build.0 = Release|Any CPU
{98851CCB-2A9B-4FDE-8D2A-4F6139EA5A9F}.Release|x86.ActiveCfg = Release|Any CPU
{98851CCB-2A9B-4FDE-8D2A-4F6139EA5A9F}.Release|x86.Build.0 = Release|Any CPU
+ {6738582B-6246-486B-B90E-6C80799736B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {6738582B-6246-486B-B90E-6C80799736B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {6738582B-6246-486B-B90E-6C80799736B5}.Debug|ARM.ActiveCfg = Debug|Any CPU
+ {6738582B-6246-486B-B90E-6C80799736B5}.Debug|ARM.Build.0 = Debug|Any CPU
+ {6738582B-6246-486B-B90E-6C80799736B5}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {6738582B-6246-486B-B90E-6C80799736B5}.Debug|x64.Build.0 = Debug|Any CPU
+ {6738582B-6246-486B-B90E-6C80799736B5}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {6738582B-6246-486B-B90E-6C80799736B5}.Debug|x86.Build.0 = Debug|Any CPU
+ {6738582B-6246-486B-B90E-6C80799736B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {6738582B-6246-486B-B90E-6C80799736B5}.Release|Any CPU.Build.0 = Release|Any CPU
+ {6738582B-6246-486B-B90E-6C80799736B5}.Release|ARM.ActiveCfg = Release|Any CPU
+ {6738582B-6246-486B-B90E-6C80799736B5}.Release|ARM.Build.0 = Release|Any CPU
+ {6738582B-6246-486B-B90E-6C80799736B5}.Release|x64.ActiveCfg = Release|Any CPU
+ {6738582B-6246-486B-B90E-6C80799736B5}.Release|x64.Build.0 = Release|Any CPU
+ {6738582B-6246-486B-B90E-6C80799736B5}.Release|x86.ActiveCfg = Release|Any CPU
+ {6738582B-6246-486B-B90E-6C80799736B5}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -100,6 +118,7 @@ Global
{ED36FB6D-7278-465D-9C44-D01927258BA1} = {9E4B772B-D417-4147-B8B1-FD9E3B0B4EC5}
{20794E60-3BFD-46F4-BC0B-87B3959AA3C7} = {9E4B772B-D417-4147-B8B1-FD9E3B0B4EC5}
{98851CCB-2A9B-4FDE-8D2A-4F6139EA5A9F} = {9E4B772B-D417-4147-B8B1-FD9E3B0B4EC5}
+ {6738582B-6246-486B-B90E-6C80799736B5} = {9E4B772B-D417-4147-B8B1-FD9E3B0B4EC5}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {0B07E734-6AE2-4A12-AD60-C072F3695854}
diff --git a/build/Microsoft.Maui.Graphics.Skia.nuspec b/build/Microsoft.Maui.Graphics.Skia.nuspec
index 413f16cc..557869dd 100644
--- a/build/Microsoft.Maui.Graphics.Skia.nuspec
+++ b/build/Microsoft.Maui.Graphics.Skia.nuspec
@@ -35,6 +35,31 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -59,5 +84,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
-
\ No newline at end of file
+
diff --git a/build/Microsoft.Maui.Graphics.nuspec b/build/Microsoft.Maui.Graphics.nuspec
index c349824c..3055d8d1 100644
--- a/build/Microsoft.Maui.Graphics.nuspec
+++ b/build/Microsoft.Maui.Graphics.nuspec
@@ -19,6 +19,8 @@
+
+
@@ -47,5 +49,9 @@
+
+
+
+
diff --git a/src/Microsoft.Maui.Graphics.Skia/Microsoft.Maui.Graphics.Skia-net6.csproj b/src/Microsoft.Maui.Graphics.Skia/Microsoft.Maui.Graphics.Skia-net6.csproj
index d4f5bb8e..1f6e8266 100644
--- a/src/Microsoft.Maui.Graphics.Skia/Microsoft.Maui.Graphics.Skia-net6.csproj
+++ b/src/Microsoft.Maui.Graphics.Skia/Microsoft.Maui.Graphics.Skia-net6.csproj
@@ -1,7 +1,7 @@
- netstandard2.0;netstandard2.1;net6.0-ios;net6.0-android;net6.0-maccatalyst;net6.0-windows10.0.18362
+ netstandard2.0;netstandard2.1;net6.0-ios;net6.0-android;net6.0-maccatalyst;net6.0-windows10.0.18362;net6.0-tizen
Microsoft.Maui.Graphics.Skia
Microsoft.Maui.Graphics.Skia
@@ -10,7 +10,7 @@
-
+
diff --git a/src/Microsoft.Maui.Graphics.Skia/Microsoft.Maui.Graphics.Skia.csproj b/src/Microsoft.Maui.Graphics.Skia/Microsoft.Maui.Graphics.Skia.csproj
index 6fed3956..0b965f01 100644
--- a/src/Microsoft.Maui.Graphics.Skia/Microsoft.Maui.Graphics.Skia.csproj
+++ b/src/Microsoft.Maui.Graphics.Skia/Microsoft.Maui.Graphics.Skia.csproj
@@ -1,27 +1,23 @@
-
+
+
- netstandard2.0
- Microsoft.Maui.Graphics.Skia
- 2.0.0
-
+ netstandard2.0;netstandard2.1;Xamarin.iOS10;MonoAndroid10.0;Xamarin.Mac20;tizen40
+ Microsoft.Maui.Graphics.Skia
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
-
diff --git a/src/Microsoft.Maui.Graphics.Skia/Views/SkiaGraphicsView.Mac.cs b/src/Microsoft.Maui.Graphics.Skia/Views/SkiaGraphicsView.Mac.cs
index fe4319a9..b24952b5 100644
--- a/src/Microsoft.Maui.Graphics.Skia/Views/SkiaGraphicsView.Mac.cs
+++ b/src/Microsoft.Maui.Graphics.Skia/Views/SkiaGraphicsView.Mac.cs
@@ -1,6 +1,6 @@
using System;
-using Microsoft.Maui.Graphics.CoreGraphics;
+using Microsoft.Maui.Graphics.Native;
using Microsoft.Maui.Graphics.Skia;
using SkiaSharp.Views.Mac;
diff --git a/src/Microsoft.Maui.Graphics/Microsoft.Maui.Graphics-net6.csproj b/src/Microsoft.Maui.Graphics/Microsoft.Maui.Graphics-net6.csproj
index 9fdb5434..b03e28a5 100644
--- a/src/Microsoft.Maui.Graphics/Microsoft.Maui.Graphics-net6.csproj
+++ b/src/Microsoft.Maui.Graphics/Microsoft.Maui.Graphics-net6.csproj
@@ -1,6 +1,6 @@
- netstandard2.0;netstandard2.1;net6.0-ios;net6.0-android;net6.0-maccatalyst;net6.0-windows10.0.18362
+ netstandard2.0;netstandard2.1;net6.0-ios;net6.0-android;net6.0-maccatalyst;net6.0-windows10.0.18362;net6.0-tizen
true
diff --git a/src/Microsoft.Maui.Graphics/Microsoft.Maui.Graphics.csproj b/src/Microsoft.Maui.Graphics/Microsoft.Maui.Graphics.csproj
index 49b499c4..959fbec9 100644
--- a/src/Microsoft.Maui.Graphics/Microsoft.Maui.Graphics.csproj
+++ b/src/Microsoft.Maui.Graphics/Microsoft.Maui.Graphics.csproj
@@ -1,6 +1,6 @@
- netstandard2.1;netstandard2.0;Xamarin.iOS10;MonoAndroid10.0;Xamarin.Mac20;
+ netstandard2.1;netstandard2.0;Xamarin.iOS10;MonoAndroid10.0;Xamarin.Mac20;tizen40
true
@@ -27,4 +27,4 @@
-
\ No newline at end of file
+