diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index 6d638e14cf..2720630c00 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -60,3 +60,4 @@ jobs: parameters: TestGroupName: IISBackCompat skipArgs: "/p:SkipIISBackwardsCompatibilityTests=false /p:SkipIISTests=true /p:SkipIISExpressTests=true /p:SkipIISForwardsCompatibilityTests=true" +- template: jobs/site-extensions-job.yml \ No newline at end of file diff --git a/.azure/pipelines/jobs/site-extensions-job.yml b/.azure/pipelines/jobs/site-extensions-job.yml new file mode 100644 index 0000000000..b21f6cc027 --- /dev/null +++ b/.azure/pipelines/jobs/site-extensions-job.yml @@ -0,0 +1,10 @@ +jobs: +- template: default-build.yml + parameters: + buildScript: ./src/SiteExtensions/LoggingAggregate/build.cmd + buildArgs: "-ci" + jobName: SiteExtensions + jobDisplayName: "Build logging site extension" + artifacts: + publish: true + path: 'src/SiteExtensions/LoggingAggregate/artifacts/' diff --git a/.azure/pipelines/site-extensions.yml b/.azure/pipelines/site-extensions.yml index 3d1359e56a..bd6759a0e0 100644 --- a/.azure/pipelines/site-extensions.yml +++ b/.azure/pipelines/site-extensions.yml @@ -1,7 +1,7 @@ trigger: branches: include: - - release/2.2 + - master paths: include: - src/SiteExtensions diff --git a/src/SiteExtensions/LoggingAggregate/Directory.Build.props b/src/SiteExtensions/LoggingAggregate/Directory.Build.props index 4710620462..c2a280b422 100644 --- a/src/SiteExtensions/LoggingAggregate/Directory.Build.props +++ b/src/SiteExtensions/LoggingAggregate/Directory.Build.props @@ -6,8 +6,7 @@ - false - false + $(MSBuildThisFileDirectory)artifacts\ diff --git a/src/SiteExtensions/LoggingAggregate/SiteExtensions.sln b/src/SiteExtensions/LoggingAggregate/SiteExtensions.sln index 9e0983fafd..39b0b63e47 100644 --- a/src/SiteExtensions/LoggingAggregate/SiteExtensions.sln +++ b/src/SiteExtensions/LoggingAggregate/SiteExtensions.sln @@ -7,6 +7,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{0ED05384-4F6 EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.AzureAppServices.SiteExtension", "src\Microsoft.AspNetCore.AzureAppServices.SiteExtension\Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj", "{69E22952-302D-4C56-B2BE-7C086EB05C79}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Web.Xdt.Extensions", "src\Microsoft.Web.Xdt.Extensions\Microsoft.Web.Xdt.Extensions.csproj", "{637E1D65-7F1C-476B-AD0A-30B295DF5414}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{6C71D9CD-271C-41CB-ACCD-9EABED6C9E80}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.AzureAppServices.SiteExtension.Tests", "test\Microsoft.AspNetCore.AzureAppServices.SiteExtension.Tests\Microsoft.AspNetCore.AzureAppServices.SiteExtension.Tests.csproj", "{A0798DB8-7681-4F00-94EC-CC966F4F3CD0}" @@ -33,6 +35,18 @@ Global {69E22952-302D-4C56-B2BE-7C086EB05C79}.Release|x64.Build.0 = Release|Any CPU {69E22952-302D-4C56-B2BE-7C086EB05C79}.Release|x86.ActiveCfg = Release|Any CPU {69E22952-302D-4C56-B2BE-7C086EB05C79}.Release|x86.Build.0 = Release|Any CPU + {637E1D65-7F1C-476B-AD0A-30B295DF5414}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {637E1D65-7F1C-476B-AD0A-30B295DF5414}.Debug|Any CPU.Build.0 = Debug|Any CPU + {637E1D65-7F1C-476B-AD0A-30B295DF5414}.Debug|x64.ActiveCfg = Debug|Any CPU + {637E1D65-7F1C-476B-AD0A-30B295DF5414}.Debug|x64.Build.0 = Debug|Any CPU + {637E1D65-7F1C-476B-AD0A-30B295DF5414}.Debug|x86.ActiveCfg = Debug|Any CPU + {637E1D65-7F1C-476B-AD0A-30B295DF5414}.Debug|x86.Build.0 = Debug|Any CPU + {637E1D65-7F1C-476B-AD0A-30B295DF5414}.Release|Any CPU.ActiveCfg = Release|Any CPU + {637E1D65-7F1C-476B-AD0A-30B295DF5414}.Release|Any CPU.Build.0 = Release|Any CPU + {637E1D65-7F1C-476B-AD0A-30B295DF5414}.Release|x64.ActiveCfg = Release|Any CPU + {637E1D65-7F1C-476B-AD0A-30B295DF5414}.Release|x64.Build.0 = Release|Any CPU + {637E1D65-7F1C-476B-AD0A-30B295DF5414}.Release|x86.ActiveCfg = Release|Any CPU + {637E1D65-7F1C-476B-AD0A-30B295DF5414}.Release|x86.Build.0 = Release|Any CPU {A0798DB8-7681-4F00-94EC-CC966F4F3CD0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A0798DB8-7681-4F00-94EC-CC966F4F3CD0}.Debug|Any CPU.Build.0 = Debug|Any CPU {A0798DB8-7681-4F00-94EC-CC966F4F3CD0}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -51,6 +65,7 @@ Global EndGlobalSection GlobalSection(NestedProjects) = preSolution {69E22952-302D-4C56-B2BE-7C086EB05C79} = {0ED05384-4F64-44BA-A4AA-47519DA26E8C} + {637E1D65-7F1C-476B-AD0A-30B295DF5414} = {0ED05384-4F64-44BA-A4AA-47519DA26E8C} {A0798DB8-7681-4F00-94EC-CC966F4F3CD0} = {6C71D9CD-271C-41CB-ACCD-9EABED6C9E80} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution diff --git a/src/SiteExtensions/LoggingAggregate/build.cmd b/src/SiteExtensions/LoggingAggregate/build.cmd index 3b0c1b533a..2e6323b2f9 100644 --- a/src/SiteExtensions/LoggingAggregate/build.cmd +++ b/src/SiteExtensions/LoggingAggregate/build.cmd @@ -1,3 +1,3 @@ @ECHO OFF -SET RepoRoot="%~dp0..\.." -%RepoRoot%\build.cmd -All -RepoRoot %~dp0 %* +SET RepoRoot="%~dp0..\..\.." +%RepoRoot%\build.cmd -Pack -ForceCoreMsBuild -Projects "%~dp0\**\*.csproj" %* diff --git a/src/SiteExtensions/LoggingAggregate/build.sh b/src/SiteExtensions/LoggingAggregate/build.sh deleted file mode 100644 index 7923286d9d..0000000000 --- a/src/SiteExtensions/LoggingAggregate/build.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -set -euo pipefail - -DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -repo_root="$DIR/../.." -"$repo_root/build.sh" -RepoRoot "$DIR" "$@" diff --git a/src/SiteExtensions/LoggingAggregate/build/dependencies.props b/src/SiteExtensions/LoggingAggregate/build/dependencies.props index 7fd2b962dc..ba3bb9de99 100644 --- a/src/SiteExtensions/LoggingAggregate/build/dependencies.props +++ b/src/SiteExtensions/LoggingAggregate/build/dependencies.props @@ -3,11 +3,15 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - - - 2.1.1-rtm-31076 - 2.2.0-rtm-35515 + 2.2.1-build-20181213.2 + 2.1.1 + 2.2.0 + 3.0.0-preview-19075-0444 + 15.6.1 + 1.4.0 + 2.4.0 + 2.4.0 diff --git a/src/SiteExtensions/LoggingAggregate/build/repo.props b/src/SiteExtensions/LoggingAggregate/build/repo.props index 0888e183c7..419564007a 100644 --- a/src/SiteExtensions/LoggingAggregate/build/repo.props +++ b/src/SiteExtensions/LoggingAggregate/build/repo.props @@ -1,8 +1,11 @@ + + + + + - - true $(RepositoryRoot)eng\signcheck.exclusions.txt diff --git a/src/SiteExtensions/LoggingAggregate/build/sources.props b/src/SiteExtensions/LoggingAggregate/build/sources.props index 43ce6137a6..322b1005da 100644 --- a/src/SiteExtensions/LoggingAggregate/build/sources.props +++ b/src/SiteExtensions/LoggingAggregate/build/sources.props @@ -5,6 +5,7 @@ $(RestoreSources); https://api.nuget.org/v3/index.json; https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json; + https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json; diff --git a/src/SiteExtensions/LoggingAggregate/src/Directory.Build.props b/src/SiteExtensions/LoggingAggregate/src/Directory.Build.props deleted file mode 100644 index 4b89a431e7..0000000000 --- a/src/SiteExtensions/LoggingAggregate/src/Directory.Build.props +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/SiteExtensions/LoggingAggregate/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj b/src/SiteExtensions/LoggingAggregate/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj index 03d5f168e4..1140ad94ee 100644 --- a/src/SiteExtensions/LoggingAggregate/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj +++ b/src/SiteExtensions/LoggingAggregate/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj @@ -1,8 +1,8 @@ - ASP.NET Core Logging Extensions - This extension enables additional functionality for ASP.NET Core on Azure WebSites, such as enabling Azure logging. + ASP.NET Core Logging Integration + This site extension enables logging integration for ASP.NET Core applications on Azure App Service. net461 false aspnet;logging;aspnetcore;AzureSiteExtension;keyvault;configuration;dataprotection @@ -14,23 +14,23 @@ false content - - false + + - + - + diff --git a/src/SiteExtensions/LoggingAggregate/test/Directory.Build.props b/src/SiteExtensions/LoggingAggregate/test/Directory.Build.props index 41a9596057..ab8bb76491 100644 --- a/src/SiteExtensions/LoggingAggregate/test/Directory.Build.props +++ b/src/SiteExtensions/LoggingAggregate/test/Directory.Build.props @@ -2,7 +2,6 @@ - diff --git a/src/SiteExtensions/LoggingAggregate/test/Microsoft.AspNetCore.AzureAppServices.SiteExtension.Tests/Microsoft.AspNetCore.AzureAppServices.SiteExtension.Tests.csproj b/src/SiteExtensions/LoggingAggregate/test/Microsoft.AspNetCore.AzureAppServices.SiteExtension.Tests/Microsoft.AspNetCore.AzureAppServices.SiteExtension.Tests.csproj index 9928aadbcc..e1212ece07 100644 --- a/src/SiteExtensions/LoggingAggregate/test/Microsoft.AspNetCore.AzureAppServices.SiteExtension.Tests/Microsoft.AspNetCore.AzureAppServices.SiteExtension.Tests.csproj +++ b/src/SiteExtensions/LoggingAggregate/test/Microsoft.AspNetCore.AzureAppServices.SiteExtension.Tests/Microsoft.AspNetCore.AzureAppServices.SiteExtension.Tests.csproj @@ -23,7 +23,7 @@ - + diff --git a/src/SiteExtensions/LoggingAggregate/version.props b/src/SiteExtensions/LoggingAggregate/version.props index bcf920cf80..b879d2b9dc 100644 --- a/src/SiteExtensions/LoggingAggregate/version.props +++ b/src/SiteExtensions/LoggingAggregate/version.props @@ -1,12 +1,10 @@ 3.0.0 - alpha1 - $(VersionPrefix) - $(VersionPrefix)-$(VersionSuffix)-final + alpha + $(VersionPrefix) t000 a- - $(FeatureBranchVersionPrefix)$(VersionSuffix)-$([System.Text.RegularExpressions.Regex]::Replace('$(FeatureBranchVersionSuffix)', '[^\w-]', '-')) $(VersionSuffix)-$(BuildNumber)