File tree 4 files changed +3
-5
lines changed
4 files changed +3
-5
lines changed Original file line number Diff line number Diff line change 39
39
</PropertyGroup >
40
40
41
41
<PropertyGroup >
42
- <SkipBuildingInstallers Condition =" '$(OS)' == 'Windows_NT' and '$(Architecture)' == 'arm'" >true</SkipBuildingInstallers >
43
42
<SkipBuildingInstallers Condition =" '$(DotNetBuildSourceOnly)' == 'true'" >true</SkipBuildingInstallers >
44
43
<SkipBuildingInstallers Condition =" '$(PgoInstrument)' == 'true'" >true</SkipBuildingInstallers >
45
44
<SkipBuildingInstallers Condition ="
Original file line number Diff line number Diff line change 43
43
</PackageDownload >
44
44
</ItemGroup >
45
45
46
- <ItemGroup Condition =" '$(OS)' == 'Windows_NT' and '$(Architecture)' != 'arm' " >
46
+ <ItemGroup Condition =" '$(OS)' == 'Windows_NT' " >
47
47
<PackageDownload Include =" @(BundledManifests->'%(MsiNupkgId)')" >
48
48
<Version >[%(Version)]</Version >
49
49
</PackageDownload >
52
52
</ItemGroup >
53
53
54
54
<Target Name =" ValidateBundledManifestSigning"
55
- Condition =" '$(OS)' == 'Windows_NT' and '$(Architecture)' != 'arm' "
55
+ Condition =" '$(OS)' == 'Windows_NT' "
56
56
BeforeTargets =" GenerateWorkloadManifestsWxs" >
57
57
<PropertyGroup >
58
58
<SignCheckExe >$(PkgMicrosoft_DotNet_SignCheck)\tools\Microsoft.DotNet.SignCheck.exe</SignCheckExe >
Original file line number Diff line number Diff line change 74
74
DestinationFiles =" $(RedistInstallerLayoutPath)templates\$(CurrentTemplateInstallPath)\$([System.String]::Copy('%(Filename)%(Extension)').ToLowerInvariant())" />
75
75
</Target >
76
76
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'))" >
78
78
<Copy SourceFiles =" %(BundledTemplatesWithInstallPaths.RestoredNupkgPath)"
79
79
DestinationFolder =" $(BaseOutputPath)$(Configuration)\templates-%(BundledTemplatesWithInstallPaths.TemplateFrameworkVersion)\templates\%(BundledTemplatesWithInstallPaths.BundledTemplateInstallPath)" />
80
80
Original file line number Diff line number Diff line change 71
71
<WinFormsAndWpfSharedFxRootUrl >$(PublicBaseURL)WindowsDesktop/$(WindowsDesktopBlobVersion)</WinFormsAndWpfSharedFxRootUrl >
72
72
<SdkRootUrl >$(PublicBaseURL)Sdk/$(FullNugetVersion)</SdkRootUrl >
73
73
74
- <IncludeWpfAndWinForms Condition =" '$(IncludeWpfAndWinForms)' == '' AND '$(Architecture)' == 'arm'" >false</IncludeWpfAndWinForms >
75
74
<IncludeWpfAndWinForms Condition =" '$(IncludeWpfAndWinForms)' == '' AND '$(OS)' == 'Windows_NT'" >true</IncludeWpfAndWinForms >
76
75
<IncludeWpfAndWinForms Condition =" '$(IncludeWpfAndWinForms)' == ''" >false</IncludeWpfAndWinForms >
77
76
</PropertyGroup >
You can’t perform that action at this time.
0 commit comments