Updatexd the UWP project files

This commit is contained in:
Matthew Leibowitz 2016-10-05 17:38:01 +02:00
Родитель 9dd8822c3e
Коммит 0abd522b65
7 изменённых файлов: 28 добавлений и 106 удалений

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

@ -362,9 +362,11 @@
<ReservedNames>
<ReservedName>Skia.UWP.Demo</ReservedName>
<ReservedName>SkiaSharp for Windows</ReservedName>
<ReservedName>SkiaSharp for Xamarin.Forms</ReservedName>
</ReservedNames>
</ProductReservedInfo>
<AccountPackageIdentityNames>
<MainPackageIdentityName>51681.NETDevelopmentAddic..NETDevelopmentAddict</MainPackageIdentityName>
<MainPackageIdentityName>51681.NETDevelopmentAddic.EnergyCubes</MainPackageIdentityName>
<MainPackageIdentityName>51681.NETDevelopmentAddic.MerryChristmasApp</MainPackageIdentityName>
</AccountPackageIdentityNames>

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

@ -1,48 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<Package
xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
IgnorableNamespaces="uap mp">
<Identity
Name="51681.NETDevelopmentAddic.Skia.UWP.Demo"
Publisher="CN=B0BB84CF-0033-49C8-BB54-7D95062245A2"
Version="1.54.1.0" />
<mp:PhoneIdentity PhoneProductId="ba3af39c-4820-4731-a149-e78facd8bdff" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp">
<Identity Name="51681.NETDevelopmentAddic.Skia.UWP.Demo" Publisher="CN=B0BB84CF-0033-49C8-BB54-7D95062245A2" Version="1.54.1.0" />
<mp:PhoneIdentity PhoneProductId="ba3af39c-4820-4731-a149-e78facd8bdff" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
<Properties>
<DisplayName>SkiaSharp for Windows</DisplayName>
<DisplayName>SkiaSharp for Xamarin.Forms</DisplayName>
<PublisherDisplayName>.NET Development Addict</PublisherDisplayName>
<Logo>Assets\StoreLogo.png</Logo>
</Properties>
<Dependencies>
<TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.0.0" />
</Dependencies>
<Resources>
<Resource Language="x-generate"/>
<Resource Language="x-generate" />
</Resources>
<Applications>
<Application Id="App"
Executable="$targetnametoken$.exe"
EntryPoint="SkiaSharpSample.FormsSample.Platform.App">
<uap:VisualElements
DisplayName="SkiaSharp for Windows"
Square150x150Logo="Assets\Square150x150Logo.png"
Square44x44Logo="Assets\Square44x44Logo.png"
Description="This is a sample app demonstrating some of the many features of SkiaSharp. The source code is available at: http://github.com/mono/SkiaSharp"
BackgroundColor="transparent">
<uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png"/>
<Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="SkiaSharpSample.FormsSample.Platform.App">
<uap:VisualElements DisplayName="SkiaSharp for Xamarin.Forms" Square150x150Logo="Assets\Square150x150Logo.png" Square44x44Logo="Assets\Square44x44Logo.png" Description="This is a sample app demonstrating some of the many features of SkiaSharp. The source code is available at: http://github.com/mono/SkiaSharp" BackgroundColor="transparent">
<uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png">
</uap:DefaultTile>
<uap:SplashScreen Image="Assets\SplashScreen.png" BackgroundColor="#f8f8f8" />
</uap:VisualElements>
</Application>
</Applications>
<Capabilities>
</Capabilities>
</Package>

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

@ -19,6 +19,9 @@
<ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<PackageCertificateKeyFile>..\..\AppStoreCertificates\Skia.UWP.Demo_StoreKey.pfx</PackageCertificateKeyFile>
<PackageCertificateThumbprint>77BB456C567B1501535FACDA67D559B9513862C1</PackageCertificateThumbprint>
<AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
<AppxBundle>Always</AppxBundle>
<AppxBundlePlatforms>x86|x64|arm</AppxBundlePlatforms>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
<DebugSymbols>true</DebugSymbols>

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

@ -5,18 +5,6 @@ VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UWPSample", "UWPSample\UWPSample.csproj", "{BFC6B190-A17C-4538-B2C6-EEDA46D87EFE}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SkiaSharp.Views", "SkiaSharp.Views", "{6B67133E-E932-4567-9052-2689AEDF76C6}"
EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SkiaSharp.Views.Shared", "..\..\source\SkiaSharp.Views\SkiaSharp.Views.Shared\SkiaSharp.Views.Shared.shproj", "{5A67972C-1C04-4913-9950-06A03BFE9533}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.Views.UWP", "..\..\source\SkiaSharp.Views\SkiaSharp.Views.UWP\SkiaSharp.Views.UWP.csproj", "{8BB20362-91A2-4206-944D-634070EAC6F3}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SkiaSharp", "SkiaSharp", "{384970C2-6392-4134-91D5-BE9AB7209DF9}"
EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Binding", "..\..\binding\Binding\Binding.shproj", "{9C502B9A-25D4-473F-89BD-5A13DDE16354}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.UWP", "..\..\binding\SkiaSharp.UWP\SkiaSharp.UWP.csproj", "{BAB615AA-956E-4079-B260-DD7B1F52EC7D}"
EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SkiaSharpSample.Shared", "..\SkiaSharpSample.Shared\SkiaSharpSample.Shared.shproj", "{509B233A-35A0-41CA-A585-0B1A9F79D470}"
EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SkiaSharpSample.Platform.Shared", "..\SkiaSharpSample.Platform.Shared\SkiaSharpSample.Platform.Shared.shproj", "{0CC41AB0-0C4C-4DAA-8F10-A249725EBF5D}"
@ -25,10 +13,6 @@ Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
..\SkiaSharpSample.Platform.Shared\SkiaSharpSample.Platform.Shared.projitems*{0cc41ab0-0c4c-4daa-8f10-a249725ebf5d}*SharedItemsImports = 13
..\SkiaSharpSample.Shared\SkiaSharpSample.Shared.projitems*{509b233a-35a0-41ca-a585-0b1a9f79d470}*SharedItemsImports = 13
..\..\source\SkiaSharp.Views\SkiaSharp.Views.Shared\SkiaSharp.Views.Shared.projitems*{5a67972c-1c04-4913-9950-06a03bfe9533}*SharedItemsImports = 13
..\..\source\SkiaSharp.Views\SkiaSharp.Views.Shared\SkiaSharp.Views.Shared.projitems*{8bb20362-91a2-4206-944d-634070eac6f3}*SharedItemsImports = 4
..\..\binding\Binding\Binding.projitems*{9c502b9a-25d4-473f-89bd-5a13dde16354}*SharedItemsImports = 13
..\..\binding\Binding\Binding.projitems*{bab615aa-956e-4079-b260-dd7b1f52ec7d}*SharedItemsImports = 4
..\SkiaSharpSample.Platform.Shared\SkiaSharpSample.Platform.Shared.projitems*{bfc6b190-a17c-4538-b2c6-eeda46d87efe}*SharedItemsImports = 4
..\SkiaSharpSample.Shared\SkiaSharpSample.Shared.projitems*{bfc6b190-a17c-4538-b2c6-eeda46d87efe}*SharedItemsImports = 4
EndGlobalSection
@ -63,46 +47,8 @@ Global
{BFC6B190-A17C-4538-B2C6-EEDA46D87EFE}.Release|x86.ActiveCfg = Release|x86
{BFC6B190-A17C-4538-B2C6-EEDA46D87EFE}.Release|x86.Build.0 = Release|x86
{BFC6B190-A17C-4538-B2C6-EEDA46D87EFE}.Release|x86.Deploy.0 = Release|x86
{8BB20362-91A2-4206-944D-634070EAC6F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8BB20362-91A2-4206-944D-634070EAC6F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8BB20362-91A2-4206-944D-634070EAC6F3}.Debug|ARM.ActiveCfg = Debug|Any CPU
{8BB20362-91A2-4206-944D-634070EAC6F3}.Debug|ARM.Build.0 = Debug|Any CPU
{8BB20362-91A2-4206-944D-634070EAC6F3}.Debug|x64.ActiveCfg = Debug|Any CPU
{8BB20362-91A2-4206-944D-634070EAC6F3}.Debug|x64.Build.0 = Debug|Any CPU
{8BB20362-91A2-4206-944D-634070EAC6F3}.Debug|x86.ActiveCfg = Debug|Any CPU
{8BB20362-91A2-4206-944D-634070EAC6F3}.Debug|x86.Build.0 = Debug|Any CPU
{8BB20362-91A2-4206-944D-634070EAC6F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8BB20362-91A2-4206-944D-634070EAC6F3}.Release|Any CPU.Build.0 = Release|Any CPU
{8BB20362-91A2-4206-944D-634070EAC6F3}.Release|ARM.ActiveCfg = Release|Any CPU
{8BB20362-91A2-4206-944D-634070EAC6F3}.Release|ARM.Build.0 = Release|Any CPU
{8BB20362-91A2-4206-944D-634070EAC6F3}.Release|x64.ActiveCfg = Release|Any CPU
{8BB20362-91A2-4206-944D-634070EAC6F3}.Release|x64.Build.0 = Release|Any CPU
{8BB20362-91A2-4206-944D-634070EAC6F3}.Release|x86.ActiveCfg = Release|Any CPU
{8BB20362-91A2-4206-944D-634070EAC6F3}.Release|x86.Build.0 = Release|Any CPU
{BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Debug|ARM.ActiveCfg = Debug|Any CPU
{BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Debug|ARM.Build.0 = Debug|Any CPU
{BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Debug|x64.ActiveCfg = Debug|Any CPU
{BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Debug|x64.Build.0 = Debug|Any CPU
{BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Debug|x86.ActiveCfg = Debug|Any CPU
{BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Debug|x86.Build.0 = Debug|Any CPU
{BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Release|Any CPU.Build.0 = Release|Any CPU
{BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Release|ARM.ActiveCfg = Release|Any CPU
{BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Release|ARM.Build.0 = Release|Any CPU
{BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Release|x64.ActiveCfg = Release|Any CPU
{BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Release|x64.Build.0 = Release|Any CPU
{BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Release|x86.ActiveCfg = Release|Any CPU
{BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{5A67972C-1C04-4913-9950-06A03BFE9533} = {6B67133E-E932-4567-9052-2689AEDF76C6}
{8BB20362-91A2-4206-944D-634070EAC6F3} = {6B67133E-E932-4567-9052-2689AEDF76C6}
{9C502B9A-25D4-473F-89BD-5A13DDE16354} = {384970C2-6392-4134-91D5-BE9AB7209DF9}
{BAB615AA-956E-4079-B260-DD7B1F52EC7D} = {384970C2-6392-4134-91D5-BE9AB7209DF9}
EndGlobalSection
EndGlobal

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

@ -94,6 +94,7 @@
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<None Include="project.json" />
<None Include="UWPSample_TemporaryKey.pfx" />
</ItemGroup>
<ItemGroup>
<Compile Include="App.xaml.cs">
@ -108,13 +109,8 @@
<AppxManifest Include="Package.appxmanifest">
<SubType>Designer</SubType>
</AppxManifest>
<None Include="SkiaSharpSample.UWPSample_TemporaryKey.pfx" />
</ItemGroup>
<ItemGroup>
<Content Include="..\..\..\native-builds\lib\uwp\x86\libSkiaSharp.dll">
<Link>libSkiaSharp.dll</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Properties\Default.rd.xml" />
<Content Include="Assets\LockScreenLogo.scale-200.png" />
<Content Include="Assets\SplashScreen.scale-200.png" />
@ -134,20 +130,6 @@
<SubType>Designer</SubType>
</Page>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\binding\SkiaSharp.UWP\SkiaSharp.UWP.csproj">
<Project>{bab615aa-956e-4079-b260-dd7b1f52ec7d}</Project>
<Name>SkiaSharp.UWP</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.Interop.UWP\SkiaSharp.Views.Interop.UWP.vcxproj">
<Project>{162d75e5-b52a-4b43-b896-5d3f3a7ab90c}</Project>
<Name>SkiaSharp.Views.Interop.UWP</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.UWP\SkiaSharp.Views.UWP.csproj">
<Project>{8bb20362-91a2-4206-944d-634070eac6f3}</Project>
<Name>SkiaSharp.Views.UWP</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<SDKReference Include="WindowsDesktop, Version=10.0.10240.0">
<Name>Windows Desktop Extensions for the UWP</Name>

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

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Condition="'$(NuGetPackageRoot)' == ''">
<NuGetPackageRoot>$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
</PropertyGroup>
<ImportGroup>
<Import Project="$(NuGetPackageRoot)\SkiaSharp\1.54.1\build\uap10.0\SkiaSharp.targets" Condition="Exists('$(NuGetPackageRoot)\SkiaSharp\1.54.1\build\uap10.0\SkiaSharp.targets')" />
<Import Project="$(NuGetPackageRoot)\SkiaSharp.Views\1.54.1-beta1\build\uap10.0\SkiaSharp.Views.targets" Condition="Exists('$(NuGetPackageRoot)\SkiaSharp.Views\1.54.1-beta1\build\uap10.0\SkiaSharp.Views.targets')" />
</ImportGroup>
</Project>

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

@ -1,7 +1,9 @@
{
"dependencies": {
"Microsoft.NETCore.UniversalWindowsPlatform": "5.1.0",
"PCLStorage": "1.0.2"
"PCLStorage": "1.0.2",
"SkiaSharp": "1.54.1",
"SkiaSharp.Views": "1.54.1-beta1"
},
"frameworks": {
"uap10.0": {}