Skip to content

Commit 8aa8c6b

Browse files
pakrympakrym
authored
Build branch logging SE in main build (#6312)
1 parent a06b0e3 commit 8aa8c6b

11 files changed

+202
-34
lines changed

‎build/AzureIntegration.targets

Lines changed: 0 additions & 30 deletions
This file was deleted.

‎build/SharedFx.targets

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
<CommonProps>$(CommonProps);AspNetUniverseBuildOffline=true</CommonProps>
4444
<CommonProps>$(CommonProps);RuntimeFrameworkVersion=$(MicrosoftNETCoreApp21PackageVersion)</CommonProps>
4545
<CommonProps>$(CommonProps);AppMetapackageVersion=$(PackageVersion)</CommonProps>
46+
<CommonProps>$(CommonProps);BuildNumber=$(BuildNumber)</CommonProps>
4647
</PropertyGroup>
4748

4849
<Error
@@ -99,6 +100,28 @@
99100
BuildInParallel="false" />
100101
</Target>
101102

103+
<Target Name="BuildSiteExtension" DependsOnTargets="BuildMetapackages" Condition="'$(BuildSiteExtension)' == 'true'" >
104+
<PropertyGroup>
105+
<AzureIntegrationProjProperties>
106+
AspNetUniverseBuildOffline=true;
107+
DotNetRestoreSourcePropsPath=$(GeneratedRestoreSourcesPropsPath);
108+
DotNetPackageVersionPropsPath=$(GeneratedPackageVersionPropsPath);
109+
BuildNumber=$(BuildNumber);
110+
Configuration=$(Configuration);
111+
IsFinalBuild=$(IsFinalBuild);
112+
</AzureIntegrationProjProperties>
113+
</PropertyGroup>
114+
115+
<!-- Pack logging site extension -->
116+
<MSBuild Projects="$(RepositoryRoot)\src\SiteExtensions\LoggingBranch\LoggingBranch.csproj" Targets="Restore;Pack" Properties="$(AzureIntegrationProjProperties);PackageOutputPath=$(BuildDir)" />
117+
</Target>
118+
119+
<Target Name="GetSiteExtensionArtifactInfo" Condition="'$(BuildSiteExtension)' == 'true'" >
120+
<MSBuild Projects="$(RepositoryRoot)\src\SiteExtensions\LoggingBranch\LoggingBranch.csproj" Targets="GetArtifactInfo" Properties="PackageOutputPath=$(BuildDir);BuildNumber=$(BuildNumber);DesignTimeBuild=true;IsFinalBuild=$(IsFinalBuild)">
121+
<Output TaskParameter="TargetOutputs" ItemName="ArtifactInfo" />
122+
</MSBuild>
123+
</Target>
124+
102125
<Target Name="DefineSharedFxPrerequisites" DependsOnTargets="ResolveCommitHash">
103126
<PropertyGroup>
104127
<RIDIsAcceptable Condition="'%(AllSharedFxRIDs.Identity)' == '$(SharedFxRID)'">true</RIDIsAcceptable>

‎build/artifacts.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
<PackageArtifact Include="Microsoft.AspNetCore.Authentication" AllMetapackage="true" AppMetapackage="true" Category="ship" />
4444
<PackageArtifact Include="Microsoft.AspNetCore.Authorization.Policy" AllMetapackage="true" AppMetapackage="true" Category="ship" />
4545
<PackageArtifact Include="Microsoft.AspNetCore.Authorization" AllMetapackage="true" AppMetapackage="true" Category="ship" />
46+
<PackageArtifact Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.2.1" AllMetapackage="false" Category="noship" Condition="'$(BuildSiteExtension)' == 'true'" />
4647
<PackageArtifact Include="Microsoft.AspNetCore.AzureAppServices.HostingStartup" AllMetapackage="true" Category="ship" />
4748
<PackageArtifact Include="Microsoft.AspNetCore.AzureAppServicesIntegration" AllMetapackage="true" Category="ship" />
4849
<PackageArtifact Include="Microsoft.AspNetCore.Connections.Abstractions" AllMetapackage="true" AppMetapackage="true" Category="ship" />

‎build/repo.props

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414
<DependencyPackageDir>$(RepositoryRoot).deps\build\</DependencyPackageDir>
1515
<SignedDependencyPackageDir>$(RepositoryRoot).deps\Signed\Packages\</SignedDependencyPackageDir>
1616
<SharedSourcesFolder>$(RepositoryRoot)src\Shared\</SharedSourcesFolder>
17+
<SharedFxArchitecture Condition="'$(SharedFxArchitecture)' == ''">$(SharedFxRid.Substring($([MSBuild]::Add($(SharedFxRid.LastIndexOf('-')), 1))))</SharedFxArchitecture>
18+
<BuildSiteExtension>false</BuildSiteExtension>
19+
<BuildSiteExtension Condition="'$(BuildSiteExtension)' == 'true' AND '$(OS)' != 'Windows_NT'">false</BuildSiteExtension>
1720
</PropertyGroup>
1821

1922
<ItemGroup>

‎build/repo.targets

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<Project>
22
<Import Project="RepositoryBuild.targets" />
33
<Import Project="PackageArchive.targets" />
4-
<Import Project="AzureIntegration.targets" />
54
<Import Project="SharedFx.targets" />
65
<Import Project="SharedFxInstaller.targets" />
76
<Import Project="Publish.targets" />
@@ -19,7 +18,7 @@
1918
<CompileDependsOn>$(CompileDependsOn);BuildProjects;PackSharedSources</CompileDependsOn>
2019
<CompileDependsOn Condition="'$(_ProjectsOnly)' != 'true'">$(CompileDependsOn);PackProjects;BuildRepositories</CompileDependsOn>
2120
<PackageDependsOn Condition=" '$(_ProjectsOnly)' == 'true'">$(PackageDependsOn);PackProjects</PackageDependsOn>
22-
<PackageDependsOn Condition="'$(TestOnly)' != 'true' AND '$(_ProjectsOnly)' != 'true'">$(PackageDependsOn);BuildMetapackages;CheckExpectedPackagesExist</PackageDependsOn>
21+
<PackageDependsOn Condition="'$(TestOnly)' != 'true' AND '$(_ProjectsOnly)' != 'true'">$(PackageDependsOn);BuildMetapackages;BuildSiteExtension;CheckExpectedPackagesExist</PackageDependsOn>
2322
<TestDependsOn>$(TestDependsOn);TestProjects</TestDependsOn>
2423
<TestDependsOn Condition="'$(_ProjectsOnly)' != 'true'">$(TestDependsOn);_TestRepositories</TestDependsOn>
2524
<GetArtifactInfoDependsOn>$(GetArtifactInfoDependsOn);GetProjectArtifactInfo</GetArtifactInfoDependsOn>
@@ -69,7 +68,7 @@
6968
</ItemGroup>
7069
</Target>
7170

72-
<Target Name="ResolveRepoInfo" DependsOnTargets="_ResolveProjectArtifactsInfoShipped;_PrepareRepositories;GetMetapackageArtifactInfo">
71+
<Target Name="ResolveRepoInfo" DependsOnTargets="_ResolveProjectArtifactsInfoShipped;_PrepareRepositories;GetMetapackageArtifactInfo;GetSiteExtensionArtifactInfo">
7372
<!-- We need to pass the NETCoreApp package versions to msbuild so that it doesn't complain about us using a different one than it was restored against. -->
7473
<PropertyGroup>
7574
<DesignTimeBuildProps>MicrosoftNETCoreAppPackageVersion=$(MicrosoftNETCoreAppPackageVersion);</DesignTimeBuildProps>

‎src/SiteExtensions/LoggingBranch/Directory.Build.targets

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<Project>
2+
3+
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.targets))\Directory.Build.targets" />
4+
5+
<Import Project="..\Sdk\SiteExtension.targets" />
6+
7+
<PropertyGroup>
8+
<!-- There is no build output -->
9+
<IncludeBuildOutput>false</IncludeBuildOutput>
10+
<!-- There are no symbols. -->
11+
<IncludeSymbols>false</IncludeSymbols>
12+
<!-- There is no API to check -->
13+
<EnableApiCheck>false</EnableApiCheck>
14+
<!-- Manually control dependencies -->
15+
<DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
16+
<!-- There is no documentation -->
17+
<GenerateDocumentationFile>false</GenerateDocumentationFile>
18+
<!-- There is no documentation -->
19+
<RunPackageAnalysis>false</RunPackageAnalysis>
20+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
21+
</PropertyGroup>
22+
23+
<Target Name="GetArtifactInfo" Returns="@(ArtifactInfo)">
24+
<ItemGroup>
25+
<ArtifactInfo Include="$(TargetPath)">
26+
<ArtifactType>NuGetPackage</ArtifactType>
27+
<PackageId>$(PackageId)</PackageId>
28+
<Version>$(PackageVersion)</Version>
29+
</ArtifactInfo>
30+
</ItemGroup>
31+
</Target>
32+
33+
</Project>

‎src/SiteExtensions/LoggingBranch/LoggingBranch.csproj

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TrimmedVersion>$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion)</TrimmedVersion>
5+
<title>ASP.NET Core Extensions</title>
6+
<Description>This extension enables additional functionality for ASP.NET Core on Azure WebSites, such as enabling Azure logging.</Description>
7+
<TargetFramework>net461</TargetFramework>
8+
<GenerateDocumentationFile>false</GenerateDocumentationFile>
9+
<PackageTags>aspnet;logging;aspnetcore;AzureSiteExtension;keyvault;configuration;dataprotection</PackageTags>
10+
<ContentTargetFolders>content</ContentTargetFolders>
11+
<PackageId>Microsoft.AspNetCore.AzureAppServices.SiteExtension.$(TrimmedVersion)</PackageId>
12+
<MicrosoftAspNetCoreAppPackageVersion>$(PackageVersion)</MicrosoftAspNetCoreAppPackageVersion>
13+
<HostingStartupRuntimeFrameworkVersion>$(MicrosoftNETCoreApp21PackageVersion)</HostingStartupRuntimeFrameworkVersion>
14+
<TargetFramework>net461</TargetFramework>
15+
<GenerateDocumentationFile>false</GenerateDocumentationFile>
16+
<PackageType>AzureSiteExtension</PackageType>
17+
<NoPackageAnalysis>true</NoPackageAnalysis>
18+
<IncludeBuildOutput>false</IncludeBuildOutput>
19+
<IncludeSymbols>false</IncludeSymbols>
20+
<IncludeSource>false</IncludeSource>
21+
<ContentTargetFolders>content</ContentTargetFolders>
22+
<IsPackageInThisPatch>true</IsPackageInThisPatch>
23+
</PropertyGroup>
24+
25+
<ItemGroup>
26+
<HostingStartupRuntimeStoreTargets Include="netcoreapp2.1" Runtime="win7-x64" />
27+
<HostingStartupRuntimeStoreTargets Include="netcoreapp2.1" Runtime="win7-x86" />
28+
<HostingStartupPackageReference Include="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="$(PackageVersion)" />
29+
30+
<PackageReference Include="Internal.AspNetCore.Sdk" PrivateAssets="All" Version="$(InternalAspNetCoreSdkPackageVersion)" />
31+
</ItemGroup>
32+
33+
</Project>

‎src/SiteExtensions/Sdk/HostingStartup/HostingStartup.csproj

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>netcoreapp2.1</TargetFramework>
5+
<OutputType>Exe</OutputType>
6+
</PropertyGroup>
7+
8+
<ItemGroup>
9+
<PackageReference Include="Microsoft.AspNetCore.App" Version="$(MicrosoftAspNetCoreAppPackageVersion)" PrivateAssets="None" />
10+
<PackageReference Include="$(HostingStartupPackageName)" Version="$(HostingStartupPackageVersion)" PrivateAssets="None" />
11+
</ItemGroup>
12+
13+
</Project>

‎src/SiteExtensions/Sdk/HostingStartup/Program.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
// Copyright (c) .NET Foundation and contributors. All rights reserved.
2+
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
3+
4+
public class Program
5+
{
6+
public static void Main() { }
7+
}

‎src/SiteExtensions/Sdk/SiteExtension.targets

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
<!--
2+
This file is automatically imported by NuGet into a user's project
3+
when it targets a single framework, or in classic (pre 2017) csproj projects.
4+
-->
5+
6+
<Project>
7+
<Target Name="GenerateHostingStartupDeps" Condition="'@(HostingStartupPackageReference->Count())' != '0'" BeforeTargets="_GetPackageFiles" >
8+
9+
<PropertyGroup>
10+
<_TemplatesDirectory>$(MSBuildThisFileDirectory)..\content\</_TemplatesDirectory>
11+
<_DepsOutputDirectory>$(RepositoryRoot).w\se\</_DepsOutputDirectory>
12+
<_WorkingDirectory>$(_DepsOutputDirectory)\depswork</_WorkingDirectory>
13+
<_BasePackagePath>content\additionaldeps\</_BasePackagePath>
14+
<_RuntimeStoreManifestFile>$(_DepsOutputDirectory)\rs.csproj</_RuntimeStoreManifestFile>
15+
<_RuntimeStoreOutput>$(_DepsOutputDirectory)\rs\</_RuntimeStoreOutput>
16+
<ManifestFileContents>
17+
<![CDATA[
18+
<Project Sdk="Microsoft.NET.Sdk">
19+
<ItemGroup>
20+
<PackageReference Remove="Internal.AspNetCore.Sdk" />
21+
<PackageReference Include="Microsoft.AspNetCore.App" Version="$(MicrosoftAspNetCoreAppPackageVersion)" IsImplicitlyDefined="true"/>
22+
<PackageReference Include="%(HostingStartupPackageReference.Identity)" Version="%(HostingStartupPackageReference.Version)" />
23+
</ItemGroup>
24+
</Project>
25+
]]>
26+
</ManifestFileContents>
27+
</PropertyGroup>
28+
29+
<ItemGroup>
30+
<_TemplateFiles Include="$(MSBuildThisFileDirectory)\HostingStartup\*.cs*" />
31+
<_HostingStartupPackageReference
32+
Include="%(HostingStartupPackageReference.Identity)"
33+
Source="%(HostingStartupPackageReference.Source)"
34+
Version="%(HostingStartupPackageReference.Version)"
35+
WorkingDirectory="$(_DepsOutputDirectory)%(HostingStartupPackageReference.Identity)"
36+
Project="$(_DepsOutputDirectory)%(HostingStartupPackageReference.Identity)\HostingStartup.csproj"
37+
DepsFile="$(_DepsOutputDirectory)%(HostingStartupPackageReference.Identity)\p\HostingStartup.deps.json"
38+
TrimmedDepsFile="$(_DepsOutputDirectory)%(HostingStartupPackageReference.Identity)\%(HostingStartupPackageReference.Identity).deps.json"
39+
PackagePath="$(_BasePackagePath)%(HostingStartupPackageReference.Identity)\shared\Microsoft.AspNetCore.App\$(MicrosoftAspNetCoreAppPackageVersion)\"
40+
/>
41+
</ItemGroup>
42+
<MakeDir Directories="$(_DepsOutputDirectory)" />
43+
44+
<!-- Generate runtime store -->
45+
<WriteLinesToFile File="$(_RuntimeStoreManifestFile)" Lines="$(ManifestFileContents)" Overwrite="true" Encoding="Unicode"/>
46+
47+
<PropertyGroup>
48+
<_CommonProperties>
49+
AspNetUniverseBuildOffline=true;
50+
DotNetRestoreSourcePropsPath=$(DotNetRestoreSourcePropsPath);
51+
DotNetPackageVersionPropsPath=$(DotNetPackageVersionPropsPath);
52+
BuildNumber=$(BuildNumber);
53+
Configuration=$(Configuration);
54+
IsFinalBuild=$(IsFinalBuild);
55+
MicrosoftAspNetCoreAppPackageVersion=$(MicrosoftAspNetCoreAppPackageVersion);
56+
RuntimeFrameworkVersion=$(HostingStartupRuntimeFrameworkVersion);
57+
</_CommonProperties>
58+
</PropertyGroup>
59+
60+
<MSBuild Projects="$(_RuntimeStoreManifestFile)"
61+
Targets="ComposeStore"
62+
Properties="TargetFramework=%(HostingStartupRuntimeStoreTargets.Identity);RuntimeIdentifier=%(HostingStartupRuntimeStoreTargets.Runtime);ComposeDir=$(_RuntimeStoreOutput)\%(HostingStartupRuntimeStoreTargets.Runtime);SkipOptimization=true;$(_CommonProperties)" />
63+
<!-- Generate deps -->
64+
<RemoveDir Directories="%(_HostingStartupPackageReference.WorkingDirectory)" />
65+
66+
<Copy SourceFiles="@(_TemplateFiles)" DestinationFolder="%(_HostingStartupPackageReference.WorkingDirectory)" />
67+
68+
<MSBuild Projects="%(_HostingStartupPackageReference.Project)"
69+
Targets="Restore"
70+
Properties="HostingStartupPackageName=%(_HostingStartupPackageReference.Identity);HostingStartupPackageVersion=%(_HostingStartupPackageReference.Version);UseAppHost=false;NoBuild=false;$(_CommonProperties)" />
71+
72+
<MSBuild Projects="%(_HostingStartupPackageReference.Project)"
73+
Targets="Publish"
74+
Properties="PublishDir=%(_HostingStartupPackageReference.WorkingDirectory)\p;HostingStartupPackageName=%(_HostingStartupPackageReference.Identity);HostingStartupPackageVersion=%(_HostingStartupPackageReference.Version);UseAppHost=false;NoBuild=false;IncludeMainProjectInDepsFile=false;$(_CommonProperties)" />
75+
<Copy SourceFiles="%(_HostingStartupPackageReference.DepsFile)" DestinationFiles="%(_HostingStartupPackageReference.TrimmedDepsFile)" />
76+
77+
<ItemGroup>
78+
<_RuntimeStoreFiles Include="$(_RuntimeStoreOutput)\%(HostingStartupRuntimeStoreTargets.Runtime)\**\*.dll" />
79+
80+
<Content Include="%(_RuntimeStoreFiles.Identity)" PackagePath="content\store\%(RecursiveDir)" />
81+
<Content Include="%(_HostingStartupPackageReference.TrimmedDepsFile)" PackagePath="%(_HostingStartupPackageReference.PackagePath)" />
82+
</ItemGroup>
83+
84+
</Target>
85+
86+
</Project>

‎version.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<AspNetCorePatchVersion>7</AspNetCorePatchVersion>
66
<PreReleaseLabel>servicing</PreReleaseLabel>
77
<PreReleaseBrandingLabel>Servicing</PreReleaseBrandingLabel>
8-
<BuildNumber Condition="'$(BuildNumber)' == ''">t000</BuildNumber>
8+
<BuildNumber Condition="'$(BuildNumber)' == '' OR '$(UsingLocalBuildNumber)' == 'true'">t000</BuildNumber>
99
<VersionPrefix>$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).$(AspNetCorePatchVersion)</VersionPrefix>
1010
<ExperimentalVersionPrefix>0.1.$(AspNetCorePatchVersion)</ExperimentalVersionPrefix>
1111

0 commit comments

Comments
 (0)