Try to fix arm64 build

dotnet · Mar 2, 2022 · 84f5bb3 · 84f5bb3
1 parent d3f09a5
commit 84f5bb3
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/AspNetCore.sln b/AspNetCore.sln
@@ -9800,7 +9800,8 @@ Global
 		{7324770C-0871-4D73-BE3D-5E2F3E9E1B1E}.Debug|x86.Build.0 = Debug|Win32
 		{7324770C-0871-4D73-BE3D-5E2F3E9E1B1E}.Debug|x86.Deploy.0 = Debug|Win32
 		{7324770C-0871-4D73-BE3D-5E2F3E9E1B1E}.Release|Any CPU.ActiveCfg = Release|Win32
-		{7324770C-0871-4D73-BE3D-5E2F3E9E1B1E}.Release|arm64.ActiveCfg = Release|Win32
+		{7324770C-0871-4D73-BE3D-5E2F3E9E1B1E}.Release|arm64.ActiveCfg = Release|ARM64
+		{7324770C-0871-4D73-BE3D-5E2F3E9E1B1E}.Release|arm64.Build.0 = Release|ARM64
 		{7324770C-0871-4D73-BE3D-5E2F3E9E1B1E}.Release|x64.ActiveCfg = Release|x64
 		{7324770C-0871-4D73-BE3D-5E2F3E9E1B1E}.Release|x64.Build.0 = Release|x64
 		{7324770C-0871-4D73-BE3D-5E2F3E9E1B1E}.Release|x86.ActiveCfg = Release|Win32
@@ -9814,7 +9815,8 @@ Global
 		{B54A8F61-60DE-4AD9-87CA-D102F230678E}.Debug|x86.Build.0 = Debug|Win32
 		{B54A8F61-60DE-4AD9-87CA-D102F230678E}.Debug|x86.Deploy.0 = Debug|Win32
 		{B54A8F61-60DE-4AD9-87CA-D102F230678E}.Release|Any CPU.ActiveCfg = Release|Win32
-		{B54A8F61-60DE-4AD9-87CA-D102F230678E}.Release|arm64.ActiveCfg = Release|Win32
+		{B54A8F61-60DE-4AD9-87CA-D102F230678E}.Release|arm64.ActiveCfg = Release|ARM64
+		{B54A8F61-60DE-4AD9-87CA-D102F230678E}.Release|arm64.Build.0 = Release|ARM64
 		{B54A8F61-60DE-4AD9-87CA-D102F230678E}.Release|x64.ActiveCfg = Release|x64
 		{B54A8F61-60DE-4AD9-87CA-D102F230678E}.Release|x64.Build.0 = Release|x64
 		{B54A8F61-60DE-4AD9-87CA-D102F230678E}.Release|x86.ActiveCfg = Release|Win32

diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/lib/iisca.vcxproj b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/lib/iisca.vcxproj
@@ -76,8 +76,9 @@
     <ProjectGuid>{7324770c-0871-4d73-be3d-5e2f3e9e1b1e}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>iisca</RootNamespace>
-    <PlatformToolsetVersion Condition=" '$(VisualStudioVersion)' == '17.0' ">v143</PlatformToolsetVersion>
-    <PlatformToolsetVersion Condition=" '$(PlatformToolsetVersion)' == '' ">v142</PlatformToolsetVersion>
+    <WindowsTargetPlatformVersion Condition=" '$(WindowsTargetPlatformVersion)' == '' ">10.0.18362.0</WindowsTargetPlatformVersion>
+    <PlatformToolsetVersion>v142</PlatformToolsetVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup>
@@ -87,14 +88,17 @@
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <PropertyGroup Label="Configuration">
-    <VCToolsVersion />
+    <VCToolsVersion>14.29.30133</VCToolsVersion>
   </PropertyGroup>
   <PropertyGroup>
     <AdditionalIncludeDirectories>$(IIS-Common)version;$(IIS-Common)Include;$(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     <PrecompiledHeader>Create</PrecompiledHeader>
     <PrecompiledHeaderFile>precomp.h</PrecompiledHeaderFile>
     <PrecompiledHeaderOutputFile>$(IntDir)precomp.pch</PrecompiledHeaderOutputFile>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <TargetName>$(ProjectName)</TargetName>
+  </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
       <AdditionalIncludeDirectories>$(WIX)sdk\$(WixPlatformToolset)\inc;$(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -138,4 +142,4 @@
     </Link>
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
+</Project>
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/startvs.cmd b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/startvs.cmd
@@ -0,0 +1,3 @@
+@ECHO OFF
+
+%~dp0..\..\..\..\..\startvs.cmd %~dp0IIS-Setup.slnf
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/build/settings/common.props b/src/Installers/Windows/AspNetCoreModule-Setup/build/settings/common.props
@@ -7,6 +7,7 @@
   <!-- Define platform shortnames for use in paths without having to rely on cpp props -->
   <PropertyGroup>
     <PlatformShortname Condition="'$(PlatformShortname)' == '' AND '$(Platform)' == 'x64'">x64</PlatformShortname>
+    <PlatformShortname Condition="'$(PlatformShortname)' == '' AND '$(Platform)' == 'arm64'">arm64</PlatformShortname>
     <PlatformShortname Condition="'$(PlatformShortname)' == '' AND ('$(Platform.ToLower())' == 'win32' OR '$(Platform)' == 'x86')">x86</PlatformShortname>
   </PropertyGroup>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		@ECHO OFF

		%~dp0..\..\..\..\..\startvs.cmd %~dp0IIS-Setup.slnf