Build branch logging SE in main build (#6312)
This commit is contained in:
Pavel Krymets
GitHub
parent
a06b0e3968
commit
8aa8c6b2b0
|
|
@ -1,30 +0,0 @@
|
|||
<Project>
|
||||
<PropertyGroup>
|
||||
<AzureIntegrationProjectRoot>$(MSBuildThisFileDirectory)..\modules\AzureIntegration\</AzureIntegrationProjectRoot>
|
||||
</PropertyGroup>
|
||||
|
||||
<Target Name="BuildAzureIntegration" DependsOnTargets="PrepareOutputPaths;GeneratePropsFiles">
|
||||
<PropertyGroup>
|
||||
<AzureIntegrationProjProperties>
|
||||
AspNetUniverseBuildOffline=true;
|
||||
RepositoryRoot=$(AzureIntegrationProjectRoot);
|
||||
DotNetRestoreSourcePropsPath=$(GeneratedRestoreSourcesPropsPath);
|
||||
DotNetPackageVersionPropsPath=$(GeneratedPackageVersionPropsPath);
|
||||
BuildNumber=$(BuildNumber);
|
||||
Configuration=$(Configuration);
|
||||
IsFinalBuild=$(IsFinalBuild);
|
||||
</AzureIntegrationProjProperties>
|
||||
</PropertyGroup>
|
||||
|
||||
<MSBuild Projects="$(MSBuildProjectFullPath)"
|
||||
Targets="$(AzureIntegrationProjectTargets)"
|
||||
Properties="$(AzureIntegrationProjProperties)" />
|
||||
|
||||
<ItemGroup>
|
||||
<AzureIntegrationArtifacts Include="$(AzureIntegrationProjectRoot)artifacts\build\*" />
|
||||
</ItemGroup>
|
||||
|
||||
<Copy SourceFiles="@(AzureIntegrationArtifacts)" DestinationFolder="$(BuildDir)" />
|
||||
</Target>
|
||||
|
||||
</Project>
|
||||
|
|
@ -43,6 +43,7 @@
|
|||
<CommonProps>$(CommonProps);AspNetUniverseBuildOffline=true</CommonProps>
|
||||
<CommonProps>$(CommonProps);RuntimeFrameworkVersion=$(MicrosoftNETCoreApp21PackageVersion)</CommonProps>
|
||||
<CommonProps>$(CommonProps);AppMetapackageVersion=$(PackageVersion)</CommonProps>
|
||||
<CommonProps>$(CommonProps);BuildNumber=$(BuildNumber)</CommonProps>
|
||||
</PropertyGroup>
|
||||
|
||||
<Error
|
||||
|
|
@ -99,6 +100,28 @@
|
|||
BuildInParallel="false" />
|
||||
</Target>
|
||||
|
||||
<Target Name="BuildSiteExtension" DependsOnTargets="BuildMetapackages" Condition="'$(BuildSiteExtension)' == 'true'" >
|
||||
<PropertyGroup>
|
||||
<AzureIntegrationProjProperties>
|
||||
AspNetUniverseBuildOffline=true;
|
||||
DotNetRestoreSourcePropsPath=$(GeneratedRestoreSourcesPropsPath);
|
||||
DotNetPackageVersionPropsPath=$(GeneratedPackageVersionPropsPath);
|
||||
BuildNumber=$(BuildNumber);
|
||||
Configuration=$(Configuration);
|
||||
IsFinalBuild=$(IsFinalBuild);
|
||||
</AzureIntegrationProjProperties>
|
||||
</PropertyGroup>
|
||||
|
||||
<!-- Pack logging site extension -->
|
||||
<MSBuild Projects="$(RepositoryRoot)\src\SiteExtensions\LoggingBranch\LoggingBranch.csproj" Targets="Restore;Pack" Properties="$(AzureIntegrationProjProperties);PackageOutputPath=$(BuildDir)" />
|
||||
</Target>
|
||||
|
||||
<Target Name="GetSiteExtensionArtifactInfo" Condition="'$(BuildSiteExtension)' == 'true'" >
|
||||
<MSBuild Projects="$(RepositoryRoot)\src\SiteExtensions\LoggingBranch\LoggingBranch.csproj" Targets="GetArtifactInfo" Properties="PackageOutputPath=$(BuildDir);BuildNumber=$(BuildNumber);DesignTimeBuild=true;IsFinalBuild=$(IsFinalBuild)">
|
||||
<Output TaskParameter="TargetOutputs" ItemName="ArtifactInfo" />
|
||||
</MSBuild>
|
||||
</Target>
|
||||
|
||||
<Target Name="DefineSharedFxPrerequisites" DependsOnTargets="ResolveCommitHash">
|
||||
<PropertyGroup>
|
||||
<RIDIsAcceptable Condition="'%(AllSharedFxRIDs.Identity)' == '$(SharedFxRID)'">true</RIDIsAcceptable>
|
||||
|
|
|
|||
|
|
@ -43,6 +43,7 @@
|
|||
<PackageArtifact Include="Microsoft.AspNetCore.Authentication" AllMetapackage="true" AppMetapackage="true" Category="ship" />
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.Authorization.Policy" AllMetapackage="true" AppMetapackage="true" Category="ship" />
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.Authorization" AllMetapackage="true" AppMetapackage="true" Category="ship" />
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.2.1" AllMetapackage="false" Category="noship" Condition="'$(BuildSiteExtension)' == 'true'" />
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.AzureAppServices.HostingStartup" AllMetapackage="true" Category="ship" />
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.AzureAppServicesIntegration" AllMetapackage="true" Category="ship" />
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.Connections.Abstractions" AllMetapackage="true" AppMetapackage="true" Category="ship" />
|
||||
|
|
|
|||
|
|
@ -14,6 +14,9 @@
|
|||
<DependencyPackageDir>$(RepositoryRoot).deps\build\</DependencyPackageDir>
|
||||
<SignedDependencyPackageDir>$(RepositoryRoot).deps\Signed\Packages\</SignedDependencyPackageDir>
|
||||
<SharedSourcesFolder>$(RepositoryRoot)src\Shared\</SharedSourcesFolder>
|
||||
<SharedFxArchitecture Condition="'$(SharedFxArchitecture)' == ''">$(SharedFxRid.Substring($([MSBuild]::Add($(SharedFxRid.LastIndexOf('-')), 1))))</SharedFxArchitecture>
|
||||
<BuildSiteExtension>false</BuildSiteExtension>
|
||||
<BuildSiteExtension Condition="'$(BuildSiteExtension)' == 'true' AND '$(OS)' != 'Windows_NT'">false</BuildSiteExtension>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
<Project>
|
||||
<Import Project="RepositoryBuild.targets" />
|
||||
<Import Project="PackageArchive.targets" />
|
||||
<Import Project="AzureIntegration.targets" />
|
||||
<Import Project="SharedFx.targets" />
|
||||
<Import Project="SharedFxInstaller.targets" />
|
||||
<Import Project="Publish.targets" />
|
||||
|
|
@ -19,7 +18,7 @@
|
|||
<CompileDependsOn>$(CompileDependsOn);BuildProjects;PackSharedSources</CompileDependsOn>
|
||||
<CompileDependsOn Condition="'$(_ProjectsOnly)' != 'true'">$(CompileDependsOn);PackProjects;BuildRepositories</CompileDependsOn>
|
||||
<PackageDependsOn Condition=" '$(_ProjectsOnly)' == 'true'">$(PackageDependsOn);PackProjects</PackageDependsOn>
|
||||
<PackageDependsOn Condition="'$(TestOnly)' != 'true' AND '$(_ProjectsOnly)' != 'true'">$(PackageDependsOn);BuildMetapackages;CheckExpectedPackagesExist</PackageDependsOn>
|
||||
<PackageDependsOn Condition="'$(TestOnly)' != 'true' AND '$(_ProjectsOnly)' != 'true'">$(PackageDependsOn);BuildMetapackages;BuildSiteExtension;CheckExpectedPackagesExist</PackageDependsOn>
|
||||
<TestDependsOn>$(TestDependsOn);TestProjects</TestDependsOn>
|
||||
<TestDependsOn Condition="'$(_ProjectsOnly)' != 'true'">$(TestDependsOn);_TestRepositories</TestDependsOn>
|
||||
<GetArtifactInfoDependsOn>$(GetArtifactInfoDependsOn);GetProjectArtifactInfo</GetArtifactInfoDependsOn>
|
||||
|
|
@ -69,7 +68,7 @@
|
|||
</ItemGroup>
|
||||
</Target>
|
||||
|
||||
<Target Name="ResolveRepoInfo" DependsOnTargets="_ResolveProjectArtifactsInfoShipped;_PrepareRepositories;GetMetapackageArtifactInfo">
|
||||
<Target Name="ResolveRepoInfo" DependsOnTargets="_ResolveProjectArtifactsInfoShipped;_PrepareRepositories;GetMetapackageArtifactInfo;GetSiteExtensionArtifactInfo">
|
||||
<!-- 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. -->
|
||||
<PropertyGroup>
|
||||
<DesignTimeBuildProps>MicrosoftNETCoreAppPackageVersion=$(MicrosoftNETCoreAppPackageVersion);</DesignTimeBuildProps>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,33 @@
|
|||
<Project>
|
||||
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.targets))\Directory.Build.targets" />
|
||||
|
||||
<Import Project="..\Sdk\SiteExtension.targets" />
|
||||
|
||||
<PropertyGroup>
|
||||
<!-- There is no build output -->
|
||||
<IncludeBuildOutput>false</IncludeBuildOutput>
|
||||
<!-- There are no symbols. -->
|
||||
<IncludeSymbols>false</IncludeSymbols>
|
||||
<!-- There is no API to check -->
|
||||
<EnableApiCheck>false</EnableApiCheck>
|
||||
<!-- Manually control dependencies -->
|
||||
<DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
|
||||
<!-- There is no documentation -->
|
||||
<GenerateDocumentationFile>false</GenerateDocumentationFile>
|
||||
<!-- There is no documentation -->
|
||||
<RunPackageAnalysis>false</RunPackageAnalysis>
|
||||
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
|
||||
</PropertyGroup>
|
||||
|
||||
<Target Name="GetArtifactInfo" Returns="@(ArtifactInfo)">
|
||||
<ItemGroup>
|
||||
<ArtifactInfo Include="$(TargetPath)">
|
||||
<ArtifactType>NuGetPackage</ArtifactType>
|
||||
<PackageId>$(PackageId)</PackageId>
|
||||
<Version>$(PackageVersion)</Version>
|
||||
</ArtifactInfo>
|
||||
</ItemGroup>
|
||||
</Target>
|
||||
|
||||
</Project>
|
||||
|
|
@ -0,0 +1,33 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TrimmedVersion>$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion)</TrimmedVersion>
|
||||
<title>ASP.NET Core Extensions</title>
|
||||
<Description>This extension enables additional functionality for ASP.NET Core on Azure WebSites, such as enabling Azure logging.</Description>
|
||||
<TargetFramework>net461</TargetFramework>
|
||||
<GenerateDocumentationFile>false</GenerateDocumentationFile>
|
||||
<PackageTags>aspnet;logging;aspnetcore;AzureSiteExtension;keyvault;configuration;dataprotection</PackageTags>
|
||||
<ContentTargetFolders>content</ContentTargetFolders>
|
||||
<PackageId>Microsoft.AspNetCore.AzureAppServices.SiteExtension.$(TrimmedVersion)</PackageId>
|
||||
<MicrosoftAspNetCoreAppPackageVersion>$(PackageVersion)</MicrosoftAspNetCoreAppPackageVersion>
|
||||
<HostingStartupRuntimeFrameworkVersion>$(MicrosoftNETCoreApp21PackageVersion)</HostingStartupRuntimeFrameworkVersion>
|
||||
<TargetFramework>net461</TargetFramework>
|
||||
<GenerateDocumentationFile>false</GenerateDocumentationFile>
|
||||
<PackageType>AzureSiteExtension</PackageType>
|
||||
<NoPackageAnalysis>true</NoPackageAnalysis>
|
||||
<IncludeBuildOutput>false</IncludeBuildOutput>
|
||||
<IncludeSymbols>false</IncludeSymbols>
|
||||
<IncludeSource>false</IncludeSource>
|
||||
<ContentTargetFolders>content</ContentTargetFolders>
|
||||
<IsPackageInThisPatch>true</IsPackageInThisPatch>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<HostingStartupRuntimeStoreTargets Include="netcoreapp2.1" Runtime="win7-x64" />
|
||||
<HostingStartupRuntimeStoreTargets Include="netcoreapp2.1" Runtime="win7-x86" />
|
||||
<HostingStartupPackageReference Include="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="$(PackageVersion)" />
|
||||
|
||||
<PackageReference Include="Internal.AspNetCore.Sdk" PrivateAssets="All" Version="$(InternalAspNetCoreSdkPackageVersion)" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>netcoreapp2.1</TargetFramework>
|
||||
<OutputType>Exe</OutputType>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.AspNetCore.App" Version="$(MicrosoftAspNetCoreAppPackageVersion)" PrivateAssets="None" />
|
||||
<PackageReference Include="$(HostingStartupPackageName)" Version="$(HostingStartupPackageVersion)" PrivateAssets="None" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
// Copyright (c) .NET Foundation and contributors. All rights reserved.
|
||||
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
|
||||
|
||||
public class Program
|
||||
{
|
||||
public static void Main() { }
|
||||
}
|
||||
|
|
@ -0,0 +1,86 @@
|
|||
<!--
|
||||
This file is automatically imported by NuGet into a user's project
|
||||
when it targets a single framework, or in classic (pre 2017) csproj projects.
|
||||
-->
|
||||
|
||||
<Project>
|
||||
<Target Name="GenerateHostingStartupDeps" Condition="'@(HostingStartupPackageReference->Count())' != '0'" BeforeTargets="_GetPackageFiles" >
|
||||
|
||||
<PropertyGroup>
|
||||
<_TemplatesDirectory>$(MSBuildThisFileDirectory)..\content\</_TemplatesDirectory>
|
||||
<_DepsOutputDirectory>$(RepositoryRoot).w\se\</_DepsOutputDirectory>
|
||||
<_WorkingDirectory>$(_DepsOutputDirectory)\depswork</_WorkingDirectory>
|
||||
<_BasePackagePath>content\additionaldeps\</_BasePackagePath>
|
||||
<_RuntimeStoreManifestFile>$(_DepsOutputDirectory)\rs.csproj</_RuntimeStoreManifestFile>
|
||||
<_RuntimeStoreOutput>$(_DepsOutputDirectory)\rs\</_RuntimeStoreOutput>
|
||||
<ManifestFileContents>
|
||||
<![CDATA[
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<ItemGroup>
|
||||
<PackageReference Remove="Internal.AspNetCore.Sdk" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.App" Version="$(MicrosoftAspNetCoreAppPackageVersion)" IsImplicitlyDefined="true"/>
|
||||
<PackageReference Include="%(HostingStartupPackageReference.Identity)" Version="%(HostingStartupPackageReference.Version)" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
]]>
|
||||
</ManifestFileContents>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<_TemplateFiles Include="$(MSBuildThisFileDirectory)\HostingStartup\*.cs*" />
|
||||
<_HostingStartupPackageReference
|
||||
Include="%(HostingStartupPackageReference.Identity)"
|
||||
Source="%(HostingStartupPackageReference.Source)"
|
||||
Version="%(HostingStartupPackageReference.Version)"
|
||||
WorkingDirectory="$(_DepsOutputDirectory)%(HostingStartupPackageReference.Identity)"
|
||||
Project="$(_DepsOutputDirectory)%(HostingStartupPackageReference.Identity)\HostingStartup.csproj"
|
||||
DepsFile="$(_DepsOutputDirectory)%(HostingStartupPackageReference.Identity)\p\HostingStartup.deps.json"
|
||||
TrimmedDepsFile="$(_DepsOutputDirectory)%(HostingStartupPackageReference.Identity)\%(HostingStartupPackageReference.Identity).deps.json"
|
||||
PackagePath="$(_BasePackagePath)%(HostingStartupPackageReference.Identity)\shared\Microsoft.AspNetCore.App\$(MicrosoftAspNetCoreAppPackageVersion)\"
|
||||
/>
|
||||
</ItemGroup>
|
||||
<MakeDir Directories="$(_DepsOutputDirectory)" />
|
||||
|
||||
<!-- Generate runtime store -->
|
||||
<WriteLinesToFile File="$(_RuntimeStoreManifestFile)" Lines="$(ManifestFileContents)" Overwrite="true" Encoding="Unicode"/>
|
||||
|
||||
<PropertyGroup>
|
||||
<_CommonProperties>
|
||||
AspNetUniverseBuildOffline=true;
|
||||
DotNetRestoreSourcePropsPath=$(DotNetRestoreSourcePropsPath);
|
||||
DotNetPackageVersionPropsPath=$(DotNetPackageVersionPropsPath);
|
||||
BuildNumber=$(BuildNumber);
|
||||
Configuration=$(Configuration);
|
||||
IsFinalBuild=$(IsFinalBuild);
|
||||
MicrosoftAspNetCoreAppPackageVersion=$(MicrosoftAspNetCoreAppPackageVersion);
|
||||
RuntimeFrameworkVersion=$(HostingStartupRuntimeFrameworkVersion);
|
||||
</_CommonProperties>
|
||||
</PropertyGroup>
|
||||
|
||||
<MSBuild Projects="$(_RuntimeStoreManifestFile)"
|
||||
Targets="ComposeStore"
|
||||
Properties="TargetFramework=%(HostingStartupRuntimeStoreTargets.Identity);RuntimeIdentifier=%(HostingStartupRuntimeStoreTargets.Runtime);ComposeDir=$(_RuntimeStoreOutput)\%(HostingStartupRuntimeStoreTargets.Runtime);SkipOptimization=true;$(_CommonProperties)" />
|
||||
<!-- Generate deps -->
|
||||
<RemoveDir Directories="%(_HostingStartupPackageReference.WorkingDirectory)" />
|
||||
|
||||
<Copy SourceFiles="@(_TemplateFiles)" DestinationFolder="%(_HostingStartupPackageReference.WorkingDirectory)" />
|
||||
|
||||
<MSBuild Projects="%(_HostingStartupPackageReference.Project)"
|
||||
Targets="Restore"
|
||||
Properties="HostingStartupPackageName=%(_HostingStartupPackageReference.Identity);HostingStartupPackageVersion=%(_HostingStartupPackageReference.Version);UseAppHost=false;NoBuild=false;$(_CommonProperties)" />
|
||||
|
||||
<MSBuild Projects="%(_HostingStartupPackageReference.Project)"
|
||||
Targets="Publish"
|
||||
Properties="PublishDir=%(_HostingStartupPackageReference.WorkingDirectory)\p;HostingStartupPackageName=%(_HostingStartupPackageReference.Identity);HostingStartupPackageVersion=%(_HostingStartupPackageReference.Version);UseAppHost=false;NoBuild=false;IncludeMainProjectInDepsFile=false;$(_CommonProperties)" />
|
||||
<Copy SourceFiles="%(_HostingStartupPackageReference.DepsFile)" DestinationFiles="%(_HostingStartupPackageReference.TrimmedDepsFile)" />
|
||||
|
||||
<ItemGroup>
|
||||
<_RuntimeStoreFiles Include="$(_RuntimeStoreOutput)\%(HostingStartupRuntimeStoreTargets.Runtime)\**\*.dll" />
|
||||
|
||||
<Content Include="%(_RuntimeStoreFiles.Identity)" PackagePath="content\store\%(RecursiveDir)" />
|
||||
<Content Include="%(_HostingStartupPackageReference.TrimmedDepsFile)" PackagePath="%(_HostingStartupPackageReference.PackagePath)" />
|
||||
</ItemGroup>
|
||||
|
||||
</Target>
|
||||
|
||||
</Project>
|
||||
|
|
@ -5,7 +5,7 @@
|
|||
<AspNetCorePatchVersion>7</AspNetCorePatchVersion>
|
||||
<PreReleaseLabel>servicing</PreReleaseLabel>
|
||||
<PreReleaseBrandingLabel>Servicing</PreReleaseBrandingLabel>
|
||||
<BuildNumber Condition="'$(BuildNumber)' == ''">t000</BuildNumber>
|
||||
<BuildNumber Condition="'$(BuildNumber)' == '' OR '$(UsingLocalBuildNumber)' == 'true'">t000</BuildNumber>
|
||||
<VersionPrefix>$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).$(AspNetCorePatchVersion)</VersionPrefix>
|
||||
<ExperimentalVersionPrefix>0.1.$(AspNetCorePatchVersion)</ExperimentalVersionPrefix>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue