Skip to content

Commit 966967a

Browse files
committed
Only build platform-specific native assets in native build
1 parent 8957ae8 commit 966967a

File tree

3 files changed

+4
-8
lines changed

3 files changed

+4
-8
lines changed

.azure/pipelines/ci-public.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,6 @@ stages:
136136
-pack
137137
-all
138138
-noBuildJava
139-
-noBuildNative
140139
/p:OnlyPackPlatformSpecificPackages=true
141140
$(_BuildArgs)
142141
$(_InternalRuntimeDownloadArgs)
@@ -152,7 +151,6 @@ stages:
152151
-sign
153152
-pack
154153
-noBuildJava
155-
-noBuildNative
156154
/p:DotNetSignType=$(_SignType)
157155
/p:OnlyPackPlatformSpecificPackages=true
158156
$(_BuildArgs)

.azure/pipelines/ci.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,6 @@ extends:
185185
-pack
186186
-all
187187
-noBuildJava
188-
-noBuildNative
189188
/p:OnlyPackPlatformSpecificPackages=true
190189
$(_BuildArgs)
191190
$(_InternalRuntimeDownloadArgs)
@@ -201,7 +200,6 @@ extends:
201200
-sign
202201
-pack
203202
-noBuildJava
204-
-noBuildNative
205203
/p:DotNetSignType=$(_SignType)
206204
/p:OnlyPackPlatformSpecificPackages=true
207205
$(_BuildArgs)

eng/Build.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,10 @@
8080
</When>
8181
<Otherwise>
8282
<!-- BuildNative -->
83-
<ItemGroup Condition=" '$(TargetOsName)' == 'win' AND ('$(TargetArchitecture)' == 'x86' OR '$(TargetArchitecture)' == 'x64' OR '$(TargetArchitecture)' == 'arm64') ">
84-
<NativeProjects Include="$(RepoRoot)src\**\*.vcxproj" Exclude="@(ProjectToExclude)" AdditionalProperties="Platform=x64" />
85-
<NativeProjects Include="$(RepoRoot)src\**\*.vcxproj" Exclude="@(ProjectToExclude)" AdditionalProperties="Platform=Win32" />
86-
<NativeProjects Include="$(RepoRoot)src\**\*.vcxproj" Exclude="@(ProjectToExclude)" AdditionalProperties="Platform=arm64" />
83+
<ItemGroup Condition=" '$(TargetOsName)' == 'win'">
84+
<NativeProjects Condition="'$(TargetArchitecture)' == 'x64'" Include="$(RepoRoot)src\**\*.vcxproj" Exclude="@(ProjectToExclude)" AdditionalProperties="Platform=x64" />
85+
<NativeProjects Condition="'$(TargetArchitecture)' == 'x86'" Include="$(RepoRoot)src\**\*.vcxproj" Exclude="@(ProjectToExclude)" AdditionalProperties="Platform=Win32" />
86+
<NativeProjects Condition="'$(TargetArchitecture)' == 'arm64'" Include="$(RepoRoot)src\**\*.vcxproj" Exclude="@(ProjectToExclude)" AdditionalProperties="Platform=arm64" />
8787
</ItemGroup>
8888

8989
<ItemGroup>

0 commit comments

Comments
 (0)