dotnet
/
System.Graphics
зеркало из https://github.com/dotnet/Microsoft.Maui.Graphics.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Merge pull request #334 from dotnet/release/6.0.2xx-preview14 

Merge p14 updates back to main
This commit is contained in:
Jonathan Dick 2022-03-03 12:25:16 -05:00 коммит произвёл GitHub
Родитель 0ad060f5b1 b088c6ce6d
Коммит cc1e48974d
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
14 изменённых файлов: 108 добавлений и 108 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

88
Microsoft.Maui.Graphics-net6.sln
Просмотреть файл

@ -15,8 +15,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Maui.Graphics.Tex
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Maui.Graphics.Win2D.WinUI.Desktop-net6", "src\Microsoft.Maui.Graphics.Win2D.WinUI.Desktop\Microsoft.Maui.Graphics.Win2D.WinUI.Desktop-net6.csproj", "{B2776881-0ED3-45B4-92DF-EF90810A2507}"
EndProject
# Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Maui.Graphics.Skia-net6", "src\Microsoft.Maui.Graphics.Skia\Microsoft.Maui.Graphics.Skia-net6.csproj", "{56EFCFA2-4520-4749-974E-6744A32B22D9}"
# EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Maui.Graphics.Skia-net6", "src\Microsoft.Maui.Graphics.Skia\Microsoft.Maui.Graphics.Skia-net6.csproj", "{56EFCFA2-4520-4749-974E-6744A32B22D9}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Maui.Graphics.Tests-net6", "tests\Microsoft.Maui.Graphics.Tests\Microsoft.Maui.Graphics.Tests-net6.csproj", "{FA7FC7EB-E1EE-4136-A2B5-FEF56A072784}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{BC96F35C-D92C-404E-8615-AC15A6E62205}"
@ -26,16 +26,16 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphicsTester.Portable-net6", "samples\GraphicsTester.Portable\GraphicsTester.Portable-net6.csproj", "{F31ED3A3-A108-4D72-8EB1-4533AF6F5D8D}"
EndProject
# Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphicsTester.Android-net6", "samples\GraphicsTester.Android\GraphicsTester.Android-net6.csproj", "{95F0FD13-7376-4936-85A7-37F20AD94E8F}"
# EndProject
# Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphicsTester.iOS-net6", "samples\GraphicsTester.iOS\GraphicsTester.iOS-net6.csproj", "{2B780F97-4C4E-432D-82DE-B591EBBE3FCB}"
# EndProject
# Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphicsTester.Mac-net6", "samples\GraphicsTester.Mac\GraphicsTester.Mac-net6.csproj", "{093D3638-F133-46B0-AE23-D35D3FBFB6DD}"
# EndProject
# Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphicsTester.MacCatalyst-net6", "samples\GraphicsTester.MacCatalyst\GraphicsTester.MacCatalyst-net6.csproj", "{0B63725C-677E-43EE-ADD2-717CCD96DC23}"
# EndProject
# Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphicsTester.Skia.Mac-net6", "samples\GraphicsTester.Skia.Mac\GraphicsTester.Skia.Mac-net6.csproj", "{883FB622-1BCB-437A-B20E-B5DBD3C53531}"
# EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphicsTester.Android-net6", "samples\GraphicsTester.Android\GraphicsTester.Android-net6.csproj", "{95F0FD13-7376-4936-85A7-37F20AD94E8F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphicsTester.iOS-net6", "samples\GraphicsTester.iOS\GraphicsTester.iOS-net6.csproj", "{2B780F97-4C4E-432D-82DE-B591EBBE3FCB}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphicsTester.Mac-net6", "samples\GraphicsTester.Mac\GraphicsTester.Mac-net6.csproj", "{093D3638-F133-46B0-AE23-D35D3FBFB6DD}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphicsTester.MacCatalyst-net6", "samples\GraphicsTester.MacCatalyst\GraphicsTester.MacCatalyst-net6.csproj", "{0B63725C-677E-43EE-ADD2-717CCD96DC23}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphicsTester.Skia.Mac-net6", "samples\GraphicsTester.Skia.Mac\GraphicsTester.Skia.Mac-net6.csproj", "{883FB622-1BCB-437A-B20E-B5DBD3C53531}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@ -54,10 +54,10 @@ Global
{B2776881-0ED3-45B4-92DF-EF90810A2507}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B2776881-0ED3-45B4-92DF-EF90810A2507}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B2776881-0ED3-45B4-92DF-EF90810A2507}.Release|Any CPU.Build.0 = Release|Any CPU
# {56EFCFA2-4520-4749-974E-6744A32B22D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
# {56EFCFA2-4520-4749-974E-6744A32B22D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
# {56EFCFA2-4520-4749-974E-6744A32B22D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
# {56EFCFA2-4520-4749-974E-6744A32B22D9}.Release|Any CPU.Build.0 = Release|Any CPU
{56EFCFA2-4520-4749-974E-6744A32B22D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{56EFCFA2-4520-4749-974E-6744A32B22D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{56EFCFA2-4520-4749-974E-6744A32B22D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{56EFCFA2-4520-4749-974E-6744A32B22D9}.Release|Any CPU.Build.0 = Release|Any CPU
{FA7FC7EB-E1EE-4136-A2B5-FEF56A072784}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FA7FC7EB-E1EE-4136-A2B5-FEF56A072784}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FA7FC7EB-E1EE-4136-A2B5-FEF56A072784}.Release|Any CPU.ActiveCfg = Release|Any CPU
@ -66,28 +66,28 @@ Global
{F31ED3A3-A108-4D72-8EB1-4533AF6F5D8D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F31ED3A3-A108-4D72-8EB1-4533AF6F5D8D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F31ED3A3-A108-4D72-8EB1-4533AF6F5D8D}.Release|Any CPU.Build.0 = Release|Any CPU
# {95F0FD13-7376-4936-85A7-37F20AD94E8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
# {95F0FD13-7376-4936-85A7-37F20AD94E8F}.Debug|Any CPU.Build.0 = Debug|Any CPU
# {95F0FD13-7376-4936-85A7-37F20AD94E8F}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
# {95F0FD13-7376-4936-85A7-37F20AD94E8F}.Release|Any CPU.ActiveCfg = Release|Any CPU
# {95F0FD13-7376-4936-85A7-37F20AD94E8F}.Release|Any CPU.Build.0 = Release|Any CPU
# {2B780F97-4C4E-432D-82DE-B591EBBE3FCB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
# {2B780F97-4C4E-432D-82DE-B591EBBE3FCB}.Debug|Any CPU.Build.0 = Debug|Any CPU
# {2B780F97-4C4E-432D-82DE-B591EBBE3FCB}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
# {2B780F97-4C4E-432D-82DE-B591EBBE3FCB}.Release|Any CPU.ActiveCfg = Release|Any CPU
# {2B780F97-4C4E-432D-82DE-B591EBBE3FCB}.Release|Any CPU.Build.0 = Release|Any CPU
# {093D3638-F133-46B0-AE23-D35D3FBFB6DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
# {093D3638-F133-46B0-AE23-D35D3FBFB6DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
# {093D3638-F133-46B0-AE23-D35D3FBFB6DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
# {093D3638-F133-46B0-AE23-D35D3FBFB6DD}.Release|Any CPU.Build.0 = Release|Any CPU
# {0B63725C-677E-43EE-ADD2-717CCD96DC23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
# {0B63725C-677E-43EE-ADD2-717CCD96DC23}.Debug|Any CPU.Build.0 = Debug|Any CPU
# {0B63725C-677E-43EE-ADD2-717CCD96DC23}.Release|Any CPU.ActiveCfg = Release|Any CPU
# {0B63725C-677E-43EE-ADD2-717CCD96DC23}.Release|Any CPU.Build.0 = Release|Any CPU
# {883FB622-1BCB-437A-B20E-B5DBD3C53531}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
# {883FB622-1BCB-437A-B20E-B5DBD3C53531}.Debug|Any CPU.Build.0 = Debug|Any CPU
# {883FB622-1BCB-437A-B20E-B5DBD3C53531}.Release|Any CPU.ActiveCfg = Release|Any CPU
# {883FB622-1BCB-437A-B20E-B5DBD3C53531}.Release|Any CPU.Build.0 = Release|Any CPU
{95F0FD13-7376-4936-85A7-37F20AD94E8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{95F0FD13-7376-4936-85A7-37F20AD94E8F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{95F0FD13-7376-4936-85A7-37F20AD94E8F}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{95F0FD13-7376-4936-85A7-37F20AD94E8F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{95F0FD13-7376-4936-85A7-37F20AD94E8F}.Release|Any CPU.Build.0 = Release|Any CPU
{2B780F97-4C4E-432D-82DE-B591EBBE3FCB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2B780F97-4C4E-432D-82DE-B591EBBE3FCB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2B780F97-4C4E-432D-82DE-B591EBBE3FCB}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{2B780F97-4C4E-432D-82DE-B591EBBE3FCB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2B780F97-4C4E-432D-82DE-B591EBBE3FCB}.Release|Any CPU.Build.0 = Release|Any CPU
{093D3638-F133-46B0-AE23-D35D3FBFB6DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{093D3638-F133-46B0-AE23-D35D3FBFB6DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{093D3638-F133-46B0-AE23-D35D3FBFB6DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{093D3638-F133-46B0-AE23-D35D3FBFB6DD}.Release|Any CPU.Build.0 = Release|Any CPU
{0B63725C-677E-43EE-ADD2-717CCD96DC23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0B63725C-677E-43EE-ADD2-717CCD96DC23}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0B63725C-677E-43EE-ADD2-717CCD96DC23}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0B63725C-677E-43EE-ADD2-717CCD96DC23}.Release|Any CPU.Build.0 = Release|Any CPU
{883FB622-1BCB-437A-B20E-B5DBD3C53531}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{883FB622-1BCB-437A-B20E-B5DBD3C53531}.Debug|Any CPU.Build.0 = Debug|Any CPU
{883FB622-1BCB-437A-B20E-B5DBD3C53531}.Release|Any CPU.ActiveCfg = Release|Any CPU
{883FB622-1BCB-437A-B20E-B5DBD3C53531}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@ -96,14 +96,14 @@ Global
{E66999B3-9585-4EF3-A45C-97A2101AD612} = {9E4B772B-D417-4147-B8B1-FD9E3B0B4EC5}
{B364BA53-2BA8-4844-8BD2-CF257A3C21F1} = {9E4B772B-D417-4147-B8B1-FD9E3B0B4EC5}
{B2776881-0ED3-45B4-92DF-EF90810A2507} = {9E4B772B-D417-4147-B8B1-FD9E3B0B4EC5}
# {56EFCFA2-4520-4749-974E-6744A32B22D9} = {9E4B772B-D417-4147-B8B1-FD9E3B0B4EC5}
{56EFCFA2-4520-4749-974E-6744A32B22D9} = {9E4B772B-D417-4147-B8B1-FD9E3B0B4EC5}
{FA7FC7EB-E1EE-4136-A2B5-FEF56A072784} = {D6F0522F-3BB5-4A10-953F-CA047F3D881A}
{F31ED3A3-A108-4D72-8EB1-4533AF6F5D8D} = {CE764F51-0699-4446-BEE2-17FBBDC99C5C}
# {95F0FD13-7376-4936-85A7-37F20AD94E8F} = {CE764F51-0699-4446-BEE2-17FBBDC99C5C}
# {2B780F97-4C4E-432D-82DE-B591EBBE3FCB} = {CE764F51-0699-4446-BEE2-17FBBDC99C5C}
# {093D3638-F133-46B0-AE23-D35D3FBFB6DD} = {CE764F51-0699-4446-BEE2-17FBBDC99C5C}
# {0B63725C-677E-43EE-ADD2-717CCD96DC23} = {CE764F51-0699-4446-BEE2-17FBBDC99C5C}
# {883FB622-1BCB-437A-B20E-B5DBD3C53531} = {CE764F51-0699-4446-BEE2-17FBBDC99C5C}
{95F0FD13-7376-4936-85A7-37F20AD94E8F} = {CE764F51-0699-4446-BEE2-17FBBDC99C5C}
{2B780F97-4C4E-432D-82DE-B591EBBE3FCB} = {CE764F51-0699-4446-BEE2-17FBBDC99C5C}
{093D3638-F133-46B0-AE23-D35D3FBFB6DD} = {CE764F51-0699-4446-BEE2-17FBBDC99C5C}
{0B63725C-677E-43EE-ADD2-717CCD96DC23} = {CE764F51-0699-4446-BEE2-17FBBDC99C5C}
{883FB622-1BCB-437A-B20E-B5DBD3C53531} = {CE764F51-0699-4446-BEE2-17FBBDC99C5C}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {0B07E734-6AE2-4A12-AD60-C072F3695854}

2
azure-pipelines.yml
Просмотреть файл

@ -130,7 +130,7 @@ stages:
- pwsh: |
Invoke-WebRequest 'https://raw.githubusercontent.com/Samsung/Tizen.NET/main/workload/scripts/workload-install.ps1' -OutFile 'workload-install.ps1'
# Fix sdk band version in Tizen script
((Get-Content -path .\workload-install.ps1 -Raw) -replace 'DotnetVersionBand = "6.0.200"','DotnetVersionBand = "6.0.300"') | Set-Content -Path .\workload-install.ps1
((Get-Content -path .\workload-install.ps1 -Raw) -replace "\`$ManifestBaseName-\`$DotnetVersionBand","`$ManifestBaseName-6.0.200") | Set-Content -Path .\workload-install.ps1
.\workload-install.ps1
displayName: install tizen

38
build/Build.Microsoft.Maui.Graphics.Windows.sln
Просмотреть файл

@ -15,8 +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
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
@ -93,22 +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
{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
@ -118,7 +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}
{6738582B-6246-486B-B90E-6C80799736B5} = {9E4B772B-D417-4147-B8B1-FD9E3B0B4EC5}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {0B07E734-6AE2-4A12-AD60-C072F3695854}

40
build/_Microsoft.Maui.Graphics.Skia.nuspec → build/Microsoft.Maui.Graphics.Skia.nuspec
Просмотреть файл

@ -17,56 +17,56 @@
<dependencies>
<group targetFramework="net6.0-android30.0">
<dependency id="Microsoft.Maui.Graphics" version="$version$"/>
<dependency id="SkiaSharp" version="2.88.0-preview.179"/>
<dependency id="SkiaSharp.Views" version="2.88.0-preview.179"/>
<dependency id="SkiaSharp" version="2.88.0-preview.224"/>
<dependency id="SkiaSharp.Views" version="2.88.0-preview.224"/>
</group>
<group targetFramework="net6.0-ios13.6">
<dependency id="Microsoft.Maui.Graphics" version="$version$"/>
<dependency id="SkiaSharp" version="2.88.0-preview.179"/>
<dependency id="SkiaSharp.Views" version="2.88.0-preview.179"/>
<dependency id="SkiaSharp" version="2.88.0-preview.224"/>
<dependency id="SkiaSharp.Views" version="2.88.0-preview.224"/>
</group>
<group targetFramework="net6.0-maccatalyst13.5">
<dependency id="Microsoft.Maui.Graphics" version="$version$"/>
<dependency id="SkiaSharp" version="2.88.0-preview.179"/>
<dependency id="SkiaSharp.Views" version="2.88.0-preview.179"/>
<dependency id="SkiaSharp" version="2.88.0-preview.224"/>
<dependency id="SkiaSharp.Views" version="2.88.0-preview.224"/>
</group>
<group targetFramework="net6.0-windows10.0.18362">
<dependency id="Microsoft.Maui.Graphics" version="$version$"/>
<dependency id="SkiaSharp" version="2.88.0-preview.179"/>
<dependency id="SkiaSharp.Views.WinUI" version="2.88.0-preview.179"/>
<dependency id="SkiaSharp" version="2.88.0-preview.224"/>
<dependency id="SkiaSharp.Views.WinUI" version="2.88.0-preview.224"/>
</group>
<group targetFramework="net6.0-tizen6.5">
<dependency id="Microsoft.Maui.Graphics" version="$version$"/>
<dependency id="SkiaSharp" version="2.88.0-preview.179"/>
<dependency id="SkiaSharp.Views" version="2.88.0-preview.179"/>
<dependency id="SkiaSharp" version="2.88.0-preview.224"/>
<dependency id="SkiaSharp.Views" version="2.88.0-preview.224"/>
</group>
<group targetFramework="tizen40">
<dependency id="Microsoft.Maui.Graphics" version="$version$"/>
<dependency id="SkiaSharp" version="2.88.0-preview.179"/>
<dependency id="SkiaSharp.Views" version="2.88.0-preview.179"/>
<dependency id="SkiaSharp" version="2.88.0-preview.224"/>
<dependency id="SkiaSharp.Views" version="2.88.0-preview.224"/>
</group>
<group targetFramework="xamarin.ios10">
<dependency id="Microsoft.Maui.Graphics" version="$version$"/>
<dependency id="SkiaSharp" version="2.88.0-preview.179"/>
<dependency id="SkiaSharp.Views" version="2.88.0-preview.179"/>
<dependency id="SkiaSharp" version="2.88.0-preview.224"/>
<dependency id="SkiaSharp.Views" version="2.88.0-preview.224"/>
</group>
<group targetFramework="monoandroid12.0">
<dependency id="Microsoft.Maui.Graphics" version="$version$"/>
<dependency id="SkiaSharp" version="2.88.0-preview.179"/>
<dependency id="SkiaSharp.Views" version="2.88.0-preview.179"/>
<dependency id="SkiaSharp" version="2.88.0-preview.224"/>
<dependency id="SkiaSharp.Views" version="2.88.0-preview.224"/>
</group>
<group targetFramework="xamarin.mac20">
<dependency id="Microsoft.Maui.Graphics" version="$version$"/>
<dependency id="SkiaSharp" version="2.88.0-preview.179"/>
<dependency id="SkiaSharp.Views" version="2.88.0-preview.179"/>
<dependency id="SkiaSharp" version="2.88.0-preview.224"/>
<dependency id="SkiaSharp.Views" version="2.88.0-preview.224"/>
</group>
<group targetFramework=".NETStandard2.0">
<dependency id="Microsoft.Maui.Graphics" version="$version$"/>
<dependency id="SkiaSharp" version="2.88.0-preview.179"/>
<dependency id="SkiaSharp" version="2.88.0-preview.224"/>
</group>
<group targetFramework=".NETStandard2.1">
<dependency id="Microsoft.Maui.Graphics" version="$version$"/>
<dependency id="SkiaSharp" version="2.88.0-preview.179"/>
<dependency id="SkiaSharp" version="2.88.0-preview.224"/>
</group>
</dependencies>
</metadata>

10
eng/Versions.props
Просмотреть файл

@ -16,13 +16,13 @@
<MicrosofttvOSSdkPackageVersion>15.2.302-preview.14.91</MicrosofttvOSSdkPackageVersion>
<!-- emsdk -->
<MicrosoftNETWorkloadEmscriptenManifest60100PackageVersion>6.0.2</MicrosoftNETWorkloadEmscriptenManifest60100PackageVersion>
<!-- <DotNetVersionBandMonoToolchain></DotNetVersionBandMonoToolchain> -->
<!-- <DotNetVersionBandEmscripten>6.0.200</DotNetVersionBandEmscripten> -->
<!-- <DotNetVersionBandAndroid></DotNetVersionBandAndroid> -->
<!-- <DotNetVersionBandApple></DotNetVersionBandApple> -->
<DotNetVersionBandMonoToolchain>6.0.200</DotNetVersionBandMonoToolchain>
<DotNetVersionBandEmscripten>6.0.200</DotNetVersionBandEmscripten>
<DotNetVersionBandAndroid>6.0.200</DotNetVersionBandAndroid>
<DotNetVersionBandApple>6.0.200</DotNetVersionBandApple>
</PropertyGroup>
<PropertyGroup>
<!-- NOTE: temporarily hardcode 6.0.100, until we have new branding on dotnet/runtime packs -->
<DotNetVersionBand Condition=" '$(DotNetVersionBand)' == '' ">6.0.200</DotNetVersionBand>
<DotNetVersionBand Condition=" '$(DotNetVersionBand)' == '' ">6.0.300</DotNetVersionBand>
</PropertyGroup>
</Project>

2
samples/GraphicsTester.Skia.Console/GraphicsTester.Skia.Console.csproj
Просмотреть файл

@ -11,7 +11,7 @@
<ProjectReference Include="..\GraphicsTester.Portable\GraphicsTester.Portable.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="SkiaSharp" Version="2.88.0-preview.179" />
<PackageReference Include="SkiaSharp" Version="2.88.0-preview.224" />
</ItemGroup>
</Project>

4
samples/GraphicsTester.Skia.Mac/GraphicsTester.Skia.Mac-net6.csproj
Просмотреть файл

@ -20,8 +20,8 @@
<UseSGen>false</UseSGen>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="SkiaSharp" Version="2.88.0-preview.179" />
<PackageReference Include="SkiaSharp.Views" Version="2.88.0-preview.179" />
<PackageReference Include="SkiaSharp" Version="2.88.0-preview.224" />
<PackageReference Include="SkiaSharp.Views" Version="2.88.0-preview.224" />
</ItemGroup>
<ItemGroup>

4
samples/GraphicsTester.Skia.Mac/GraphicsTester.Skia.Mac.csproj
Просмотреть файл

@ -113,10 +113,10 @@
<Version>0.22.1</Version>
</PackageReference>
<PackageReference Include="SkiaSharp">
<Version>2.88.0-preview.179</Version>
<Version>2.88.0-preview.224</Version>
</PackageReference>
<PackageReference Include="SkiaSharp.Views">
<Version>2.88.0-preview.179</Version>
<Version>2.88.0-preview.224</Version>
</PackageReference>
<PackageReference Include="NETStandard.Library" Version="2.0.3" />
</ItemGroup>

4
samples/GraphicsTester.Skia.Windows/GraphicsTester.Skia.Windows.csproj
Просмотреть файл

@ -65,9 +65,9 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="SkiaSharp" Version="2.88.0-preview.179">
<PackageReference Include="SkiaSharp" Version="2.88.0-preview.224">
</PackageReference>
<PackageReference Include="SkiaSharp.Views" Version="2.88.0-preview.179">
<PackageReference Include="SkiaSharp.Views" Version="2.88.0-preview.224">
</PackageReference>
</ItemGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

6
src/Microsoft.Maui.Graphics.Skia.GtkSharp/Microsoft.Maui.Graphics.Skia.GtkSharp.csproj
Просмотреть файл

@ -11,9 +11,9 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="SkiaSharp" Version="2.88.0-preview.179" />
<PackageReference Include="SkiaSharp.Views" Version="2.88.0-preview.179" />
<PackageReference Include="SkiaSharp.Views.Gtk3" Version="2.88.0-preview.179" />
<PackageReference Include="SkiaSharp" Version="2.88.0-preview.224" />
<PackageReference Include="SkiaSharp.Views" Version="2.88.0-preview.224" />
<PackageReference Include="SkiaSharp.Views.Gtk3" Version="2.88.0-preview.224" />
</ItemGroup>

6
src/Microsoft.Maui.Graphics.Skia.WPF/Microsoft.Maui.Graphics.Skia.WPF.csproj
Просмотреть файл

@ -13,9 +13,9 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="SkiaSharp" Version="2.88.0-preview.179" />
<PackageReference Include="SkiaSharp.Views" Version="2.88.0-preview.179" />
<PackageReference Include="SkiaSharp.Views.WPF" Version="2.88.0-preview.179" />
<PackageReference Include="SkiaSharp" Version="2.88.0-preview.224" />
<PackageReference Include="SkiaSharp.Views" Version="2.88.0-preview.224" />
<PackageReference Include="SkiaSharp.Views.WPF" Version="2.88.0-preview.224" />
</ItemGroup>
<ItemGroup>

6
src/Microsoft.Maui.Graphics.Skia/Microsoft.Maui.Graphics.Skia-net6.csproj
Просмотреть файл

@ -9,15 +9,15 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="SkiaSharp" Version="2.88.0-preview.179" />
<PackageReference Include="SkiaSharp" Version="2.88.0-preview.224" />
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.Contains('-android')) or $(TargetFramework.Contains('-ios')) or $(TargetFramework.Contains('-macos')) or $(TargetFramework.Contains('-maccatalyst')) or $(TargetFramework.Contains('-tizen'))">
<PackageReference Include="SkiaSharp.Views" Version="2.88.0-preview.179" />
<PackageReference Include="SkiaSharp.Views" Version="2.88.0-preview.224" />
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.Contains('-windows'))">
<PackageReference Include="SkiaSharp.Views.WinUI" Version="2.88.0-preview.179" />
<PackageReference Include="SkiaSharp.Views.WinUI" Version="2.88.0-preview.224" />
</ItemGroup>
<ItemGroup>

4
src/Microsoft.Maui.Graphics.Skia/Microsoft.Maui.Graphics.Skia.csproj
Просмотреть файл

@ -6,8 +6,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="SkiaSharp" Version="2.88.0-preview.179" />
<PackageReference Include="SkiaSharp.Views" Version="2.88.0-preview.179" />
<PackageReference Include="SkiaSharp" Version="2.88.0-preview.224" />
<PackageReference Include="SkiaSharp.Views" Version="2.88.0-preview.224" />
</ItemGroup>
<ItemGroup>

2
src/Microsoft.Maui.Graphics.Skia/Views/SkiaGraphicsView.Windows.cs
Просмотреть файл

@ -43,7 +43,7 @@ namespace Microsoft.Maui.Graphics.Skia.Views
_scalingCanvas.ResetState();
_scalingCanvas.Scale(scale, scale);
_drawable.Draw(_scalingCanvas, new RectangleF(0, 0, _width / scale, _height / scale));
_drawable.Draw(_scalingCanvas, new RectF(0, 0, _width / scale, _height / scale));
}
private void OnSizeChanged(object sender, SizeChangedEventArgs e)