File tree Expand file tree Collapse file tree 4 files changed +3
-5
lines changed Expand file tree Collapse file tree 4 files changed +3
-5
lines changed Original file line number Diff line number Diff line change 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 ="
Original file line number Diff line number Diff line change 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 >
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 >
Original file line number Diff line number Diff line change 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
Original file line number Diff line number Diff line change 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 >
You can’t perform that action at this time.
0 commit comments