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

[Build] Improved the Windows build

This commit is contained in:
Matthew Leibowitz 2016-02-04 21:46:42 +02:00
Родитель 6bfa567907
Коммит e555d02a6c
11 изменённых файлов: 130 добавлений и 111 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

1
.gitignore поставляемый
Просмотреть файл

@ -4,6 +4,7 @@
# Repository-specific files # Repository-specific files
tools/ tools/
output/ output/
binding/SkiaSharp.Portable/SkiaPortable.cs
# User-specific files # User-specific files
*.suo *.suo

54
binding/SkiaSharp.Desktop/SkiaSharp.Desktop.csproj
Просмотреть файл

@ -17,7 +17,7 @@
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType> <DebugType>full</DebugType>
<Optimize>false</Optimize> <Optimize>false</Optimize>
<OutputPath>bin\AnyCPU\Debug\</OutputPath> <OutputPath>bin\Debug\</OutputPath>
<DefineConstants>TRACE;DEBUG;DESKTOP</DefineConstants> <DefineConstants>TRACE;DEBUG;DESKTOP</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
@ -27,63 +27,13 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType> <DebugType>pdbonly</DebugType>
<Optimize>true</Optimize> <Optimize>true</Optimize>
<OutputPath>bin\AnyCPU\Release\</OutputPath> <OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE;DESKTOP</DefineConstants> <DefineConstants>TRACE;DESKTOP</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit> <Prefer32Bit>false</Prefer32Bit>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x86\Debug\</OutputPath>
<DefineConstants>TRACE;DEBUG;DESKTOP</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<WarningLevel>4</WarningLevel>
<Optimize>false</Optimize>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
<OutputPath>bin\x86\Release\</OutputPath>
<DefineConstants>TRACE;DESKTOP</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x64\Debug\</OutputPath>
<DefineConstants>TRACE;DEBUG;DESKTOP</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x64</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<WarningLevel>4</WarningLevel>
<Optimize>false</Optimize>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
<OutputPath>bin\x64\Release\</OutputPath>
<DefineConstants>TRACE;WINDOWS_DESKTOP</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x64</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />

16
binding/SkiaSharp.Windows.sln
Просмотреть файл

@ -37,16 +37,16 @@ Global
{7AA90628-2FDD-4585-AF2F-CC51CFA8B52A}.Release|x86.Build.0 = Release|Any CPU {7AA90628-2FDD-4585-AF2F-CC51CFA8B52A}.Release|x86.Build.0 = Release|Any CPU
{EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|Any CPU.Build.0 = Debug|Any CPU {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|x64.ActiveCfg = Debug|x64 {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|x64.ActiveCfg = Debug|Any CPU
{EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|x64.Build.0 = Debug|x64 {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|x64.Build.0 = Debug|Any CPU
{EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|x86.ActiveCfg = Debug|x86 {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|x86.ActiveCfg = Debug|Any CPU
{EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|x86.Build.0 = Debug|x86 {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|x86.Build.0 = Debug|Any CPU
{EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Release|Any CPU.ActiveCfg = Release|Any CPU {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Release|Any CPU.Build.0 = Release|Any CPU {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Release|Any CPU.Build.0 = Release|Any CPU
{EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Release|x64.ActiveCfg = Release|x64 {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Release|x64.ActiveCfg = Release|Any CPU
{EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Release|x64.Build.0 = Release|x64 {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Release|x64.Build.0 = Release|Any CPU
{EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Release|x86.ActiveCfg = Release|x86 {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Release|x86.ActiveCfg = Release|Any CPU
{EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Release|x86.Build.0 = Release|x86 {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE

65
build.cake
Просмотреть файл

@ -54,60 +54,47 @@ CakeSpec.Libs = new ISolutionBuilder [] {
ToDirectory = "./output/portable/" ToDirectory = "./output/portable/"
}, },
new OutputFileCopy { new OutputFileCopy {
FromFile = "./binding/SkiaSharp.Desktop/bin/AnyCPU/Release/SkiaSharp.dll", FromFile = "./binding/SkiaSharp.Desktop/bin/Release/SkiaSharp.dll",
ToDirectory = "./output/mac/" ToDirectory = "./output/mac/"
}, },
new OutputFileCopy { new OutputFileCopy {
FromFile = "./binding/SkiaSharp.Desktop/bin/AnyCPU/Release/SkiaSharp.Desktop.targets", FromFile = "./binding/SkiaSharp.Desktop/bin/Release/SkiaSharp.Desktop.targets",
ToDirectory = "./output/mac/" ToDirectory = "./output/mac/"
}, },
new OutputFileCopy { new OutputFileCopy {
FromFile = "./binding/SkiaSharp.Desktop/bin/AnyCPU/Release/SkiaSharp.dll.config", FromFile = "./binding/SkiaSharp.Desktop/bin/Release/SkiaSharp.dll.config",
ToDirectory = "./output/mac/" ToDirectory = "./output/mac/"
}, },
new OutputFileCopy { new OutputFileCopy {
FromFile = "./binding/SkiaSharp.Desktop/bin/AnyCPU/Release/mac/libskia_osx.dylib", FromFile = "./binding/SkiaSharp.Desktop/bin/Release/mac/libskia_osx.dylib",
ToDirectory = "./output/mac/" ToDirectory = "./output/mac/"
}, },
} }
}, },
new DefaultSolutionBuilder { new DefaultSolutionBuilder {
SolutionPath = "binding/SkiaSharp.Windows.sln", SolutionPath = "binding/SkiaSharp.Windows.sln",
Platform = "x86",
IsWindowsCompatible = true, IsWindowsCompatible = true,
IsMacCompatible = false, IsMacCompatible = false,
OutputFiles = new [] { OutputFiles = new [] {
new OutputFileCopy { new OutputFileCopy {
FromFile = "./binding/SkiaSharp.Desktop/bin/x86/Release/SkiaSharp.dll", FromFile = "./binding/SkiaSharp.Portable/bin/Release/SkiaSharp.dll",
ToDirectory = "./output/windows/x86/" ToDirectory = "./output/portable/"
}, },
new OutputFileCopy { new OutputFileCopy {
FromFile = "./binding/SkiaSharp.Desktop/bin/x86/Release/SkiaSharp.pdb", FromFile = "./binding/SkiaSharp.Desktop/bin/Release/SkiaSharp.dll",
ToDirectory = "./output/windows/x86/" ToDirectory = "./output/windows/"
}, },
new OutputFileCopy { new OutputFileCopy {
FromFile = "./binding/SkiaSharp.Desktop/bin/x86/Release/SkiaSharp.Desktop.targets", FromFile = "./binding/SkiaSharp.Desktop/bin/Release/SkiaSharp.pdb",
ToDirectory = "./output/windows/x86/" ToDirectory = "./output/windows/"
},
}
},
new DefaultSolutionBuilder {
SolutionPath = "binding/SkiaSharp.Windows.sln",
Platform = "x64",
IsWindowsCompatible = true,
IsMacCompatible = false,
OutputFiles = new [] {
new OutputFileCopy {
FromFile = "./binding/SkiaSharp.Desktop/bin/x64/Release/SkiaSharp.dll",
ToDirectory = "./output/windows/x64/"
}, },
new OutputFileCopy { new OutputFileCopy {
FromFile = "./binding/SkiaSharp.Desktop/bin/x64/Release/SkiaSharp.pdb", FromFile = "./binding/SkiaSharp.Desktop/bin/Release/SkiaSharp.dll.config",
ToDirectory = "./output/windows/x64/" ToDirectory = "./output/windows/"
}, },
new OutputFileCopy { new OutputFileCopy {
FromFile = "./binding/SkiaSharp.Desktop/bin/x64/Release/SkiaSharp.Desktop.targets", FromFile = "./binding/SkiaSharp.Desktop/bin/Release/SkiaSharp.Desktop.targets",
ToDirectory = "./output/windows/x64/" ToDirectory = "./output/windows/"
}, },
} }
}, },
@ -127,7 +114,8 @@ CakeSpec.Samples = new ISolutionBuilder [] {
new DefaultSolutionBuilder { new DefaultSolutionBuilder {
IsWindowsCompatible = true, IsWindowsCompatible = true,
IsMacCompatible = false, IsMacCompatible = false,
SolutionPath = "./samples/Skia.Windows.Demo/Skia.Windows.Demo.sln" Platform = "x86",
SolutionPath = "./samples/Skia.WindowsDesktop.Demo/Skia.WindowsDesktop.Demo.sln"
}, },
}; };
@ -162,9 +150,18 @@ CakeSpec.Tests = new SolutionTestRunner [] {
}, },
}; };
CakeSpec.NuSpecs = new [] { if (IsRunningOnWindows ()) {
"./nuget/Xamarin.SkiaSharp.nuspec" CakeSpec.NuSpecs = new [] {
}; "./nuget/Xamarin.SkiaSharp.Windows.nuspec",
};
}
if (IsRunningOnUnix ()) {
CakeSpec.NuSpecs = new [] {
"./nuget/Xamarin.SkiaSharp.Mac.nuspec",
"./nuget/Xamarin.SkiaSharp.nuspec",
};
}
Task ("libs") Task ("libs")
.IsDependentOn ("externals") .IsDependentOn ("externals")
@ -176,6 +173,12 @@ Task ("libs")
CopyFileToDirectory ("./native-builds/lib/osx/libskia_osx.dylib", "./output/mac/"); CopyFileToDirectory ("./native-builds/lib/osx/libskia_osx.dylib", "./output/mac/");
} }
if (IsRunningOnWindows ()) { if (IsRunningOnWindows ()) {
if (!DirectoryExists ("./output/windows/x86/")) {
CreateDirectory ("./output/windows/x86/");
}
if (!DirectoryExists ("./output/windows/x64/")) {
CreateDirectory ("./output/windows/x64/");
}
CopyFileToDirectory ("./native-builds/lib/windows/x86/libskia_windows.dll", "./output/windows/x86/"); CopyFileToDirectory ("./native-builds/lib/windows/x86/libskia_windows.dll", "./output/windows/x86/");
CopyFileToDirectory ("./native-builds/lib/windows/x86/libskia_windows.pdb", "./output/windows/x86/"); CopyFileToDirectory ("./native-builds/lib/windows/x86/libskia_windows.pdb", "./output/windows/x86/");
CopyFileToDirectory ("./native-builds/lib/windows/x64/libskia_windows.dll", "./output/windows/x64/"); CopyFileToDirectory ("./native-builds/lib/windows/x64/libskia_windows.dll", "./output/windows/x64/");

33
nuget/Xamarin.SkiaSharp.Mac.nuspec Normal file
Просмотреть файл

@ -0,0 +1,33 @@
<?xml version="1.0"?>
<package >
<metadata>
<id>Xamarin.SkiaSharp.Mac</id>
<title>Skia for Xamarin</title>
<version>1.49.0.0-preview6</version>
<authors>Xamarin Inc.</authors>
<owners>Xamarin Inc.</owners>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>C# bindings for Google's Skia library</description>
<copyright>Copyright (c) Xamarin Inc. 2016</copyright>
</metadata>
<files>
<!-- the platform specific -->
<file src="./output/mac/SkiaSharp.dll" target="lib\net45" />
<file src="./output/mac/SkiaSharp.dll.config" target="lib\net45" />
<file src="./output/android/SkiaSharp.dll" target="lib\MonoAndroid" />
<file src="./output/ios/SkiaSharp.dll" target="lib\XamariniOS" />
<file src="./output/osx/SkiaSharp.dll" target="lib\XamarinMac" />
<!-- the PCL -->
<file src="./output/portable/SkiaSharp.dll" target="lib\portable-net45+xamarinmac+xamarinios+monotouch+monoandroid+win8+wpa81+wp8+xamarin.watchos+xamarin.tvos" />
<!-- the build bits -->
<!-- .NET 4.5 -->
<file src="./output/mac/SkiaSharp.Desktop.targets" target="build\net45\Xamarin.SkiaSharp.Mac.targets" />
<!-- .NET 4.5 (OS X) -->
<file src="./output/mac/libskia_osx.dylib" target="build\net45\mac\libskia_osx.dylib" />
<!-- OS X -->
<file src="./output/osx/SkiaSharp.OSX.targets" target="build\XamarinMac\Xamarin.SkiaSharp.Mac.targets" />
<file src="./output/osx/libskia_osx.dylib" target="build\XamarinMac\libskia_osx.dylib" />
</files>
</package>

28
nuget/Xamarin.SkiaSharp.Windows.nuspec Normal file
Просмотреть файл

@ -0,0 +1,28 @@
<?xml version="1.0"?>
<package >
<metadata>
<id>Xamarin.SkiaSharp.Windows</id>
<title>Skia for Windows</title>
<version>1.49.0.0-preview6</version>
<authors>Xamarin Inc.</authors>
<owners>Xamarin Inc.</owners>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>C# bindings for Google's Skia library</description>
<copyright>Copyright (c) Xamarin Inc. 2016</copyright>
</metadata>
<files>
<!-- the platform specific -->
<file src="output/windows/SkiaSharp.dll" target="lib\net45" />
<file src="output/windows/SkiaSharp.dll.config" target="lib\net45" />
<!-- the PCL -->
<file src="output/portable/SkiaSharp.dll" target="lib\portable-net45+xamarinmac+xamarinios+monotouch+monoandroid+win8+wpa81+wp8+xamarin.watchos+xamarin.tvos" />
<!-- the build bits -->
<!-- .NET 4.5 -->
<file src="output/windows/SkiaSharp.Desktop.targets" target="build\net45\Xamarin.SkiaSharp.Windows.targets" />
<!-- .NET 4.5 (Windows) -->
<file src="output/windows/x64/libskia_windows.dll" target="build\net45\x64\libskia_windows.dll" />
<file src="output/windows/x86/libskia_windows.dll" target="build\net45\x86\libskia_windows.dll" />
</files>
</package>

8
nuget/Xamarin.SkiaSharp.nuspec
Просмотреть файл

@ -3,7 +3,7 @@
<metadata> <metadata>
<id>Xamarin.SkiaSharp</id> <id>Xamarin.SkiaSharp</id>
<title>Skia for Xamarin and Windows</title> <title>Skia for Xamarin and Windows</title>
<version>1.49.0.0-preview5</version> <version>1.49.0.0-preview6</version>
<authors>Xamarin Inc.</authors> <authors>Xamarin Inc.</authors>
<owners>Xamarin Inc.</owners> <owners>Xamarin Inc.</owners>
<requireLicenseAcceptance>false</requireLicenseAcceptance> <requireLicenseAcceptance>false</requireLicenseAcceptance>
@ -13,7 +13,7 @@
<files> <files>
<!-- the platform specific --> <!-- the platform specific -->
<file src="./output/mac/SkiaSharp.dll" target="lib\net45" /> <file src="./output/mac/SkiaSharp.dll" target="lib\net45" />
<file src="./output/mac/SkiaSharp.dll.config" target="lib\net45\SkiaSharp.dll.config" /> <file src="./output/mac/SkiaSharp.dll.config" target="lib\net45" />
<file src="./output/android/SkiaSharp.dll" target="lib\MonoAndroid" /> <file src="./output/android/SkiaSharp.dll" target="lib\MonoAndroid" />
<file src="./output/ios/SkiaSharp.dll" target="lib\XamariniOS" /> <file src="./output/ios/SkiaSharp.dll" target="lib\XamariniOS" />
<file src="./output/osx/SkiaSharp.dll" target="lib\XamarinMac" /> <file src="./output/osx/SkiaSharp.dll" target="lib\XamarinMac" />
@ -24,6 +24,10 @@
<!-- the build bits --> <!-- the build bits -->
<!-- .NET 4.5 --> <!-- .NET 4.5 -->
<file src="./output/mac/SkiaSharp.Desktop.targets" target="build\net45\Xamarin.SkiaSharp.targets" /> <file src="./output/mac/SkiaSharp.Desktop.targets" target="build\net45\Xamarin.SkiaSharp.targets" />
<!-- .NET 4.5 (Windows) -->
<file src="./output/windows/x64/libskia_windows.dll" target="build\net45\x64\libskia_windows.dll" />
<file src="./output/windows/x86/libskia_windows.dll" target="build\net45\x86\libskia_windows.dll" />
<!-- .NET 4.5 (OS X) -->
<file src="./output/mac/libskia_osx.dylib" target="build\net45\mac\libskia_osx.dylib" /> <file src="./output/mac/libskia_osx.dylib" target="build\net45\mac\libskia_osx.dylib" />
<!-- OS X --> <!-- OS X -->
<file src="./output/osx/SkiaSharp.OSX.targets" target="build\XamarinMac\Xamarin.SkiaSharp.targets" /> <file src="./output/osx/SkiaSharp.OSX.targets" target="build\XamarinMac\Xamarin.SkiaSharp.targets" />

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

@ -146,7 +146,7 @@
<Name>SkiaSharp.Desktop</Name> <Name>SkiaSharp.Desktop</Name>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<Import Project="..\..\binding\SkiaSharp.Desktop\bin\$(Platform)\$(Configuration)\SkiaSharp.Desktop.targets" /> <Import Project="..\..\binding\SkiaSharp.Desktop\bin\$(Configuration)\SkiaSharp.Desktop.targets" />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets. Other similar extension points exist, see Microsoft.Common.targets.

16
samples/Skia.WindowsDesktop.Demo/Skia.WindowsDesktop.Demo.sln
Просмотреть файл

@ -37,16 +37,16 @@ Global
{9F1E2C85-F1B2-48D0-9750-207BE59E87F4}.Release|x86.Build.0 = Release|x86 {9F1E2C85-F1B2-48D0-9750-207BE59E87F4}.Release|x86.Build.0 = Release|x86
{EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|Any CPU.Build.0 = Debug|Any CPU {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|x64.ActiveCfg = Debug|x64 {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|x64.ActiveCfg = Debug|Any CPU
{EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|x64.Build.0 = Debug|x64 {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|x64.Build.0 = Debug|Any CPU
{EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|x86.ActiveCfg = Debug|x86 {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|x86.ActiveCfg = Debug|Any CPU
{EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|x86.Build.0 = Debug|x86 {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|x86.Build.0 = Debug|Any CPU
{EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Release|Any CPU.ActiveCfg = Release|Any CPU {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Release|Any CPU.Build.0 = Release|Any CPU {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Release|Any CPU.Build.0 = Release|Any CPU
{EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Release|x64.ActiveCfg = Release|x64 {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Release|x64.ActiveCfg = Release|Any CPU
{EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Release|x64.Build.0 = Release|x64 {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Release|x64.Build.0 = Release|Any CPU
{EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Release|x86.ActiveCfg = Release|x86 {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Release|x86.ActiveCfg = Release|Any CPU
{EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Release|x86.Build.0 = Release|x86 {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE

2
tests/SkiaSharp.Desktop.Tests/SkiaSharp.Desktop.Tests.csproj
Просмотреть файл

@ -104,7 +104,7 @@
<Name>SkiaSharp.Desktop</Name> <Name>SkiaSharp.Desktop</Name>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<Import Project="..\..\binding\SkiaSharp.Desktop\bin\$(Platform)\$(Configuration)\SkiaSharp.Desktop.targets" /> <Import Project="..\..\binding\SkiaSharp.Desktop\bin\$(Configuration)\SkiaSharp.Desktop.targets" />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets. Other similar extension points exist, see Microsoft.Common.targets.

16
tests/SkiaSharp.Desktop.Tests/SkiaSharp.Desktop.Tests.sln
Просмотреть файл

@ -25,16 +25,16 @@ Global
GlobalSection(ProjectConfigurationPlatforms) = postSolution GlobalSection(ProjectConfigurationPlatforms) = postSolution
{EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|Any CPU.Build.0 = Debug|Any CPU {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|x64.ActiveCfg = Debug|x64 {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|x64.ActiveCfg = Debug|Any CPU
{EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|x64.Build.0 = Debug|x64 {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|x64.Build.0 = Debug|Any CPU
{EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|x86.ActiveCfg = Debug|x86 {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|x86.ActiveCfg = Debug|Any CPU
{EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|x86.Build.0 = Debug|x86 {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|x86.Build.0 = Debug|Any CPU
{EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Release|Any CPU.ActiveCfg = Release|Any CPU {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Release|Any CPU.Build.0 = Release|Any CPU {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Release|Any CPU.Build.0 = Release|Any CPU
{EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Release|x64.ActiveCfg = Release|x64 {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Release|x64.ActiveCfg = Release|Any CPU
{EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Release|x64.Build.0 = Release|x64 {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Release|x64.Build.0 = Release|Any CPU
{EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Release|x86.ActiveCfg = Release|x86 {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Release|x86.ActiveCfg = Release|Any CPU
{EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Release|x86.Build.0 = Release|x86 {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Release|x86.Build.0 = Release|Any CPU
{F0179CDB-9435-4FB4-8E52-DBF191079491}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F0179CDB-9435-4FB4-8E52-DBF191079491}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F0179CDB-9435-4FB4-8E52-DBF191079491}.Debug|Any CPU.Build.0 = Debug|Any CPU {F0179CDB-9435-4FB4-8E52-DBF191079491}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F0179CDB-9435-4FB4-8E52-DBF191079491}.Debug|x64.ActiveCfg = Debug|x64 {F0179CDB-9435-4FB4-8E52-DBF191079491}.Debug|x64.ActiveCfg = Debug|x64