Fix build errors

microsoft · May 18, 2023 · 224c358 · 224c358
1 parent 59b8583
commit 224c358
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/src/AppInstallerCLIPackage/AppInstallerCLIPackage.wapproj b/src/AppInstallerCLIPackage/AppInstallerCLIPackage.wapproj
@@ -94,6 +94,8 @@
       copy "$(TargetDir)\resources.pri" "$(ProjectDir)\..\$(Platform)\$(Configuration)\AppInstallerCLI\resources.pri"
       copy "$(TargetDir)\resources.pri" "$(TargetDir)\AppInstallerCLI\resources.pri"
     </PostBuildEvent>
+    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
+    <TargetPlatformVersion>10.0.22000.0</TargetPlatformVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Platform)'=='ARM'">
     <ConfigServerRid>win10-arm</ConfigServerRid>
@@ -112,7 +114,6 @@
       <WinGetAdditonalPackageFileRoot>$(SolutionDir)</WinGetAdditonalPackageFileRoot>
       <WinGetAdditonalPackageFileRoot Condition="!Exists('$(WinGetAdditonalPackageFileRoot)\$(PlatformTarget)\$(Configuration)\WindowsPackageManager\WindowsPackageManager.dll')">$(OutputPath)\..\..\..\..</WinGetAdditonalPackageFileRoot>
     </PropertyGroup>
-
     <Message Importance="normal" Text="WinGetAdditonalPackageFileRoot = $(WinGetAdditonalPackageFileRoot)" />
     <ItemGroup>
       <WinGetAdditionalPackageFile Include="$(WinGetAdditonalPackageFileRoot)\$(PlatformTarget)\$(Configuration)\WindowsPackageManager\WindowsPackageManager.dll">
@@ -142,21 +143,16 @@
         <Recurse>true</Recurse>
       </WinGetAdditionalPackageFile>
     </ItemGroup>
-
     <Error Condition="!Exists('%(WinGetAdditionalPackageFile.Identity)')" Text="%(WinGetAdditionalPackageFile.Identity) was not found" />
-
     <!-- Single (non-recursive) file items -->
     <Message Importance="normal" Condition="'%(WinGetAdditionalPackageFile.Recurse)'!='true' AND Exists('%(WinGetAdditionalPackageFile.Identity)')" Text="%(WinGetAdditionalPackageFile.Identity) -&gt; %(WinGetAdditionalPackageFile.PackagePath)" />
-
     <ItemGroup>
       <AppxPackagePayload Condition="'%(WinGetAdditionalPackageFile.Recurse)'!='true'" Include="%(WinGetAdditionalPackageFile.Identity)" KeepDuplicates="false">
         <TargetPath>%(WinGetAdditionalPackageFile.PackagePath)</TargetPath>
       </AppxPackagePayload>
     </ItemGroup>
-
     <!-- Recursive file items -->
     <Message Importance="normal" Condition="'%(WinGetAdditionalPackageFile.Recurse)'=='true' AND Exists('%(WinGetAdditionalPackageFile.Identity)')" Text="%(WinGetAdditionalPackageFile.Identity) -&gt; %(WinGetAdditionalPackageFile.PackagePath)\%(WinGetAdditionalPackageFile.RecursiveDir)%(WinGetAdditionalPackageFile.Filename)%(WinGetAdditionalPackageFile.Extension)" />
-
     <ItemGroup>
       <AppxPackagePayload Condition="'%(WinGetAdditionalPackageFile.Recurse)'=='true'" Include="%(WinGetAdditionalPackageFile.Identity)" KeepDuplicates="false">
         <TargetPath>%(WinGetAdditionalPackageFile.PackagePath)\%(WinGetAdditionalPackageFile.RecursiveDir)%(WinGetAdditionalPackageFile.Filename)%(WinGetAdditionalPackageFile.Extension)</TargetPath>

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -28,7 +28,9 @@
       </ItemDefinitionGroup>
     </When>
 
-    <!-- Most of the properties here are for C++, so the few C# projects are a special case -->
+    <!-- Most of the properties here are for C++, so we exclude other project types. -->
+    <When Condition=" '$(MSBuildProjectExtension)' == '.wapproj' "/>
+
     <When Condition=" '$(MSBuildProjectExtension)' == '.csproj' ">
       <PropertyGroup>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>