Update FaceDetection to 1.2.8

xamarin · Dec 1, 2016 · 51e4437 · 51e4437
1 parent ed2c466
commit 51e4437
Show file tree

Hide file tree

Showing 14 changed files with 500 additions and 7,206 deletions.
diff --git a/FaceDetection/Core/FaceDetection.csproj b/FaceDetection/Core/FaceDetection.csproj
@@ -41,8 +41,8 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="Urho">
-      <HintPath>..\packages\UrhoSharp.1.0.500\lib\portable-net45+win8+monoandroid+monotouch+Xamarin.iOS10\Urho.dll</HintPath>
+    <Reference Include="Urho, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\UrhoSharp.1.2.8\lib\portable-net45+win8+monoandroid+monotouch+Xamarin.iOS10\Urho.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>

diff --git a/FaceDetection/Core/UrhoApp.cs b/FaceDetection/Core/UrhoApp.cs
@@ -4,7 +4,6 @@
 using Urho;
 using Urho.Gui;
 using Urho.Actions;
-using Urho.Repl;
 using Urho.Urho2D;
 
 namespace FaceDetection
@@ -19,6 +18,7 @@ public class UrhoApp : Application
 
 		public const int VideoCapturingFPS = 0; //200, 60, 24, 0 (no limit)
 
+		[Preserve]
 		public UrhoApp(ApplicationOptions options) : base(options) {}
 
 		public async void CaptureVideo(Func<Task<FrameWithFaces>> frameSource)

diff --git a/FaceDetection/Core/packages.config b/FaceDetection/Core/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="UrhoSharp" version="1.0.500" targetFramework="portable45-net45+win8" />
+  <package id="UrhoSharp" version="1.2.8" targetFramework="portable45-net45+win8" />
 </packages>
diff --git a/FaceDetection/Desktop/FaceDetection.Desktop.csproj b/FaceDetection/Desktop/FaceDetection.Desktop.csproj
@@ -39,7 +39,7 @@
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Xml" />
     <Reference Include="Urho, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UrhoSharp.1.0.500\lib\net45\Urho.dll</HintPath>
+      <HintPath>..\packages\UrhoSharp.1.2.8\lib\net45\Urho.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>
@@ -74,11 +74,11 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\packages\UrhoSharp.1.0.500\build\net45\UrhoSharp.targets" Condition="Exists('..\packages\UrhoSharp.1.0.500\build\net45\UrhoSharp.targets')" />
+  <Import Project="..\packages\UrhoSharp.1.2.8\build\net45\UrhoSharp.targets" Condition="Exists('..\packages\UrhoSharp.1.2.8\build\net45\UrhoSharp.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\UrhoSharp.1.0.500\build\net45\UrhoSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\UrhoSharp.1.0.500\build\net45\UrhoSharp.targets'))" />
+    <Error Condition="!Exists('..\packages\UrhoSharp.1.2.8\build\net45\UrhoSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\UrhoSharp.1.2.8\build\net45\UrhoSharp.targets'))" />
   </Target>
 </Project>
diff --git a/FaceDetection/Desktop/packages.config b/FaceDetection/Desktop/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="UrhoSharp" version="1.0.500" targetFramework="net45" />
+  <package id="UrhoSharp" version="1.2.8" targetFramework="net45" />
 </packages>
diff --git a/FaceDetection/Droid/FaceDetection.Droid.csproj b/FaceDetection/Droid/FaceDetection.Droid.csproj
@@ -16,7 +16,7 @@
     <AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
     <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
     <AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
-    <TargetFrameworkVersion>v6.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v7.0</TargetFrameworkVersion>
     <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
@@ -50,7 +50,15 @@
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Xml" />
     <Reference Include="Urho, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UrhoSharp.1.0.500\lib\MonoAndroid\Urho.dll</HintPath>
+      <HintPath>..\packages\UrhoSharp.1.2.8\lib\MonoAndroid\Urho.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Urho.Droid.GoogleVR, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\UrhoSharp.1.2.8\lib\MonoAndroid\Urho.Droid.GoogleVR.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Urho.Droid.SdlBinding, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\UrhoSharp.1.2.8\lib\MonoAndroid\Urho.Droid.SdlBinding.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>
@@ -73,21 +81,21 @@
     <None Include="packages.config" />
     <None Include="Properties\AndroidManifest.xml" />
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="UrhoSharpReadme.txt" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Core\FaceDetection.csproj">
       <Project>{47bbbf31-9620-4c61-81ba-eaa693f72a78}</Project>
       <Name>FaceDetection</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="UrhoSharpReadme.txt" />
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
-  <Import Project="..\packages\UrhoSharp.1.0.500\build\MonoAndroid\UrhoSharp.targets" Condition="Exists('..\packages\UrhoSharp.1.0.500\build\MonoAndroid\UrhoSharp.targets')" />
+  <Import Project="..\packages\UrhoSharp.1.2.8\build\MonoAndroid\UrhoSharp.targets" Condition="Exists('..\packages\UrhoSharp.1.2.8\build\MonoAndroid\UrhoSharp.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\UrhoSharp.1.0.500\build\MonoAndroid\UrhoSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\UrhoSharp.1.0.500\build\MonoAndroid\UrhoSharp.targets'))" />
+    <Error Condition="!Exists('..\packages\UrhoSharp.1.2.8\build\MonoAndroid\UrhoSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\UrhoSharp.1.2.8\build\MonoAndroid\UrhoSharp.targets'))" />
   </Target>
 </Project>
diff --git a/FaceDetection/Droid/FaceDetection.Droid.csproj.bak b/FaceDetection/Droid/FaceDetection.Droid.csproj.bak
@@ -50,7 +50,7 @@
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Xml" />
     <Reference Include="Urho, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\UrhoSharp.1.0.500\lib\MonoAndroid\Urho.dll</HintPath>
+      <HintPath>..\packages\UrhoSharp.1.2.8\lib\MonoAndroid\Urho.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>
@@ -65,26 +65,29 @@
     <AndroidAsset Include="Assets\Data\Models\Sphere.mdl" />
     <AndroidAsset Include="Assets\Data\Materials\BoxMaterial.xml" />
     <AndroidAsset Include="Assets\Data\Textures\xamarin.png" />
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\drawable\Icon.png" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="packages.config" />
     <None Include="Properties\AndroidManifest.xml" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\FaceDetection\FaceDetection.csproj">
+    <Content Include="UrhoSharpReadme.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Core\FaceDetection.csproj">
+      <Project>{47bbbf31-9620-4c61-81ba-eaa693f72a78}</Project>
       <Name>FaceDetection</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup />
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
-  <Import Project="..\..\packages\UrhoSharp.1.0.500\build\MonoAndroid\UrhoSharp.targets" Condition="Exists('..\..\packages\UrhoSharp.1.0.500\build\MonoAndroid\UrhoSharp.targets')" />
+  <Import Project="..\packages\UrhoSharp.1.2.8\build\MonoAndroid\UrhoSharp.targets" Condition="Exists('..\packages\UrhoSharp.1.2.8\build\MonoAndroid\UrhoSharp.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\UrhoSharp.1.0.500\build\MonoAndroid\UrhoSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\UrhoSharp.1.0.500\build\MonoAndroid\UrhoSharp.targets'))" />
+    <Error Condition="!Exists('..\packages\UrhoSharp.1.2.8\build\MonoAndroid\UrhoSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\UrhoSharp.1.2.8\build\MonoAndroid\UrhoSharp.targets'))" />
   </Target>
 </Project>
diff --git a/FaceDetection/Droid/packages.config b/FaceDetection/Droid/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="UrhoSharp" version="1.0.500" targetFramework="monoandroid6.0.99" />
+  <package id="UrhoSharp" version="1.2.8" targetFramework="monoandroid60" />
 </packages>
diff --git a/FaceDetection/UWP/FaceDetection.UWP.nuget.targets b/FaceDetection/UWP/FaceDetection.UWP.nuget.targets
@@ -4,6 +4,6 @@
     <NuGetPackageRoot>$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
   </PropertyGroup>
   <ImportGroup>
-    <Import Project="$(NuGetPackageRoot)\UrhoSharp\1.0.500\build\uap10.0\UrhoSharp.targets" Condition="Exists('$(NuGetPackageRoot)\UrhoSharp\1.0.500\build\uap10.0\UrhoSharp.targets')" />
+    <Import Project="$(NuGetPackageRoot)\UrhoSharp\1.2.8\build\uap10.0\UrhoSharp.targets" Condition="Exists('$(NuGetPackageRoot)\UrhoSharp\1.2.8\build\uap10.0\UrhoSharp.targets')" />
   </ImportGroup>
 </Project>
diff --git a/FaceDetection/UWP/project.json b/FaceDetection/UWP/project.json
@@ -1,17 +1,13 @@
 {
   "dependencies": {
     "Microsoft.NETCore.UniversalWindowsPlatform": "5.0.0",
-    "UrhoSharp": "1.0.500"
+    "UrhoSharp": "1.2.8"
   },
   "frameworks": {
     "uap10.0": {}
   },
   "runtimes": {
-    "win10-arm": {},
-    "win10-arm-aot": {},
     "win10-x86": {},
-    "win10-x86-aot": {},
-    "win10-x64": {},
-    "win10-x64-aot": {}
+    "win10-x86-aot": {}
   }
 }