Skip to content

Commit 633add6

Browse files
authored
Fix SFX issues causing sdk injestion failures (#59398)
* Add missing publish args for Linux x64/arm64 * Don't reference the vcxproj during restore.
1 parent fffa4a5 commit 633add6

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

.azure/pipelines/ci.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -359,6 +359,7 @@ extends:
359359
--all
360360
--build-installers
361361
--no-build-java
362+
$(_ArcadePublishNonWindowsArg)
362363
-p:OnlyPackPlatformSpecificPackages=true
363364
$(_BuildArgs)
364365
$(_InternalRuntimeDownloadArgs)
@@ -417,6 +418,7 @@ extends:
417418
--all
418419
--build-installers
419420
--no-build-java
421+
$(_ArcadePublishNonWindowsArg)
420422
-p:OnlyPackPlatformSpecificPackages=true
421423
$(_BuildArgs)
422424
$(_InternalRuntimeDownloadArgs)

src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.Composite.sfxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
<NativePlatform Condition=" '$(NativePlatform)' == 'x86' ">Win32</NativePlatform>
7878
</PropertyGroup>
7979
<ItemGroup>
80-
<ProjectReference Condition=" '$(UseIisNativeAssets)' == 'true' AND $(BuildNative) "
80+
<ProjectReference Condition=" '$(UseIisNativeAssets)' == 'true' AND $(BuildNative) AND '$(MSBuildRestoreSessionId)' == ''"
8181
Include="$(RepoRoot)src\Servers\IIS\AspNetCoreModuleV2\InProcessRequestHandler\InProcessRequestHandler.vcxproj">
8282
<SetPlatform>Platform=$(NativePlatform)</SetPlatform>
8383
<!-- A custom item group to be used in targets later. -->

src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.sfxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
<NativePlatform Condition=" '$(NativePlatform)' == 'x86' ">Win32</NativePlatform>
7272
</PropertyGroup>
7373
<ItemGroup>
74-
<ProjectReference Condition=" '$(UseIisNativeAssets)' == 'true' AND $(BuildNative) "
74+
<ProjectReference Condition=" '$(UseIisNativeAssets)' == 'true' AND $(BuildNative) AND '$(MSBuildRestoreSessionId)' == ''"
7575
Include="$(RepoRoot)src\Servers\IIS\AspNetCoreModuleV2\InProcessRequestHandler\InProcessRequestHandler.vcxproj">
7676
<SetPlatform>Platform=$(NativePlatform)</SetPlatform>
7777
<OutputItemType>NativeRuntimeAsset</OutputItemType>

0 commit comments

Comments
 (0)