Updated to SDK2.0 Lumia.Imaging namespace

Ignoring generated files.
This commit is contained in:
Magnus Olofstam 2014-12-10 14:42:23 +01:00
Родитель 748d3437a9
Коммит b9b1dbd9f8
4 изменённых файлов: 17 добавлений и 8 удалений

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

@ -0,0 +1,6 @@
Bin/
obj/
*.suo
packages/
*.chm
*.user

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

@ -27,7 +27,7 @@
<ThrowErrorsInValidation>true</ThrowErrorsInValidation> <ThrowErrorsInValidation>true</ThrowErrorsInValidation>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages> <RestorePackages>true</RestorePackages>
<NuGetPackageImportStamp>c1b7280d</NuGetPackageImportStamp> <NuGetPackageImportStamp>65ec4bfb</NuGetPackageImportStamp>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
@ -124,6 +124,7 @@
</Page> </Page>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="Help\Lumia Imaging SDK.chm" />
<None Include="Help\Nokia Imaging SDK.chm" /> <None Include="Help\Nokia Imaging SDK.chm" />
<None Include="packages.config" /> <None Include="packages.config" />
<None Include="Properties\AppManifest.xml" /> <None Include="Properties\AppManifest.xml" />
@ -153,12 +154,12 @@
</EmbeddedResource> </EmbeddedResource>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Lumia.Imaging.Managed">
<HintPath>..\packages\LumiaImagingSDK.2.0.142-alpha\lib\wp8\Lumia.Imaging.Managed.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Phone.Controls.Toolkit"> <Reference Include="Microsoft.Phone.Controls.Toolkit">
<HintPath>..\packages\WPtoolkit.4.2013.08.16\lib\wp8\Microsoft.Phone.Controls.Toolkit.dll</HintPath> <HintPath>..\packages\WPtoolkit.4.2013.08.16\lib\wp8\Microsoft.Phone.Controls.Toolkit.dll</HintPath>
</Reference> </Reference>
<Reference Include="Nokia.Graphics.Imaging.Managed">
<HintPath>..\packages\NokiaImagingSDK.1.2.115\lib\wp8\Nokia.Graphics.Imaging.Managed.dll</HintPath>
</Reference>
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Microsoft\$(TargetFrameworkIdentifier)\$(TargetFrameworkVersion)\Microsoft.$(TargetFrameworkIdentifier).$(TargetFrameworkVersion).Overrides.targets" /> <Import Project="$(MSBuildExtensionsPath)\Microsoft\$(TargetFrameworkIdentifier)\$(TargetFrameworkVersion)\Microsoft.$(TargetFrameworkIdentifier).$(TargetFrameworkVersion).Overrides.targets" />
<Import Project="$(MSBuildExtensionsPath)\Microsoft\$(TargetFrameworkIdentifier)\$(TargetFrameworkVersion)\Microsoft.$(TargetFrameworkIdentifier).CSharp.targets" /> <Import Project="$(MSBuildExtensionsPath)\Microsoft\$(TargetFrameworkIdentifier)\$(TargetFrameworkVersion)\Microsoft.$(TargetFrameworkIdentifier).CSharp.targets" />
@ -171,11 +172,11 @@
--> -->
<ProjectExtensions /> <ProjectExtensions />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" /> <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
<Import Project="..\packages\NokiaImagingSDK.1.2.115\build\wp8\NokiaImagingSDK.targets" Condition="Exists('..\packages\NokiaImagingSDK.1.2.115\build\wp8\NokiaImagingSDK.targets')" /> <Import Project="..\packages\LumiaImagingSDK.2.0.142-alpha\build\wp8\LumiaImagingSDK.targets" Condition="Exists('..\packages\LumiaImagingSDK.2.0.142-alpha\build\wp8\LumiaImagingSDK.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup> <PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup> </PropertyGroup>
<Error Condition="!Exists('..\packages\NokiaImagingSDK.1.2.115\build\wp8\NokiaImagingSDK.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NokiaImagingSDK.1.2.115\build\wp8\NokiaImagingSDK.targets'))" /> <Error Condition="!Exists('..\packages\LumiaImagingSDK.2.0.142-alpha\build\wp8\LumiaImagingSDK.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LumiaImagingSDK.2.0.142-alpha\build\wp8\LumiaImagingSDK.targets'))" />
</Target> </Target>
</Project> </Project>

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

@ -12,7 +12,7 @@ using ChromaKeyDemo.Resources;
using Microsoft.Devices; using Microsoft.Devices;
using Microsoft.Phone.Controls; using Microsoft.Phone.Controls;
using Microsoft.Phone.Shell; using Microsoft.Phone.Shell;
using Nokia.Graphics.Imaging; using Lumia.Imaging;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Windows; using System.Windows;
@ -21,6 +21,8 @@ using System.Windows.Media.Imaging;
using System.Windows.Navigation; using System.Windows.Navigation;
using System.Windows.Threading; using System.Windows.Threading;
using Windows.Phone.Media.Capture; using Windows.Phone.Media.Capture;
using Lumia.Imaging.Transforms;
using Lumia.Imaging.Compositing;
namespace ChromaKeyDemo.Pages namespace ChromaKeyDemo.Pages
{ {

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

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="NokiaImagingSDK" version="1.2.115" targetFramework="wp80" /> <package id="LumiaImagingSDK" version="2.0.142-alpha" targetFramework="wp80" />
<package id="WPtoolkit" version="4.2013.08.16" targetFramework="wp80" /> <package id="WPtoolkit" version="4.2013.08.16" targetFramework="wp80" />
</packages> </packages>