fixed cutting bug

Adrianotiger · Oct 4, 2019 · ea97d88 · ea97d88
1 parent 15b42c1
commit ea97d88
Show file tree

Hide file tree

Showing 21 changed files with 422 additions and 216 deletions.
diff --git a/src/AppWins/App.xaml.cs b/src/AppWins/App.xaml.cs
@@ -30,9 +30,10 @@ public App()
         {
             this.InitializeComponent();
             this.Suspending += OnSuspending;
+            MyData = new LocalData.LocalData(Windows.Storage.ApplicationData.Current.LocalFolder.Path, Environment.CurrentDirectory + "\\DesktopPet\\eSheep.exe");
         }
 
-        public static LocalData.LocalData MyData = new LocalData.LocalData();
+        public static LocalData.LocalData MyData = null;
 
         protected override void OnActivated(Windows.ApplicationModel.Activation.IActivatedEventArgs e)
         {

diff --git a/src/AppWins/OptionsWindow.csproj b/src/AppWins/OptionsWindow.csproj
@@ -11,7 +11,7 @@
     <AssemblyName>Options</AssemblyName>
     <DefaultLanguage>en-GB</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.17763.0</TargetPlatformVersion>
+    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.18362.0</TargetPlatformVersion>
     <TargetPlatformMinVersion>10.0.17134.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
@@ -160,7 +160,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>6.2.3</Version>
+      <Version>6.2.9</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>

diff --git a/src/AppWins/Properties/AssemblyInfo.cs b/src/AppWins/Properties/AssemblyInfo.cs
@@ -1,4 +1,5 @@
-using System.Reflection;
+using System.Resources;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
@@ -26,4 +27,6 @@
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
-[assembly: ComVisible(false)]
+[assembly: ComVisible(false)]
+[assembly: NeutralResourcesLanguage("en-GB")]
+
diff --git a/src/DesktopPet.csproj b/src/DesktopPet.csproj
@@ -121,15 +121,61 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="NAudio, Version=1.8.5.0, Culture=neutral">
-      <HintPath>packages\NAudio.1.8.5\lib\net35\NAudio.dll</HintPath>
+    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>packages\Microsoft.Bcl.AsyncInterfaces.1.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
+    </Reference>
+    <Reference Include="NAudio, Version=1.9.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>packages\NAudio.1.9.0\lib\net35\NAudio.dll</HintPath>
+    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>packages\System.Buffers.4.5.0\lib\netstandard2.0\System.Buffers.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Data.OracleClient" />
+    <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>packages\System.Memory.4.5.3\lib\netstandard2.0\System.Memory.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Net" />
+    <Reference Include="System.Numerics" />
+    <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>packages\System.Runtime.CompilerServices.Unsafe.4.6.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    </Reference>
     <Reference Include="System.Runtime.WindowsRuntime, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETCore\v4.5\System.Runtime.WindowsRuntime.dll</HintPath>
     </Reference>
+    <Reference Include="System.Security" />
+    <Reference Include="System.Security.AccessControl, Version=4.1.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>packages\System.Security.AccessControl.4.6.0\lib\net461\System.Security.AccessControl.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Security.Permissions, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>packages\System.Security.Permissions.4.6.0\lib\net461\System.Security.Permissions.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Security.Principal.Windows, Version=4.1.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>packages\System.Security.Principal.Windows.4.6.0\lib\net461\System.Security.Principal.Windows.dll</HintPath>
+    </Reference>
+    <Reference Include="System.ServiceProcess" />
+    <Reference Include="System.Text.Encodings.Web, Version=4.0.4.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>packages\System.Text.Encodings.Web.4.6.0\lib\netstandard2.0\System.Text.Encodings.Web.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Text.Json, Version=4.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>packages\System.Text.Json.4.6.0\lib\net461\System.Text.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>packages\System.Threading.Tasks.Extensions.4.5.3\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Transactions" />
+    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll</HintPath>
+    </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
@@ -141,6 +187,7 @@
     <Reference Include="Windows">
       <HintPath>C:\Program Files (x86)\Windows Kits\10\UnionMetadata\10.0.17763.0\Windows.winmd</HintPath>
     </Reference>
+    <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="dotNet\Animations.cs" />

diff --git a/src/DesktopPet.sln b/src/DesktopPet.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.28307.329
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29306.81
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DesktopPet", "DesktopPet.csproj", "{87663C46-C416-4AED-971B-7A16624C1F1D}"
 EndProject
@@ -53,14 +53,14 @@ Global
 		{1F2CE52E-2521-4181-8939-0E8CE00222E6}.Release|x86.ActiveCfg = Release|x86
 		{1F2CE52E-2521-4181-8939-0E8CE00222E6}.Release|x86.Build.0 = Release|x86
 		{1F2CE52E-2521-4181-8939-0E8CE00222E6}.Release|x86.Deploy.0 = Release|x86
-		{E95D998F-DF30-4C58-8FE7-EF10374D8AC5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E95D998F-DF30-4C58-8FE7-EF10374D8AC5}.Debug|x64.Build.0 = Debug|Any CPU
-		{E95D998F-DF30-4C58-8FE7-EF10374D8AC5}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E95D998F-DF30-4C58-8FE7-EF10374D8AC5}.Debug|x86.Build.0 = Debug|Any CPU
-		{E95D998F-DF30-4C58-8FE7-EF10374D8AC5}.Release|x64.ActiveCfg = Release|Any CPU
-		{E95D998F-DF30-4C58-8FE7-EF10374D8AC5}.Release|x64.Build.0 = Release|Any CPU
-		{E95D998F-DF30-4C58-8FE7-EF10374D8AC5}.Release|x86.ActiveCfg = Release|Any CPU
-		{E95D998F-DF30-4C58-8FE7-EF10374D8AC5}.Release|x86.Build.0 = Release|Any CPU
+		{E95D998F-DF30-4C58-8FE7-EF10374D8AC5}.Debug|x64.ActiveCfg = Debug|x64
+		{E95D998F-DF30-4C58-8FE7-EF10374D8AC5}.Debug|x64.Build.0 = Debug|x64
+		{E95D998F-DF30-4C58-8FE7-EF10374D8AC5}.Debug|x86.ActiveCfg = Debug|x86
+		{E95D998F-DF30-4C58-8FE7-EF10374D8AC5}.Debug|x86.Build.0 = Debug|x86
+		{E95D998F-DF30-4C58-8FE7-EF10374D8AC5}.Release|x64.ActiveCfg = Release|x64
+		{E95D998F-DF30-4C58-8FE7-EF10374D8AC5}.Release|x64.Build.0 = Release|x64
+		{E95D998F-DF30-4C58-8FE7-EF10374D8AC5}.Release|x86.ActiveCfg = Release|x86
+		{E95D998F-DF30-4C58-8FE7-EF10374D8AC5}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE