Skip to content

Commit ceda306

Browse files
Disable native projects (#399)
* Disable native projects * All empty sign list
1 parent 86e48a7 commit ceda306

File tree

2 files changed

+13
-2
lines changed

2 files changed

+13
-2
lines changed

Build.proj

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,14 @@
33
<PropertyGroup>
44
<!-- Disable target framework filtering for top level projects -->
55
<NoTargetFrameworkFiltering>true</NoTargetFrameworkFiltering>
6+
7+
<!-- Disable native projects - see https://github.com/dotnet/deployment-tools/issues/398 -->
8+
<DisableNativeProjects>true</DisableNativeProjects>
69
</PropertyGroup>
710

811
<ItemGroup Condition="'$(DotNetBuild)' != 'true'">
912
<ClickOnceProjectToBuild Include="src/clickonce/**/*.csproj" Pack="true" />
10-
<ClickOnceProjectToBuild Include="src/clickonce/native/build-native.proj" Pack="false" />
13+
<ClickOnceProjectToBuild Include="src/clickonce/native/build-native.proj" Pack="false" Condition="'$(DisableNativeProjects)' != 'true'"/>
1114
<ProjectReference Include="@(ClickOnceProjectToBuild)"
1215
BuildInParallel="true"
1316
Test="false">
@@ -18,7 +21,7 @@
1821
Pack="true"
1922
Test="false"
2023
BuildInParallel="false"
21-
Condition="'$(TargetOS)' == 'windows'">
24+
Condition="'$(TargetOS)' == 'windows' and '$(DisableNativeProjects)' != 'true'">
2225
<AdditionalProperties Condition="'$(ClickOnceConfiguration)' != ''">Configuration=$(ClickOnceConfiguration)</AdditionalProperties>
2326
</ProjectReference>
2427
</ItemGroup>

eng/Signing.props

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
<Project>
22

33
<PropertyGroup>
4+
<!--
5+
Windows arm/arm64 jobs, as well as x86 if not building NetCoreCheck, don't have any artifacts to sign.
6+
Keep it simple: allow not finding any matches here and rely on overall signing validation.
7+
8+
During post build signing, there are no packages to sign during SignFinalPackages.
9+
-->
10+
<AllowEmptySignList>true</AllowEmptySignList>
11+
412
<UseDotNetCertificate>true</UseDotNetCertificate>
513
<!-- Don't sign and publish rid agnostic nuget packages from other builds than win-x64 when not building
614
inside the VMR or producing source-build artifacts. -->

0 commit comments

Comments
 (0)