Use Mile.Project.Windows instead of Mile.Project.ModernWindows.

beybeyzk · May 16, 2022 · 168106f · 168106f
1 parent 45feae5
commit 168106f
Show file tree

Hide file tree

Showing 23 changed files with 83 additions and 61 deletions.
diff --git a/...ject.ModernWindows/Mile.Project.Cpp.props → Mile.Project.Windows/Mile.Project.Cpp.props b/...ject.ModernWindows/Mile.Project.Cpp.props → Mile.Project.Windows/Mile.Project.Cpp.props
@@ -39,7 +39,7 @@
     <MinimumVisualStudioVersion>17.0</MinimumVisualStudioVersion>
     <Keyword>Win32Proj</Keyword>
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-    <CleanImport Condition="'$(MileProjectEnableVCLTLSupport)' == 'true' and $([System.Version]::Parse('$(WindowsTargetPlatformMinVersion)').Build) >= 10240">true</CleanImport>
+    <CleanImport>true</CleanImport>
   </PropertyGroup>
   <PropertyGroup Label="Globals" Condition="'$(MileProjectEnableCppWinRTSupport)' == 'true'">
     <CppWinRTOptimized>true</CppWinRTOptimized>

diff --git a/...ct.ModernWindows/Mile.Project.Cpp.targets → ....Project.Windows/Mile.Project.Cpp.targets b/...ct.ModernWindows/Mile.Project.Cpp.targets → ....Project.Windows/Mile.Project.Cpp.targets
diff --git a/...ct.ModernWindows/Mile.Project.Manifest.rc → ....Project.Windows/Mile.Project.Manifest.rc b/...ct.ModernWindows/Mile.Project.Manifest.rc → ....Project.Windows/Mile.Project.Manifest.rc
diff --git a/Mile.Project.Windows/Mile.Project.Platform.ARM.props b/Mile.Project.Windows/Mile.Project.Platform.ARM.props
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  PROJECT:   Mouri Internal Library Essentials
+  FILE:      Mile.Project.Platform.ARM.props
+  PURPOSE:   Definition for Visual Studio C++ Project
+
+  LICENSE:   The MIT License
+
+  DEVELOPER: Mouri_Naruto (Mouri_Naruto AT Outlook.com)
+-->
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|ARM">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM">
+      <Configuration>Release</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+</Project>
diff --git a/...Windows/Mile.Project.Platform.ARM64.props → ...Windows/Mile.Project.Platform.ARM64.props b/...Windows/Mile.Project.Platform.ARM64.props → ...Windows/Mile.Project.Platform.ARM64.props
diff --git a/...rnWindows/Mile.Project.Platform.x64.props → ...t.Windows/Mile.Project.Platform.x64.props b/...rnWindows/Mile.Project.Platform.x64.props → ...t.Windows/Mile.Project.Platform.x64.props
diff --git a/...rnWindows/Mile.Project.Platform.x86.props → ...t.Windows/Mile.Project.Platform.x86.props b/...rnWindows/Mile.Project.Platform.x86.props → ...t.Windows/Mile.Project.Platform.x86.props
diff --git a/...ject.ModernWindows/Mile.Project.Version.h → Mile.Project.Windows/Mile.Project.Version.h b/...ject.ModernWindows/Mile.Project.Version.h → Mile.Project.Windows/Mile.Project.Version.h
diff --git a/...ect.ModernWindows/Mile.Project.Version.rc → Mile.Project.Windows/Mile.Project.Version.rc b/...ect.ModernWindows/Mile.Project.Version.rc → Mile.Project.Windows/Mile.Project.Version.rc
diff --git a/...ject.ModernWindows/Mile.Project.Wap.props → Mile.Project.Windows/Mile.Project.Wap.props b/...ject.ModernWindows/Mile.Project.Wap.props → Mile.Project.Windows/Mile.Project.Wap.props
diff --git a/...ct.ModernWindows/Mile.Project.Wap.targets → ....Project.Windows/Mile.Project.Wap.targets b/...ct.ModernWindows/Mile.Project.Wap.targets → ....Project.Windows/Mile.Project.Wap.targets
diff --git a/NanaZip.Shared/NanaZip.Shared.ModernExperienceShims.vcxproj b/NanaZip.Shared/NanaZip.Shared.ModernExperienceShims.vcxproj
@@ -1,21 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\Mile.Project.ModernWindows\Mile.Project.Platform.x86.props" />
-  <Import Project="..\Mile.Project.ModernWindows\Mile.Project.Platform.x64.props" />
-  <Import Project="..\Mile.Project.ModernWindows\Mile.Project.Platform.ARM64.props" />
+  <Import Project="..\Mile.Project.Windows\Mile.Project.Platform.x86.props" />
+  <Import Project="..\Mile.Project.Windows\Mile.Project.Platform.x64.props" />
+  <Import Project="..\Mile.Project.Windows\Mile.Project.Platform.ARM64.props" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{501956AB-67C3-47FA-BE2B-8AEFF463AF1C}</ProjectGuid>
     <RootNamespace>NanaZip.Shared.ModernExperienceShims</RootNamespace>
     <MileProjectType>StaticLibrary</MileProjectType>
-    <WindowsTargetPlatformMinVersion>6.0.6000.0</WindowsTargetPlatformMinVersion>
     <MileProjectEnableVCLTLSupport>true</MileProjectEnableVCLTLSupport>
   </PropertyGroup>
-  <Import Project="..\Mile.Project.ModernWindows\Mile.Project.Cpp.props" />
+  <Import Project="..\Mile.Project.Windows\Mile.Project.Cpp.props" />
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <EnableEnhancedInstructionSet Condition="'$(Platform)'=='Win32'">NoExtensions</EnableEnhancedInstructionSet>
+    </ClCompile>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <None Include="NanaZip.Shared.ModernExperienceShims.props" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="ModernWin32MessageBox.cpp" />
   </ItemGroup>
-  <Import Project="..\Mile.Project.ModernWindows\Mile.Project.Cpp.targets" />
+  <Import Project="..\Mile.Project.Windows\Mile.Project.Cpp.targets" />
 </Project>
diff --git a/NanaZip.Shared/NanaZip.Shared.SevenZipZStandard.vcxproj b/NanaZip.Shared/NanaZip.Shared.SevenZipZStandard.vcxproj
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\Mile.Project.ModernWindows\Mile.Project.Platform.x86.props" />
-  <Import Project="..\Mile.Project.ModernWindows\Mile.Project.Platform.x64.props" />
-  <Import Project="..\Mile.Project.ModernWindows\Mile.Project.Platform.ARM64.props" />
+  <Import Project="..\Mile.Project.Windows\Mile.Project.Platform.x86.props" />
+  <Import Project="..\Mile.Project.Windows\Mile.Project.Platform.x64.props" />
+  <Import Project="..\Mile.Project.Windows\Mile.Project.Platform.ARM64.props" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{6F0E7455-ECE1-440D-9EA2-8C18E4F1CBE6}</ProjectGuid>
     <RootNamespace>NanaZip.Shared.SevenZipZStandard</RootNamespace>
     <MileProjectType>StaticLibrary</MileProjectType>
-    <WindowsTargetPlatformMinVersion>6.0.6000.0</WindowsTargetPlatformMinVersion>
     <MileProjectEnableVCLTLSupport>true</MileProjectEnableVCLTLSupport>
   </PropertyGroup>
-  <Import Project="..\Mile.Project.ModernWindows\Mile.Project.Cpp.props" />
+  <Import Project="..\Mile.Project.Windows\Mile.Project.Cpp.props" />
   <PropertyGroup>
     <IncludePath>..\SevenZip\C\brotli\;$(IncludePath)</IncludePath>
     <IncludePath>..\SevenZip\C\fast-lzma2\;$(IncludePath)</IncludePath>
@@ -23,6 +22,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
+      <EnableEnhancedInstructionSet Condition="'$(Platform)'=='Win32'">NoExtensions</EnableEnhancedInstructionSet>
       <AdditionalOptions>%(AdditionalOptions) /Wv:18</AdditionalOptions>
       <PreprocessorDefinitions>ZSTD_LEGACY_SUPPORT;ZSTD_MULTITHREAD;NO_XXHASH;FL2_7ZIP_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
@@ -311,5 +311,5 @@
     <None Include="..\SevenZip\C\zstdmt\LICENSE" />
     <None Include="..\SevenZip\C\zstdmt\README.md" />
   </ItemGroup>
-  <Import Project="..\Mile.Project.ModernWindows\Mile.Project.Cpp.targets" />
+  <Import Project="..\Mile.Project.Windows\Mile.Project.Cpp.targets" />
 </Project>
diff --git a/NanaZip/NanaZip.vcxproj b/NanaZip/NanaZip.vcxproj
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\Mile.Project.ModernWindows\Mile.Project.Platform.x86.props" />
-  <Import Project="..\Mile.Project.ModernWindows\Mile.Project.Platform.x64.props" />
-  <Import Project="..\Mile.Project.ModernWindows\Mile.Project.Platform.ARM64.props" />
+  <Import Project="..\Mile.Project.Windows\Mile.Project.Platform.x86.props" />
+  <Import Project="..\Mile.Project.Windows\Mile.Project.Platform.x64.props" />
+  <Import Project="..\Mile.Project.Windows\Mile.Project.Platform.ARM64.props" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{97894839-6677-49D2-BA7C-39ED0C8D4FDB}</ProjectGuid>
     <RootNamespace>NanaZip</RootNamespace>
@@ -12,7 +12,7 @@
     <MileProjectEnableVCLTLSupport>true</MileProjectEnableVCLTLSupport>
     <MileProjectEnableCppWinRTSupport>true</MileProjectEnableCppWinRTSupport>
   </PropertyGroup>
-  <Import Project="..\Mile.Project.ModernWindows\Mile.Project.Cpp.props" />
+  <Import Project="..\Mile.Project.Windows\Mile.Project.Cpp.props" />
   <Import Project="..\NanaZip.Shared\NanaZip.Shared.ModernExperienceShims.props" />
   <ItemDefinitionGroup>
     <ClCompile>
@@ -375,5 +375,5 @@
   <ItemGroup>
     <Manifest Include="NanaZip.manifest" />
   </ItemGroup>
-  <Import Project="..\Mile.Project.ModernWindows\Mile.Project.Cpp.targets" />
+  <Import Project="..\Mile.Project.Windows\Mile.Project.Cpp.targets" />
 </Project>
diff --git a/NanaZipConsole/NanaZipConsole.vcxproj b/NanaZipConsole/NanaZipConsole.vcxproj
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\Mile.Project.ModernWindows\Mile.Project.Platform.x86.props" />
-  <Import Project="..\Mile.Project.ModernWindows\Mile.Project.Platform.x64.props" />
-  <Import Project="..\Mile.Project.ModernWindows\Mile.Project.Platform.ARM64.props" />
+  <Import Project="..\Mile.Project.Windows\Mile.Project.Platform.x86.props" />
+  <Import Project="..\Mile.Project.Windows\Mile.Project.Platform.x64.props" />
+  <Import Project="..\Mile.Project.Windows\Mile.Project.Platform.ARM64.props" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{D866CA04-DF51-4660-BA4D-F82426A3A522}</ProjectGuid>
     <RootNamespace>NanaZipConsole</RootNamespace>
@@ -12,7 +12,7 @@
     <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
     <MileProjectEnableVCLTLSupport>true</MileProjectEnableVCLTLSupport>
   </PropertyGroup>
-  <Import Project="..\Mile.Project.ModernWindows\Mile.Project.Cpp.props" />
+  <Import Project="..\Mile.Project.Windows\Mile.Project.Cpp.props" />
   <ItemDefinitionGroup>
     <ClCompile>
       <AdditionalOptions>%(AdditionalOptions) /Wv:18</AdditionalOptions>
@@ -214,5 +214,5 @@
   <ItemGroup>
     <Manifest Include="NanaZipConsole.manifest" />
   </ItemGroup>
-  <Import Project="..\Mile.Project.ModernWindows\Mile.Project.Cpp.targets" />
+  <Import Project="..\Mile.Project.Windows\Mile.Project.Cpp.targets" />
 </Project>
diff --git a/NanaZipCore/NanaZipCore.vcxproj b/NanaZipCore/NanaZipCore.vcxproj
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\Mile.Project.ModernWindows\Mile.Project.Platform.x86.props" />
-  <Import Project="..\Mile.Project.ModernWindows\Mile.Project.Platform.x64.props" />
-  <Import Project="..\Mile.Project.ModernWindows\Mile.Project.Platform.ARM64.props" />
+  <Import Project="..\Mile.Project.Windows\Mile.Project.Platform.x86.props" />
+  <Import Project="..\Mile.Project.Windows\Mile.Project.Platform.x64.props" />
+  <Import Project="..\Mile.Project.Windows\Mile.Project.Platform.ARM64.props" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{86D65350-E2AE-47BC-AE05-FC35D3BAAE6C}</ProjectGuid>
     <RootNamespace>NanaZipCore</RootNamespace>
     <MileProjectType>DynamicLibrary</MileProjectType>
     <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
     <MileProjectEnableVCLTLSupport>true</MileProjectEnableVCLTLSupport>
   </PropertyGroup>
-  <Import Project="..\Mile.Project.ModernWindows\Mile.Project.Cpp.props" />
+  <Import Project="..\Mile.Project.Windows\Mile.Project.Cpp.props" />
   <Import Condition="('$(Platform)'=='Win32') Or ('$(Platform)'=='x64')" Project="$(VCTargetsPath)\BuildCustomizations\masm.props" />
   <Import Project="..\NanaZip.Shared\NanaZip.Shared.SevenZipZStandard.props" />
   <Import Project="..\NanaZip.Shared\NanaZip.Shared.SevenZipHardwareAcceleration.props" />
@@ -550,6 +550,6 @@
     <ClInclude Include="..\SevenZip\CPP\7zip\Bundles\Format7zF\StdAfx.h" />
     <ClInclude Include="Mile.Project.Properties.h" />
   </ItemGroup>
-  <Import Project="..\Mile.Project.ModernWindows\Mile.Project.Cpp.targets" />
+  <Import Project="..\Mile.Project.Windows\Mile.Project.Cpp.targets" />
   <Import Condition="('$(Platform)'=='Win32') Or ('$(Platform)'=='x64')" Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
 </Project>
diff --git a/NanaZipInstaller/NanaZipInstaller.vcxproj b/NanaZipInstaller/NanaZipInstaller.vcxproj
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\Mile.Project.ModernWindows\Mile.Project.Platform.x86.props" />
-  <Import Project="..\Mile.Project.ModernWindows\Mile.Project.Platform.x64.props" />
-  <Import Project="..\Mile.Project.ModernWindows\Mile.Project.Platform.ARM64.props" />
+  <Import Project="..\Mile.Project.Windows\Mile.Project.Platform.x86.props" />
+  <Import Project="..\Mile.Project.Windows\Mile.Project.Platform.x64.props" />
+  <Import Project="..\Mile.Project.Windows\Mile.Project.Platform.ARM64.props" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{7FD9CD52-4A25-41B0-B3C6-5CE92681DD52}</ProjectGuid>
     <RootNamespace>NanaZipInstaller</RootNamespace>
     <MileProjectType>WindowsApplication</MileProjectType>
     <MileProjectManifestFile>NanaZipInstaller.manifest</MileProjectManifestFile>
-    <WindowsTargetPlatformMinVersion>6.0.6000.0</WindowsTargetPlatformMinVersion>
     <MileProjectEnableVCLTLSupport>true</MileProjectEnableVCLTLSupport>
     <MileProjectEnableCppWinRTSupport>true</MileProjectEnableCppWinRTSupport>
   </PropertyGroup>
-  <Import Project="..\Mile.Project.ModernWindows\Mile.Project.Cpp.props" />
+  <Import Project="..\Mile.Project.Windows\Mile.Project.Cpp.props" />
   <ItemDefinitionGroup>
     <ClCompile>
       <EnableEnhancedInstructionSet Condition="'$(Platform)'=='Win32'">NoExtensions</EnableEnhancedInstructionSet>
@@ -34,5 +33,5 @@
   <ItemGroup>
     <Image Include="icon1.ico" />
   </ItemGroup>
-  <Import Project="..\Mile.Project.ModernWindows\Mile.Project.Cpp.targets" />
+  <Import Project="..\Mile.Project.Windows\Mile.Project.Cpp.targets" />
 </Project>
diff --git a/NanaZipPackage/NanaZipPackage.wapproj b/NanaZipPackage/NanaZipPackage.wapproj
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\Mile.Project.ModernWindows\Mile.Project.Platform.x86.props" />
-  <Import Project="..\Mile.Project.ModernWindows\Mile.Project.Platform.x64.props" />
-  <Import Project="..\Mile.Project.ModernWindows\Mile.Project.Platform.ARM64.props" />
-  <Import Project="..\Mile.Project.ModernWindows\Mile.Project.Wap.props" />
+  <Import Project="..\Mile.Project.Windows\Mile.Project.Platform.x86.props" />
+  <Import Project="..\Mile.Project.Windows\Mile.Project.Platform.x64.props" />
+  <Import Project="..\Mile.Project.Windows\Mile.Project.Platform.ARM64.props" />
+  <Import Project="..\Mile.Project.Windows\Mile.Project.Wap.props" />
   <PropertyGroup>
     <ProjectGuid>9a119a76-97cb-4490-b8c2-651576cb9302</ProjectGuid>
     <TargetPlatformVersion>10.0.22000.0</TargetPlatformVersion>
@@ -45,5 +45,5 @@
     <ProjectReference Include="..\NanaZipShellExtension\NanaZipShellExtension.vcxproj" />
     <ProjectReference Include="..\NanaZipWindows\NanaZipWindows.vcxproj" />
   </ItemGroup>
-  <Import Project="..\Mile.Project.ModernWindows\Mile.Project.Wap.targets" />
+  <Import Project="..\Mile.Project.Windows\Mile.Project.Wap.targets" />
 </Project>
diff --git a/NanaZipSfxConsole/NanaZipSfxConsole.vcxproj b/NanaZipSfxConsole/NanaZipSfxConsole.vcxproj
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\Mile.Project.ModernWindows\Mile.Project.Platform.x86.props" />
+  <Import Project="..\Mile.Project.Windows\Mile.Project.Platform.x86.props" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{96C0A1A0-D964-4725-AFDC-73EBF7FC1416}</ProjectGuid>
     <RootNamespace>NanaZipSfxConsole</RootNamespace>
     <MileProjectType>ConsoleApplication</MileProjectType>
     <MileProjectManifestFile>NanaZipSfxConsole.manifest</MileProjectManifestFile>
-    <WindowsTargetPlatformMinVersion>6.0.6000.0</WindowsTargetPlatformMinVersion>
     <MileProjectEnableVCLTLSupport>true</MileProjectEnableVCLTLSupport>
   </PropertyGroup>
-  <Import Project="..\Mile.Project.ModernWindows\Mile.Project.Cpp.props" />
+  <Import Project="..\Mile.Project.Windows\Mile.Project.Cpp.props" />
   <Import Project="..\NanaZip.Shared\NanaZip.Shared.SevenZipZStandard.props" />
   <PropertyGroup>
     <TargetName>NanaZipConsole</TargetName>
@@ -233,5 +232,5 @@
   <ItemGroup>
     <Manifest Include="NanaZipSfxConsole.manifest" />
   </ItemGroup>
-  <Import Project="..\Mile.Project.ModernWindows\Mile.Project.Cpp.targets" />
+  <Import Project="..\Mile.Project.Windows\Mile.Project.Cpp.targets" />
 </Project>
diff --git a/NanaZipSfxSetup/NanaZipSfxSetup.vcxproj b/NanaZipSfxSetup/NanaZipSfxSetup.vcxproj
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\Mile.Project.ModernWindows\Mile.Project.Platform.x86.props" />
+  <Import Project="..\Mile.Project.Windows\Mile.Project.Platform.x86.props" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{43308629-5328-46BF-8E1C-A258A937B981}</ProjectGuid>
     <RootNamespace>NanaZipSfxSetup</RootNamespace>
     <MileProjectType>WindowsApplication</MileProjectType>
     <MileProjectManifestFile>NanaZipSfxSetup.manifest</MileProjectManifestFile>
-    <WindowsTargetPlatformMinVersion>6.0.6000.0</WindowsTargetPlatformMinVersion>
     <MileProjectEnableVCLTLSupport>true</MileProjectEnableVCLTLSupport>
   </PropertyGroup>
-  <Import Project="..\Mile.Project.ModernWindows\Mile.Project.Cpp.props" />
+  <Import Project="..\Mile.Project.Windows\Mile.Project.Cpp.props" />
   <Import Project="..\NanaZip.Shared\NanaZip.Shared.SevenZipZStandard.props" />
   <Import Project="..\NanaZip.Shared\NanaZip.Shared.ModernExperienceShims.props" />
   <PropertyGroup>
@@ -195,5 +194,5 @@
   <ItemGroup>
     <Manifest Include="NanaZipSfxSetup.manifest" />
   </ItemGroup>
-  <Import Project="..\Mile.Project.ModernWindows\Mile.Project.Cpp.targets" />
+  <Import Project="..\Mile.Project.Windows\Mile.Project.Cpp.targets" />
 </Project>
diff --git a/NanaZipSfxWindows/NanaZipSfxWindows.vcxproj b/NanaZipSfxWindows/NanaZipSfxWindows.vcxproj
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\Mile.Project.ModernWindows\Mile.Project.Platform.x86.props" />
+  <Import Project="..\Mile.Project.Windows\Mile.Project.Platform.x86.props" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{C11F288B-9E3C-4DA9-8206-852BB91C7E4C}</ProjectGuid>
     <RootNamespace>NanaZipSfxWindows</RootNamespace>
     <MileProjectType>WindowsApplication</MileProjectType>
     <MileProjectManifestFile>NanaZipSfxWindows.manifest</MileProjectManifestFile>
-    <WindowsTargetPlatformMinVersion>6.0.6000.0</WindowsTargetPlatformMinVersion>
     <MileProjectEnableVCLTLSupport>true</MileProjectEnableVCLTLSupport>
   </PropertyGroup>
-  <Import Project="..\Mile.Project.ModernWindows\Mile.Project.Cpp.props" />
+  <Import Project="..\Mile.Project.Windows\Mile.Project.Cpp.props" />
   <Import Project="..\NanaZip.Shared\NanaZip.Shared.SevenZipZStandard.props" />
   <Import Project="..\NanaZip.Shared\NanaZip.Shared.ModernExperienceShims.props" />
   <PropertyGroup>
@@ -250,5 +249,5 @@
   <ItemGroup>
     <Manifest Include="NanaZipSfxWindows.manifest" />
   </ItemGroup>
-  <Import Project="..\Mile.Project.ModernWindows\Mile.Project.Cpp.targets" />
+  <Import Project="..\Mile.Project.Windows\Mile.Project.Cpp.targets" />
 </Project>
diff --git a/NanaZipShellExtension/NanaZipShellExtension.vcxproj b/NanaZipShellExtension/NanaZipShellExtension.vcxproj
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\Mile.Project.ModernWindows\Mile.Project.Platform.x86.props" />
-  <Import Project="..\Mile.Project.ModernWindows\Mile.Project.Platform.x64.props" />
-  <Import Project="..\Mile.Project.ModernWindows\Mile.Project.Platform.ARM64.props" />
+  <Import Project="..\Mile.Project.Windows\Mile.Project.Platform.x86.props" />
+  <Import Project="..\Mile.Project.Windows\Mile.Project.Platform.x64.props" />
+  <Import Project="..\Mile.Project.Windows\Mile.Project.Platform.ARM64.props" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{F17D4837-7943-4361-9527-2AF9CACE477D}</ProjectGuid>
     <RootNamespace>NanaZipShellExtension</RootNamespace>
@@ -12,7 +12,7 @@
     <MileProjectEnableVCLTLSupport>true</MileProjectEnableVCLTLSupport>
     <MileProjectEnableCppWinRTSupport>true</MileProjectEnableCppWinRTSupport>
   </PropertyGroup>
-  <Import Project="..\Mile.Project.ModernWindows\Mile.Project.Cpp.props" />
+  <Import Project="..\Mile.Project.Windows\Mile.Project.Cpp.props" />
   <Import Project="..\NanaZip.Shared\NanaZip.Shared.ModernExperienceShims.props" />
   <ItemDefinitionGroup>
     <ClCompile>
@@ -134,5 +134,5 @@
   <ItemGroup>
     <None Include="NanaZipShellExtension.def" />
   </ItemGroup>
-  <Import Project="..\Mile.Project.ModernWindows\Mile.Project.Cpp.targets" />
+  <Import Project="..\Mile.Project.Windows\Mile.Project.Cpp.targets" />
 </Project>