Commit before fixing FFMpeg on mobile

NGame1 · Dec 1, 2022 · faf15be · faf15be
1 parent 96d65db
commit faf15be
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 23 deletions.
diff --git a/ViewModels/ViewModels.csproj b/ViewModels/ViewModels.csproj
@@ -13,8 +13,9 @@
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
     <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.22621.0</TargetPlatformVersion>
-    <!--<TargetPlatformMinVersion Condition=" '$(TargetPlatformMinVersion)' == '' ">10.0.15063.0</TargetPlatformMinVersion>-->
-    <TargetPlatformMinVersion Condition=" '$(TargetPlatformMinVersion)' == '' ">10.0.17763.0</TargetPlatformMinVersion>
+    <TargetPlatformMinVersion Condition=" '$(TargetPlatformMinVersion)' == '' ">10.0.15063.0</TargetPlatformMinVersion>
+    <DefineConstants>WINDOWS_UWP;WINDOWS_UWP15063</DefineConstants>
+    <!--<TargetPlatformMinVersion Condition=" '$(TargetPlatformMinVersion)' == '' ">10.0.17763.0</TargetPlatformMinVersion>-->
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
@@ -161,18 +162,21 @@
     <EmbeddedResource Include="Properties\ViewModels.rd.xml" />
   </ItemGroup>
   <!--For 15063 Min Target and Above-->
-  <!--<ItemGroup Condition="'$(TargetPlatformMinVersion)' == '10.0.15063.0'">
+  <ItemGroup Condition="'$(TargetPlatformMinVersion)' == '10.0.15063.0'">
+    <PackageReference Include="ImageCropper.UWP">
+      <Version>1.3.0</Version>
+    </PackageReference>
     <PackageReference Include="System.Threading.Thread">
       <Version>4.3.0</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Toolkit.Uwp">
-      <Version>4.0.0</Version>
+      <Version>5.0.0-preview.gb86cb1c4cb</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Toolkit.Uwp.UI">
-      <Version>4.0.0</Version>
+      <Version>5.0.0-preview.gb86cb1c4cb</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls">
-      <Version>4.0.0</Version>
+      <Version>5.0.0-preview.gb86cb1c4cb</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.UI.Xaml">
       <Version>2.7.3</Version>
@@ -183,7 +187,7 @@
       <Project>{898C6B7E-C8FE-418F-9348-B32DA493FA10}</Project>
       <Name>WinstaCore</Name>
     </ProjectReference>
-  </ItemGroup>-->
+  </ItemGroup>
   <!--For 16299 Min Target and Above-->
   <!--<ItemGroup>
 		<ProjectReference Include="..\Microsoft.Toolkit.Mvvm\Microsoft.Toolkit.Mvvm.csproj">
@@ -201,7 +205,7 @@
 		</PackageReference>
 	</ItemGroup>-->
   <!--For 177763 Min Target and Above-->
-  <ItemGroup Condition="'$(TargetPlatformMinVersion)' == '10.0.17763.0'">
+  <!--<ItemGroup Condition="'$(TargetPlatformMinVersion)' == '10.0.17763.0'">
     <PackageReference Include="Microsoft.Toolkit.Mvvm">
       <Version>7.1.2</Version>
     </PackageReference>
@@ -217,13 +221,13 @@
     <PackageReference Include="Microsoft.UI.Xaml">
       <Version>2.8.1</Version>
     </PackageReference>
-  </ItemGroup>
+  </ItemGroup>-->
   <ItemGroup>
     <PackageReference Include="FFmpegInteropX">
-      <Version>1.1.0-pre38</Version>
+      <Version>1.0.0</Version>
     </PackageReference>
     <PackageReference Include="FFmpegInteropX.FFmpegUWP">
-      <Version>5.1.100</Version>
+      <Version>4.2.200</Version>
     </PackageReference>
     <PackageReference Include="Fody">
       <Version>6.6.4</Version>
@@ -237,7 +241,7 @@
       <Version>6.2.14</Version>
     </PackageReference>
     <PackageReference Include="PropertyChanged.Fody">
-      <Version>4.1.0</Version>
+      <Version>3.4.1</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>

diff --git a/WinstaCore/WinstaCore.csproj b/WinstaCore/WinstaCore.csproj
@@ -13,8 +13,8 @@
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
     <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.22621.0</TargetPlatformVersion>
-    <!--<TargetPlatformMinVersion Condition=" '$(TargetPlatformMinVersion)' == '' ">10.0.15063.0</TargetPlatformMinVersion>-->
-    <TargetPlatformMinVersion Condition=" '$(TargetPlatformMinVersion)' == '' ">10.0.17763.0</TargetPlatformMinVersion>
+    <TargetPlatformMinVersion Condition=" '$(TargetPlatformMinVersion)' == '' ">10.0.15063.0</TargetPlatformMinVersion>
+    <!--<TargetPlatformMinVersion Condition=" '$(TargetPlatformMinVersion)' == '' ">10.0.17763.0</TargetPlatformMinVersion>-->
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
@@ -190,23 +190,23 @@
     <EmbeddedResource Include="Properties\WinstaCore.rd.xml" />
   </ItemGroup>
   <!--For 15063 Min Target and Above-->
-  <!--<ItemGroup Condition="'$(TargetPlatformMinVersion)' == '10.0.15063.0'">
+  <ItemGroup Condition="'$(TargetPlatformMinVersion)' == '10.0.15063.0'">
     <PackageReference Include="Microsoft.UI.Xaml">
       <Version>2.7.3</Version>
     </PackageReference>
     <PackageReference Include="System.Threading.Thread">
       <Version>4.3.0</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Toolkit.Uwp">
-      <Version>4.0.0</Version>
+      <Version>5.0.0-preview.gb86cb1c4cb</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Toolkit.Uwp.UI">
-      <Version>4.0.0</Version>
+      <Version>5.0.0-preview.gb86cb1c4cb</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls">
-      <Version>4.0.0</Version>
+      <Version>5.0.0-preview.gb86cb1c4cb</Version>
     </PackageReference>
-  </ItemGroup>-->
+  </ItemGroup>
   <!--For 16299 Min Target and Above-->
   <!--<ItemGroup Condition="'$(TargetPlatformMinVersion)' == '10.0.16299.0'">
     <PackageReference Include="Microsoft.Toolkit.Uwp">
@@ -220,7 +220,7 @@
     </PackageReference>
   </ItemGroup>-->
   <!--For 177763 Min Target and Above-->
-  <ItemGroup Condition="'$(TargetPlatformMinVersion)' == '10.0.17763.0'">
+  <!--<ItemGroup Condition="'$(TargetPlatformMinVersion)' == '10.0.17763.0'">
     <PackageReference Include="Microsoft.UI.Xaml">
       <Version>2.8.1</Version>
     </PackageReference>
@@ -233,13 +233,16 @@
     <PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls">
       <Version>7.1.3</Version>
     </PackageReference>
-  </ItemGroup>
+  </ItemGroup>-->
   <ItemGroup>
     <PackageReference Include="CacheManager.Core">
       <Version>1.2.0</Version>
     </PackageReference>
     <PackageReference Include="FFmpegInteropX">
-      <Version>1.1.0-pre38</Version>
+      <Version>1.0.0</Version>
+    </PackageReference>
+    <PackageReference Include="FFmpegInteropX.FFmpegUWP">
+      <Version>4.2.200</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
       <Version>6.2.14</Version>
@@ -250,7 +253,7 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="PropertyChanged.Fody">
-      <Version>4.1.0</Version>
+      <Version>3.4.1</Version>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>