diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml
index bdebce016c..ab2ad89b13 100644
--- a/.azure/pipelines/ci.yml
+++ b/.azure/pipelines/ci.yml
@@ -30,22 +30,6 @@ jobs:
- powershell: ./eng/scripts/CodeCheck.ps1 -ci
displayName: Run eng/scripts/CodeCheck.ps1
-- template: jobs/default-build.yml
- parameters:
- codeSign: true
- agentOs: Windows
- buildScript: ./src/SiteExtensions/LoggingAggregate/build.cmd
- buildArgs: -ci -sign /p:SignType=$(_SignType)
- installNodeJs: false
- installJdk: false
- jobName: SiteExtensions
- jobDisplayName: "Build: Azure Logging Site Extension"
- artifacts:
- - name: AzureSiteExtensions_Packages
- path: artifacts/packages/
- - name: AzureSiteExtensions_Logs
- path: artifacts/logs/
-
# Build Windows (x64/x86)
- template: jobs/default-build.yml
parameters:
@@ -74,6 +58,8 @@ jobs:
# Windows installers bundle both x86 and x64 assets
- powershell: ./src/Installers/Windows/build.ps1 -ci /p:SignType=$(_SignType)
displayName: Build Installers
+ - powershell: ./build.ps1 -ci -sign -forceCoreMsbuild -projects ./src/SiteExtensions/LoggingAggregate/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj
+ displayName: Build SiteExtension
- script: ./build.cmd -ci -sign /t:SignCheck /p:SignType=$(_SignType)
displayName: Run signcheck
artifacts:
diff --git a/.azure/pipelines/site-extensions.yml b/.azure/pipelines/site-extensions.yml
deleted file mode 100644
index e613be3201..0000000000
--- a/.azure/pipelines/site-extensions.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-trigger:
- branches:
- include:
- - master
-
-phases:
-- phase: SiteExtensions
- pool:
- name: dotnet-internal-temp
- variables:
- CI: true
- DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
-
- # This variable is required by MicroBuildSigningPlugin to determine permissions for codesigning.
- TeamName: AspNetCore
-
- # SignType = { test, real }
- # This is prefixed underscore because variables automatically become environment variables (and therefore MSBuild properties),
- # and this one was causing issues in MSBuild projects which use the $(SignType) MSbuild prop.
- _SignType: real
-
- steps:
- - task: MicroBuildSigningPlugin@1
- displayName: Install MicroBuild plugin
- condition: and(succeeded(), in(variables['_SignType'], 'test', 'real'))
- inputs:
- signType: $(_SignType)
- zipSources: false
- - script: src/SiteExtensions/LoggingAggregate/build.cmd -ci -sign
- displayName: Run src/SiteExtensions/LoggingAggregate/build.cmd
- - task: PublishBuildArtifacts@1
- displayName: Upload artifacts
- condition: eq(variables['system.pullrequest.isfork'], false)
- inputs:
- pathtoPublish: ./artifacts/
- artifactName: artifacts-Windows-Release
- artifactType: Container
- - task: MicroBuildCleanup@1
- displayName: Cleanup MicroBuild tasks
- condition: always()
diff --git a/build/repo.props b/build/repo.props
index 10ad43d598..19384ac996 100644
--- a/build/repo.props
+++ b/build/repo.props
@@ -140,6 +140,7 @@
$(RepositoryRoot)src\Identity\**\*.*proj;
$(RepositoryRoot)src\Servers\**\*.csproj;
$(RepositoryRoot)src\Security\**\*.*proj;
+ $(RepositoryRoot)src\SiteExtensions\Microsoft.Web.Xdt.Extensions\**\*.csproj;
$(RepositoryRoot)src\Shared\**\*.*proj;
$(RepositoryRoot)src\Tools\**\*.*proj;
$(RepositoryRoot)src\Middleware\**\*.csproj;
diff --git a/eng/Dependencies.props b/eng/Dependencies.props
index c842d044f0..c667bd4414 100644
--- a/eng/Dependencies.props
+++ b/eng/Dependencies.props
@@ -31,6 +31,8 @@ and are generated based on the last package release.
+
+
diff --git a/eng/ProjectReferences.props b/eng/ProjectReferences.props
index cf82e398f3..51da91165a 100644
--- a/eng/ProjectReferences.props
+++ b/eng/ProjectReferences.props
@@ -63,6 +63,7 @@
+
diff --git a/eng/Versions.props b/eng/Versions.props
index 1ab0c86739..33bb13d0bc 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -147,6 +147,9 @@
0.8.0-preview-20190125.1
0.8.0-preview1-20181126.4
+
+ 2.1.1
+ 2.2.0
0.9.9
0.10.13
diff --git a/src/SiteExtensions/LoggingAggregate/Directory.Build.props b/src/SiteExtensions/LoggingAggregate/Directory.Build.props
deleted file mode 100644
index 54d0fcaec2..0000000000
--- a/src/SiteExtensions/LoggingAggregate/Directory.Build.props
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
- $(MSBuildThisFileDirectory)..\..\..\artifacts\packages\$(Configuration)\Shipping
-
-
-
diff --git a/src/SiteExtensions/LoggingAggregate/Directory.Build.targets b/src/SiteExtensions/LoggingAggregate/Directory.Build.targets
deleted file mode 100644
index 3787302e64..0000000000
--- a/src/SiteExtensions/LoggingAggregate/Directory.Build.targets
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
diff --git a/src/SiteExtensions/LoggingAggregate/SiteExtensions.sln b/src/SiteExtensions/LoggingAggregate/SiteExtensions.sln
deleted file mode 100644
index eb24ce3992..0000000000
--- a/src/SiteExtensions/LoggingAggregate/SiteExtensions.sln
+++ /dev/null
@@ -1,74 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26124.0
-MinimumVisualStudioVersion = 15.0.26124.0
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{0ED05384-4F64-44BA-A4AA-47519DA26E8C}"
-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", "..\Microsoft.Web.Xdt.Extensions\src\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}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Any CPU = Debug|Any CPU
- Debug|x64 = Debug|x64
- Debug|x86 = Debug|x86
- Release|Any CPU = Release|Any CPU
- Release|x64 = Release|x64
- Release|x86 = Release|x86
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {69E22952-302D-4C56-B2BE-7C086EB05C79}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {69E22952-302D-4C56-B2BE-7C086EB05C79}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {69E22952-302D-4C56-B2BE-7C086EB05C79}.Debug|x64.ActiveCfg = Debug|Any CPU
- {69E22952-302D-4C56-B2BE-7C086EB05C79}.Debug|x64.Build.0 = Debug|Any CPU
- {69E22952-302D-4C56-B2BE-7C086EB05C79}.Debug|x86.ActiveCfg = Debug|Any CPU
- {69E22952-302D-4C56-B2BE-7C086EB05C79}.Debug|x86.Build.0 = Debug|Any CPU
- {69E22952-302D-4C56-B2BE-7C086EB05C79}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {69E22952-302D-4C56-B2BE-7C086EB05C79}.Release|Any CPU.Build.0 = Release|Any CPU
- {69E22952-302D-4C56-B2BE-7C086EB05C79}.Release|x64.ActiveCfg = Release|Any CPU
- {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
- {A0798DB8-7681-4F00-94EC-CC966F4F3CD0}.Debug|x64.Build.0 = Debug|Any CPU
- {A0798DB8-7681-4F00-94EC-CC966F4F3CD0}.Debug|x86.ActiveCfg = Debug|Any CPU
- {A0798DB8-7681-4F00-94EC-CC966F4F3CD0}.Debug|x86.Build.0 = Debug|Any CPU
- {A0798DB8-7681-4F00-94EC-CC966F4F3CD0}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {A0798DB8-7681-4F00-94EC-CC966F4F3CD0}.Release|Any CPU.Build.0 = Release|Any CPU
- {A0798DB8-7681-4F00-94EC-CC966F4F3CD0}.Release|x64.ActiveCfg = Release|Any CPU
- {A0798DB8-7681-4F00-94EC-CC966F4F3CD0}.Release|x64.Build.0 = Release|Any CPU
- {A0798DB8-7681-4F00-94EC-CC966F4F3CD0}.Release|x86.ActiveCfg = Release|Any CPU
- {A0798DB8-7681-4F00-94EC-CC966F4F3CD0}.Release|x86.Build.0 = Release|Any CPU
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- 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
- SolutionGuid = {7ACE43EF-2C19-4D80-B7DB-0169D9302623}
- EndGlobalSection
-EndGlobal
diff --git a/src/SiteExtensions/LoggingAggregate/build.cmd b/src/SiteExtensions/LoggingAggregate/build.cmd
deleted file mode 100644
index 2e6323b2f9..0000000000
--- a/src/SiteExtensions/LoggingAggregate/build.cmd
+++ /dev/null
@@ -1,3 +0,0 @@
-@ECHO OFF
-SET RepoRoot="%~dp0..\..\.."
-%RepoRoot%\build.cmd -Pack -ForceCoreMsBuild -Projects "%~dp0\**\*.csproj" %*
diff --git a/src/SiteExtensions/LoggingAggregate/build/dependencies.props b/src/SiteExtensions/LoggingAggregate/build/dependencies.props
deleted file mode 100644
index ba3bb9de99..0000000000
--- a/src/SiteExtensions/LoggingAggregate/build/dependencies.props
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
- $(MSBuildAllProjects);$(MSBuildThisFileFullPath)
-
-
-
- 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
deleted file mode 100644
index 419564007a..0000000000
--- a/src/SiteExtensions/LoggingAggregate/build/repo.props
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
- $(RepositoryRoot)eng\signcheck.exclusions.txt
-
-
-
diff --git a/src/SiteExtensions/LoggingAggregate/build/sources.props b/src/SiteExtensions/LoggingAggregate/build/sources.props
deleted file mode 100644
index 322b1005da..0000000000
--- a/src/SiteExtensions/LoggingAggregate/build/sources.props
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
- $(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;
-
-
-
-
\ No newline at end of file
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 1140ad94ee..4b9fcec234 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
@@ -13,24 +13,29 @@
false
false
content
-
+ true
+ true
+
+ $(RestoreSources);
+ $(ArtifactsNonShippingPackagesDir)
+
-
-
-
-
+
+
+
+
-
+
-
+
diff --git a/src/SiteExtensions/LoggingAggregate/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/applicationHost.xdt b/src/SiteExtensions/LoggingAggregate/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/applicationHost.xdt
index 7078c4f254..f3f732ede1 100644
--- a/src/SiteExtensions/LoggingAggregate/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/applicationHost.xdt
+++ b/src/SiteExtensions/LoggingAggregate/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/applicationHost.xdt
@@ -7,7 +7,7 @@
-
+
diff --git a/src/SiteExtensions/Microsoft.Web.Xdt.Extensions/tests/Microsoft.Web.Xdt.Extensions.Tests.csproj b/src/SiteExtensions/Microsoft.Web.Xdt.Extensions/tests/Microsoft.Web.Xdt.Extensions.Tests.csproj
index 026516e0ae..b73f8dc9e1 100644
--- a/src/SiteExtensions/Microsoft.Web.Xdt.Extensions/tests/Microsoft.Web.Xdt.Extensions.Tests.csproj
+++ b/src/SiteExtensions/Microsoft.Web.Xdt.Extensions/tests/Microsoft.Web.Xdt.Extensions.Tests.csproj
@@ -27,7 +27,7 @@
-
+
diff --git a/src/SiteExtensions/Sdk/SiteExtension.targets b/src/SiteExtensions/Sdk/SiteExtension.targets
index 0a027b15bc..beed2c8708 100644
--- a/src/SiteExtensions/Sdk/SiteExtension.targets
+++ b/src/SiteExtensions/Sdk/SiteExtension.targets
@@ -50,7 +50,7 @@
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)\"
+ PackagePath="$(_BasePackagePath)\shared\Microsoft.AspNetCore.App\$(MicrosoftAspNetCoreAppPackageVersion)\"
/>