From aa7a5388e9b464b644f127aedeceaaefca8b03fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ole=20Andr=C3=A9=20Vadla=20Ravn=C3=A5s?= <oleavr@gmail.com>
Date: Mon, 24 Jan 2022 22:32:17 +0100
Subject: [PATCH] msvs: Tweak project naming and move to Python 3.10

---
 ...-python27.vcxproj => frida-python2.vcxproj |  2 +-
 ...j.filters => frida-python2.vcxproj.filters |  0
 ...-python38.vcxproj => frida-python3.vcxproj | 26 +++++++++----------
 ...j.filters => frida-python3.vcxproj.filters |  0
 4 files changed, 14 insertions(+), 14 deletions(-)
 rename frida-python27.vcxproj => frida-python2.vcxproj (97%)
 rename frida-python27.vcxproj.filters => frida-python2.vcxproj.filters (100%)
 rename frida-python38.vcxproj => frida-python3.vcxproj (83%)
 rename frida-python38.vcxproj.filters => frida-python3.vcxproj.filters (100%)

diff --git a/frida-python27.vcxproj b/frida-python2.vcxproj
similarity index 97%
rename from frida-python27.vcxproj
rename to frida-python2.vcxproj
index 88e6486..25d1e6d 100644
--- a/frida-python27.vcxproj
+++ b/frida-python2.vcxproj
@@ -22,7 +22,7 @@
     <ProjectGuid>{7409F45B-E10E-48AA-9E68-94C113995D4A}</ProjectGuid>
     <RootNamespace>frida</RootNamespace>
     <Keyword>Win32Proj</Keyword>
-    <ProjectName>frida-python27</ProjectName>
+    <ProjectName>frida-python2</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
diff --git a/frida-python27.vcxproj.filters b/frida-python2.vcxproj.filters
similarity index 100%
rename from frida-python27.vcxproj.filters
rename to frida-python2.vcxproj.filters
diff --git a/frida-python38.vcxproj b/frida-python3.vcxproj
similarity index 83%
rename from frida-python38.vcxproj
rename to frida-python3.vcxproj
index 33c7439..7a48292 100644
--- a/frida-python38.vcxproj
+++ b/frida-python3.vcxproj
@@ -22,7 +22,7 @@
     <ProjectGuid>{7505F884-DD69-4F23-ADE6-1E0E049AB018}</ProjectGuid>
     <RootNamespace>frida</RootNamespace>
     <Keyword>Win32Proj</Keyword>
-    <ProjectName>frida-python38</ProjectName>
+    <ProjectName>frida-python3</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -73,10 +73,10 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)build\frida-windows\$(PlatformName)-$(Configuration)\lib\python3.8\site-packages\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build\frida-windows\$(PlatformName)-$(Configuration)\lib\python3.8\site-packages\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)build\frida-windows\$(PlatformName)-$(Configuration)\lib\python3.8\site-packages\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build\frida-windows\$(PlatformName)-$(Configuration)\lib\python3.8\site-packages\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)build\frida-windows\$(PlatformName)-$(Configuration)\lib\python3.10\site-packages\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build\frida-windows\$(PlatformName)-$(Configuration)\lib\python3.10\site-packages\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)build\frida-windows\$(PlatformName)-$(Configuration)\lib\python3.10\site-packages\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build\frida-windows\$(PlatformName)-$(Configuration)\lib\python3.10\site-packages\</OutDir>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">_frida</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">_frida</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">_frida</TargetName>
@@ -89,40 +89,40 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Link>
       <SubSystem>Windows</SubSystem>
-      <AdditionalLibraryDirectories>C:\Program Files (x86)\Python 3.8\libs;$(SolutionDir)python\3.8\x86\libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>C:\Program Files (x86)\Python 3.10\libs;$(SolutionDir)python\3.10\x86\libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(IntDir)..\frida-core\api;C:\Program Files (x86)\Python 3.8\include;$(SolutionDir)python\3.8\x86\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(IntDir)..\frida-core\api;C:\Program Files (x86)\Python 3.10\include;$(SolutionDir)python\3.10\x86\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>$(FridaComponentDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Link>
       <SubSystem>Windows</SubSystem>
-      <AdditionalLibraryDirectories>C:\Program Files\Python 3.8\libs;$(SolutionDir)python\3.8\x64\libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>C:\Program Files\Python 3.10\libs;$(SolutionDir)python\3.10\x64\libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(IntDir)..\frida-core\api;C:\Program Files\Python 3.8\include;$(SolutionDir)python\3.8\x64\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(IntDir)..\frida-core\api;C:\Program Files\Python 3.10\include;$(SolutionDir)python\3.10\x64\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>$(FridaComponentDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Link>
       <SubSystem>Windows</SubSystem>
-      <AdditionalLibraryDirectories>C:\Program Files (x86)\Python 3.8\libs;$(SolutionDir)python\3.8\x86\libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>C:\Program Files (x86)\Python 3.10\libs;$(SolutionDir)python\3.10\x86\libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(IntDir)..\frida-core\api;C:\Program Files (x86)\Python 3.8\include;$(SolutionDir)python\3.8\x86\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(IntDir)..\frida-core\api;C:\Program Files (x86)\Python 3.10\include;$(SolutionDir)python\3.10\x86\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>$(FridaComponentDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Link>
       <SubSystem>Windows</SubSystem>
-      <AdditionalLibraryDirectories>C:\Program Files\Python 3.8\libs;$(SolutionDir)python\3.8\x64\libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>C:\Program Files\Python 3.10\libs;$(SolutionDir)python\3.10\x64\libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(IntDir)..\frida-core\api;C:\Program Files\Python 3.8\include;$(SolutionDir)python\3.8\x64\include;$(SolutionDir)python\3.8\x64\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(IntDir)..\frida-core\api;C:\Program Files\Python 3.10\include;$(SolutionDir)python\3.10\x64\include;$(SolutionDir)python\3.10\x64\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>$(FridaComponentDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
diff --git a/frida-python38.vcxproj.filters b/frida-python3.vcxproj.filters
similarity index 100%
rename from frida-python38.vcxproj.filters
rename to frida-python3.vcxproj.filters