Skip to content

Commit a15df19

Browse files
committed
Remove unnecessary 32bit arm architecture checks in the Windows build
We only build for arm64 on Windows since .NET 5.
1 parent bdd17aa commit a15df19

File tree

4 files changed

+3
-5
lines changed

4 files changed

+3
-5
lines changed

src/Layout/Directory.Build.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
</PropertyGroup>
4040

4141
<PropertyGroup>
42-
<SkipBuildingInstallers Condition="'$(OS)' == 'Windows_NT' and '$(Architecture)' == 'arm'">true</SkipBuildingInstallers>
4342
<SkipBuildingInstallers Condition="'$(DotNetBuildSourceOnly)' == 'true'">true</SkipBuildingInstallers>
4443
<SkipBuildingInstallers Condition="'$(PgoInstrument)' == 'true'">true</SkipBuildingInstallers>
4544
<SkipBuildingInstallers Condition="

src/Layout/redist-installer/targets/BundledManifests.targets

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
</PackageDownload>
4444
</ItemGroup>
4545

46-
<ItemGroup Condition=" '$(OS)' == 'Windows_NT' and '$(Architecture)' != 'arm' ">
46+
<ItemGroup Condition=" '$(OS)' == 'Windows_NT' ">
4747
<PackageDownload Include="@(BundledManifests->'%(MsiNupkgId)')">
4848
<Version>[%(Version)]</Version>
4949
</PackageDownload>
@@ -52,7 +52,7 @@
5252
</ItemGroup>
5353

5454
<Target Name="ValidateBundledManifestSigning"
55-
Condition="'$(OS)' == 'Windows_NT' and '$(Architecture)' != 'arm'"
55+
Condition="'$(OS)' == 'Windows_NT' "
5656
BeforeTargets="GenerateWorkloadManifestsWxs">
5757
<PropertyGroup>
5858
<SignCheckExe>$(PkgMicrosoft_DotNet_SignCheck)\tools\Microsoft.DotNet.SignCheck.exe</SignCheckExe>

src/Layout/redist-installer/targets/BundledTemplates.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
DestinationFiles="$(RedistInstallerLayoutPath)templates\$(CurrentTemplateInstallPath)\$([System.String]::Copy('%(Filename)%(Extension)').ToLowerInvariant())" />
7575
</Target>
7676

77-
<Target Name="LayoutTemplatesForMSI" DependsOnTargets="CalculateTemplatesVersions;GetRepoTemplates" Condition="$(ProductMonikerRid.StartsWith('win')) And '$(Architecture)' != 'arm'">
77+
<Target Name="LayoutTemplatesForMSI" DependsOnTargets="CalculateTemplatesVersions;GetRepoTemplates" Condition="$(ProductMonikerRid.StartsWith('win'))">
7878
<Copy SourceFiles="%(BundledTemplatesWithInstallPaths.RestoredNupkgPath)"
7979
DestinationFolder="$(BaseOutputPath)$(Configuration)\templates-%(BundledTemplatesWithInstallPaths.TemplateFrameworkVersion)\templates\%(BundledTemplatesWithInstallPaths.BundledTemplateInstallPath)" />
8080

src/Layout/redist-installer/targets/RestoreLayout.targets

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@
7171
<WinFormsAndWpfSharedFxRootUrl>$(PublicBaseURL)WindowsDesktop/$(WindowsDesktopBlobVersion)</WinFormsAndWpfSharedFxRootUrl>
7272
<SdkRootUrl>$(PublicBaseURL)Sdk/$(FullNugetVersion)</SdkRootUrl>
7373

74-
<IncludeWpfAndWinForms Condition="'$(IncludeWpfAndWinForms)' == '' AND '$(Architecture)' == 'arm'">false</IncludeWpfAndWinForms>
7574
<IncludeWpfAndWinForms Condition="'$(IncludeWpfAndWinForms)' == '' AND '$(OS)' == 'Windows_NT'">true</IncludeWpfAndWinForms>
7675
<IncludeWpfAndWinForms Condition="'$(IncludeWpfAndWinForms)' == ''">false</IncludeWpfAndWinForms>
7776
</PropertyGroup>

0 commit comments

Comments
 (0)