jsuarezruiz
/
SkiaSharp
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Fix the script when using the local packages: 

- we have to build the .Windows and .Mac as SkiaSharp
This commit is contained in:
Matthew Leibowitz 2016-06-15 09:15:05 +02:00
Родитель a0bc5693a7
Коммит 2fc89bdce9
20 изменённых файлов: 37 добавлений и 38 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -881,17 +881,16 @@ Task ("nuget")
.IsDependentOn ("docs")
.Does (() =>
{
if (IsRunningOnWindows ()) {
PackageNuGet ("./nuget/SkiaSharp.Windows.nuspec", "./output/");
}
if (IsRunningOnUnix ()) {
PackageNuGet ("./nuget/SkiaSharp.Mac.nuspec", "./output/");
}
// we can only build the combined package on CI
if (TARGET == "CI") {
PackageNuGet ("./nuget/SkiaSharp.nuspec", "./output/");
} else {
if (IsRunningOnWindows ()) {
PackageNuGet ("./nuget/SkiaSharp.Windows.nuspec", "./output/");
}
if (IsRunningOnUnix ()) {
PackageNuGet ("./nuget/SkiaSharp.Mac.nuspec", "./output/");
}
}
});

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

@ -1,9 +1,9 @@
<?xml version="1.0"?>
<package >
<metadata>
<id>SkiaSharp.Mac</id>
<title>SkiaSharp for OSX</title>
<version>1.49.4.0-beta4</version>
<id>SkiaSharp</id>
<title>SkiaSharp (for OSX)</title>
<version>1.49.4.0-beta</version>
<authors>Xamarin Inc.</authors>
<owners>Xamarin Inc.</owners>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
@ -33,12 +33,12 @@
<!-- the build bits -->
<!-- .NET 4.5 -->
<file src="output/mac/SkiaSharp.Desktop.targets" target="build/net45/SkiaSharp.Mac.targets" />
<file src="output/mac/SkiaSharp.Desktop.targets" target="build/net45/SkiaSharp.targets" />
<!-- .NET 4.5 (OS X) -->
<file src="output/mac/libSkiaSharp.dylib" target="build/net45/mac/libSkiaSharp.dylib" />
<file src="output/mac/SkiaSharp.dll.config" target="build/net45/SkiaSharp.dll.config" />
<!-- OS X -->
<file src="output/osx/SkiaSharp.OSX.targets" target="build/XamarinMac/SkiaSharp.Mac.targets" />
<file src="output/osx/SkiaSharp.OSX.targets" target="build/XamarinMac/SkiaSharp.targets" />
<file src="output/osx/libSkiaSharp.dylib" target="build/XamarinMac/libSkiaSharp.dylib" />
</files>
</package>

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

@ -1,9 +1,9 @@
<?xml version="1.0"?>
<package >
<metadata>
<id>SkiaSharp.Windows</id>
<title>SkiaSharp for Windows</title>
<version>1.49.4.0-beta4</version>
<id>SkiaSharp</id>
<title>SkiaSharp (for Windows)</title>
<version>1.49.4.0-beta</version>
<authors>Xamarin Inc.</authors>
<owners>Xamarin Inc.</owners>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
@ -27,12 +27,12 @@
<!-- the build bits -->
<!-- .NET 4.5 -->
<file src="output/windows/SkiaSharp.Desktop.targets" target="build/net45/SkiaSharp.Windows.targets" />
<file src="output/windows/SkiaSharp.Desktop.targets" target="build/net45/SkiaSharp.targets" />
<!-- .NET 4.5 (Windows) -->
<file src="output/windows/x64/libSkiaSharp.dll" target="build/net45/x64/libSkiaSharp.dll" />
<file src="output/windows/x86/libSkiaSharp.dll" target="build/net45/x86/libSkiaSharp.dll" />
<!-- UWP -->
<file src="output/uwp/SkiaSharp.UWP.targets" target="build/uap10.0/SkiaSharp.Windows.targets" />
<file src="output/uwp/SkiaSharp.UWP.targets" target="build/uap10.0/SkiaSharp.targets" />
<file src="output/uwp/x64/libSkiaSharp.dll" target="build/uap10.0/x64/libSkiaSharp.dll" />
<file src="output/uwp/x86/libSkiaSharp.dll" target="build/uap10.0/x86/libSkiaSharp.dll" />
<file src="output/uwp/arm/libSkiaSharp.dll" target="build/uap10.0/arm/libSkiaSharp.dll" />

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

@ -3,7 +3,7 @@
<metadata>
<id>SkiaSharp</id>
<title>SkiaSharp</title>
<version>1.49.4.0-beta4</version>
<version>1.49.4.0-beta</version>
<authors>Xamarin Inc.</authors>
<owners>Xamarin Inc.</owners>
<requireLicenseAcceptance>false</requireLicenseAcceptance>

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

@ -52,7 +52,7 @@
<Private>True</Private>
</Reference>
<Reference Include="SkiaSharp, Version=1.49.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SkiaSharp.1.49.4-beta4\lib\MonoAndroid\SkiaSharp.dll</HintPath>
<HintPath>..\packages\SkiaSharp.1.49.4-beta\lib\MonoAndroid\SkiaSharp.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />

2
samples/Skia.Forms.Demo/Droid/packages.config
Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="SkiaSharp" version="1.49.4-beta4" targetFramework="monoandroid60" />
<package id="SkiaSharp" version="1.49.4-beta" targetFramework="monoandroid60" />
<package id="Xamarin.Android.Support.Animated.Vector.Drawable" version="23.3.0" targetFramework="monoandroid60" />
<package id="Xamarin.Android.Support.Design" version="23.3.0" targetFramework="monoandroid60" />
<package id="Xamarin.Android.Support.v4" version="23.3.0" targetFramework="monoandroid60" />

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

@ -33,7 +33,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="SkiaSharp, Version=1.49.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>packages\SkiaSharp.1.49.4-beta4\lib\portable-net45+xamarinmac+xamarinios+monotouch+monoandroid+win8+wpa81+wp8+xamarin.watchos+xamarin.tvos\SkiaSharp.dll</HintPath>
<HintPath>packages\SkiaSharp.1.49.4-beta\lib\portable-net45+xamarinmac+xamarinios+monotouch+monoandroid+win8+wpa81+wp8+xamarin.watchos+xamarin.tvos\SkiaSharp.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">

2
samples/Skia.Forms.Demo/UWP/Skia.Forms.Demo.UWP.nuget.targets
Просмотреть файл

@ -4,7 +4,7 @@
<NuGetPackageRoot>$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
</PropertyGroup>
<ImportGroup>
<Import Project="$(NuGetPackageRoot)\SkiaSharp\1.49.4-beta4\build\uap10.0\SkiaSharp.targets" Condition="Exists('$(NuGetPackageRoot)\SkiaSharp\1.49.4-beta4\build\uap10.0\SkiaSharp.targets')" />
<Import Project="$(NuGetPackageRoot)\SkiaSharp\1.49.4-beta\build\uap10.0\SkiaSharp.targets" Condition="Exists('$(NuGetPackageRoot)\SkiaSharp\1.49.4-beta\build\uap10.0\SkiaSharp.targets')" />
<Import Project="$(NuGetPackageRoot)\Xamarin.Forms\2.3.0.38-pre2\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('$(NuGetPackageRoot)\Xamarin.Forms\2.3.0.38-pre2\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
</ImportGroup>
</Project>

2
samples/Skia.Forms.Demo/UWP/project.json
Просмотреть файл

@ -1,7 +1,7 @@
{
"dependencies": {
"Microsoft.NETCore.UniversalWindowsPlatform": "5.1.0",
"SkiaSharp": "1.49.4-beta4",
"SkiaSharp": "1.49.4-beta",
"Xamarin.Forms": "2.3.0.38-pre2"
},
"frameworks": {

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

@ -79,7 +79,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="SkiaSharp, Version=1.49.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SkiaSharp.1.49.4-beta4\lib\XamariniOS\SkiaSharp.dll</HintPath>
<HintPath>..\packages\SkiaSharp.1.49.4-beta\lib\XamariniOS\SkiaSharp.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />

2
samples/Skia.Forms.Demo/iOS/packages.config
Просмотреть файл

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="SkiaSharp" version="1.49.4-beta4" targetFramework="xamarinios10" />
<package id="SkiaSharp" version="1.49.4-beta" targetFramework="xamarinios10" />
<package id="Xamarin.Forms" version="2.3.0.38-pre2" targetFramework="xamarinios10" />
</packages>

2
samples/Skia.Forms.Demo/packages.config
Просмотреть файл

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="SkiaSharp" version="1.49.4-beta4" targetFramework="portable45-net45+win8+wp8" />
<package id="SkiaSharp" version="1.49.4-beta" targetFramework="portable45-net45+win8+wp8" />
<package id="Xamarin.Forms" version="2.3.0.38-pre2" targetFramework="portable45-net45+win8+wp8" />
</packages>

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

@ -56,7 +56,7 @@
<Reference Include="System.Core" />
<Reference Include="Xamarin.Mac" />
<Reference Include="SkiaSharp">
<HintPath>packages\SkiaSharp.1.49.4-beta4\lib\XamarinMac\SkiaSharp.dll</HintPath>
<HintPath>packages\SkiaSharp.1.49.4-beta\lib\XamarinMac\SkiaSharp.dll</HintPath>
<Private>False</Private>
</Reference>
</ItemGroup>
@ -115,5 +115,5 @@
</BundleResource>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" />
<Import Project="packages\SkiaSharp.1.49.4-beta4\build\XamarinMac\SkiaSharp.targets" Condition="Exists('packages\SkiaSharp.1.49.4-beta4\build\XamarinMac\SkiaSharp.targets')" />
<Import Project="packages\SkiaSharp.1.49.4-beta\build\XamarinMac\SkiaSharp.targets" Condition="Exists('packages\SkiaSharp.1.49.4-beta\build\XamarinMac\SkiaSharp.targets')" />
</Project>

2
samples/Skia.OSX.Demo/packages.config
Просмотреть файл

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="SkiaSharp" version="1.49.4-beta4" targetFramework="xamarinmac20" />
<package id="SkiaSharp" version="1.49.4-beta" targetFramework="xamarinmac20" />
</packages>

2
samples/Skia.UWP.Demo/Skia.UWP.Demo.nuget.targets
Просмотреть файл

@ -4,6 +4,6 @@
<NuGetPackageRoot>$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
</PropertyGroup>
<ImportGroup>
<Import Project="$(NuGetPackageRoot)\SkiaSharp\1.49.4-beta4\build\uap10.0\SkiaSharp.targets" Condition="Exists('$(NuGetPackageRoot)\SkiaSharp\1.49.4-beta4\build\uap10.0\SkiaSharp.targets')" />
<Import Project="$(NuGetPackageRoot)\SkiaSharp\1.49.4-beta\build\uap10.0\SkiaSharp.targets" Condition="Exists('$(NuGetPackageRoot)\SkiaSharp\1.49.4-beta\build\uap10.0\SkiaSharp.targets')" />
</ImportGroup>
</Project>

2
samples/Skia.UWP.Demo/project.json
Просмотреть файл

@ -4,7 +4,7 @@
"Microsoft.ApplicationInsights.PersistenceChannel": "1.0.0",
"Microsoft.ApplicationInsights.WindowsApps": "1.0.0",
"Microsoft.NETCore.UniversalWindowsPlatform": "5.0.0",
"SkiaSharp": "1.49.4-beta4"
"SkiaSharp": "1.49.4-beta"
},
"frameworks": {
"uap10.0": {}

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

@ -87,7 +87,7 @@
<ItemGroup>
<Reference Include="Microsoft.CSharp" />
<Reference Include="SkiaSharp, Version=1.49.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>packages\SkiaSharp.1.49.4-beta4\lib\net45\SkiaSharp.dll</HintPath>
<HintPath>packages\SkiaSharp.1.49.4-beta\lib\net45\SkiaSharp.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
@ -133,11 +133,11 @@
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="packages\SkiaSharp.1.49.4-beta4\build\net45\SkiaSharp.targets" Condition="Exists('packages\SkiaSharp.1.49.4-beta4\build\net45\SkiaSharp.targets')" />
<Import Project="packages\SkiaSharp.1.49.4-beta\build\net45\SkiaSharp.targets" Condition="Exists('packages\SkiaSharp.1.49.4-beta\build\net45\SkiaSharp.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('packages\SkiaSharp.1.49.4-beta4\build\net45\SkiaSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\SkiaSharp.1.49.4-beta4\build\net45\SkiaSharp.targets'))" />
<Error Condition="!Exists('packages\SkiaSharp.1.49.4-beta\build\net45\SkiaSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\SkiaSharp.1.49.4-beta\build\net45\SkiaSharp.targets'))" />
</Target>
</Project>

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

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="SkiaSharp" version="1.49.4-beta4" targetFramework="net45" />
<package id="SkiaSharp" version="1.49.4-beta" targetFramework="net45" />
</packages>

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

@ -86,7 +86,7 @@
<Reference Include="System.Core" />
<Reference Include="Xamarin.TVOS" />
<Reference Include="SkiaSharp">
<HintPath>packages\SkiaSharp.1.49.4-beta4\lib\XamarintvOS\SkiaSharp.dll</HintPath>
<HintPath>packages\SkiaSharp.1.49.4-beta\lib\XamarintvOS\SkiaSharp.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>

2
samples/Skia.tvOS.Demo/packages.config
Просмотреть файл

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="SkiaSharp" version="1.49.4-beta4" targetFramework="xamarintvos10" />
<package id="SkiaSharp" version="1.49.4-beta" targetFramework="xamarintvos10" />
</packages>