diff --git a/AzureIntegration.sln b/AzureIntegration.sln
index 5ef2360204..3afad8233f 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", "extensions\Microsoft.AspNetCore.AzureAppServices.SiteExtension\Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj", "{1CE2D76B-39E6-46C0-8F6F-C63E370955A9}"
+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}"
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 cf7178529c..e65ebe85ec 100644
--- a/NuGetPackageVerifier.json
+++ b/NuGetPackageVerifier.json
@@ -1,16 +1,30 @@
{
- "adx": { // Packages written by the ADX team and that ship on NuGet.org
+ "adx-siteextension": {
+ "rules": [
+ "PackageCopyrightRule",
+ "RequiredPackageMetadataRule",
+ "StrictSemanticVersionValidationRule"
+ ],
+ "packages": {
+ "Microsoft.AspNetCore.AzureAppServices.SiteExtension": {
+ "packageTypes": [
+ "AzureSiteExtension"
+ ]
+ }
+ }
+ },
+ "adx": {
"rules": [
"AdxVerificationCompositeRule"
],
"packages": {
- "Microsoft.AspNetCore.AzureAppServicesIntegration": { },
- "Microsoft.Extensions.ApplicationModelDetection": { }
+ "Microsoft.AspNetCore.AzureAppServicesIntegration": {},
+ "Microsoft.Extensions.ApplicationModelDetection": {}
}
},
- "Default": { // Rules to run for packages not listed in any other set.
+ "Default": {
"rules": [
"DefaultCompositeRule"
]
}
-}
\ No newline at end of file
+}
diff --git a/build/repo.props b/build/repo.props
index 705fcee079..cfaaff9b40 100644
--- a/build/repo.props
+++ b/build/repo.props
@@ -11,7 +11,6 @@
-
diff --git a/extensions/Directory.Build.props b/extensions/Directory.Build.props
index 33da9f03c1..472d1b7b8a 100644
--- a/extensions/Directory.Build.props
+++ b/extensions/Directory.Build.props
@@ -1,15 +1,7 @@
-
- net461
- false
- AzureSiteExtension
- true
- false
- false
- false
- content
-
+
+
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 6c52b68215..1aab636f41 100644
--- a/extensions/Microsoft.AspNetCore.Runtime.SiteExtension/Microsoft.AspNetCore.Runtime.SiteExtension.csproj
+++ b/extensions/Microsoft.AspNetCore.Runtime.SiteExtension/Microsoft.AspNetCore.Runtime.SiteExtension.csproj
@@ -6,6 +6,7 @@
This site extension installs Microsoft.AspNetCore.All, Microsoft.AspNetCore.App and Microsoft.NetCore.App shared runtimes.
aspnetcore;AzureSiteExtension
AspNetCoreRuntime.$(TrimmedVersion).$(RuntimeArch)
+ net461
diff --git a/extensions/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj b/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj
similarity index 71%
rename from extensions/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj
rename to src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj
index 725847a797..cd0ddaa3f2 100644
--- a/extensions/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj
+++ b/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj
@@ -1,23 +1,23 @@
+
+
- ASP.NET Core Extensions
+ ASP.NET Core Extensions
This extension enables additional functionality for ASP.NET Core on Azure WebSites, such as enabling Azure logging.
net461
- false
- aspnet;logging;aspnetcore;AzureSiteExtension;keyvault;configuration;dataprotection
- content
$(MicrosoftNETCoreApp21PackageVersion)
+ aspnet;logging;aspnetcore;AzureSiteExtension;keyvault;configuration;dataprotection
-
+
-
+
diff --git a/extensions/Microsoft.AspNetCore.AzureAppServices.SiteExtension/applicationHost.xdt b/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/applicationHost.xdt
similarity index 100%
rename from extensions/Microsoft.AspNetCore.AzureAppServices.SiteExtension/applicationHost.xdt
rename to src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/applicationHost.xdt
diff --git a/extensions/Microsoft.AspNetCore.AzureAppServices.SiteExtension/scmApplicationHost.xdt b/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/scmApplicationHost.xdt
similarity index 100%
rename from extensions/Microsoft.AspNetCore.AzureAppServices.SiteExtension/scmApplicationHost.xdt
rename to src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/scmApplicationHost.xdt
diff --git a/src/SiteExtensions.props b/src/SiteExtensions.props
new file mode 100644
index 0000000000..715dbce887
--- /dev/null
+++ b/src/SiteExtensions.props
@@ -0,0 +1,12 @@
+
+
+ AzureSiteExtension
+ false
+ content
+ true
+ false
+ false
+ false
+ false
+
+
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 f1a8425b4d..9928aadbcc 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 @@
-
+
PreserveNewest