CoreGraphics is now a single project

This commit is contained in:
James Clancey 2020-11-20 14:42:55 -09:00
Родитель 7af33e22b3
Коммит a361d6a957
63 изменённых файлов: 271 добавлений и 306 удалений

13
.editorconfig Normal file
Просмотреть файл

@ -0,0 +1,13 @@
# This file is the top-most EditorConfig file
root = true
# All Files
[*]
indent_style = space
indent_size = 4
trim_trailing_whitespace = true
[*.cs]
indent_style = space
indent_size = 4

131
System.Graphics.Mac.sln Normal file
Просмотреть файл

@ -0,0 +1,131 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.30523.141
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Graphics.Core", "src\libraries\System.Graphics.Core\System.Graphics.Core.csproj", "{76F3031E-341E-43CC-BD92-B23F83495DB7}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Graphics.Text.Markdig", "src\libraries\System.Graphics.Text.Markdig\System.Graphics.Text.Markdig.csproj", "{ED36FB6D-7278-465D-9C44-D01927258BA1}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Graphics.Android", "src\libraries\System.Graphics.Android\System.Graphics.Android.csproj", "{F63D421B-A5E5-4107-9BAC-9C45ED1363DE}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Graphics.Blazor", "src\libraries\System.Graphics.Blazor\System.Graphics.Blazor.csproj", "{B755D39B-1AD8-48FA-B56F-53FCA7478085}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Graphics.Blazor.JS", "src\libraries\System.Graphics.Blazor.JS\System.Graphics.Blazor.JS.csproj", "{0E1E4EF4-9415-43FF-971F-204311403A2D}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Graphics.Forms.Core", "src\libraries\System.Graphics.Forms.Core\System.Graphics.Forms.Core.csproj", "{BE7203D5-B616-4F38-9D9F-B5D4D92DBDF3}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Graphics.Forms.Android", "src\libraries\System.Graphics.Forms.Android\System.Graphics.Forms.Android.csproj", "{A1FE5CA7-45EE-4BB0-9FDF-8698BB22568B}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Graphics.Forms.iOS", "src\libraries\System.Graphics.Forms.iOS\System.Graphics.Forms.iOS.csproj", "{7B6503A2-DA2C-4512-BBA5-95BF85CF63C1}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Graphics.Skia.Core", "src\libraries\System.Graphics.Skia.Core\System.Graphics.Skia.Core.csproj", "{C7613109-6198-402E-953F-57EA81E8238E}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{9E4B772B-D417-4147-B8B1-FD9E3B0B4EC5}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{D6F0522F-3BB5-4A10-953F-CA047F3D881A}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{CE764F51-0699-4446-BEE2-17FBBDC99C5C}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphicsTester.Portable", "src\samples\GraphicsTester.Portable\GraphicsTester.Portable.csproj", "{D1878E17-08A7-4858-94B8-DE8B38BE2632}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GraphicsTester.Android", "src\samples\GraphicsTester.Android\GraphicsTester.Android.csproj", "{7E256F6E-B676-41D3-B94E-CCDC40AA6749}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GraphicsTester.Skia.Mac", "src\samples\GraphicsTester.Skia.Mac\GraphicsTester.Skia.Mac.csproj", "{E78A38E5-57F6-4F31-8A4C-7A1B53679E13}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{2BAF0999-6876-4091-9FCE-CBC56D80BEC3}"
ProjectSection(SolutionItems) = preProject
.editorconfig = .editorconfig
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Graphics.CoreGraphics", "src\libraries\System.Graphics.CoreGraphics\System.Graphics.CoreGraphics.csproj", "{D1C32399-E9A0-44AF-89DD-EC32B81A5211}"
EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
src\libraries\System.Graphics.SharpDX.Shared\System.Graphics.SharpDX.Shared.projitems*{5163bcb2-4d70-42da-975a-af55d6b6a0b3}*SharedItemsImports = 13
src\libraries\System.Graphics.SharpDX.Shared\System.Graphics.SharpDX.Shared.projitems*{694e970d-5c18-483f-bc48-d6d86da8e78f}*SharedItemsImports = 4
src\libraries\System.Graphics.CoreGraphics\System.Graphics.CoreGraphics.projitems*{95a3e5f1-26b7-4bd8-8f01-48fe7bfd79fa}*SharedItemsImports = 13
src\libraries\System.Graphics.SharpDX.Shared\System.Graphics.SharpDX.Shared.projitems*{bc291304-fdc0-4e1d-a673-39f5e446b0e0}*SharedItemsImports = 5
src\libraries\System.Graphics.CoreGraphics\System.Graphics.CoreGraphics.projitems*{edf26ebb-0ac3-4212-81d6-8dd08f5acc17}*SharedItemsImports = 4
src\libraries\System.Graphics.CoreGraphics\System.Graphics.CoreGraphics.projitems*{f8d43f64-af09-4e06-8473-5bdc37281908}*SharedItemsImports = 4
EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{76F3031E-341E-43CC-BD92-B23F83495DB7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{76F3031E-341E-43CC-BD92-B23F83495DB7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{76F3031E-341E-43CC-BD92-B23F83495DB7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{76F3031E-341E-43CC-BD92-B23F83495DB7}.Release|Any CPU.Build.0 = Release|Any CPU
{ED36FB6D-7278-465D-9C44-D01927258BA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{ED36FB6D-7278-465D-9C44-D01927258BA1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{ED36FB6D-7278-465D-9C44-D01927258BA1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{ED36FB6D-7278-465D-9C44-D01927258BA1}.Release|Any CPU.Build.0 = Release|Any CPU
{F63D421B-A5E5-4107-9BAC-9C45ED1363DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F63D421B-A5E5-4107-9BAC-9C45ED1363DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F63D421B-A5E5-4107-9BAC-9C45ED1363DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F63D421B-A5E5-4107-9BAC-9C45ED1363DE}.Release|Any CPU.Build.0 = Release|Any CPU
{B755D39B-1AD8-48FA-B56F-53FCA7478085}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B755D39B-1AD8-48FA-B56F-53FCA7478085}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B755D39B-1AD8-48FA-B56F-53FCA7478085}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B755D39B-1AD8-48FA-B56F-53FCA7478085}.Release|Any CPU.Build.0 = Release|Any CPU
{0E1E4EF4-9415-43FF-971F-204311403A2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0E1E4EF4-9415-43FF-971F-204311403A2D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0E1E4EF4-9415-43FF-971F-204311403A2D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0E1E4EF4-9415-43FF-971F-204311403A2D}.Release|Any CPU.Build.0 = Release|Any CPU
{BE7203D5-B616-4F38-9D9F-B5D4D92DBDF3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BE7203D5-B616-4F38-9D9F-B5D4D92DBDF3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BE7203D5-B616-4F38-9D9F-B5D4D92DBDF3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BE7203D5-B616-4F38-9D9F-B5D4D92DBDF3}.Release|Any CPU.Build.0 = Release|Any CPU
{A1FE5CA7-45EE-4BB0-9FDF-8698BB22568B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A1FE5CA7-45EE-4BB0-9FDF-8698BB22568B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A1FE5CA7-45EE-4BB0-9FDF-8698BB22568B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A1FE5CA7-45EE-4BB0-9FDF-8698BB22568B}.Release|Any CPU.Build.0 = Release|Any CPU
{7B6503A2-DA2C-4512-BBA5-95BF85CF63C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7B6503A2-DA2C-4512-BBA5-95BF85CF63C1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7B6503A2-DA2C-4512-BBA5-95BF85CF63C1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7B6503A2-DA2C-4512-BBA5-95BF85CF63C1}.Release|Any CPU.Build.0 = Release|Any CPU
{C7613109-6198-402E-953F-57EA81E8238E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C7613109-6198-402E-953F-57EA81E8238E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C7613109-6198-402E-953F-57EA81E8238E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C7613109-6198-402E-953F-57EA81E8238E}.Release|Any CPU.Build.0 = Release|Any CPU
{D1878E17-08A7-4858-94B8-DE8B38BE2632}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D1878E17-08A7-4858-94B8-DE8B38BE2632}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D1878E17-08A7-4858-94B8-DE8B38BE2632}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D1878E17-08A7-4858-94B8-DE8B38BE2632}.Release|Any CPU.Build.0 = Release|Any CPU
{7E256F6E-B676-41D3-B94E-CCDC40AA6749}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7E256F6E-B676-41D3-B94E-CCDC40AA6749}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7E256F6E-B676-41D3-B94E-CCDC40AA6749}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7E256F6E-B676-41D3-B94E-CCDC40AA6749}.Release|Any CPU.Build.0 = Release|Any CPU
{E78A38E5-57F6-4F31-8A4C-7A1B53679E13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E78A38E5-57F6-4F31-8A4C-7A1B53679E13}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E78A38E5-57F6-4F31-8A4C-7A1B53679E13}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E78A38E5-57F6-4F31-8A4C-7A1B53679E13}.Release|Any CPU.Build.0 = Release|Any CPU
{D1C32399-E9A0-44AF-89DD-EC32B81A5211}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D1C32399-E9A0-44AF-89DD-EC32B81A5211}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D1C32399-E9A0-44AF-89DD-EC32B81A5211}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D1C32399-E9A0-44AF-89DD-EC32B81A5211}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{76F3031E-341E-43CC-BD92-B23F83495DB7} = {9E4B772B-D417-4147-B8B1-FD9E3B0B4EC5}
{ED36FB6D-7278-465D-9C44-D01927258BA1} = {9E4B772B-D417-4147-B8B1-FD9E3B0B4EC5}
{F63D421B-A5E5-4107-9BAC-9C45ED1363DE} = {9E4B772B-D417-4147-B8B1-FD9E3B0B4EC5}
{B755D39B-1AD8-48FA-B56F-53FCA7478085} = {9E4B772B-D417-4147-B8B1-FD9E3B0B4EC5}
{0E1E4EF4-9415-43FF-971F-204311403A2D} = {9E4B772B-D417-4147-B8B1-FD9E3B0B4EC5}
{BE7203D5-B616-4F38-9D9F-B5D4D92DBDF3} = {9E4B772B-D417-4147-B8B1-FD9E3B0B4EC5}
{A1FE5CA7-45EE-4BB0-9FDF-8698BB22568B} = {9E4B772B-D417-4147-B8B1-FD9E3B0B4EC5}
{7B6503A2-DA2C-4512-BBA5-95BF85CF63C1} = {9E4B772B-D417-4147-B8B1-FD9E3B0B4EC5}
{C7613109-6198-402E-953F-57EA81E8238E} = {9E4B772B-D417-4147-B8B1-FD9E3B0B4EC5}
{D1878E17-08A7-4858-94B8-DE8B38BE2632} = {CE764F51-0699-4446-BEE2-17FBBDC99C5C}
{7E256F6E-B676-41D3-B94E-CCDC40AA6749} = {CE764F51-0699-4446-BEE2-17FBBDC99C5C}
{E78A38E5-57F6-4F31-8A4C-7A1B53679E13} = {CE764F51-0699-4446-BEE2-17FBBDC99C5C}
{D1C32399-E9A0-44AF-89DD-EC32B81A5211} = {9E4B772B-D417-4147-B8B1-FD9E3B0B4EC5}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {0B07E734-6AE2-4A12-AD60-C072F3695854}
EndGlobalSection
EndGlobal

Просмотреть файл

@ -26,7 +26,6 @@
<WarningLevel>4</WarningLevel>
<AndroidLinkMode>None</AndroidLinkMode>
<ConsolePause>false</ConsolePause>
<AndroidSupportedAbis>armeabi-v7a;x86;arm64-v8a;x86_64</AndroidSupportedAbis>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>full</DebugType>

Просмотреть файл

@ -1,98 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectTypeGuids>{A3F8F2AB-B479-4A4A-A458-A89E7DC349F1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<ProjectGuid>{EDF26EBB-0AC3-4212-81D6-8DD08F5ACC17}</ProjectGuid>
<OutputType>Library</OutputType>
<RootNamespace>System.Graphics.CoreGraphics</RootNamespace>
<MonoMacResourcePrefix>Resources</MonoMacResourcePrefix>
<AssemblyName>System.Graphics.CoreGraphics.Mac</AssemblyName>
<TargetFrameworkIdentifier>Xamarin.Mac</TargetFrameworkIdentifier>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug</OutputPath>
<DefineConstants>DEBUG;MONOMAC;</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
<UseSGen>false</UseSGen>
<IncludeMonoRuntime>false</IncludeMonoRuntime>
<EnablePackageSigning>false</EnablePackageSigning>
<EnableCodeSigning>false</EnableCodeSigning>
<CreatePackage>false</CreatePackage>
<UseRefCounting>false</UseRefCounting>
<Profiling>true</Profiling>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<Optimize>true</Optimize>
<OutputPath>bin\Release</OutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
<UseSGen>false</UseSGen>
<IncludeMonoRuntime>false</IncludeMonoRuntime>
<EnablePackageSigning>false</EnablePackageSigning>
<EnableCodeSigning>false</EnableCodeSigning>
<CreatePackage>false</CreatePackage>
<DefineConstants>MONOMAC;</DefineConstants>
<UseRefCounting>false</UseRefCounting>
<Profiling>false</Profiling>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.IO.Compression" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="Xamarin.Mac" />
<Reference Include="netstandard" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" />
<ItemGroup>
<Compile Include="AppKitConstants.cs" />
<Compile Include="CoreGraphicsExtensions.cs" />
<Compile Include="NativeImage.cs" />
<Compile Include="NativeGraphicsView.cs" />
<Compile Include="NativeGraphicsService.cs" />
<Compile Include="IGraphicsRenderer.cs" />
<Compile Include="NativeBitmapExportContext.cs" />
<Compile Include="DirectRenderer.cs" />
<Compile Include="GraphicsMac.Designer.cs">
<DependentUpon>GraphicsMac.resx</DependentUpon>
</Compile>
<Compile Include="NativeFontService.cs" />
<Compile Include="NativeFontFamily.cs" />
<Compile Include="NativeFontStyle.cs" />
<Compile Include="DrawableExtensions.cs" />
<Compile Include="NativeImageExtensions.cs" />
<Compile Include="NativePdfExportService.cs" />
<Compile Include="NativePdfExportContext.cs" />
<Compile Include="NativeFontRegistry.cs" />
<Compile Include="NSColorExtensions.cs" />
<Compile Include="NSImageExtensions.cs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="GraphicsMac.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>GraphicsMac.Designer.cs</LastGenOutput>
<CustomToolNamespace>System.Graphics.CoreGraphics</CustomToolNamespace>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\System.Graphics.Core\System.Graphics.Core.csproj">
<Project>{76f3031e-341e-43cc-bd92-b23f83495db7}</Project>
<Name>System.Graphics.Core</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Extensions\" />
</ItemGroup>
<Import Project="..\System.Graphics.CoreGraphics\System.Graphics.CoreGraphics.projitems" Label="Shared" />
</Project>

Просмотреть файл

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<config>
<add key="repositoryPath" value="../../../../packages" />
</config>
</configuration>

Просмотреть файл

@ -1,25 +0,0 @@
using System.Reflection;
// Information about this assembly is defined by the following attributes.
// Change them to the values specific to your project.
[assembly: AssemblyTitle("System.Graphics.CoreGraphics.iOS")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("")]
[assembly: AssemblyCopyright("jlipsky")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
// The form "{Major}.{Minor}.*" will automatically update the build and revision,
// and "{Major}.{Minor}.{Build}.*" will update just the revision.
[assembly: AssemblyVersion("1.0.*")]
// The following attributes are used to specify the signing key for the assembly,
// if desired. See the Mono documentation for more information about signing.
//[assembly: AssemblyDelaySign(false)]
//[assembly: AssemblyKeyFile("")]

Просмотреть файл

@ -1,76 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectTypeGuids>{FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<ProjectGuid>{F8D43F64-AF09-4E06-8473-5BDC37281908}</ProjectGuid>
<OutputType>Library</OutputType>
<RootNamespace>System.Graphics.CoreGraphics</RootNamespace>
<IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
<AssemblyName>System.Graphics.CoreGraphics.iOS</AssemblyName>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug</OutputPath>
<DefineConstants>DEBUG;</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<Optimize>true</Optimize>
<OutputPath>bin\Release</OutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.IO.Compression" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
<Reference Include="System.Core" />
<Reference Include="Xamarin.iOS" />
</ItemGroup>
<ItemGroup>
<Compile Include="NativeImageExtensions.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="UIColorExtensions.cs" />
<Compile Include="UIKitExtensions.cs" />
<Compile Include="DirectRenderer.cs" />
<Compile Include="NativeBitmapExportContext.cs" />
<Compile Include="IGraphicsRenderer.cs" />
<Compile Include="NativeGraphicsService.cs" />
<Compile Include="NativeGraphicsView.cs" />
<Compile Include="NativeImage.cs" />
<Compile Include="GraphicsiOS.Designer.cs">
<DependentUpon>GraphicsiOS.resx</DependentUpon>
</Compile>
<Compile Include="NativeFontService.cs" />
<Compile Include="NativeFontFamily.cs" />
<Compile Include="NativeFontStyle.cs" />
<Compile Include="UIImageExtensions.cs" />
<Compile Include="UIViewExtensions.cs" />
<Compile Include="NativePdfExportService.cs" />
<Compile Include="NativePdfExportContext.cs" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
<ItemGroup>
<EmbeddedResource Include="GraphicsiOS.resx">
<Generator>Public.ResXFileCodeGenerator</Generator>
<LastGenOutput>GraphicsiOS.Designer.cs</LastGenOutput>
<CustomToolNamespace>System.Graphics.CoreGraphics</CustomToolNamespace>
<SubType>Designer</SubType>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\System.Graphics.Core\System.Graphics.Core.csproj">
<Project>{76f3031e-341e-43cc-bd92-b23f83495db7}</Project>
<Name>System.Graphics.Core</Name>
</ProjectReference>
</ItemGroup>
<Import Project="..\System.Graphics.CoreGraphics\System.Graphics.CoreGraphics.projitems" Label="Shared" />
</Project>

Просмотреть файл

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<config>
<add key="repositoryPath" value="../../../../packages" />
</config>
</configuration>

Просмотреть файл

@ -1,4 +1,4 @@
#if MONOMAC
#if __MACOS__
using AppKit;
#else
using UIKit;

Просмотреть файл

@ -0,0 +1,15 @@
<Project Sdk="MSBuild.Sdk.Extras">
<PropertyGroup>
<TargetFrameworks>Xamarin.iOS10;Xamarin.Mac20;</TargetFrameworks>
<RootNamespace>System.Graphics.CoreGraphics</RootNamespace>
</PropertyGroup>
<PropertyGroup>
<LangVersion>8.0</LangVersion>
<PackageId>System.Graphics.CoreGraphics</PackageId>
<Product>System.Graphics.CoreGraphics</Product>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\System.Graphics.Core\System.Graphics.Core.csproj"/>
</ItemGroup>
<Import Project="..\..\targets\MultiTargeting.targets"/>
</Project>

Просмотреть файл

@ -1,19 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
<HasSharedItems>true</HasSharedItems>
<SharedGUID>{95A3E5F1-26B7-4BD8-8F01-48FE7BFD79FA}</SharedGUID>
</PropertyGroup>
<PropertyGroup Label="Configuration">
<Import_RootNamespace>System.Graphics.CoreGraphics</Import_RootNamespace>
</PropertyGroup>
<ItemGroup>
<Compile Include="$(MSBuildThisFileDirectory)NativeCanvas.cs" />
<Compile Include="$(MSBuildThisFileDirectory)NativeCanvasState.cs" />
<Compile Include="$(MSBuildThisFileDirectory)NativeGraphicsExtensions.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Text\AttributedTextExtensions.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Text\CGColorExtensions.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Text\NSAttributedStringExtension.cs" />
</ItemGroup>
</Project>

Просмотреть файл

@ -1,11 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectGuid>{95A3E5F1-26B7-4BD8-8F01-48FE7BFD79FA}</ProjectGuid>
</PropertyGroup>
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
<Import Project="System.Graphics.CoreGraphics.projitems" Label="Shared" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
</Project>

Просмотреть файл

@ -57,7 +57,7 @@ namespace System.Graphics.CoreGraphics
if (attrs.TryGetValue(NSStringAttributeKey.Font, out font))
{
var actualFont = (NSFont) font;
#if MONOMAC
#if __MACOS__
var fontName = actualFont.FontName;
#else
var fontName = actualFont.Name;

Просмотреть файл

@ -0,0 +1,5 @@
{
"msbuild-sdks": {
"MSBuild.Sdk.Extras": "2.0.54"
}
}

Просмотреть файл

@ -35,22 +35,6 @@ namespace System.Graphics.Forms.Android
{
}
}
public partial class String
{
// aapt resource value: 0x7F010000
public static int library_name = 2130771968;
static String()
{
global::Android.Runtime.ResourceIdManager.UpdateIdValues();
}
private String()
{
}
}
}
}
#pragma warning restore 1591

Просмотреть файл

@ -24,7 +24,6 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AndroidSupportedAbis>armeabi-v7a;x86;arm64-v8a;x86_64</AndroidSupportedAbis>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@ -33,7 +32,6 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AndroidSupportedAbis>armeabi-v7a;x86;arm64-v8a;x86_64</AndroidSupportedAbis>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.CSharp" />

Просмотреть файл

@ -55,12 +55,6 @@
<Compile Include="Forms.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\System.Graphics.CoreGraphics.iOS\System.Graphics.CoreGraphics.iOS.csproj">
<Project>{f8d43f64-af09-4e06-8473-5bdc37281908}</Project>
<Name>System.Graphics.CoreGraphics.iOS</Name>
<IsAppExtension>false</IsAppExtension>
<IsWatchApp>false</IsWatchApp>
</ProjectReference>
<ProjectReference Include="..\System.Graphics.Core\System.Graphics.Core.csproj">
<Project>{76f3031e-341e-43cc-bd92-b23f83495db7}</Project>
<Name>System.Graphics.Core</Name>
@ -69,6 +63,10 @@
<Project>{be7203d5-b616-4f38-9d9f-b5d4d92dbdf3}</Project>
<Name>System.Graphics.Forms.Core</Name>
</ProjectReference>
<ProjectReference Include="..\System.Graphics.CoreGraphics\System.Graphics.CoreGraphics.csproj">
<Project>{D1C32399-E9A0-44AF-89DD-EC32B81A5211}</Project>
<Name>System.Graphics.CoreGraphics</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms">

Просмотреть файл

@ -25,7 +25,6 @@ namespace GraphicsTester.Android
public static void UpdateIdValues()
{
global::System.Graphics.Android.Resource.String.library_name = global::GraphicsTester.Android.Resource.String.library_name;
}
public partial class Attribute
@ -98,9 +97,6 @@ namespace GraphicsTester.Android
// aapt resource value: 0x7F040001
public const int hello = 2130968577;
// aapt resource value: 0x7F040002
public const int library_name = 2130968578;
static String()
{
global::Android.Runtime.ResourceIdManager.UpdateIdValues();

Просмотреть файл

@ -51,6 +51,9 @@
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="Xamarin.Mac" />
<Reference Include="Markdig">
<HintPath>..\..\..\packages\Markdig.0.22.0\lib\netstandard2.1\Markdig.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<ImageAsset Include="Resources\Images.xcassets\AppIcons.appiconset\Contents.json" />
@ -90,14 +93,6 @@
<InterfaceDefinition Include="MainWindow.xib" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\libraries\System.Graphics.CoreGraphics.Mac\System.Graphics.CoreGraphics.Mac.csproj">
<Project>{edf26ebb-0ac3-4212-81d6-8dd08f5acc17}</Project>
<Name>System.Graphics.Mac</Name>
</ProjectReference>
<ProjectReference Include="..\..\libraries\System.Graphics.CoreGraphics.Mac\System.Graphics.CoreGraphics.Mac.csproj">
<Project>{edf26ebb-0ac3-4212-81d6-8dd08f5acc17}</Project>
<Name>System.Graphics.CoreGraphics.Mac</Name>
</ProjectReference>
<ProjectReference Include="..\..\libraries\System.Graphics.Core\System.Graphics.Core.csproj">
<Project>{76f3031e-341e-43cc-bd92-b23f83495db7}</Project>
<Name>System.Graphics.Core</Name>
@ -106,6 +101,19 @@
<Project>{D1878E17-08A7-4858-94B8-DE8B38BE2632}</Project>
<Name>GraphicsTester.Portable</Name>
</ProjectReference>
<ProjectReference Include="..\..\libraries\System.Graphics.Text.Markdig\System.Graphics.Text.Markdig.csproj">
<Project>{ED36FB6D-7278-465D-9C44-D01927258BA1}</Project>
<Name>System.Graphics.Text.Markdig</Name>
</ProjectReference>
<ProjectReference Include="..\..\libraries\System.Graphics.CoreGraphics\System.Graphics.CoreGraphics.csproj">
<Project>{D1C32399-E9A0-44AF-89DD-EC32B81A5211}</Project>
<Name>System.Graphics.CoreGraphics</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Markdig">
<Version>0.22.0</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" />
</Project>

Просмотреть файл

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
@ -11,7 +11,7 @@
<key>CFBundleVersion</key>
<string>1</string>
<key>LSMinimumSystemVersion</key>
<string>10.7</string>
<string>10.9</string>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleInfoDictionaryVersion</key>
@ -28,6 +28,5 @@
<string>MainMenu</string>
<key>XSAppIconAssets</key>
<string>Resources/Images.xcassets/AppIcons.appiconset</string>
</dict>
</plist>

Просмотреть файл

@ -9,16 +9,19 @@ namespace GraphicsTester.Skia
{
public MainWindow (IntPtr handle) : base (handle)
{
Initialize ();
}
[Export ("initWithCoder:")]
public MainWindow (NSCoder coder) : base (coder)
{
Initialize ();
}
public override void AwakeFromNib ()
{
base.AwakeFromNib ();
}
void Initialize()
{
ContentViewController = new TesterViewController ();
}
}
}

Просмотреть файл

@ -26,5 +26,6 @@ namespace GraphicsTester.Skia
}
public new MainWindow Window => (MainWindow)base.Window;
}
}

Просмотреть файл

@ -3,32 +3,37 @@ using System.Graphics.CoreGraphics;
using AppKit;
using CoreGraphics;
namespace GraphicsTester.Skia
{
public class TesterView : NSView
{
namespace GraphicsTester.Skia {
public class TesterViewController : NSViewController {
public override void LoadView ()
{
View = new TesterView ();
}
}
public class TesterView : NSView {
private readonly NSTableView tableView;
private readonly NativeGraphicsView graphicsView;
private readonly TesterTableViewSource tableSource;
public TesterView (CGRect rect) : base(rect)
public TesterView () : base ()
{
GraphicsPlatform.Register(NativeGraphicsService.Instance);
GraphicsPlatform.Register (NativeGraphicsService.Instance);
tableSource = new TesterTableViewSource ();
tableSource.ScenarioSelected += (drawable) =>
{
tableSource.ScenarioSelected += (drawable) => {
graphicsView.Drawable = drawable;
graphicsView.InvalidateDrawable();
graphicsView.InvalidateDrawable ();
};
tableView = new NSTableView (new CGRect (0, 0, 300, rect.Height));
tableView.AddColumn (new NSTableColumn ()
{
tableView = new NSTableView ();
tableView.AddColumn (new NSTableColumn () {
Width = 300,
});
tableView.Source = tableSource;
tableView.BackgroundColor = NSColor.White;
//tableView.BackgroundColor = NSColor.White;
AddSubview (tableView);
@ -45,15 +50,13 @@ namespace GraphicsTester.Skia
public override void Layout ()
{
var bounds = Bounds;
tableView.Frame = new CGRect (0, 24, 300, bounds.Height-24);
graphicsView.Frame = new CGRect (300, 24, bounds.Width - 300, bounds.Height-24);
tableView.Frame = new CGRect (0, 24, 300, bounds.Height - 24);
graphicsView.Frame = new CGRect (300, 24, bounds.Width - 300, bounds.Height - 24);
}
public override CGRect Frame
{
public override CGRect Frame {
get => base.Frame;
set
{
set {
base.Frame = value;
Layout ();
}

Просмотреть файл

@ -0,0 +1,53 @@
<Project>
<ItemGroup Condition="$(TargetFramework.StartsWith(&apos;Xamarin.iOS&apos;)) != true ">
<Compile Remove="**\*.iOS.cs"/>
<None Include="**\*.iOS.cs"/>
<Compile Remove="**\iOS\*.cs"/>
<None Include="**\iOS\*.cs"/>
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.StartsWith(&apos;Xamarin.Mac&apos;)) != true ">
<Compile Remove="**\*.Mac.cs"/>
<None Include="**\*.Mac.cs"/>
<Compile Remove="**\Mac\*.cs"/>
<None Include="**\Mac\*.cs"/>
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.StartsWith(&apos;Xamarin.Mac&apos;)) != true And $(TargetFramework.StartsWith(&apos;Xamarin.iOS&apos;)) != true ">
<Compile Remove="**\*.MaciOS.cs"/>
<None Include="**\*.MaciOS.cs"/>
<Compile Remove="**\MaciOS\*.cs"/>
<None Include="**\MaciOS\*.cs"/>
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.StartsWith(&apos;MonoAndroid&apos;)) != true ">
<Compile Remove="**\*.Android.cs"/>
<None Include="**\*.Android.cs"/>
<Compile Remove="**\Android\*.cs"/>
<None Include="**\Android\*.cs"/>
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.StartsWith(&apos;netstandard&apos;)) != true ">
<Compile Remove="**\*.Standard.cs"/>
<None Include="**\*.Standard.cs"/>
<Compile Remove="**\Standard\*.cs"/>
<None Include="**\Standard\*.cs"/>
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.StartsWith(&apos;netcoreapp&apos;)) != true ">
<Compile Remove="**\*.Win32.cs"/>
<None Include="**\*.Win32.cs"/>
<Compile Remove="**\*.xaml.cs"/>
<None Include="**\*.xaml.cs"/>
<Compile Remove="**\*.xaml"/>
<None Include="**\*.xaml"/>
<Compile Remove="**\Win32\*.cs"/>
<None Include="**\Win32\*.cs"/>
</ItemGroup>
<PropertyGroup Condition="$(TargetFramework.StartsWith(&apos;netcoreapp&apos;)) == true ">
<UseWpf>true</UseWpf>
</PropertyGroup>
<PropertyGroup Condition="&apos;$(Configuration)|$(TargetFramework)|$(Platform)&apos;==&apos;Debug|netstandard2.0|AnyCPU&apos;">
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
</PropertyGroup><!-- If this becomes part of the product we will remove these but for now it's useful having them all in one place -->
<ItemGroup Condition="$(TargetFramework.StartsWith(&apos;MonoAndroid&apos;)) == true ">
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.2.0"/>
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.0.0.1"/>
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.1"/>
</ItemGroup>
</Project>