Skip to content

Commit fc067c3

Browse files
authored
Fix missing VMR assets in SiteExtensions packages (#61233)
* Fix missing VMR assets in SiteExtensions packages * Add error * More errors * Remove condition
1 parent 9c67617 commit fc067c3

File tree

2 files changed

+34
-16
lines changed

2 files changed

+34
-16
lines changed

src/SiteExtensions/LoggingAggregate/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
<IsShipping>true</IsShipping>
2020
<IsShipping Condition=" '$(PreReleaseVersionLabel)' == 'preview' ">false</IsShipping>
2121
<SiteExtensionsReferenceLayoutDir>$(ArtifactsObjDir)SiteExtensionsReferenceLayout/</SiteExtensionsReferenceLayoutDir>
22+
<MicrosoftWebXdtExtensionsPath>$(ArtifactsBinDir)Microsoft.Web.Xdt.Extensions\$(Configuration)\net462\Microsoft.Web.Xdt.Extensions.dll</MicrosoftWebXdtExtensionsPath>
23+
<MicrosoftWebXdtExtensionsPath Condition="'$(DotNetBuildPass)' == '2'">$(ArtifactsBinDir)Microsoft.Web.Xdt.Extensions\$(TargetArchitecture)\$(Configuration)\net462\Microsoft.Web.Xdt.Extensions.dll</MicrosoftWebXdtExtensionsPath>
2224

2325
<!-- Grab packages LB.csproj should have just built. -->
2426
<RestoreAdditionalProjectSources>$(RestoreAdditionalProjectSources);$(ArtifactsNonShippingPackagesDir)</RestoreAdditionalProjectSources>
@@ -59,30 +61,27 @@
5961
BeforeTargets="Restore"
6062
Condition=" '$(DotNetBuildPass)' == '2' ">
6163

62-
<MSBuild Projects="..\..\..\LoggingBranch\LB.csproj"
63-
BuildInParallel="$(BuildInParallel)"
64-
Properties="Platform=x64;DisableTransitiveFrameworkReferences=true"
65-
Targets="_VmrBuild" />
66-
<MSBuild Projects="..\..\..\LoggingBranch\LB.csproj"
67-
BuildInParallel="$(BuildInParallel)"
68-
Properties="Platform=x86;TargetRid=win-x86;BaseOS=win-x86;TargetRuntimeIdentifier=win-x86;TargetArchitecture=x86;DisableTransitiveFrameworkReferences=true"
69-
Targets="_VmrBuild" />
7064
<MSBuild Projects="..\..\..\Runtime\Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj"
71-
BuildInParallel="$(BuildInParallel)"
65+
BuildInParallel="false"
7266
Properties="Platform=x64"
7367
Targets="_VmrBuild" />
7468
<MSBuild Projects="..\..\..\Runtime\Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj"
75-
BuildInParallel="$(BuildInParallel)"
69+
BuildInParallel="false"
7670
Properties="Platform=x86;TargetRid=win-x86;BaseOS=win-x86;TargetRuntimeIdentifier=win-x86;TargetArchitecture=x86"
7771
Targets="_VmrBuild" />
72+
<MSBuild Projects="..\..\..\LoggingBranch\LB.csproj"
73+
BuildInParallel="false"
74+
Properties="Platform=x64;DisableTransitiveFrameworkReferences=true"
75+
Targets="_VmrBuild" />
76+
<MSBuild Projects="..\..\..\LoggingBranch\LB.csproj"
77+
BuildInParallel="false"
78+
Properties="Platform=x86;TargetRid=win-x86;BaseOS=win-x86;TargetRuntimeIdentifier=win-x86;TargetArchitecture=x86;DisableTransitiveFrameworkReferences=true"
79+
Targets="_VmrBuild" />
7880
</Target>
7981

8082
<ItemGroup>
8183
<Content Include="applicationHost.xdt" />
8284
<Content Include="scmApplicationHost.xdt" />
83-
<Content Include="$(ArtifactsBinDir)Microsoft.Web.Xdt.Extensions\$(Configuration)\$(DefaultNetFxTargetFramework)\Microsoft.Web.Xdt.Extensions.dll"
84-
Condition="EXISTS('$(ArtifactsBinDir)Microsoft.Web.Xdt.Extensions\$(Configuration)\$(DefaultNetFxTargetFramework)\Microsoft.Web.Xdt.Extensions.dll')"
85-
PackagePath="content" />
8685
</ItemGroup>
8786

8887
<ItemGroup>
@@ -129,6 +128,8 @@
129128
OverwriteReadOnlyFiles="true"
130129
Condition="'$(DotNetBuild)' == 'true'" />
131130

131+
<Error Condition="!Exists('$(MicrosoftWebXdtExtensionsPath)')" Text="Microsoft.Web.Xdt.Extensions.dll should be available for SiteExtensions .nupkg, but isn't." />
132+
132133
<ItemGroup>
133134
<!--
134135
The x64 & x86 SiteExtension packages have identical deps.json files. We include only the x64 files to
@@ -146,6 +147,7 @@
146147
<!-- Temporarily skip the common files -->
147148
<FilteredContentFilesToPack Include="@(ContentFilesToPack)" Condition="'%(RecursiveDir)' != ''" />
148149
<None Include="@(FilteredContentFilesToPack)" PackagePath="content\%(RecursiveDir)%(Filename)%(Extension)" Pack="true" />
150+
<Content Include="$(MicrosoftWebXdtExtensionsPath)" PackagePath="content" />
149151
</ItemGroup>
150152
</Target>
151153
</Project>

src/SiteExtensions/Runtime/Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414
<DotNetUnpackFolder>$(RedistSharedFrameworkLayoutRoot)</DotNetUnpackFolder>
1515
<IsPackable>true</IsPackable>
1616
<NoSemVer20>true</NoSemVer20>
17+
<CrossArchitectureInstallerBasePathNormalized>$([MSBuild]::NormalizeDirectory('$(CrossArchitectureInstallerBasePath)', 'aspnetcore', 'Runtime'))</CrossArchitectureInstallerBasePathNormalized>
18+
<MicrosoftWebXdtExtensionsPath>$(ArtifactsBinDir)Microsoft.Web.Xdt.Extensions\$(Configuration)\net462\Microsoft.Web.Xdt.Extensions.dll</MicrosoftWebXdtExtensionsPath>
19+
<MicrosoftWebXdtExtensionsPath Condition="'$(DotNetBuildPass)' == '2'">$(ArtifactsBinDir)Microsoft.Web.Xdt.Extensions\$(Platform)\$(Configuration)\net462\Microsoft.Web.Xdt.Extensions.dll</MicrosoftWebXdtExtensionsPath>
1720
</PropertyGroup>
1821

1922
<Import Project="..\..\..\src\Servers\IIS\build\assets.props" />
@@ -22,9 +25,6 @@
2225
<Content Include="applicationHost.xdt" />
2326
<Content Include="scmApplicationHost.xdt" />
2427
<Content Include="install.cmd" />
25-
<Content Include="$(ArtifactsBinDir)Microsoft.Web.Xdt.Extensions\$(Configuration)\net462\Microsoft.Web.Xdt.Extensions.dll"
26-
Condition="EXISTS('$(ArtifactsBinDir)Microsoft.Web.Xdt.Extensions\$(Configuration)\net462\Microsoft.Web.Xdt.Extensions.dll')"
27-
PackagePath="content" />
2828
</ItemGroup>
2929

3030
<ItemGroup>
@@ -46,12 +46,28 @@
4646
</ItemGroup>
4747

4848
<Target Name="ResolveReferenceItemsForPackage" DependsOnTargets="ResolveReferences" BeforeTargets="_GetPackageFiles">
49+
<ItemGroup>
50+
<AspNetRuntimeArchive
51+
Include="$(CrossArchitectureInstallerBasePathNormalized)**\$(RuntimeInstallerBaseName)-*-win-$(Platform).zip"
52+
Exclude="$(CrossArchitectureInstallerBasePathNormalized)**\$(RuntimeInstallerBaseName)-composite*" />
53+
</ItemGroup>
54+
55+
<Unzip
56+
SourceFiles="@(AspNetRuntimeArchive)"
57+
DestinationFolder="$(DotNetUnpackFolder)"
58+
OverwriteReadOnlyFiles="true"
59+
Condition="'$(DotNetBuildPass)' == '2'" />
60+
61+
<Error Condition="!Exists('$(DotNetUnpackFolder)')" Text="AspNetCore Shared Framework layout should be available for AspNetCoreRuntime .nupkg, but isn't." />
62+
<Error Condition="!Exists('$(MicrosoftWebXdtExtensionsPath)')" Text="Microsoft.Web.Xdt.Extensions.dll should be available for AspNetCoreRuntime .nupkg, but isn't." />
63+
4964
<ItemGroup>
5065
<Content Include="$(DotNetUnpackFolder)\**\*.*" Exclude="$(DotNetUnpackFolder)\**\.*" PackagePath="content\%(RecursiveDir)" />
5166
<Content Include="%(ShimComponents.DllLocation)"
5267
Pack="true"
5368
Condition="'%(ShimComponents.Platform)' == '$(TargetArchitecture)'"
5469
PackagePath="content\ancm\%(ShimComponents.TempSubfolder)" />
70+
<Content Include="$(MicrosoftWebXdtExtensionsPath)" PackagePath="content" />
5571
</ItemGroup>
5672
</Target>
5773

0 commit comments

Comments
 (0)