Skip to content

Fix missing VMR assets in SiteExtensions packages #61233

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 1, 2025
Merged

Fix missing VMR assets in SiteExtensions packages #61233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7c52fc1
Fix missing VMR assets in SiteExtensions packages
wtgodbe Mar 29, 2025
cf21acb
Add error
wtgodbe Mar 31, 2025
6a73df0
More errors
wtgodbe Mar 31, 2025
9c664c0
Remove condition
wtgodbe Mar 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 15 additions & 13 deletions ...AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
<IsShipping>true</IsShipping>
<IsShipping Condition=" '$(PreReleaseVersionLabel)' == 'preview' ">false</IsShipping>
<SiteExtensionsReferenceLayoutDir>$(ArtifactsObjDir)SiteExtensionsReferenceLayout/</SiteExtensionsReferenceLayoutDir>
<MicrosoftWebXdtExtensionsPath>$(ArtifactsBinDir)Microsoft.Web.Xdt.Extensions\$(Configuration)\net462\Microsoft.Web.Xdt.Extensions.dll</MicrosoftWebXdtExtensionsPath>
<MicrosoftWebXdtExtensionsPath Condition="'$(DotNetBuildPass)' == '2'">$(ArtifactsBinDir)Microsoft.Web.Xdt.Extensions\$(TargetArchitecture)\$(Configuration)\net462\Microsoft.Web.Xdt.Extensions.dll</MicrosoftWebXdtExtensionsPath>

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

<MSBuild Projects="..\..\..\LoggingBranch\LB.csproj"
BuildInParallel="$(BuildInParallel)"
Properties="Platform=x64;DisableTransitiveFrameworkReferences=true"
Targets="_VmrBuild" />
<MSBuild Projects="..\..\..\LoggingBranch\LB.csproj"
BuildInParallel="$(BuildInParallel)"
Properties="Platform=x86;TargetRid=win-x86;BaseOS=win-x86;TargetRuntimeIdentifier=win-x86;TargetArchitecture=x86;DisableTransitiveFrameworkReferences=true"
Targets="_VmrBuild" />
<MSBuild Projects="..\..\..\Runtime\Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj"
BuildInParallel="$(BuildInParallel)"
BuildInParallel="false"
Properties="Platform=x64"
Targets="_VmrBuild" />
<MSBuild Projects="..\..\..\Runtime\Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj"
BuildInParallel="$(BuildInParallel)"
BuildInParallel="false"
Properties="Platform=x86;TargetRid=win-x86;BaseOS=win-x86;TargetRuntimeIdentifier=win-x86;TargetArchitecture=x86"
Targets="_VmrBuild" />
<MSBuild Projects="..\..\..\LoggingBranch\LB.csproj"
BuildInParallel="false"
Properties="Platform=x64;DisableTransitiveFrameworkReferences=true"
Targets="_VmrBuild" />
<MSBuild Projects="..\..\..\LoggingBranch\LB.csproj"
BuildInParallel="false"
Properties="Platform=x86;TargetRid=win-x86;BaseOS=win-x86;TargetRuntimeIdentifier=win-x86;TargetArchitecture=x86;DisableTransitiveFrameworkReferences=true"
Targets="_VmrBuild" />
</Target>

<ItemGroup>
<Content Include="applicationHost.xdt" />
<Content Include="scmApplicationHost.xdt" />
<Content Include="$(ArtifactsBinDir)Microsoft.Web.Xdt.Extensions\$(Configuration)\$(DefaultNetFxTargetFramework)\Microsoft.Web.Xdt.Extensions.dll"
Condition="EXISTS('$(ArtifactsBinDir)Microsoft.Web.Xdt.Extensions\$(Configuration)\$(DefaultNetFxTargetFramework)\Microsoft.Web.Xdt.Extensions.dll')"
PackagePath="content" />
</ItemGroup>

<ItemGroup>
Expand Down Expand Up @@ -129,6 +128,8 @@
OverwriteReadOnlyFiles="true"
Condition="'$(DotNetBuild)' == 'true'" />

<Error Condition="!Exists('$(MicrosoftWebXdtExtensionsPath)')" Text="Microsoft.Web.Xdt.Extensions.dll should be available for SiteExtensions .nupkg, but isn't." />

<ItemGroup>
<!--
The x64 & x86 SiteExtension packages have identical deps.json files. We include only the x64 files to
Expand All @@ -146,6 +147,7 @@
<!-- Temporarily skip the common files -->
<FilteredContentFilesToPack Include="@(ContentFilesToPack)" Condition="'%(RecursiveDir)' != ''" />
<None Include="@(FilteredContentFilesToPack)" PackagePath="content\%(RecursiveDir)%(Filename)%(Extension)" Pack="true" />
<Content Include="$(MicrosoftWebXdtExtensionsPath)" PackagePath="content" />
</ItemGroup>
</Target>
</Project>
22 changes: 19 additions & 3 deletions src/SiteExtensions/Runtime/Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@
<DotNetUnpackFolder>$(RedistSharedFrameworkLayoutRoot)</DotNetUnpackFolder>
<IsPackable>true</IsPackable>
<NoSemVer20>true</NoSemVer20>
<CrossArchitectureInstallerBasePathNormalized>$([MSBuild]::NormalizeDirectory('$(CrossArchitectureInstallerBasePath)', 'aspnetcore', 'Runtime'))</CrossArchitectureInstallerBasePathNormalized>
<MicrosoftWebXdtExtensionsPath>$(ArtifactsBinDir)Microsoft.Web.Xdt.Extensions\$(Configuration)\net462\Microsoft.Web.Xdt.Extensions.dll</MicrosoftWebXdtExtensionsPath>
<MicrosoftWebXdtExtensionsPath Condition="'$(DotNetBuildPass)' == '2'">$(ArtifactsBinDir)Microsoft.Web.Xdt.Extensions\$(Platform)\$(Configuration)\net462\Microsoft.Web.Xdt.Extensions.dll</MicrosoftWebXdtExtensionsPath>
</PropertyGroup>

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

<ItemGroup>
Expand All @@ -46,12 +46,28 @@
</ItemGroup>

<Target Name="ResolveReferenceItemsForPackage" DependsOnTargets="ResolveReferences" BeforeTargets="_GetPackageFiles">
<ItemGroup>
<AspNetRuntimeArchive
Include="$(CrossArchitectureInstallerBasePathNormalized)**\$(RuntimeInstallerBaseName)-*-win-$(Platform).zip"
Exclude="$(CrossArchitectureInstallerBasePathNormalized)**\$(RuntimeInstallerBaseName)-composite*" />
</ItemGroup>

<Unzip
SourceFiles="@(AspNetRuntimeArchive)"
DestinationFolder="$(DotNetUnpackFolder)"
OverwriteReadOnlyFiles="true"
Condition="'$(DotNetBuildPass)' == '2'" />

<Error Condition="!Exists('$(DotNetUnpackFolder)')" Text="AspNetCore Shared Framework layout should be available for AspNetCoreRuntime .nupkg, but isn't." />
<Error Condition="!Exists('$(MicrosoftWebXdtExtensionsPath)')" Text="Microsoft.Web.Xdt.Extensions.dll should be available for AspNetCoreRuntime .nupkg, but isn't." />

<ItemGroup>
<Content Include="$(DotNetUnpackFolder)\**\*.*" Exclude="$(DotNetUnpackFolder)\**\.*" PackagePath="content\%(RecursiveDir)" />
<Content Include="%(ShimComponents.DllLocation)"
Pack="true"
Condition="'%(ShimComponents.Platform)' == '$(TargetArchitecture)'"
PackagePath="content\ancm\%(ShimComponents.TempSubfolder)" />
<Content Include="$(MicrosoftWebXdtExtensionsPath)" PackagePath="content" />
</ItemGroup>
</Target>

Expand Down
Loading