From 53c25198fde1255557cb2aa4239f9686fb5a149d Mon Sep 17 00:00:00 2001
From: Nate McMaster <nate.mcmaster@microsoft.com>
Date: Thu, 19 Apr 2018 15:08:17 -0700
Subject: [PATCH] Revert "Produce the
 Microsoft.AspNetCore.AzureAppServices.SiteExtension package on normal builds
 (#188)"

This reverts commit 0921e5b60f8eeb474af2c5ec12386d648c40671a.
---
 AzureIntegration.sln                          |  2 +-
 NuGetPackageVerifier.json                     | 24 ++++---------------
 build/repo.props                              |  1 +
 extensions/Directory.Build.props              | 12 ++++++++--
 ...Core.AzureAppServices.SiteExtension.csproj | 12 +++++-----
 .../applicationHost.xdt                       |  0
 .../scmApplicationHost.xdt                    |  0
 ...ft.AspNetCore.Runtime.SiteExtension.csproj |  1 -
 src/SiteExtensions.props                      | 12 ----------
 ...zureAppServices.SiteExtension.Tests.csproj |  2 +-
 10 files changed, 24 insertions(+), 42 deletions(-)
 rename {src => extensions}/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj (71%)
 rename {src => extensions}/Microsoft.AspNetCore.AzureAppServices.SiteExtension/applicationHost.xdt (100%)
 rename {src => extensions}/Microsoft.AspNetCore.AzureAppServices.SiteExtension/scmApplicationHost.xdt (100%)
 delete mode 100644 src/SiteExtensions.props

diff --git a/AzureIntegration.sln b/AzureIntegration.sln
index 3afad8233f..5ef2360204 100644
--- a/AzureIntegration.sln
+++ b/AzureIntegration.sln
@@ -38,7 +38,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApplicationInsightsHostingS
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Web.Xdt.Extensions", "src\Microsoft.Web.Xdt.Extensions\Microsoft.Web.Xdt.Extensions.csproj", "{9B22E525-FEC9-4C7C-9F9C-598C15BD0250}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.AzureAppServices.SiteExtension", "src\Microsoft.AspNetCore.AzureAppServices.SiteExtension\Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj", "{1CE2D76B-39E6-46C0-8F6F-C63E370955A9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.AzureAppServices.SiteExtension", "extensions\Microsoft.AspNetCore.AzureAppServices.SiteExtension\Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj", "{1CE2D76B-39E6-46C0-8F6F-C63E370955A9}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApplicationInsights.HostingStartup.Tests", "test\ApplicationInsights.HostingStartup.Tests\ApplicationInsights.HostingStartup.Tests.csproj", "{0899A101-E451-40A4-81B0-7AA18202C25D}"
 EndProject
diff --git a/NuGetPackageVerifier.json b/NuGetPackageVerifier.json
index e65ebe85ec..cf7178529c 100644
--- a/NuGetPackageVerifier.json
+++ b/NuGetPackageVerifier.json
@@ -1,30 +1,16 @@
 {
-    "adx-siteextension": {
-        "rules": [
-            "PackageCopyrightRule",
-            "RequiredPackageMetadataRule",
-            "StrictSemanticVersionValidationRule"
-        ],
-        "packages": {
-            "Microsoft.AspNetCore.AzureAppServices.SiteExtension": {
-                "packageTypes": [
-                    "AzureSiteExtension"
-                ]
-            }
-        }
-    },
-    "adx": {
+    "adx": { // Packages written by the ADX team and that ship on NuGet.org
         "rules": [
             "AdxVerificationCompositeRule"
         ],
         "packages": {
-            "Microsoft.AspNetCore.AzureAppServicesIntegration": {},
-            "Microsoft.Extensions.ApplicationModelDetection": {}
+          "Microsoft.AspNetCore.AzureAppServicesIntegration": { },
+          "Microsoft.Extensions.ApplicationModelDetection": { }
         }
     },
-    "Default": {
+    "Default": { // Rules to run for packages not listed in any other set.
         "rules": [
             "DefaultCompositeRule"
         ]
     }
-}
+}
\ No newline at end of file
diff --git a/build/repo.props b/build/repo.props
index 3a586a018d..b57455e22a 100644
--- a/build/repo.props
+++ b/build/repo.props
@@ -15,6 +15,7 @@
   <ItemGroup>
     <SiteExtensions Include="$(RepositoryRoot)extensions\Microsoft.AspNetCore.Runtime.SiteExtension\Microsoft.AspNetCore.Runtime.SiteExtension.csproj" PackageName="AspNetCoreRuntime.2.1.x64" BuildProperties="RuntimeArch=x64;" />
     <SiteExtensions Include="$(RepositoryRoot)extensions\Microsoft.AspNetCore.Runtime.SiteExtension\Microsoft.AspNetCore.Runtime.SiteExtension.csproj" PackageName="AspNetCoreRuntime.2.1.x86" BuildProperties="RuntimeArch=x86;" />
+    <SiteExtensions Include="$(RepositoryRoot)extensions\Microsoft.AspNetCore.AzureAppServices.SiteExtension\Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj" PackageName="Microsoft.AspNetCore.AzureAppServices.SiteExtension" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/extensions/Directory.Build.props b/extensions/Directory.Build.props
index 472d1b7b8a..33da9f03c1 100644
--- a/extensions/Directory.Build.props
+++ b/extensions/Directory.Build.props
@@ -1,7 +1,15 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
-  <Import Project="..\src\SiteExtensions.props" />
-
+  <PropertyGroup>
+    <TargetFramework>net461</TargetFramework>
+    <GenerateDocumentationFile>false</GenerateDocumentationFile>
+    <PackageType>AzureSiteExtension</PackageType>
+    <NoPackageAnalysis>true</NoPackageAnalysis>
+    <IncludeBuildOutput>false</IncludeBuildOutput>
+    <IncludeSymbols>false</IncludeSymbols>
+    <IncludeSource>false</IncludeSource>
+    <ContentTargetFolders>content</ContentTargetFolders>
+  </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Internal.AspNetCore.Sdk" PrivateAssets="All" Version="$(InternalAspNetCoreSdkPackageVersion)" />
   </ItemGroup>
diff --git a/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj b/extensions/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj
similarity index 71%
rename from src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj
rename to extensions/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj
index cd0ddaa3f2..725847a797 100644
--- a/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj
+++ b/extensions/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj
@@ -1,23 +1,23 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="..\SiteExtensions.props" />
-
   <PropertyGroup>
-    <Title>ASP.NET Core Extensions</Title>
+    <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>
-    <HostingStartupRuntimeFrameworkVersion>$(MicrosoftNETCoreApp21PackageVersion)</HostingStartupRuntimeFrameworkVersion>
+    <GenerateDocumentationFile>false</GenerateDocumentationFile>
     <PackageTags>aspnet;logging;aspnetcore;AzureSiteExtension;keyvault;configuration;dataprotection</PackageTags>
+    <ContentTargetFolders>content</ContentTargetFolders>
+    <HostingStartupRuntimeFrameworkVersion>$(MicrosoftNETCoreApp21PackageVersion)</HostingStartupRuntimeFrameworkVersion>
   </PropertyGroup>
 
   <ItemGroup>
     <Content Include="applicationHost.xdt" />
     <Content Include="scmApplicationHost.xdt" />
-    <Content Include="$(OutputPath)Microsoft.Web.Xdt.Extensions.dll" PackagePath="content" />
+    <Content Include="bin\$(Configuration)\$(TargetFramework)\Microsoft.Web.Xdt.Extensions.dll" PackagePath="content" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.Web.Xdt.Extensions\Microsoft.Web.Xdt.Extensions.csproj" PrivateAssets="All" />
+    <ProjectReference Include="..\..\src\Microsoft.Web.Xdt.Extensions\Microsoft.Web.Xdt.Extensions.csproj" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/applicationHost.xdt b/extensions/Microsoft.AspNetCore.AzureAppServices.SiteExtension/applicationHost.xdt
similarity index 100%
rename from src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/applicationHost.xdt
rename to extensions/Microsoft.AspNetCore.AzureAppServices.SiteExtension/applicationHost.xdt
diff --git a/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/scmApplicationHost.xdt b/extensions/Microsoft.AspNetCore.AzureAppServices.SiteExtension/scmApplicationHost.xdt
similarity index 100%
rename from src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/scmApplicationHost.xdt
rename to extensions/Microsoft.AspNetCore.AzureAppServices.SiteExtension/scmApplicationHost.xdt
diff --git a/extensions/Microsoft.AspNetCore.Runtime.SiteExtension/Microsoft.AspNetCore.Runtime.SiteExtension.csproj b/extensions/Microsoft.AspNetCore.Runtime.SiteExtension/Microsoft.AspNetCore.Runtime.SiteExtension.csproj
index 1aab636f41..6c52b68215 100644
--- a/extensions/Microsoft.AspNetCore.Runtime.SiteExtension/Microsoft.AspNetCore.Runtime.SiteExtension.csproj
+++ b/extensions/Microsoft.AspNetCore.Runtime.SiteExtension/Microsoft.AspNetCore.Runtime.SiteExtension.csproj
@@ -6,7 +6,6 @@
     <Description>This site extension installs Microsoft.AspNetCore.All, Microsoft.AspNetCore.App and Microsoft.NetCore.App shared runtimes.</Description>
     <PackageTags>aspnetcore;AzureSiteExtension</PackageTags>
     <PackageId>AspNetCoreRuntime.$(TrimmedVersion).$(RuntimeArch)</PackageId>
-    <TargetFramework>net461</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/SiteExtensions.props b/src/SiteExtensions.props
deleted file mode 100644
index 715dbce887..0000000000
--- a/src/SiteExtensions.props
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <PackageType>AzureSiteExtension</PackageType>
-    <GenerateDocumentationFile>false</GenerateDocumentationFile>
-    <ContentTargetFolders>content</ContentTargetFolders>
-    <NoPackageAnalysis>true</NoPackageAnalysis>
-    <IncludeBuildOutput>false</IncludeBuildOutput>
-    <IncludeSymbols>false</IncludeSymbols>
-    <IncludeSource>false</IncludeSource>
-    <EnableApiCheck>false</EnableApiCheck>
-  </PropertyGroup>
-</Project>
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
index 9928aadbcc..f1a8425b4d 100644
--- 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
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Content Include="..\..\src\Microsoft.AspNetCore.AzureAppServices.SiteExtension\applicationHost.xdt" Link="applicationHost.xdt">
+    <Content Include="..\..\extensions\Microsoft.AspNetCore.AzureAppServices.SiteExtension\applicationHost.xdt" Link="applicationHost.xdt">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="config_empty.xml">