From f58d3d4e9424f9d33d8f8de2bc9a09f9a11d7079 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Fri, 26 Oct 2018 09:49:27 -0700 Subject: [PATCH] Remove unused content from logging site extension (#245) --- AzureIntegration.sln | 7 -- ...Core.AzureAppServices.SiteExtension.csproj | 10 -- .../applicationHost.xdt | 16 ---- .../scmApplicationHost.xdt | 5 - ...zureAppServices.SiteExtension.Tests.csproj | 29 ------ .../TransformTest.cs | 93 ------------------- .../config_empty.xml | 3 - .../config_existingemptyvalue.xml | 12 --- .../config_existingline.xml | 12 --- .../config_existingvalue.xml | 12 --- 10 files changed, 199 deletions(-) delete mode 100644 extensions/Microsoft.AspNetCore.AzureAppServices.SiteExtension/applicationHost.xdt delete mode 100644 extensions/Microsoft.AspNetCore.AzureAppServices.SiteExtension/scmApplicationHost.xdt delete mode 100644 test/Microsoft.AspNetCore.AzureAppServices.SiteExtension.Tests/Microsoft.AspNetCore.AzureAppServices.SiteExtension.Tests.csproj delete mode 100644 test/Microsoft.AspNetCore.AzureAppServices.SiteExtension.Tests/TransformTest.cs delete mode 100644 test/Microsoft.AspNetCore.AzureAppServices.SiteExtension.Tests/config_empty.xml delete mode 100644 test/Microsoft.AspNetCore.AzureAppServices.SiteExtension.Tests/config_existingemptyvalue.xml delete mode 100644 test/Microsoft.AspNetCore.AzureAppServices.SiteExtension.Tests/config_existingline.xml delete mode 100644 test/Microsoft.AspNetCore.AzureAppServices.SiteExtension.Tests/config_existingvalue.xml diff --git a/AzureIntegration.sln b/AzureIntegration.sln index 5ef2360204..62854c75fd 100644 --- a/AzureIntegration.sln +++ b/AzureIntegration.sln @@ -46,8 +46,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.AzureA EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Web.Xdt.Extensions.Tests", "test\Microsoft.Web.Xdt.Extensions.Tests\Microsoft.Web.Xdt.Extensions.Tests.csproj", "{809AEE05-1B28-4E31-8959-776B249BD725}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.AzureAppServices.SiteExtension.Tests", "test\Microsoft.AspNetCore.AzureAppServices.SiteExtension.Tests\Microsoft.AspNetCore.AzureAppServices.SiteExtension.Tests.csproj", "{491A857A-3529-4375-985D-D748F9F01476}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.ApplicationModelDetection", "src\Microsoft.Extensions.ApplicationModelDetection\Microsoft.Extensions.ApplicationModelDetection.csproj", "{F0CABFE8-A5B1-487B-A451-A486D26742D3}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.ApplicationModelDetection.Tests", "test\Microsoft.Extensions.ApplicationModelDetection.Tests\Microsoft.Extensions.ApplicationModelDetection.Tests.csproj", "{15664836-2B94-4D2D-AC18-6DED01FCCCBD}" @@ -108,10 +106,6 @@ Global {809AEE05-1B28-4E31-8959-776B249BD725}.Debug|Any CPU.Build.0 = Debug|Any CPU {809AEE05-1B28-4E31-8959-776B249BD725}.Release|Any CPU.ActiveCfg = Release|Any CPU {809AEE05-1B28-4E31-8959-776B249BD725}.Release|Any CPU.Build.0 = Release|Any CPU - {491A857A-3529-4375-985D-D748F9F01476}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {491A857A-3529-4375-985D-D748F9F01476}.Debug|Any CPU.Build.0 = Debug|Any CPU - {491A857A-3529-4375-985D-D748F9F01476}.Release|Any CPU.ActiveCfg = Release|Any CPU - {491A857A-3529-4375-985D-D748F9F01476}.Release|Any CPU.Build.0 = Release|Any CPU {F0CABFE8-A5B1-487B-A451-A486D26742D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F0CABFE8-A5B1-487B-A451-A486D26742D3}.Debug|Any CPU.Build.0 = Debug|Any CPU {F0CABFE8-A5B1-487B-A451-A486D26742D3}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -141,7 +135,6 @@ Global {0899A101-E451-40A4-81B0-7AA18202C25D} = {CD650B4B-81C2-4A44-AEF2-A251A877C1F0} {2B2C37FF-9249-4EA4-9A7F-038B55A15C2C} = {CD650B4B-81C2-4A44-AEF2-A251A877C1F0} {809AEE05-1B28-4E31-8959-776B249BD725} = {CD650B4B-81C2-4A44-AEF2-A251A877C1F0} - {491A857A-3529-4375-985D-D748F9F01476} = {CD650B4B-81C2-4A44-AEF2-A251A877C1F0} {F0CABFE8-A5B1-487B-A451-A486D26742D3} = {FF9B744E-6C59-40CC-9E41-9D2EBD292435} {15664836-2B94-4D2D-AC18-6DED01FCCCBD} = {CD650B4B-81C2-4A44-AEF2-A251A877C1F0} {E1E9BC7A-6951-4B60-8DFB-DBB9AC3CDEB0} = {FF9B744E-6C59-40CC-9E41-9D2EBD292435} diff --git a/extensions/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj b/extensions/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj index 9bfa429b7d..57539ac8cf 100644 --- a/extensions/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj +++ b/extensions/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj @@ -12,16 +12,6 @@ Microsoft.AspNetCore.AzureAppServices.SiteExtension.$(TrimmedVersion) - - - - - - - - - - diff --git a/extensions/Microsoft.AspNetCore.AzureAppServices.SiteExtension/applicationHost.xdt b/extensions/Microsoft.AspNetCore.AzureAppServices.SiteExtension/applicationHost.xdt deleted file mode 100644 index 7078c4f254..0000000000 --- a/extensions/Microsoft.AspNetCore.AzureAppServices.SiteExtension/applicationHost.xdt +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/extensions/Microsoft.AspNetCore.AzureAppServices.SiteExtension/scmApplicationHost.xdt b/extensions/Microsoft.AspNetCore.AzureAppServices.SiteExtension/scmApplicationHost.xdt deleted file mode 100644 index a8dd367f9f..0000000000 --- a/extensions/Microsoft.AspNetCore.AzureAppServices.SiteExtension/scmApplicationHost.xdt +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/test/Microsoft.AspNetCore.AzureAppServices.SiteExtension.Tests/Microsoft.AspNetCore.AzureAppServices.SiteExtension.Tests.csproj b/test/Microsoft.AspNetCore.AzureAppServices.SiteExtension.Tests/Microsoft.AspNetCore.AzureAppServices.SiteExtension.Tests.csproj deleted file mode 100644 index f1a8425b4d..0000000000 --- a/test/Microsoft.AspNetCore.AzureAppServices.SiteExtension.Tests/Microsoft.AspNetCore.AzureAppServices.SiteExtension.Tests.csproj +++ /dev/null @@ -1,29 +0,0 @@ - - - - net461 - - - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - - - - - - diff --git a/test/Microsoft.AspNetCore.AzureAppServices.SiteExtension.Tests/TransformTest.cs b/test/Microsoft.AspNetCore.AzureAppServices.SiteExtension.Tests/TransformTest.cs deleted file mode 100644 index 98d295b50d..0000000000 --- a/test/Microsoft.AspNetCore.AzureAppServices.SiteExtension.Tests/TransformTest.cs +++ /dev/null @@ -1,93 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.IO; -using System.Xml; -using Microsoft.Web.XmlTransform; -using Xunit; - -namespace Microsoft.AspNetCore.AzureAppServices.SiteExtension -{ - public class TransformTest - { - private static readonly string XdtExtensionPath = AppDomain.CurrentDomain.BaseDirectory; - - [Theory] - [InlineData("config_empty.xml")] - [InlineData("config_existingline.xml")] - [InlineData("config_existingEmptyValue.xml")] - public void Transform_EmptyConfig_Added(string configFile) - { - var doc = LoadDocAndRunTransform(configFile); - - Assert.Equal(2, doc.ChildNodes.Count); - var envNode = doc["configuration"]?["system.webServer"]?["runtime"]?["environmentVariables"]; - - Assert.NotNull(envNode); - - Assert.Equal(3, envNode.ChildNodes.Count); - - var depsElement = envNode.FirstChild; - Assert.Equal("add", depsElement.Name); - Assert.Equal("DOTNET_ADDITIONAL_DEPS", depsElement.Attributes["name"].Value); - Assert.Equal($@"{XdtExtensionPath}\additionalDeps\Microsoft.AspNetCore.AzureAppServices.HostingStartup\;" + - @"%ProgramFiles%\dotnet\additionalDeps\Microsoft.AspNetCore.AzureAppServices.HostingStartup\", - depsElement.Attributes["value"].Value); - - var sharedStoreElement = depsElement.NextSibling; - Assert.Equal("add", sharedStoreElement.Name); - Assert.Equal("DOTNET_SHARED_STORE", sharedStoreElement.Attributes["name"].Value); - Assert.Equal($@"{XdtExtensionPath}\store", sharedStoreElement.Attributes["value"].Value); - - var startupAssembliesElement = sharedStoreElement.NextSibling; - Assert.Equal("add", startupAssembliesElement.Name); - Assert.Equal("ASPNETCORE_HOSTINGSTARTUPASSEMBLIES", startupAssembliesElement.Attributes["name"].Value); - Assert.Equal("Microsoft.AspNetCore.AzureAppServices.HostingStartup", startupAssembliesElement.Attributes["value"].Value); - } - - [Fact] - public void Transform_ExistingValue_AppendsValue() - { - var doc = LoadDocAndRunTransform("config_existingvalue.xml"); - - Assert.Equal(2, doc.ChildNodes.Count); - var envNode = doc["configuration"]?["system.webServer"]?["runtime"]?["environmentVariables"]; - - Assert.NotNull(envNode); - - Assert.Equal(3, envNode.ChildNodes.Count); - - var depsElement = envNode.FirstChild; - Assert.Equal("add", depsElement.Name); - Assert.Equal("DOTNET_ADDITIONAL_DEPS", depsElement.Attributes["name"].Value); - Assert.Equal(@"ExistingValue1;"+ - $@"{XdtExtensionPath}\additionalDeps\Microsoft.AspNetCore.AzureAppServices.HostingStartup\;" + - @"%ProgramFiles%\dotnet\additionalDeps\Microsoft.AspNetCore.AzureAppServices.HostingStartup\", - depsElement.Attributes["value"].Value); - - var sharedStoreElement = depsElement.NextSibling; - Assert.Equal("add", sharedStoreElement.Name); - Assert.Equal("DOTNET_SHARED_STORE", sharedStoreElement.Attributes["name"].Value); - Assert.Equal($@"ExistingValue3;{XdtExtensionPath}\store", sharedStoreElement.Attributes["value"].Value); - - var startupAssembliesElement = sharedStoreElement.NextSibling; - Assert.Equal("add", startupAssembliesElement.Name); - Assert.Equal("ASPNETCORE_HOSTINGSTARTUPASSEMBLIES", startupAssembliesElement.Attributes["name"].Value); - Assert.Equal("ExistingValue2;Microsoft.AspNetCore.AzureAppServices.HostingStartup", startupAssembliesElement.Attributes["value"].Value); - } - - private static XmlDocument LoadDocAndRunTransform(string docName) - { - // Microsoft.Web.Hosting.Transformers.ApplicationHost.SiteExtensionDefinition.Transform - // (See Microsoft.Web.Hosting, Version=7.1.0.0) replaces variables for you in Azure. - var transformFile = File.ReadAllText("applicationHost.xdt"); - transformFile = transformFile.Replace("%XDT_EXTENSIONPATH%", XdtExtensionPath); - var transform = new XmlTransformation(transformFile, isTransformAFile: false, logger: null); - var doc = new XmlDocument(); - doc.Load(docName); - Assert.True(transform.Apply(doc)); - return doc; - } - } -} diff --git a/test/Microsoft.AspNetCore.AzureAppServices.SiteExtension.Tests/config_empty.xml b/test/Microsoft.AspNetCore.AzureAppServices.SiteExtension.Tests/config_empty.xml deleted file mode 100644 index 1156926c52..0000000000 --- a/test/Microsoft.AspNetCore.AzureAppServices.SiteExtension.Tests/config_empty.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/test/Microsoft.AspNetCore.AzureAppServices.SiteExtension.Tests/config_existingemptyvalue.xml b/test/Microsoft.AspNetCore.AzureAppServices.SiteExtension.Tests/config_existingemptyvalue.xml deleted file mode 100644 index b25079c3ce..0000000000 --- a/test/Microsoft.AspNetCore.AzureAppServices.SiteExtension.Tests/config_existingemptyvalue.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/test/Microsoft.AspNetCore.AzureAppServices.SiteExtension.Tests/config_existingline.xml b/test/Microsoft.AspNetCore.AzureAppServices.SiteExtension.Tests/config_existingline.xml deleted file mode 100644 index 312e525b86..0000000000 --- a/test/Microsoft.AspNetCore.AzureAppServices.SiteExtension.Tests/config_existingline.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/test/Microsoft.AspNetCore.AzureAppServices.SiteExtension.Tests/config_existingvalue.xml b/test/Microsoft.AspNetCore.AzureAppServices.SiteExtension.Tests/config_existingvalue.xml deleted file mode 100644 index 4659b9a48b..0000000000 --- a/test/Microsoft.AspNetCore.AzureAppServices.SiteExtension.Tests/config_existingvalue.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file