Skip to content

Commit 331a1dc

Browse files
dougbudougbu
committed
Correct the site extensions builds
- remove 2.2 package from the site extensions bundle - update 3.1 packages in bundle to 3.1.7 version - include 6.0.0 content in final bundle now and when servicing - prepare to include 5.0.0 content; wait 'til 6.0.0 targets `net6.0` - remove useless empty folder from LoggingBranch (TFM-specific) package - double slashes help nobody nit: fix a binary log filename
1 parent 8a3da02 commit 331a1dc

File tree

6 files changed

+58
-24
lines changed

6 files changed

+58
-24
lines changed

‎Directory.Build.props‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,10 @@
8888

8989
<IncludeSymbols>true</IncludeSymbols>
9090

91-
<!-- Also update the DefaultNetCoreTargetFramework defined at src/Razor/test/testassets/Directory.Build.props -->
91+
<!--
92+
Also update the DefaultNetCoreTargetFramework defined at src/Razor/test/testassets/Directory.Build.props and
93+
the packages referenced in Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj when this changes.
94+
-->
9295
<DefaultNetCoreTargetFramework>net5.0</DefaultNetCoreTargetFramework>
9396
</PropertyGroup>
9497

‎eng/Dependencies.props‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,8 @@ and are generated based on the last package release.
103103
<LatestPackageReference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.2.2" />
104104
<LatestPackageReference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.3.1.x64" />
105105
<LatestPackageReference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.3.1.x86" />
106+
<LatestPackageReference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.5.0.x64" />
107+
<LatestPackageReference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.5.0.x86" />
106108
<LatestPackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Runtime" />
107109
<LatestPackageReference Include="Microsoft.Bcl.AsyncInterfaces" />
108110
<LatestPackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" />

‎eng/Versions.props‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -234,12 +234,14 @@
234234
<MicrosoftWebAdministrationPackageVersion>11.1.0</MicrosoftWebAdministrationPackageVersion>
235235
<MicrosoftWebXdtPackageVersion>1.4.0</MicrosoftWebXdtPackageVersion>
236236
<SystemIdentityModelTokensJwtPackageVersion>6.7.1</SystemIdentityModelTokensJwtPackageVersion>
237-
<!-- Packages from 2.1/2.2 branches used for site extension build -->
237+
<!-- Packages from 2.1, 3.1, and 5.0 branches used for site extension build. -->
238238
<MicrosoftAspNetCoreAzureAppServicesSiteExtension21PackageVersion>2.1.1</MicrosoftAspNetCoreAzureAppServicesSiteExtension21PackageVersion>
239-
<MicrosoftAspNetCoreAzureAppServicesSiteExtension22PackageVersion>2.2.0</MicrosoftAspNetCoreAzureAppServicesSiteExtension22PackageVersion>
240-
<MicrosoftAspNetCoreAzureAppServicesSiteExtension31PackageVersion>3.1.3-servicing-20163-14</MicrosoftAspNetCoreAzureAppServicesSiteExtension31PackageVersion>
239+
<MicrosoftAspNetCoreAzureAppServicesSiteExtension31PackageVersion>3.1.7-servicing-20372-13</MicrosoftAspNetCoreAzureAppServicesSiteExtension31PackageVersion>
241240
<MicrosoftAspNetCoreAzureAppServicesSiteExtension31x64PackageVersion>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension31PackageVersion)</MicrosoftAspNetCoreAzureAppServicesSiteExtension31x64PackageVersion>
242241
<MicrosoftAspNetCoreAzureAppServicesSiteExtension31x86PackageVersion>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension31PackageVersion)</MicrosoftAspNetCoreAzureAppServicesSiteExtension31x86PackageVersion>
242+
<MicrosoftAspNetCoreAzureAppServicesSiteExtension50PackageVersion>5.0.0-preview-7-20365-19</MicrosoftAspNetCoreAzureAppServicesSiteExtension50PackageVersion>
243+
<MicrosoftAspNetCoreAzureAppServicesSiteExtension50x64PackageVersion>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension50PackageVersion)</MicrosoftAspNetCoreAzureAppServicesSiteExtension50x64PackageVersion>
244+
<MicrosoftAspNetCoreAzureAppServicesSiteExtension50x86PackageVersion>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension50PackageVersion)</MicrosoftAspNetCoreAzureAppServicesSiteExtension50x86PackageVersion>
243245
<!-- 3rd party dependencies -->
244246
<AngleSharpPackageVersion>0.9.9</AngleSharpPackageVersion>
245247
<BenchmarkDotNetPackageVersion>0.12.1</BenchmarkDotNetPackageVersion>

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

Lines changed: 41 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,31 @@
2424
</PropertyGroup>
2525

2626
<ItemGroup>
27+
<!--
28+
Bundle in most down-level versions of the runtime-specific site extension packages. When updating
29+
$(DefaultNetCoreTargetFramework), add previous SiteExtension packages to the list below. Remove
30+
entries when packages aren't needed in the bundle anymore.
31+
-->
2732
<Reference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.2.1" PrivateAssets="All" />
28-
<Reference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.2.2" PrivateAssets="All" />
2933
<Reference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.3.1.x64" PrivateAssets="All" />
3034
<Reference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.3.1.x86" PrivateAssets="All" />
31-
<!-- When updating this add the previous SiteExtension(s) to the list above -->
32-
<PackageReference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.5.0.x86" Version="$(PackageVersion)" PrivateAssets="All" />
33-
<PackageReference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.5.0.x64" Version="$(PackageVersion)" PrivateAssets="All" />
35+
<!--
36+
Coming soon...
37+
<Reference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.5.0.x64" PrivateAssets="All" />
38+
<Reference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.5.0.x86" PrivateAssets="All" />
39+
-->
40+
<!--
41+
Bundle the just-built LB.csproj package content into this one the easy way. See
42+
UpdateLatestPackageReferences for the hard way.
43+
-->
44+
<PackageReference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.$(AspNetCoreMajorMinorVersion).x64"
45+
Condition=" '$(IsShipping)' == 'false' "
46+
PrivateAssets="All"
47+
Version="$(PackageVersion)" />
48+
<PackageReference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.$(AspNetCoreMajorMinorVersion).x86"
49+
Condition=" '$(IsShipping)' == 'false' "
50+
PrivateAssets="All"
51+
Version="$(PackageVersion)" />
3452
</ItemGroup>
3553

3654
<ItemGroup>
@@ -43,8 +61,13 @@
4361
<Reference Include="Microsoft.Web.Xdt.Extensions" PrivateAssets="All" />
4462
</ItemGroup>
4563

46-
<Target Name="AddContent" BeforeTargets="_GetPackageFiles">
47-
<!-- Cannot assume this project and LB.csproj have the same package version. -->
64+
<!--
65+
Cannot assume this project and LB.csproj have the same package version because this creates a shipping
66+
package in non-preview builds and LB.csproj never creates a shipping package.
67+
-->
68+
<Target Name="UpdateLatestPackageReferences"
69+
BeforeTargets="CollectPackageReferences;ResolveAssemblyReferencesDesignTime;ResolveAssemblyReferences"
70+
Condition=" '$(IsShipping)' == 'true' ">
4871
<!-- This target is defined in eng/targets/Packaging.targets and included in every C# and F# project. -->
4972
<MSBuild Projects="$(RepoRoot)src\SiteExtensions\LoggingBranch\LB.csproj"
5073
Targets="_GetPackageVersionInfo"
@@ -53,17 +76,21 @@
5376
</MSBuild>
5477

5578
<ItemGroup>
56-
<PackageReference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.3.1.x86"
57-
Version="%(_ResolvedPackageVersionInfo.PackageVersion)"
58-
PrivateAssets="All" />
59-
<PackageReference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.3.1.x64"
60-
Version="%(_ResolvedPackageVersionInfo.PackageVersion)"
61-
PrivateAssets="All" />
79+
<PackageReference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.$(AspNetCoreMajorMinorVersion).x64"
80+
PrivateAssets="All"
81+
Version="%(_ResolvedPackageVersionInfo.PackageVersion)" />
82+
<PackageReference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.$(AspNetCoreMajorMinorVersion).x86"
83+
PrivateAssets="All"
84+
Version="%(_ResolvedPackageVersionInfo.PackageVersion)" />
6285
</ItemGroup>
86+
</Target>
6387

88+
<Target Name="AddContent" BeforeTargets="_GetPackageFiles">
6489
<ItemGroup>
65-
<!-- LB.csproj package content is bundled into this one. -->
66-
<!-- The x64 & x86 SiteExtension packages have identical deps.json files - we only include the x64 files to avoid build warnings -->
90+
<!--
91+
The x64 & x86 SiteExtension packages have identical deps.json files. We include only the x64 files to
92+
avoid build warnings.
93+
-->
6794
<ContentFilesToPack
6895
Include="$(NugetPackageRoot)\%(PackageReference.Identity)\%(PackageReference.Version)\content\**\*.*"
6996
Exclude="$(NugetPackageRoot)\Microsoft.AspNetCore.AzureAppServices.SiteExtension.*.x86\**\Microsoft.AspNetCore.AzureAppServices.HostingStartup.deps.json"/>

‎src/SiteExtensions/Sdk/SiteExtension.targets‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99

1010
<PropertyGroup>
1111
<_TemplatesDirectory>$(MSBuildThisFileDirectory)..\content\</_TemplatesDirectory>
12-
<_DepsOutputDirectory>$(IntermediateOutputPath)\se\</_DepsOutputDirectory>
13-
<_WorkingDirectory>$(_DepsOutputDirectory)\depswork</_WorkingDirectory>
12+
<_DepsOutputDirectory>$(IntermediateOutputPath)se\</_DepsOutputDirectory>
13+
<_WorkingDirectory>$(_DepsOutputDirectory)depswork</_WorkingDirectory>
1414
<_BasePackagePath>content\additionaldeps\</_BasePackagePath>
15-
<_RuntimeStoreManifestFile>$(_DepsOutputDirectory)\rs.csproj</_RuntimeStoreManifestFile>
16-
<_RuntimeStoreOutput>$(_DepsOutputDirectory)\rs\</_RuntimeStoreOutput>
15+
<_RuntimeStoreManifestFile>$(_DepsOutputDirectory)rs.csproj</_RuntimeStoreManifestFile>
16+
<_RuntimeStoreOutput>$(_DepsOutputDirectory)rs\</_RuntimeStoreOutput>
1717
<_RsRestoreSources>
1818
$(RestoreAdditionalProjectSources);
1919
$(ArtifactsShippingPackagesDir);
@@ -55,7 +55,7 @@
5555
Project="$(_DepsOutputDirectory)%(HostingStartupPackageReference.Identity)\HostingStartup.csproj"
5656
DepsFile="$(_DepsOutputDirectory)%(HostingStartupPackageReference.Identity)\p\HostingStartup.deps.json"
5757
TrimmedDepsFile="$(_DepsOutputDirectory)%(HostingStartupPackageReference.Identity)\%(HostingStartupPackageReference.Identity).deps.json"
58-
PackagePath="$(_BasePackagePath)\shared\Microsoft.AspNetCore.App\$(AspNetCoreMajorMinorVersion).0\"
58+
PackagePath="$(_BasePackagePath)shared\Microsoft.AspNetCore.App\$(AspNetCoreMajorMinorVersion).0\"
5959
/>
6060
</ItemGroup>
6161
<MakeDir Directories="$(_DepsOutputDirectory)" />

‎src/SiteExtensions/build.cmd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ SET RepoRoot=%~dp0..\..
33

44
ECHO Building x64 Microsoft.AspNetCore.Runtime.SiteExtension
55
CALL "%RepoRoot%\build.cmd" -arch x64 -projects "%~dp0Runtime\Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj" ^
6-
"/bl:%RepoRoot%/artifacts/log/SiteExtensions-Runtime-x86.binlog" %*
6+
"/bl:%RepoRoot%/artifacts/log/SiteExtensions-Runtime-x64.binlog" %*
77
IF %ERRORLEVEL% NEQ 0 (
88
EXIT /b %ErrorLevel%
99
)

0 commit comments

Comments
 (0)