huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge in 'release/2.2' changes

This commit is contained in:
dotnet-bot 2019-01-04 22:20:08 +00:00
parent 291b346201 9556cc133d
commit 590fe38284
83 changed files with 576 additions and 996 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.azure/pipelines/pr-validation-temp.yml
View File

@ -28,3 +28,11 @@ jobs:
jobDisplayName: "Build only : Linux"
agentOs: Linux
buildArgs: '/p:SkipTests=true'
- job: Code_check
displayName: Code check
workspace:
clean: all
pool:
vmImage: vs2017-win2016
steps:
- powershell: ./eng/scripts/CodeCheck.ps1 -ci

2
build/artifacts.props
View File

@ -170,7 +170,6 @@
<PackageArtifact Include="Microsoft.EntityFrameworkCore.Tools" Category="ship" />
<PackageArtifact Include="Microsoft.EntityFrameworkCore" Category="ship" />
<PackageArtifact Include="Microsoft.Extensions.ApiDescription.Design" Category="noship" />
<PackageArtifact Include="Microsoft.Extensions.ApplicationModelDetection" Category="noship" />
<PackageArtifact Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Category="ship" />
<PackageArtifact Include="Microsoft.Extensions.Identity.Core" Category="ship" />
<PackageArtifact Include="Microsoft.Extensions.Identity.Stores" Category="ship" />
@ -185,7 +184,6 @@
<PackageArtifact Include="Microsoft.VisualStudio.Web.CodeGeneration.Utils" Category="ship" />
<PackageArtifact Include="Microsoft.VisualStudio.Web.CodeGeneration" Category="ship" />
<PackageArtifact Include="Microsoft.VisualStudio.Web.CodeGenerators.Mvc" Category="ship" />
<PackageArtifact Include="Microsoft.Web.Xdt.Extensions" Category="shipoob" />
<PackageArtifact Include="Internal.WebHostBuilderFactory.Sources" Category="noship"/>
</ItemGroup>

1
build/buildorder.props
View File

@ -10,7 +10,6 @@
<RepositoryBuildOrder Include="EntityFrameworkCore" Order="8" />
<RepositoryBuildOrder Include="MvcPrecompilation" Order="15" RootPath="$(RepositoryRoot)src\MvcPrecompilation\" />
<RepositoryBuildOrder Include="Scaffolding" Order="15" />
<RepositoryBuildOrder Include="AzureIntegration" Order="15" RootPath="$(RepositoryRoot)src\AzureIntegration\" />
<RepositoryBuildOrder Include="MusicStore" Order="16" RootPath="$(RepositoryRoot)src\MusicStore\" />
<RepositoryBuildOrder Include="SignalR" Order="16" RootPath="$(RepositoryRoot)src\SignalR\" />
<RepositoryBuildOrder Include="AuthSamples" Order="16" RootPath="$(RepositoryRoot)src\AuthSamples\" />

35
build/repo.props
View File

@ -51,6 +51,23 @@
<SharedFrameworkName Include="Microsoft.AspNetCore.App" />
</ItemGroup>
<ItemGroup>
<!-- These projects use 'legacy' csproj, which is not supported by dotnet-msbuild. -->
<ProjectToExclude Include="
$(RepositoryRoot)src\Servers\HttpSys\samples\TestClient\TestClient.csproj;
$(RepositoryRoot)src\Middleware\WebSockets\samples\TestServer\TestServer.csproj;
"
Condition=" '$(MSBuildRuntimeType)' == 'Core' " />
<!-- Exclude the websockets samples for now because they use classic .csproj, which is not yet supported in our build. -->
<ProjectToExclude Include="
$(RepositoryRoot)src\Middleware\WebSockets\samples\**\*.csproj;
$(RepositoryRoot)src\Middleware\NodeServices.Sockets\**\*.csproj;
$(RepositoryRoot)src\Tools\dotnet-watch\test\TestProjects\**\*.csproj;
$(RepositoryRoot)src\Razor\Razor.Design\test\testassets\**\*.*proj
" />
</ItemGroup>
<Choose>
<!-- Project selection can be overridden on the command line by passing in -projects -->
<When Condition="'$(Projects)' != ''">
@ -64,24 +81,6 @@
<ProjectToExclude Include="@(SamplesProject)" Condition="'$(BuildSamples)' == 'false' "/>
<!-- These projects use 'legacy' csproj, which is not supported by dotnet-msbuild. -->
<ProjectToExclude Include="
$(RepositoryRoot)src\Servers\HttpSys\samples\TestClient\TestClient.csproj;
$(RepositoryRoot)src\Middleware\WebSockets\samples\TestServer\TestServer.csproj;
"
Condition=" '$(MSBuildRuntimeType)' == 'Core' " />
<!-- Exclude the WPF samples for now because they use classic .csproj, which is not yet supported in our build. -->
<ProjectToExclude Include="$(RepositoryRoot)src\Identity\Identity\samples\NativeWPFClient\NativeWPFClient.csproj;" />
<!-- Exclude the websockets samples for now because they use classic .csproj, which is not yet supported in our build. -->
<ProjectToExclude Include="
$(RepositoryRoot)src\Middleware\WebSockets\samples\**\*.csproj;
$(RepositoryRoot)src\Middleware\NodeServices.Sockets\**\*.csproj;
$(RepositoryRoot)src\Tools\dotnet-watch\test\TestProjects\**\*.csproj;
$(RepositoryRoot)src\Razor\Razor.Design\test\testassets\**\*.*proj
" />
<NpmProjectDirectory Include="$(RepositoryRoot)src\Middleware\CORS\test\FunctionalTests\" />
<ProjectToBuild Condition=" '$(OS)' == 'Windows_NT' AND '$(MSBuildRuntimeType)' != 'Core' " Include="$(RepositoryRoot)src\Servers\**\*.vcxproj">

8
build/repo.targets
View File

@ -35,12 +35,8 @@
<Target Name="RestoreNpm" Condition="@(NpmProjectDirectory->Count()) != 0">
<Message Text="Restoring NPM modules" Importance="high" />
<PropertyGroup>
<NpmInstallCommand Condition=" '$(CI)' != 'true' ">install --no-optional</NpmInstallCommand>
<NpmInstallCommand Condition=" '$(CI)' == 'true' ">ci</NpmInstallCommand>
</PropertyGroup>
<Exec Command="npm $(NpmInstallCommand)" WorkingDirectory="%(NpmProjectDirectory.Identity)" Condition=" '%(NpmProjectDirectory.Identity)' != '' " />
<!-- Always run `npm ci` because `npm install` has a tendancy to churn package-lock.json for no apparent reason. -->
<Exec Command="npm ci" WorkingDirectory="%(NpmProjectDirectory.Identity)" Condition=" '%(NpmProjectDirectory.Identity)' != '' " />
</Target>
<Target Name="PrepareOutputPaths">

2
build/submodules.props
View File

@ -46,8 +46,6 @@
</ItemGroup>
<ItemGroup>
<ShippedRepository Include="AzureIntegration" RootPath="$(RepositoryRoot)src\AzureIntegration\" />
<ShippedRepository Include="MetaPackages" RootPath="$(RepositoryRoot)src\MetaPackages\" PatchPolicy="CascadeVersions" />
<ShippedRepository Include="MvcPrecompilation" RootPath="$(RepositoryRoot)src\MvcPrecompilation\"/>
<ShippedRepository Include="SignalR" RootPath="$(RepositoryRoot)src\SignalR\" />
</ItemGroup>

55
eng/Baseline.Designer.props
View File

@ -44,6 +44,37 @@
<BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="[2.2.0, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.Mvc" Version="[2.2.0, )" />
</ItemGroup>
<!-- Package: Microsoft.AspNetCore.ApplicationInsights.HostingStartup-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.ApplicationInsights.HostingStartup' ">
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
</PropertyGroup>
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.ApplicationInsights.HostingStartup' AND '$(TargetFramework)' == 'net461' ">
<BaselinePackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.Hosting" Version="[2.2.0, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.Razor.Runtime" Version="[2.2.0, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Configuration.Json" Version="[2.2.0, )" />
<BaselinePackageReference Include="Microsoft.Extensions.DiagnosticAdapter" Version="[2.2.0, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Logging" Version="[2.2.0, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="[2.2.0, )" />
</ItemGroup>
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.ApplicationInsights.HostingStartup' AND '$(TargetFramework)' == 'netcoreapp2.0' ">
<BaselinePackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.Hosting" Version="[2.2.0, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.Razor.Runtime" Version="[2.2.0, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Configuration.Json" Version="[2.2.0, )" />
<BaselinePackageReference Include="Microsoft.Extensions.DiagnosticAdapter" Version="[2.2.0, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Logging" Version="[2.2.0, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="[2.2.0, )" />
</ItemGroup>
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.ApplicationInsights.HostingStartup' AND '$(TargetFramework)' == 'netcoreapp2.1' ">
<BaselinePackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.Hosting" Version="[2.2.0, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.Razor.Runtime" Version="[2.2.0, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Configuration.Json" Version="[2.2.0, )" />
<BaselinePackageReference Include="Microsoft.Extensions.DiagnosticAdapter" Version="[2.2.0, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Logging" Version="[2.2.0, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="[2.2.0, )" />
</ItemGroup>
<!-- Package: Microsoft.AspNetCore.AspNetCoreModule-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.AspNetCoreModule' ">
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
@ -187,6 +218,30 @@
<BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[2.2.0, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.2.0, )" />
</ItemGroup>
<!-- Package: Microsoft.AspNetCore.AzureAppServices.HostingStartup-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.AzureAppServices.HostingStartup' ">
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
</PropertyGroup>
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.AzureAppServices.HostingStartup' AND '$(TargetFramework)' == 'net461' ">
<BaselinePackageReference Include="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="[2.2.0, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="[2.2.0, )" />
</ItemGroup>
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.AzureAppServices.HostingStartup' AND '$(TargetFramework)' == 'netcoreapp2.0' ">
<BaselinePackageReference Include="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="[2.2.0, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="[2.2.0, )" />
</ItemGroup>
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.AzureAppServices.HostingStartup' AND '$(TargetFramework)' == 'netcoreapp2.1' ">
<BaselinePackageReference Include="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="[2.2.0, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="[2.2.0, )" />
</ItemGroup>
<!-- Package: Microsoft.AspNetCore.AzureAppServicesIntegration-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.AzureAppServicesIntegration' ">
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
</PropertyGroup>
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.AzureAppServicesIntegration' AND '$(TargetFramework)' == 'netstandard2.0' ">
<BaselinePackageReference Include="Microsoft.AspNetCore.Hosting" Version="[2.2.0, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="[2.2.0, )" />
</ItemGroup>
<!-- Package: Microsoft.AspNetCore.Connections.Abstractions-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Connections.Abstractions' ">
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>

3
eng/Baseline.xml
View File

@ -11,6 +11,7 @@ build of ASP.NET Core 2.2.x. Update this list when preparing for a new patch.
<Package Id="dotnet-watch" Version="2.2.0" />
<Package Id="Microsoft.AspNetCore.Antiforgery" Version="2.2.0" />
<Package Id="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" Version="2.2.0-preview-35687" />
<Package Id="Microsoft.AspNetCore.ApplicationInsights.HostingStartup" Version="2.2.0" />
<Package Id="Microsoft.AspNetCore.AspNetCoreModule" Version="2.2.0" />
<Package Id="Microsoft.AspNetCore.AspNetCoreModuleV2" Version="2.2.0" />
<Package Id="Microsoft.AspNetCore.Authentication.Abstractions" Version="2.2.0" />
@ -29,6 +30,8 @@ build of ASP.NET Core 2.2.x. Update this list when preparing for a new patch.
<Package Id="Microsoft.AspNetCore.Authentication" Version="2.2.0" />
<Package Id="Microsoft.AspNetCore.Authorization.Policy" Version="2.2.0" />
<Package Id="Microsoft.AspNetCore.Authorization" Version="2.2.0" />
<Package Id="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="2.2.0" />
<Package Id="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="2.2.0" />
<Package Id="Microsoft.AspNetCore.Connections.Abstractions" Version="2.2.0" />
<Package Id="Microsoft.AspNetCore.CookiePolicy" Version="2.2.0" />
<Package Id="Microsoft.AspNetCore.Cors" Version="2.2.0" />

3
eng/ProjectReferences.props
View File

@ -123,7 +123,10 @@
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.WebApiCompatShim" ProjectPath="$(RepositoryRoot)src\Mvc\src\Microsoft.AspNetCore.Mvc.WebApiCompatShim\Microsoft.AspNetCore.Mvc.WebApiCompatShim.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc" ProjectPath="$(RepositoryRoot)src\Mvc\src\Microsoft.AspNetCore.Mvc\Microsoft.AspNetCore.Mvc.csproj" />
<ProjectReferenceProvider Include="Microsoft.Extensions.ApiDescription.Tasks" ProjectPath="$(RepositoryRoot)src\Mvc\src\Microsoft.Extensions.ApiDescription.Design\Microsoft.Extensions.ApiDescription.Design.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.ApplicationInsights.HostingStartup" ProjectPath="$(RepositoryRoot)src\Azure\ApplicationInsights.HostingStartup\src\Microsoft.AspNetCore.ApplicationInsights.HostingStartup.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Authentication.AzureAD.UI" ProjectPath="$(RepositoryRoot)src\Azure\AzureAD\Authentication.AzureAD.UI\src\Microsoft.AspNetCore.Authentication.AzureAD.UI.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" ProjectPath="$(RepositoryRoot)src\Azure\AzureAD\Authentication.AzureADB2C.UI\src\Microsoft.AspNetCore.Authentication.AzureADB2C.UI.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.AzureAppServices.HostingStartup" ProjectPath="$(RepositoryRoot)src\Azure\AzureAppServices.HostingStartup\src\Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.AzureAppServicesIntegration" ProjectPath="$(RepositoryRoot)src\Azure\AzureAppServicesIntegration\src\Microsoft.AspNetCore.AzureAppServicesIntegration.csproj" />
</ItemGroup>
</Project>

69
eng/scripts/CodeCheck.ps1 Normal file
View File

@ -0,0 +1,69 @@
#requires -version 5
<#
.SYNOPSIS
This script runs a quick check for common errors, such as checking that Visual Studio solutions are up to date or that generated code has been committed to source.
#>
param(
[switch]$ci
)
$ErrorActionPreference = 'Stop'
Set-StrictMode -Version 1
Import-Module -Scope Local -Force "$PSScriptRoot/common.psm1"
$repoRoot = Resolve-Path "$PSScriptRoot/../../"
[string[]] $errors = @()
try {
#
# Solutions
#
Write-Host "Checking that solutions are up to date"
Get-ChildItem "$repoRoot/*.sln" -Recurse | % {
Write-Host " Checking $(Split-Path -Leaf $_)"
$slnDir = Split-Path -Parent $_
$sln = $_
& dotnet sln $_ list `
| ? { $_ -ne 'Project(s)' -and $_ -ne '----------' } `
| % {
$proj = Join-Path $slnDir $_
if (-not (Test-Path $proj)) {
$errors += "Missing project. Solution references a project which does not exist: $proj. [$sln] "
}
}
}
#
# Generated code check
#
Write-Host "Re-running code generation"
Invoke-Block {
[string[]] $generateArgs = @()
if ($ci) {
$generateArgs += '-ci'
}
& $repoRoot/build.cmd /t:GenerateProjectList @generateArgs
}
Write-Host "git diff"
& git diff --ignore-space-at-eol --exit-code
if ($LastExitCode -ne 0) {
$status = git status -s | Out-String
$status = $status -replace "`n","`n "
$errors += "Generated code is not up to date."
}
}
finally {
foreach ($err in $errors) {
Write-Host -f Red "error : $err"
}
if ($errors) {
exit 1
}
}

74
eng/scripts/common.psm1 Normal file
View File

@ -0,0 +1,74 @@
$ErrorActionPreference = 'Stop'
# Update the default TLS support to 1.2
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
function Invoke-Block([scriptblock]$cmd, [string]$WorkingDir = $null) {
if ($WorkingDir) {
Push-Location $WorkingDir
}
try {
$cmd | Out-String | Write-Verbose
& $cmd
# Need to check both of these cases for errors as they represent different items
# - $?: did the powershell script block throw an error
# - $lastexitcode: did a windows command executed by the script block end in error
if ((-not $?) -or ($lastexitcode -ne 0)) {
if ($error -ne $null)
{
Write-Warning $error[0]
}
throw "Command failed to execute: $cmd"
}
}
finally {
if ($WorkingDir) {
Pop-Location
}
}
}
function SaveXml([xml]$xml, [string]$path) {
Write-Verbose "Saving to $path"
$ErrorActionPreference = 'stop'
$settings = New-Object System.XML.XmlWriterSettings
$settings.OmitXmlDeclaration = $true
$settings.Encoding = New-Object System.Text.UTF8Encoding( $true )
$writer = [System.XML.XMLTextWriter]::Create($path, $settings)
$xml.Save($writer)
$writer.Close()
}
function LoadXml([string]$path) {
Write-Verbose "Reading from $path"
$ErrorActionPreference = 'stop'
$obj = new-object xml
$obj.PreserveWhitespace = $true
$obj.Load($path)
return $obj
}
function Get-RemoteFile([string]$RemotePath, [string]$LocalPath) {
if ($RemotePath -notlike 'http*') {
Copy-Item $RemotePath $LocalPath
return
}
$retries = 10
while ($retries -gt 0) {
$retries -= 1
try {
Invoke-WebRequest -UseBasicParsing -Uri $RemotePath -OutFile $LocalPath
return
}
catch {
Write-Verbose "Request failed. $retries retries remaining"
}
}
Write-Error "Download failed: '$RemotePath'."
}

0
src/AzureIntegration/src/Microsoft.AspNetCore.ApplicationInsights.HostingStartup/ApplicationInsightsLoggerStartupFilter.cs → src/Azure/ApplicationInsights.HostingStartup/src/ApplicationInsightsLoggerStartupFilter.cs
View File

0
src/AzureIntegration/src/Microsoft.AspNetCore.ApplicationInsights.HostingStartup/ApplicationInsightsStartupLoader.cs → src/Azure/ApplicationInsights.HostingStartup/src/ApplicationInsightsStartupLoader.cs
View File

0
src/AzureIntegration/src/Microsoft.AspNetCore.ApplicationInsights.HostingStartup/JavaScriptSnippetTagHelperComponent.cs → src/Azure/ApplicationInsights.HostingStartup/src/JavaScriptSnippetTagHelperComponent.cs
View File

22
src/Azure/ApplicationInsights.HostingStartup/src/Microsoft.AspNetCore.ApplicationInsights.HostingStartup.csproj Normal file
View File

@ -0,0 +1,22 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\hostingstartup.targets" />
<PropertyGroup>
<Description>ASP.NET Core lightup integration with Application Insights.</Description>
<TargetFrameworks>netcoreapp2.1;netcoreapp2.0;net461</TargetFrameworks>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;ApplicationInsights;Analytics;Telemetry;AppInsights</PackageTags>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.ApplicationInsights.AspNetCore" />
<Reference Include="Microsoft.AspNetCore.Hosting" />
<Reference Include="Microsoft.AspNetCore.Razor.Runtime" />
<Reference Include="Microsoft.Extensions.Configuration.Json" />
<Reference Include="Microsoft.Extensions.Logging" />
<Reference Include="Microsoft.Extensions.Logging.Configuration" />
<Reference Include="Microsoft.Extensions.DiagnosticAdapter" />
</ItemGroup>
</Project>

0
src/AzureIntegration/src/Microsoft.AspNetCore.ApplicationInsights.HostingStartup/baseline.netcore.json → src/Azure/ApplicationInsights.HostingStartup/src/baseline.netcore.json
View File

0
src/AzureIntegration/src/Microsoft.AspNetCore.ApplicationInsights.HostingStartup/baseline.netframework.json → src/Azure/ApplicationInsights.HostingStartup/src/baseline.netframework.json
View File

0
src/AzureIntegration/test/ApplicationInsights.HostingStartup.Tests/AfterScript.html → src/Azure/ApplicationInsights.HostingStartup/test/UnitTests/AfterScript.html
View File

0
src/AzureIntegration/test/ApplicationInsights.HostingStartup.Tests/BeforeScript.html → src/Azure/ApplicationInsights.HostingStartup/test/UnitTests/BeforeScript.html
View File

6
src/AzureIntegration/test/ApplicationInsights.HostingStartup.Tests/FunctionalTest.cs → src/Azure/ApplicationInsights.HostingStartup/test/UnitTests/FunctionalTest.cs
View File

@ -19,7 +19,7 @@ namespace ApplicationInsightsJavaScriptSnippetTest
var current = new DirectoryInfo(AppContext.BaseDirectory);
while (current != null)
{
if (File.Exists(Path.Combine(current.FullName, "AzureIntegration.sln")))
if (File.Exists(Path.Combine(current.FullName, "Azure.sln")))
{
break;
}
@ -31,7 +31,7 @@ namespace ApplicationInsightsJavaScriptSnippetTest
throw new InvalidOperationException("Could not find the solution directory");
}
return Path.GetFullPath(Path.Combine(current.FullName, "sample", "ApplicationInsightsHostingStartupSample"));
return Path.GetFullPath(Path.Combine(current.FullName, "ApplicationInsights.HostingStartup", "test", "testassets", "ApplicationInsightsHostingStartupSample"));
}
protected static bool PreservePublishedApplicationForDebugging
@ -63,4 +63,4 @@ namespace ApplicationInsightsJavaScriptSnippetTest
return configuration;
}
}
}
}

0
src/AzureIntegration/test/ApplicationInsights.HostingStartup.Tests/JavaScriptSnippetTest.cs → src/Azure/ApplicationInsights.HostingStartup/test/UnitTests/JavaScriptSnippetTest.cs
View File

0
src/AzureIntegration/test/ApplicationInsights.HostingStartup.Tests/LoggingTest.cs → src/Azure/ApplicationInsights.HostingStartup/test/UnitTests/LoggingTest.cs
View File

10
src/AzureIntegration/test/ApplicationInsights.HostingStartup.Tests/ApplicationInsights.HostingStartup.Tests.csproj → src/Azure/ApplicationInsights.HostingStartup/test/UnitTests/Microsoft.AspNetCore.ApplicationInsights.HostingStartup.Tests.csproj
View File

@ -17,12 +17,10 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\Microsoft.AspNetCore.ApplicationInsights.HostingStartup\Microsoft.AspNetCore.ApplicationInsights.HostingStartup.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Server.IntegrationTesting" Version="$(MicrosoftAspNetCoreServerIntegrationTestingPackageVersion)" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsolePackageVersion)" />
<Reference Include="Microsoft.AspNetCore.ApplicationInsights.HostingStartup" />
<Reference Include="Microsoft.AspNetCore.Server.IntegrationTesting" />
<Reference Include="Microsoft.Extensions.Logging.Console" />
<Reference Include="Microsoft.Extensions.Logging.Testing" />
</ItemGroup>
</Project>

0
src/AzureIntegration/test/ApplicationInsights.HostingStartup.Tests/Properties/AssemblyInfo.cs → src/Azure/ApplicationInsights.HostingStartup/test/UnitTests/Properties/AssemblyInfo.cs
View File

0
src/AzureIntegration/test/ApplicationInsights.HostingStartup.Tests/Rendered.html → src/Azure/ApplicationInsights.HostingStartup/test/UnitTests/Rendered.html
View File

0
src/AzureIntegration/test/ApplicationInsights.HostingStartup.Tests/Validator.cs → src/Azure/ApplicationInsights.HostingStartup/test/UnitTests/Validator.cs
View File

20
src/Azure/ApplicationInsights.HostingStartup/test/testassets/ApplicationInsightsHostingStartupSample/ApplicationInsightsHostingStartupSample.csproj Normal file
View File

@ -0,0 +1,20 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFrameworks>netcoreapp2.1;netcoreapp2.0;net461</TargetFrameworks>
<RuntimeIdentifiers>win7-x86;win7-x64;linux-x64;osx-x64</RuntimeIdentifiers>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.AspNetCore.ApplicationInsights.HostingStartup" />
<Reference Include="Microsoft.AspNetCore.Hosting" />
<Reference Include="Microsoft.AspNetCore.Mvc" />
<Reference Include="Microsoft.AspNetCore.Server.Kestrel" />
<Reference Include="Microsoft.Extensions.Configuration.CommandLine" />
<Reference Include="Microsoft.Extensions.Logging.Console" />
</ItemGroup>
<ItemGroup>
<None Include="appsettings.json" CopyToOutputDirectory="PreserveNewest" />
</ItemGroup>
</Project>

0
src/AzureIntegration/sample/ApplicationInsightsHostingStartupSample/Controllers/HomeController.cs → src/Azure/ApplicationInsights.HostingStartup/test/testassets/ApplicationInsightsHostingStartupSample/Controllers/HomeController.cs
View File

0
src/AzureIntegration/sample/ApplicationInsightsHostingStartupSample/CurrentResponseTelemetryChannel.cs → src/Azure/ApplicationInsights.HostingStartup/test/testassets/ApplicationInsightsHostingStartupSample/CurrentResponseTelemetryChannel.cs
View File

0
src/AzureIntegration/sample/ApplicationInsightsHostingStartupSample/Startup.cs → src/Azure/ApplicationInsights.HostingStartup/test/testassets/ApplicationInsightsHostingStartupSample/Startup.cs
View File

0
src/AzureIntegration/sample/ApplicationInsightsHostingStartupSample/Views/Home/ScriptCheck.cshtml → src/Azure/ApplicationInsights.HostingStartup/test/testassets/ApplicationInsightsHostingStartupSample/Views/Home/ScriptCheck.cshtml
View File

0
src/AzureIntegration/sample/ApplicationInsightsHostingStartupSample/Views/Shared/_Layout.cshtml → src/Azure/ApplicationInsights.HostingStartup/test/testassets/ApplicationInsightsHostingStartupSample/Views/Shared/_Layout.cshtml
View File

0
src/AzureIntegration/sample/ApplicationInsightsHostingStartupSample/Views/_ViewImports.cshtml → src/Azure/ApplicationInsights.HostingStartup/test/testassets/ApplicationInsightsHostingStartupSample/Views/_ViewImports.cshtml
View File

0
src/AzureIntegration/sample/ApplicationInsightsHostingStartupSample/Views/_ViewStart.cshtml → src/Azure/ApplicationInsights.HostingStartup/test/testassets/ApplicationInsightsHostingStartupSample/Views/_ViewStart.cshtml
View File

0
src/AzureIntegration/sample/ApplicationInsightsHostingStartupSample/appsettings.Development.json → src/Azure/ApplicationInsights.HostingStartup/test/testassets/ApplicationInsightsHostingStartupSample/appsettings.Development.json
View File

0
src/AzureIntegration/sample/ApplicationInsightsHostingStartupSample/appsettings.json → src/Azure/ApplicationInsights.HostingStartup/test/testassets/ApplicationInsightsHostingStartupSample/appsettings.json
View File

0
src/AzureIntegration/sample/ApplicationInsightsHostingStartupSample/home/site/diagnostics/ApplicationInsights.settings.json → src/Azure/ApplicationInsights.HostingStartup/test/testassets/ApplicationInsightsHostingStartupSample/home/site/diagnostics/ApplicationInsights.settings.json
View File

211
src/Azure/Azure.sln
View File

@ -39,7 +39,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Static
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.HttpsPolicy", "..\Middleware\HttpsPolicy\src\Microsoft.AspNetCore.HttpsPolicy.csproj", "{A3789DA9-2E0E-41D6-BDDD-11DA4D3DD72D}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IISIntegration", "..\Servers\IIS\src\Microsoft.AspNetCore.Server.IISIntegration\Microsoft.AspNetCore.Server.IISIntegration.csproj", "{9631D314-7B0C-4CEC-8650-0259A8F4C77A}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IISIntegration", "..\Servers\IIS\IISIntegration\src\Microsoft.AspNetCore.Server.IISIntegration.csproj", "{9631D314-7B0C-4CEC-8650-0259A8F4C77A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Https", "..\Servers\Kestrel\Https\src\Microsoft.AspNetCore.Server.Kestrel.Https.csproj", "{01B31C53-7BAB-4DA7-A55D-C67D9B1FB4A2}"
EndProject
@ -49,6 +49,44 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc",
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Testing", "..\Mvc\src\Microsoft.AspNetCore.Mvc.Testing\Microsoft.AspNetCore.Mvc.Testing.csproj", "{9593691E-1B65-4EB1-97AA-F8B292B0082A}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ApplicationInsights.HostingStartup", "ApplicationInsights.HostingStartup", "{EE98F905-C0E0-4A09-8B0E-5F8728EB14CF}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.ApplicationInsights.HostingStartup", "ApplicationInsights.HostingStartup\src\Microsoft.AspNetCore.ApplicationInsights.HostingStartup.csproj", "{12544BE3-B7B9-42EA-A6BD-C354C9F39568}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{9F1C63CA-BBE9-468A-B8E1-1C28A7D09F32}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "testassets", "testassets", "{D9A5379C-EA5B-4AAE-8C84-46FAF40E4EEB}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApplicationInsightsHostingStartupSample", "ApplicationInsights.HostingStartup\test\testassets\ApplicationInsightsHostingStartupSample\ApplicationInsightsHostingStartupSample.csproj", "{B76BE944-681D-4887-9F90-5A24AD5924CB}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AzureAppServices.HostingStartup", "AzureAppServices.HostingStartup", "{9EC158BE-EB9C-4627-931D-B1B95D3210B6}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.AzureAppServices.HostingStartup", "AzureAppServices.HostingStartup\src\Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj", "{4209F2B4-0388-47DF-A054-C974ABE78723}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AzureAppServicesIntegration", "AzureAppServicesIntegration", "{C6E2B73F-137E-4C37-84DE-0863B1C30D23}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.AzureAppServicesIntegration", "AzureAppServicesIntegration\src\Microsoft.AspNetCore.AzureAppServicesIntegration.csproj", "{215BC7AA-7275-44CA-A7B5-D62AEC7D4752}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.AzureAppServicesIntegration.Tests", "AzureAppServicesIntegration\test\Microsoft.AspNetCore.AzureAppServicesIntegration.Tests.csproj", "{15FAF776-E564-4ADF-9F10-20F3C0A8BA7C}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.ApplicationInsights.HostingStartup.Tests", "ApplicationInsights.HostingStartup\test\UnitTests\Microsoft.AspNetCore.ApplicationInsights.HostingStartup.Tests.csproj", "{F523DF0F-E297-4DA6-A6CF-DECAFBB95562}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{3DCECD76-8F99-481E-B828-9C674FF39B2A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AzureAppServicesHostingStartupSample", "samples\AzureAppServicesHostingStartupSample\AzureAppServicesHostingStartupSample.csproj", "{A52106C7-6539-4928-A6E3-A216292327E7}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AzureAppServicesSample", "samples\AzureAppServicesSample\AzureAppServicesSample.csproj", "{6B3083B3-FAEA-4626-B299-26D89AE1175A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Hosting.Abstractions", "..\Hosting\Abstractions\src\Microsoft.AspNetCore.Hosting.Abstractions.csproj", "{CDD2AA23-BC7A-4C2A-8C42-3442B1D6B481}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Hosting", "..\Hosting\Hosting\src\Microsoft.AspNetCore.Hosting.csproj", "{DF5A8E5A-77C7-48B7-B8CD-4D032BAC8989}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IntegrationTesting", "..\Hosting\Server.IntegrationTesting\src\Microsoft.AspNetCore.Server.IntegrationTesting.csproj", "{38027842-48A7-4A64-A44F-004BAF0AB450}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.TestHost", "..\Hosting\TestHost\src\Microsoft.AspNetCore.TestHost.csproj", "{C520D48E-87A0-463D-B4CF-3E6B68F8F4D0}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authorization", "..\Security\Authorization\Core\src\Microsoft.AspNetCore.Authorization.csproj", "{C57DFBC2-A887-44B4-A149-7ABFA6D98F7E}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@ -251,6 +289,162 @@ Global
{9593691E-1B65-4EB1-97AA-F8B292B0082A}.Release|x64.Build.0 = Release|Any CPU
{9593691E-1B65-4EB1-97AA-F8B292B0082A}.Release|x86.ActiveCfg = Release|Any CPU
{9593691E-1B65-4EB1-97AA-F8B292B0082A}.Release|x86.Build.0 = Release|Any CPU
{12544BE3-B7B9-42EA-A6BD-C354C9F39568}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{12544BE3-B7B9-42EA-A6BD-C354C9F39568}.Debug|Any CPU.Build.0 = Debug|Any CPU
{12544BE3-B7B9-42EA-A6BD-C354C9F39568}.Debug|x64.ActiveCfg = Debug|Any CPU
{12544BE3-B7B9-42EA-A6BD-C354C9F39568}.Debug|x64.Build.0 = Debug|Any CPU
{12544BE3-B7B9-42EA-A6BD-C354C9F39568}.Debug|x86.ActiveCfg = Debug|Any CPU
{12544BE3-B7B9-42EA-A6BD-C354C9F39568}.Debug|x86.Build.0 = Debug|Any CPU
{12544BE3-B7B9-42EA-A6BD-C354C9F39568}.Release|Any CPU.ActiveCfg = Release|Any CPU
{12544BE3-B7B9-42EA-A6BD-C354C9F39568}.Release|Any CPU.Build.0 = Release|Any CPU
{12544BE3-B7B9-42EA-A6BD-C354C9F39568}.Release|x64.ActiveCfg = Release|Any CPU
{12544BE3-B7B9-42EA-A6BD-C354C9F39568}.Release|x64.Build.0 = Release|Any CPU
{12544BE3-B7B9-42EA-A6BD-C354C9F39568}.Release|x86.ActiveCfg = Release|Any CPU
{12544BE3-B7B9-42EA-A6BD-C354C9F39568}.Release|x86.Build.0 = Release|Any CPU
{B76BE944-681D-4887-9F90-5A24AD5924CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B76BE944-681D-4887-9F90-5A24AD5924CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B76BE944-681D-4887-9F90-5A24AD5924CB}.Debug|x64.ActiveCfg = Debug|Any CPU
{B76BE944-681D-4887-9F90-5A24AD5924CB}.Debug|x64.Build.0 = Debug|Any CPU
{B76BE944-681D-4887-9F90-5A24AD5924CB}.Debug|x86.ActiveCfg = Debug|Any CPU
{B76BE944-681D-4887-9F90-5A24AD5924CB}.Debug|x86.Build.0 = Debug|Any CPU
{B76BE944-681D-4887-9F90-5A24AD5924CB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B76BE944-681D-4887-9F90-5A24AD5924CB}.Release|Any CPU.Build.0 = Release|Any CPU
{B76BE944-681D-4887-9F90-5A24AD5924CB}.Release|x64.ActiveCfg = Release|Any CPU
{B76BE944-681D-4887-9F90-5A24AD5924CB}.Release|x64.Build.0 = Release|Any CPU
{B76BE944-681D-4887-9F90-5A24AD5924CB}.Release|x86.ActiveCfg = Release|Any CPU
{B76BE944-681D-4887-9F90-5A24AD5924CB}.Release|x86.Build.0 = Release|Any CPU
{4209F2B4-0388-47DF-A054-C974ABE78723}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4209F2B4-0388-47DF-A054-C974ABE78723}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4209F2B4-0388-47DF-A054-C974ABE78723}.Debug|x64.ActiveCfg = Debug|Any CPU
{4209F2B4-0388-47DF-A054-C974ABE78723}.Debug|x64.Build.0 = Debug|Any CPU
{4209F2B4-0388-47DF-A054-C974ABE78723}.Debug|x86.ActiveCfg = Debug|Any CPU
{4209F2B4-0388-47DF-A054-C974ABE78723}.Debug|x86.Build.0 = Debug|Any CPU
{4209F2B4-0388-47DF-A054-C974ABE78723}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4209F2B4-0388-47DF-A054-C974ABE78723}.Release|Any CPU.Build.0 = Release|Any CPU
{4209F2B4-0388-47DF-A054-C974ABE78723}.Release|x64.ActiveCfg = Release|Any CPU
{4209F2B4-0388-47DF-A054-C974ABE78723}.Release|x64.Build.0 = Release|Any CPU
{4209F2B4-0388-47DF-A054-C974ABE78723}.Release|x86.ActiveCfg = Release|Any CPU
{4209F2B4-0388-47DF-A054-C974ABE78723}.Release|x86.Build.0 = Release|Any CPU
{215BC7AA-7275-44CA-A7B5-D62AEC7D4752}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{215BC7AA-7275-44CA-A7B5-D62AEC7D4752}.Debug|Any CPU.Build.0 = Debug|Any CPU
{215BC7AA-7275-44CA-A7B5-D62AEC7D4752}.Debug|x64.ActiveCfg = Debug|Any CPU
{215BC7AA-7275-44CA-A7B5-D62AEC7D4752}.Debug|x64.Build.0 = Debug|Any CPU
{215BC7AA-7275-44CA-A7B5-D62AEC7D4752}.Debug|x86.ActiveCfg = Debug|Any CPU
{215BC7AA-7275-44CA-A7B5-D62AEC7D4752}.Debug|x86.Build.0 = Debug|Any CPU
{215BC7AA-7275-44CA-A7B5-D62AEC7D4752}.Release|Any CPU.ActiveCfg = Release|Any CPU
{215BC7AA-7275-44CA-A7B5-D62AEC7D4752}.Release|Any CPU.Build.0 = Release|Any CPU
{215BC7AA-7275-44CA-A7B5-D62AEC7D4752}.Release|x64.ActiveCfg = Release|Any CPU
{215BC7AA-7275-44CA-A7B5-D62AEC7D4752}.Release|x64.Build.0 = Release|Any CPU
{215BC7AA-7275-44CA-A7B5-D62AEC7D4752}.Release|x86.ActiveCfg = Release|Any CPU
{215BC7AA-7275-44CA-A7B5-D62AEC7D4752}.Release|x86.Build.0 = Release|Any CPU
{15FAF776-E564-4ADF-9F10-20F3C0A8BA7C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{15FAF776-E564-4ADF-9F10-20F3C0A8BA7C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{15FAF776-E564-4ADF-9F10-20F3C0A8BA7C}.Debug|x64.ActiveCfg = Debug|Any CPU
{15FAF776-E564-4ADF-9F10-20F3C0A8BA7C}.Debug|x64.Build.0 = Debug|Any CPU
{15FAF776-E564-4ADF-9F10-20F3C0A8BA7C}.Debug|x86.ActiveCfg = Debug|Any CPU
{15FAF776-E564-4ADF-9F10-20F3C0A8BA7C}.Debug|x86.Build.0 = Debug|Any CPU
{15FAF776-E564-4ADF-9F10-20F3C0A8BA7C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{15FAF776-E564-4ADF-9F10-20F3C0A8BA7C}.Release|Any CPU.Build.0 = Release|Any CPU
{15FAF776-E564-4ADF-9F10-20F3C0A8BA7C}.Release|x64.ActiveCfg = Release|Any CPU
{15FAF776-E564-4ADF-9F10-20F3C0A8BA7C}.Release|x64.Build.0 = Release|Any CPU
{15FAF776-E564-4ADF-9F10-20F3C0A8BA7C}.Release|x86.ActiveCfg = Release|Any CPU
{15FAF776-E564-4ADF-9F10-20F3C0A8BA7C}.Release|x86.Build.0 = Release|Any CPU
{F523DF0F-E297-4DA6-A6CF-DECAFBB95562}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F523DF0F-E297-4DA6-A6CF-DECAFBB95562}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F523DF0F-E297-4DA6-A6CF-DECAFBB95562}.Debug|x64.ActiveCfg = Debug|Any CPU
{F523DF0F-E297-4DA6-A6CF-DECAFBB95562}.Debug|x64.Build.0 = Debug|Any CPU
{F523DF0F-E297-4DA6-A6CF-DECAFBB95562}.Debug|x86.ActiveCfg = Debug|Any CPU
{F523DF0F-E297-4DA6-A6CF-DECAFBB95562}.Debug|x86.Build.0 = Debug|Any CPU
{F523DF0F-E297-4DA6-A6CF-DECAFBB95562}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F523DF0F-E297-4DA6-A6CF-DECAFBB95562}.Release|Any CPU.Build.0 = Release|Any CPU
{F523DF0F-E297-4DA6-A6CF-DECAFBB95562}.Release|x64.ActiveCfg = Release|Any CPU
{F523DF0F-E297-4DA6-A6CF-DECAFBB95562}.Release|x64.Build.0 = Release|Any CPU
{F523DF0F-E297-4DA6-A6CF-DECAFBB95562}.Release|x86.ActiveCfg = Release|Any CPU
{F523DF0F-E297-4DA6-A6CF-DECAFBB95562}.Release|x86.Build.0 = Release|Any CPU
{A52106C7-6539-4928-A6E3-A216292327E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A52106C7-6539-4928-A6E3-A216292327E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A52106C7-6539-4928-A6E3-A216292327E7}.Debug|x64.ActiveCfg = Debug|Any CPU
{A52106C7-6539-4928-A6E3-A216292327E7}.Debug|x64.Build.0 = Debug|Any CPU
{A52106C7-6539-4928-A6E3-A216292327E7}.Debug|x86.ActiveCfg = Debug|Any CPU
{A52106C7-6539-4928-A6E3-A216292327E7}.Debug|x86.Build.0 = Debug|Any CPU
{A52106C7-6539-4928-A6E3-A216292327E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A52106C7-6539-4928-A6E3-A216292327E7}.Release|Any CPU.Build.0 = Release|Any CPU
{A52106C7-6539-4928-A6E3-A216292327E7}.Release|x64.ActiveCfg = Release|Any CPU
{A52106C7-6539-4928-A6E3-A216292327E7}.Release|x64.Build.0 = Release|Any CPU
{A52106C7-6539-4928-A6E3-A216292327E7}.Release|x86.ActiveCfg = Release|Any CPU
{A52106C7-6539-4928-A6E3-A216292327E7}.Release|x86.Build.0 = Release|Any CPU
{6B3083B3-FAEA-4626-B299-26D89AE1175A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6B3083B3-FAEA-4626-B299-26D89AE1175A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6B3083B3-FAEA-4626-B299-26D89AE1175A}.Debug|x64.ActiveCfg = Debug|Any CPU
{6B3083B3-FAEA-4626-B299-26D89AE1175A}.Debug|x64.Build.0 = Debug|Any CPU
{6B3083B3-FAEA-4626-B299-26D89AE1175A}.Debug|x86.ActiveCfg = Debug|Any CPU
{6B3083B3-FAEA-4626-B299-26D89AE1175A}.Debug|x86.Build.0 = Debug|Any CPU
{6B3083B3-FAEA-4626-B299-26D89AE1175A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6B3083B3-FAEA-4626-B299-26D89AE1175A}.Release|Any CPU.Build.0 = Release|Any CPU
{6B3083B3-FAEA-4626-B299-26D89AE1175A}.Release|x64.ActiveCfg = Release|Any CPU
{6B3083B3-FAEA-4626-B299-26D89AE1175A}.Release|x64.Build.0 = Release|Any CPU
{6B3083B3-FAEA-4626-B299-26D89AE1175A}.Release|x86.ActiveCfg = Release|Any CPU
{6B3083B3-FAEA-4626-B299-26D89AE1175A}.Release|x86.Build.0 = Release|Any CPU
{CDD2AA23-BC7A-4C2A-8C42-3442B1D6B481}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CDD2AA23-BC7A-4C2A-8C42-3442B1D6B481}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CDD2AA23-BC7A-4C2A-8C42-3442B1D6B481}.Debug|x64.ActiveCfg = Debug|Any CPU
{CDD2AA23-BC7A-4C2A-8C42-3442B1D6B481}.Debug|x64.Build.0 = Debug|Any CPU
{CDD2AA23-BC7A-4C2A-8C42-3442B1D6B481}.Debug|x86.ActiveCfg = Debug|Any CPU
{CDD2AA23-BC7A-4C2A-8C42-3442B1D6B481}.Debug|x86.Build.0 = Debug|Any CPU
{CDD2AA23-BC7A-4C2A-8C42-3442B1D6B481}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CDD2AA23-BC7A-4C2A-8C42-3442B1D6B481}.Release|Any CPU.Build.0 = Release|Any CPU
{CDD2AA23-BC7A-4C2A-8C42-3442B1D6B481}.Release|x64.ActiveCfg = Release|Any CPU
{CDD2AA23-BC7A-4C2A-8C42-3442B1D6B481}.Release|x64.Build.0 = Release|Any CPU
{CDD2AA23-BC7A-4C2A-8C42-3442B1D6B481}.Release|x86.ActiveCfg = Release|Any CPU
{CDD2AA23-BC7A-4C2A-8C42-3442B1D6B481}.Release|x86.Build.0 = Release|Any CPU
{DF5A8E5A-77C7-48B7-B8CD-4D032BAC8989}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DF5A8E5A-77C7-48B7-B8CD-4D032BAC8989}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DF5A8E5A-77C7-48B7-B8CD-4D032BAC8989}.Debug|x64.ActiveCfg = Debug|Any CPU
{DF5A8E5A-77C7-48B7-B8CD-4D032BAC8989}.Debug|x64.Build.0 = Debug|Any CPU
{DF5A8E5A-77C7-48B7-B8CD-4D032BAC8989}.Debug|x86.ActiveCfg = Debug|Any CPU
{DF5A8E5A-77C7-48B7-B8CD-4D032BAC8989}.Debug|x86.Build.0 = Debug|Any CPU
{DF5A8E5A-77C7-48B7-B8CD-4D032BAC8989}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DF5A8E5A-77C7-48B7-B8CD-4D032BAC8989}.Release|Any CPU.Build.0 = Release|Any CPU
{DF5A8E5A-77C7-48B7-B8CD-4D032BAC8989}.Release|x64.ActiveCfg = Release|Any CPU
{DF5A8E5A-77C7-48B7-B8CD-4D032BAC8989}.Release|x64.Build.0 = Release|Any CPU
{DF5A8E5A-77C7-48B7-B8CD-4D032BAC8989}.Release|x86.ActiveCfg = Release|Any CPU
{DF5A8E5A-77C7-48B7-B8CD-4D032BAC8989}.Release|x86.Build.0 = Release|Any CPU
{38027842-48A7-4A64-A44F-004BAF0AB450}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{38027842-48A7-4A64-A44F-004BAF0AB450}.Debug|Any CPU.Build.0 = Debug|Any CPU
{38027842-48A7-4A64-A44F-004BAF0AB450}.Debug|x64.ActiveCfg = Debug|Any CPU
{38027842-48A7-4A64-A44F-004BAF0AB450}.Debug|x64.Build.0 = Debug|Any CPU
{38027842-48A7-4A64-A44F-004BAF0AB450}.Debug|x86.ActiveCfg = Debug|Any CPU
{38027842-48A7-4A64-A44F-004BAF0AB450}.Debug|x86.Build.0 = Debug|Any CPU
{38027842-48A7-4A64-A44F-004BAF0AB450}.Release|Any CPU.ActiveCfg = Release|Any CPU
{38027842-48A7-4A64-A44F-004BAF0AB450}.Release|Any CPU.Build.0 = Release|Any CPU
{38027842-48A7-4A64-A44F-004BAF0AB450}.Release|x64.ActiveCfg = Release|Any CPU
{38027842-48A7-4A64-A44F-004BAF0AB450}.Release|x64.Build.0 = Release|Any CPU
{38027842-48A7-4A64-A44F-004BAF0AB450}.Release|x86.ActiveCfg = Release|Any CPU
{38027842-48A7-4A64-A44F-004BAF0AB450}.Release|x86.Build.0 = Release|Any CPU
{C520D48E-87A0-463D-B4CF-3E6B68F8F4D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C520D48E-87A0-463D-B4CF-3E6B68F8F4D0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C520D48E-87A0-463D-B4CF-3E6B68F8F4D0}.Debug|x64.ActiveCfg = Debug|Any CPU
{C520D48E-87A0-463D-B4CF-3E6B68F8F4D0}.Debug|x64.Build.0 = Debug|Any CPU
{C520D48E-87A0-463D-B4CF-3E6B68F8F4D0}.Debug|x86.ActiveCfg = Debug|Any CPU
{C520D48E-87A0-463D-B4CF-3E6B68F8F4D0}.Debug|x86.Build.0 = Debug|Any CPU
{C520D48E-87A0-463D-B4CF-3E6B68F8F4D0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C520D48E-87A0-463D-B4CF-3E6B68F8F4D0}.Release|Any CPU.Build.0 = Release|Any CPU
{C520D48E-87A0-463D-B4CF-3E6B68F8F4D0}.Release|x64.ActiveCfg = Release|Any CPU
{C520D48E-87A0-463D-B4CF-3E6B68F8F4D0}.Release|x64.Build.0 = Release|Any CPU
{C520D48E-87A0-463D-B4CF-3E6B68F8F4D0}.Release|x86.ActiveCfg = Release|Any CPU
{C520D48E-87A0-463D-B4CF-3E6B68F8F4D0}.Release|x86.Build.0 = Release|Any CPU
{C57DFBC2-A887-44B4-A149-7ABFA6D98F7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C57DFBC2-A887-44B4-A149-7ABFA6D98F7E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C57DFBC2-A887-44B4-A149-7ABFA6D98F7E}.Debug|x64.ActiveCfg = Debug|Any CPU
{C57DFBC2-A887-44B4-A149-7ABFA6D98F7E}.Debug|x64.Build.0 = Debug|Any CPU
{C57DFBC2-A887-44B4-A149-7ABFA6D98F7E}.Debug|x86.ActiveCfg = Debug|Any CPU
{C57DFBC2-A887-44B4-A149-7ABFA6D98F7E}.Debug|x86.Build.0 = Debug|Any CPU
{C57DFBC2-A887-44B4-A149-7ABFA6D98F7E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C57DFBC2-A887-44B4-A149-7ABFA6D98F7E}.Release|Any CPU.Build.0 = Release|Any CPU
{C57DFBC2-A887-44B4-A149-7ABFA6D98F7E}.Release|x64.ActiveCfg = Release|Any CPU
{C57DFBC2-A887-44B4-A149-7ABFA6D98F7E}.Release|x64.Build.0 = Release|Any CPU
{C57DFBC2-A887-44B4-A149-7ABFA6D98F7E}.Release|x86.ActiveCfg = Release|Any CPU
{C57DFBC2-A887-44B4-A149-7ABFA6D98F7E}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@ -277,6 +471,21 @@ Global
{240BBDB1-3501-4637-8A17-996EA4EBB20B} = {84622717-F98A-4DE2-806E-1EF89C45C0EB}
{88EF760A-99A2-48C8-920F-78632A3BB57A} = {84622717-F98A-4DE2-806E-1EF89C45C0EB}
{9593691E-1B65-4EB1-97AA-F8B292B0082A} = {84622717-F98A-4DE2-806E-1EF89C45C0EB}
{12544BE3-B7B9-42EA-A6BD-C354C9F39568} = {EE98F905-C0E0-4A09-8B0E-5F8728EB14CF}
{9F1C63CA-BBE9-468A-B8E1-1C28A7D09F32} = {EE98F905-C0E0-4A09-8B0E-5F8728EB14CF}
{D9A5379C-EA5B-4AAE-8C84-46FAF40E4EEB} = {9F1C63CA-BBE9-468A-B8E1-1C28A7D09F32}
{B76BE944-681D-4887-9F90-5A24AD5924CB} = {D9A5379C-EA5B-4AAE-8C84-46FAF40E4EEB}
{4209F2B4-0388-47DF-A054-C974ABE78723} = {9EC158BE-EB9C-4627-931D-B1B95D3210B6}
{215BC7AA-7275-44CA-A7B5-D62AEC7D4752} = {C6E2B73F-137E-4C37-84DE-0863B1C30D23}
{15FAF776-E564-4ADF-9F10-20F3C0A8BA7C} = {C6E2B73F-137E-4C37-84DE-0863B1C30D23}
{F523DF0F-E297-4DA6-A6CF-DECAFBB95562} = {9F1C63CA-BBE9-468A-B8E1-1C28A7D09F32}
{A52106C7-6539-4928-A6E3-A216292327E7} = {3DCECD76-8F99-481E-B828-9C674FF39B2A}
{6B3083B3-FAEA-4626-B299-26D89AE1175A} = {3DCECD76-8F99-481E-B828-9C674FF39B2A}
{CDD2AA23-BC7A-4C2A-8C42-3442B1D6B481} = {84622717-F98A-4DE2-806E-1EF89C45C0EB}
{DF5A8E5A-77C7-48B7-B8CD-4D032BAC8989} = {84622717-F98A-4DE2-806E-1EF89C45C0EB}
{38027842-48A7-4A64-A44F-004BAF0AB450} = {84622717-F98A-4DE2-806E-1EF89C45C0EB}
{C520D48E-87A0-463D-B4CF-3E6B68F8F4D0} = {84622717-F98A-4DE2-806E-1EF89C45C0EB}
{C57DFBC2-A887-44B4-A149-7ABFA6D98F7E} = {84622717-F98A-4DE2-806E-1EF89C45C0EB}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {81AADD49-473B-43ED-8A08-F6B7A058AA39}

0
src/AzureIntegration/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup/AssemblyInfo.cs → src/Azure/AzureAppServices.HostingStartup/src/AssemblyInfo.cs
View File

0
src/AzureIntegration/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup/AzureAppServicesHostingStartup.cs → src/Azure/AzureAppServices.HostingStartup/src/AzureAppServicesHostingStartup.cs
View File

0
src/AzureIntegration/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup/HostingStartupConfigurationExtensions.cs → src/Azure/AzureAppServices.HostingStartup/src/HostingStartupConfigurationExtensions.cs
View File

9
src/AzureIntegration/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup/Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj → src/Azure/AzureAppServices.HostingStartup/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj
View File

@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\build\hostingstartup.targets" />
<Import Project="..\..\hostingstartup.targets" />
<PropertyGroup>
<Description>ASP.NET Core lightup integration with Azure AppServices.</Description>
@ -10,11 +10,8 @@
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Microsoft.AspNetCore.AzureAppServicesIntegration\Microsoft.AspNetCore.AzureAppServicesIntegration.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion)" />
<Reference Include="Microsoft.AspNetCore.AzureAppServicesIntegration" />
<Reference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" />
</ItemGroup>
</Project>

0
src/AzureIntegration/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup/baseline.netcore.json → src/Azure/AzureAppServices.HostingStartup/src/baseline.netcore.json
View File

0
src/AzureIntegration/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup/baseline.netframework.json → src/Azure/AzureAppServices.HostingStartup/src/baseline.netframework.json
View File

0
src/AzureIntegration/src/Microsoft.AspNetCore.AzureAppServicesIntegration/AppServicesWebHostBuilderExtensions.cs → src/Azure/AzureAppServicesIntegration/src/AppServicesWebHostBuilderExtensions.cs
View File

4
src/AzureIntegration/src/Microsoft.AspNetCore.AzureAppServicesIntegration/Microsoft.AspNetCore.AzureAppServicesIntegration.csproj → src/Azure/AzureAppServicesIntegration/src/Microsoft.AspNetCore.AzureAppServicesIntegration.csproj
View File

@ -10,8 +10,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Hosting" Version="$(MicrosoftAspNetCoreHostingPackageVersion)" />
<PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="$(MicrosoftExtensionsLoggingAzureAppServicesPackageVersion)" />
<Reference Include="Microsoft.AspNetCore.Hosting" />
<Reference Include="Microsoft.Extensions.Logging.AzureAppServices" />
</ItemGroup>
</Project>

0
src/AzureIntegration/src/Microsoft.AspNetCore.AzureAppServicesIntegration/Properties/AssemblyInfo.cs → src/Azure/AzureAppServicesIntegration/src/Properties/AssemblyInfo.cs
View File

0
src/AzureIntegration/src/Microsoft.AspNetCore.AzureAppServicesIntegration/baseline.netcore.json → src/Azure/AzureAppServicesIntegration/src/baseline.netcore.json
View File

0
src/AzureIntegration/test/Microsoft.AspNetCore.AzureAppServicesIntegration.Tests/AppServicesWebHostBuilderExtensionsTest.cs → src/Azure/AzureAppServicesIntegration/test/AppServicesWebHostBuilderExtensionsTest.cs
View File

13
src/Azure/AzureAppServicesIntegration/test/Microsoft.AspNetCore.AzureAppServicesIntegration.Tests.csproj Normal file
View File

@ -0,0 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netcoreapp2.2;net461</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.AspNetCore.AzureAppServicesIntegration" />
<Reference Include="Microsoft.AspNetCore.AzureAppServices.HostingStartup" />
<Reference Include="Microsoft.AspNetCore.TestHost" />
</ItemGroup>
</Project>

0
src/AzureIntegration/build/hostingstartup.targets → src/Azure/hostingstartup.targets
View File

15
src/Azure/samples/AzureAppServicesHostingStartupSample/AzureAppServicesHostingStartupSample.csproj Normal file
View File

@ -0,0 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFrameworks>netcoreapp2.2;net461</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.AspNetCore.AzureAppServices.HostingStartup" />
<Reference Include="Microsoft.AspNetCore.Hosting" />
<Reference Include="Microsoft.AspNetCore.Server.IISIntegration" />
<Reference Include="Microsoft.AspNetCore.Server.Kestrel" />
<Reference Include="Microsoft.Extensions.Logging.Console" />
</ItemGroup>
</Project>

0
src/AzureIntegration/sample/AzureAppServicesHostingStartupSample/Startup.cs → src/Azure/samples/AzureAppServicesHostingStartupSample/Startup.cs
View File

15
src/Azure/samples/AzureAppServicesSample/AzureAppServicesSample.csproj Normal file
View File

@ -0,0 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFrameworks>netcoreapp2.2;net461</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.AspNetCore.AzureAppServicesIntegration" />
<Reference Include="Microsoft.AspNetCore.Hosting" />
<Reference Include="Microsoft.AspNetCore.Server.IISIntegration" />
<Reference Include="Microsoft.AspNetCore.Server.Kestrel" />
<Reference Include="Microsoft.Extensions.Logging.Console" />
</ItemGroup>
</Project>

0
src/AzureIntegration/sample/AzureAppServicesSample/Startup.cs → src/Azure/samples/AzureAppServicesSample/Startup.cs
View File

77
src/AzureIntegration/AzureIntegration.sln
View File

@ -2,8 +2,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.27016.1
MinimumVisualStudioVersion = 15.0.26730.03
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.AzureAppServicesIntegration", "src\Microsoft.AspNetCore.AzureAppServicesIntegration\Microsoft.AspNetCore.AzureAppServicesIntegration.csproj", "{5916BEB5-0969-469B-976C-A392E015DFAC}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{FF9B744E-6C59-40CC-9E41-9D2EBD292435}"
ProjectSection(SolutionItems) = preProject
src\Directory.Build.props = src\Directory.Build.props
@ -17,38 +15,20 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
NuGet.config = NuGet.config
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AzureAppServicesSample", "sample\AzureAppServicesSample\AzureAppServicesSample.csproj", "{05A4D308-B162-4194-BC5E-88CCB4DBD318}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{37237C93-6855-40D9-9E60-418B093EF49A}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{CD650B4B-81C2-4A44-AEF2-A251A877C1F0}"
ProjectSection(SolutionItems) = preProject
test\Directory.Build.props = test\Directory.Build.props
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.AzureAppServicesIntegration.Tests", "test\Microsoft.AspNetCore.AzureAppServicesIntegration.Tests\Microsoft.AspNetCore.AzureAppServicesIntegration.Tests.csproj", "{9BA1B692-B313-4E22-A864-F0ADBBE3C3FA}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.AzureAppServices.HostingStartup", "src\Microsoft.AspNetCore.AzureAppServices.HostingStartup\Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj", "{AC023B45-7995-4D4A-8108-E512AE8E5734}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AzureAppServicesHostingStartupSample", "sample\AzureAppServicesHostingStartupSample\AzureAppServicesHostingStartupSample.csproj", "{939EA897-CA31-4F2E-BA51-22B570B64671}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.ApplicationInsights.HostingStartup", "src\Microsoft.AspNetCore.ApplicationInsights.HostingStartup\Microsoft.AspNetCore.ApplicationInsights.HostingStartup.csproj", "{2849A2D9-7C08-4198-BF2B-8BFB4B13554D}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApplicationInsightsHostingStartupSample", "sample\ApplicationInsightsHostingStartupSample\ApplicationInsightsHostingStartupSample.csproj", "{33E245F0-2566-4B5B-BA7C-8895B7A697AE}"
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}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApplicationInsights.HostingStartup.Tests", "test\ApplicationInsights.HostingStartup.Tests\ApplicationInsights.HostingStartup.Tests.csproj", "{0899A101-E451-40A4-81B0-7AA18202C25D}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.AzureAppServices.FunctionalTests", "test\Microsoft.AspNetCore.AzureAppServices.FunctionalTests\Microsoft.AspNetCore.AzureAppServices.FunctionalTests.csproj", "{2B2C37FF-9249-4EA4-9A7F-038B55A15C2C}"
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.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}"
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.AspNetCore.Runtime.SiteExtension", "extensions\Microsoft.AspNetCore.Runtime.SiteExtension\Microsoft.AspNetCore.Runtime.SiteExtension.csproj", "{E1E9BC7A-6951-4B60-8DFB-DBB9AC3CDEB0}"
EndProject
@ -58,34 +38,6 @@ Global
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{5916BEB5-0969-469B-976C-A392E015DFAC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5916BEB5-0969-469B-976C-A392E015DFAC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5916BEB5-0969-469B-976C-A392E015DFAC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5916BEB5-0969-469B-976C-A392E015DFAC}.Release|Any CPU.Build.0 = Release|Any CPU
{05A4D308-B162-4194-BC5E-88CCB4DBD318}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{05A4D308-B162-4194-BC5E-88CCB4DBD318}.Debug|Any CPU.Build.0 = Debug|Any CPU
{05A4D308-B162-4194-BC5E-88CCB4DBD318}.Release|Any CPU.ActiveCfg = Release|Any CPU
{05A4D308-B162-4194-BC5E-88CCB4DBD318}.Release|Any CPU.Build.0 = Release|Any CPU
{9BA1B692-B313-4E22-A864-F0ADBBE3C3FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9BA1B692-B313-4E22-A864-F0ADBBE3C3FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9BA1B692-B313-4E22-A864-F0ADBBE3C3FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9BA1B692-B313-4E22-A864-F0ADBBE3C3FA}.Release|Any CPU.Build.0 = Release|Any CPU
{AC023B45-7995-4D4A-8108-E512AE8E5734}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AC023B45-7995-4D4A-8108-E512AE8E5734}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AC023B45-7995-4D4A-8108-E512AE8E5734}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AC023B45-7995-4D4A-8108-E512AE8E5734}.Release|Any CPU.Build.0 = Release|Any CPU
{939EA897-CA31-4F2E-BA51-22B570B64671}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{939EA897-CA31-4F2E-BA51-22B570B64671}.Debug|Any CPU.Build.0 = Debug|Any CPU
{939EA897-CA31-4F2E-BA51-22B570B64671}.Release|Any CPU.ActiveCfg = Release|Any CPU
{939EA897-CA31-4F2E-BA51-22B570B64671}.Release|Any CPU.Build.0 = Release|Any CPU
{2849A2D9-7C08-4198-BF2B-8BFB4B13554D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2849A2D9-7C08-4198-BF2B-8BFB4B13554D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2849A2D9-7C08-4198-BF2B-8BFB4B13554D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2849A2D9-7C08-4198-BF2B-8BFB4B13554D}.Release|Any CPU.Build.0 = Release|Any CPU
{33E245F0-2566-4B5B-BA7C-8895B7A697AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{33E245F0-2566-4B5B-BA7C-8895B7A697AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{33E245F0-2566-4B5B-BA7C-8895B7A697AE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{33E245F0-2566-4B5B-BA7C-8895B7A697AE}.Release|Any CPU.Build.0 = Release|Any CPU
{9B22E525-FEC9-4C7C-9F9C-598C15BD0250}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9B22E525-FEC9-4C7C-9F9C-598C15BD0250}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9B22E525-FEC9-4C7C-9F9C-598C15BD0250}.Release|Any CPU.ActiveCfg = Release|Any CPU
@ -94,10 +46,6 @@ Global
{1CE2D76B-39E6-46C0-8F6F-C63E370955A9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1CE2D76B-39E6-46C0-8F6F-C63E370955A9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1CE2D76B-39E6-46C0-8F6F-C63E370955A9}.Release|Any CPU.Build.0 = Release|Any CPU
{0899A101-E451-40A4-81B0-7AA18202C25D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0899A101-E451-40A4-81B0-7AA18202C25D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0899A101-E451-40A4-81B0-7AA18202C25D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0899A101-E451-40A4-81B0-7AA18202C25D}.Release|Any CPU.Build.0 = Release|Any CPU
{2B2C37FF-9249-4EA4-9A7F-038B55A15C2C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2B2C37FF-9249-4EA4-9A7F-038B55A15C2C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2B2C37FF-9249-4EA4-9A7F-038B55A15C2C}.Release|Any CPU.ActiveCfg = Release|Any CPU
@ -106,14 +54,10 @@ 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
{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
{F0CABFE8-A5B1-487B-A451-A486D26742D3}.Release|Any CPU.Build.0 = Release|Any CPU
{15664836-2B94-4D2D-AC18-6DED01FCCCBD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{15664836-2B94-4D2D-AC18-6DED01FCCCBD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{15664836-2B94-4D2D-AC18-6DED01FCCCBD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{15664836-2B94-4D2D-AC18-6DED01FCCCBD}.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
{E1E9BC7A-6951-4B60-8DFB-DBB9AC3CDEB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E1E9BC7A-6951-4B60-8DFB-DBB9AC3CDEB0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E1E9BC7A-6951-4B60-8DFB-DBB9AC3CDEB0}.Release|Any CPU.ActiveCfg = Release|Any CPU
@ -123,20 +67,11 @@ Global
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{5916BEB5-0969-469B-976C-A392E015DFAC} = {FF9B744E-6C59-40CC-9E41-9D2EBD292435}
{05A4D308-B162-4194-BC5E-88CCB4DBD318} = {37237C93-6855-40D9-9E60-418B093EF49A}
{9BA1B692-B313-4E22-A864-F0ADBBE3C3FA} = {CD650B4B-81C2-4A44-AEF2-A251A877C1F0}
{AC023B45-7995-4D4A-8108-E512AE8E5734} = {FF9B744E-6C59-40CC-9E41-9D2EBD292435}
{939EA897-CA31-4F2E-BA51-22B570B64671} = {37237C93-6855-40D9-9E60-418B093EF49A}
{2849A2D9-7C08-4198-BF2B-8BFB4B13554D} = {FF9B744E-6C59-40CC-9E41-9D2EBD292435}
{33E245F0-2566-4B5B-BA7C-8895B7A697AE} = {37237C93-6855-40D9-9E60-418B093EF49A}
{9B22E525-FEC9-4C7C-9F9C-598C15BD0250} = {FF9B744E-6C59-40CC-9E41-9D2EBD292435}
{1CE2D76B-39E6-46C0-8F6F-C63E370955A9} = {FF9B744E-6C59-40CC-9E41-9D2EBD292435}
{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}
{F0CABFE8-A5B1-487B-A451-A486D26742D3} = {FF9B744E-6C59-40CC-9E41-9D2EBD292435}
{15664836-2B94-4D2D-AC18-6DED01FCCCBD} = {CD650B4B-81C2-4A44-AEF2-A251A877C1F0}
{491A857A-3529-4375-985D-D748F9F01476} = {CD650B4B-81C2-4A44-AEF2-A251A877C1F0}
{E1E9BC7A-6951-4B60-8DFB-DBB9AC3CDEB0} = {FF9B744E-6C59-40CC-9E41-9D2EBD292435}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution

25
src/AzureIntegration/sample/ApplicationInsightsHostingStartupSample/ApplicationInsightsHostingStartupSample.csproj
View File

@ -1,25 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFrameworks>netcoreapp2.1;netcoreapp2.0;net461</TargetFrameworks>
<RuntimeIdentifiers>win7-x86;win7-x64;linux-x64;osx-x64</RuntimeIdentifiers>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Hosting" Version="$(MicrosoftAspNetCoreHostingPackageVersion)" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(MicrosoftAspNetCoreMvcPackageVersion)" />
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="$(MicrosoftAspNetCoreServerIISIntegrationPackageVersion)" />
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="$(MicrosoftAspNetCoreServerKestrelPackageVersion)" />
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="$(MicrosoftExtensionsConfigurationCommandLinePackageVersion)" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsolePackageVersion)" />
<PackageReference Include="Microsoft.NET.Sdk.Razor" Version="$(MicrosoftNETSdkRazorPackageVersion)" PrivateAssets="All" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\Microsoft.AspNetCore.ApplicationInsights.HostingStartup\Microsoft.AspNetCore.ApplicationInsights.HostingStartup.csproj" />
</ItemGroup>
<ItemGroup>
<None Include="appsettings.json" CopyToOutputDirectory="PreserveNewest" />
</ItemGroup>
</Project>

29
src/AzureIntegration/sample/ApplicationInsightsHostingStartupSample/Properties/launchSettings.json
View File

@ -1,29 +0,0 @@
{
"iisSettings": {
"windowsAuthentication": false,
"anonymousAuthentication": true,
"iisExpress": {
"applicationUrl": "http://localhost:22071/",
"sslPort": 0
}
},
"profiles": {
"IIS Express": {
"commandName": "IISExpress",
"launchBrowser": true,
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development",
"ASPNETCORE_HOSTINGSTARTUPASSEMBLIES": "Microsoft.AspNetCore.ApplicationInsights.HostingStartup;Microsoft.AspNetCore.Server.IISIntegration"
}
},
"ApplicationInsightsHostingStartupSample": {
"commandName": "project",
"launchBrowser": true,
"launchUrl": "http://localhost:5000/",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development",
"ASPNETCORE_HOSTINGSTARTUPASSEMBLIES": "Microsoft.AspNetCore.ApplicationInsights.HostingStartup"
}
}
}
}

18
src/AzureIntegration/sample/AzureAppServicesHostingStartupSample/AzureAppServicesHostingStartupSample.csproj
View File

@ -1,18 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFrameworks>netcoreapp2.1;net461</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Hosting" Version="$(MicrosoftAspNetCoreHostingPackageVersion)" />
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="$(MicrosoftAspNetCoreServerIISIntegrationPackageVersion)" />
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="$(MicrosoftAspNetCoreServerKestrelPackageVersion)" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsolePackageVersion)" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\Microsoft.AspNetCore.AzureAppServices.HostingStartup\Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj" />
</ItemGroup>
</Project>

24
src/AzureIntegration/sample/AzureAppServicesHostingStartupSample/Properties/launchSettings.json
View File

@ -1,24 +0,0 @@
{
"iisSettings": {
"windowsAuthentication": false,
"anonymousAuthentication": true,
"iisExpress": {
"applicationUrl": "http://localhost:22071/",
"sslPort": 0
}
},
"profiles": {
"IIS Express": {
"commandName": "IISExpress",
"launchBrowser": true,
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development",
"ASPNETCORE_HOSTINGSTARTUPASSEMBLIES": "Microsoft.AspNetCore.AzureAppServices.HostingStartup;Microsoft.AspNetCore.Server.IISIntegration"
}
},
"AzureAppServicesHostingStartupSample": {
"commandName": "IISExpress",
"launchBrowser": true
}
}
}

18
src/AzureIntegration/sample/AzureAppServicesSample/AzureAppServicesSample.csproj
View File

@ -1,18 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFrameworks>netcoreapp2.1;net461</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\Microsoft.AspNetCore.AzureAppServicesIntegration\Microsoft.AspNetCore.AzureAppServicesIntegration.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Hosting" Version="$(MicrosoftAspNetCoreHostingPackageVersion)" />
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="$(MicrosoftAspNetCoreServerIISIntegrationPackageVersion)" />
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="$(MicrosoftAspNetCoreServerKestrelPackageVersion)" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsolePackageVersion)" />
</ItemGroup>
</Project>

24
src/AzureIntegration/sample/AzureAppServicesSample/Properties/launchSettings.json
View File

@ -1,24 +0,0 @@
{
"iisSettings": {
"windowsAuthentication": false,
"anonymousAuthentication": true,
"iisExpress": {
"applicationUrl": "http://localhost:64358/",
"sslPort": 0
}
},
"profiles": {
"IIS Express": {
"commandName": "IISExpress",
"launchBrowser": true,
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development",
"ASPNETCORE_HOSTINGSTARTUPASSEMBLIES": "Microsoft.AspNetCore.Server.IISIntegration"
}
},
"AzureAppServicesSample": {
"commandName": "IISExpress",
"launchBrowser": true
}
}
}

22
src/AzureIntegration/src/Microsoft.AspNetCore.ApplicationInsights.HostingStartup/Microsoft.AspNetCore.ApplicationInsights.HostingStartup.csproj
View File

@ -1,22 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\build\hostingstartup.targets" />
<PropertyGroup>
<Description>ASP.NET Core lightup integration with Application Insights.</Description>
<TargetFrameworks>netcoreapp2.1;netcoreapp2.0;net461</TargetFrameworks>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;ApplicationInsights;Analytics;Telemetry;AppInsights</PackageTags>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="$(MicrosoftApplicationInsightsAspNetCorePackageVersion)" />
<PackageReference Include="Microsoft.AspNetCore.Hosting" Version="$(MicrosoftAspNetCoreHostingPackageVersion)" />
<PackageReference Include="Microsoft.AspNetCore.Razor.Runtime" Version="$(MicrosoftAspNetCoreRazorRuntimePackageVersion)" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="$(MicrosoftExtensionsConfigurationJsonPackageVersion)" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingPackageVersion)" />
<PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="$(MicrosoftExtensionsLoggingConfigurationPackageVersion)" />
<PackageReference Include="Microsoft.Extensions.DiagnosticAdapter" Version="$(MicrosoftExtensionsDiagnosticAdapterPackageVersion)" />
</ItemGroup>
</Project>

12
src/AzureIntegration/src/Microsoft.Extensions.ApplicationModelDetection/AppModelDetectionResult.cs
View File

@ -1,12 +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.
namespace Microsoft.Extensions.ApplicationModelDetection
{
public class AppModelDetectionResult
{
public RuntimeFramework? Framework { get; set; }
public string FrameworkVersion { get; set; }
public string AspNetCoreVersion { get; set; }
}
}

250
src/AzureIntegration/src/Microsoft.Extensions.ApplicationModelDetection/AppModelDetector.cs
View File

@ -1,250 +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.Linq;
using System.Reflection.Metadata;
using System.Reflection.PortableExecutable;
using System.Xml.Linq;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
namespace Microsoft.Extensions.ApplicationModelDetection
{
public class AppModelDetector
{
// We use Hosting package to detect AspNetCore version
// it contains light-up implemenation that we care about and
// would have to be used by aspnet core web apps
private const string AspNetCoreAssembly = "Microsoft.AspNetCore.Hosting";
/// <summary>
/// Reads the following sources
/// - web.config to detect dotnet framework kind
/// - *.runtimeconfig.json to detect target framework version
/// - *.deps.json to detect Asp.Net Core version
/// - Microsoft.AspNetCore.Hosting.dll to detect Asp.Net Core version
/// </summary>
/// <param name="directory">The application directory</param>
/// <returns>The <see cref="AppModelDetectionResult"/> instance containing information about application</returns>
public AppModelDetectionResult Detect(DirectoryInfo directory)
{
string entryPoint = null;
// Try reading web.config and resolving framework and app path
var webConfig = directory.GetFiles("web.config").FirstOrDefault();
bool webConfigExists = webConfig != null;
bool? usesDotnetExe = null;
if (webConfigExists &&
TryParseWebConfig(webConfig, out var dotnetExe, out entryPoint))
{
usesDotnetExe = dotnetExe;
}
// If we found entry point let's look for .deps.json
// in some cases it exists in desktop too
FileInfo depsJson = null;
FileInfo runtimeConfig = null;
if (!string.IsNullOrWhiteSpace(entryPoint))
{
depsJson = new FileInfo(Path.ChangeExtension(entryPoint, ".deps.json"));
runtimeConfig = new FileInfo(Path.ChangeExtension(entryPoint, ".runtimeconfig.json"));
}
if (depsJson == null || !depsJson.Exists)
{
depsJson = directory.GetFiles("*.deps.json").FirstOrDefault();
}
if (runtimeConfig == null || !runtimeConfig.Exists)
{
runtimeConfig = directory.GetFiles("*.runtimeconfig.json").FirstOrDefault();
}
string aspNetCoreVersionFromDeps = null;
string aspNetCoreVersionFromDll = null;
// Try to detect ASP.NET Core version from .deps.json
if (depsJson != null &&
depsJson.Exists &&
TryParseDependencies(depsJson, out var aspNetCoreVersion))
{
aspNetCoreVersionFromDeps = aspNetCoreVersion;
}
// Try to detect ASP.NET Core version from .deps.json
var aspNetCoreDll = directory.GetFiles(AspNetCoreAssembly + ".dll").FirstOrDefault();
if (aspNetCoreDll != null &&
TryParseAssembly(aspNetCoreDll, out aspNetCoreVersion))
{
aspNetCoreVersionFromDll = aspNetCoreVersion;
}
// Try to detect dotnet core runtime version from runtimeconfig.json
string runtimeVersionFromRuntimeConfig = null;
if (runtimeConfig != null &&
runtimeConfig.Exists)
{
TryParseRuntimeConfig(runtimeConfig, out runtimeVersionFromRuntimeConfig);
}
var result = new AppModelDetectionResult();
if (usesDotnetExe == true)
{
result.Framework = RuntimeFramework.DotNetCore;
result.FrameworkVersion = runtimeVersionFromRuntimeConfig;
}
else
{
if (depsJson?.Exists == true &&
runtimeConfig?.Exists == true)
{
result.Framework = RuntimeFramework.DotNetCoreStandalone;
}
else
{
result.Framework = RuntimeFramework.DotNetFramework;
}
}
result.AspNetCoreVersion = aspNetCoreVersionFromDeps ?? aspNetCoreVersionFromDll;
return result;
}
private bool TryParseAssembly(FileInfo aspNetCoreDll, out string aspNetCoreVersion)
{
aspNetCoreVersion = null;
try
{
using (var stream = aspNetCoreDll.OpenRead())
using (var peReader = new PEReader(stream))
{
var metadataReader = peReader.GetMetadataReader();
var assemblyDefinition = metadataReader.GetAssemblyDefinition();
aspNetCoreVersion = assemblyDefinition.Version.ToString();
return true;
}
}
catch (Exception)
{
return false;
}
}
/// <summary>
/// Search for Microsoft.AspNetCore.Hosting entry in deps.json and get it's version number
/// </summary>
private bool TryParseDependencies(FileInfo depsJson, out string aspnetCoreVersion)
{
aspnetCoreVersion = null;
try
{
using (var streamReader = depsJson.OpenText())
using (var jsonReader = new JsonTextReader(streamReader))
{
var json = JObject.Load(jsonReader);
var libraryPrefix = AspNetCoreAssembly+ "/";
var library = json.Descendants().OfType<JProperty>().FirstOrDefault(property => property.Name.StartsWith(libraryPrefix));
if (library != null)
{
aspnetCoreVersion = library.Name.Substring(libraryPrefix.Length);
return true;
}
}
}
catch (Exception)
{
}
return false;
}
private bool TryParseRuntimeConfig(FileInfo runtimeConfig, out string frameworkVersion)
{
frameworkVersion = null;
try
{
using (var streamReader = runtimeConfig.OpenText())
using (var jsonReader = new JsonTextReader(streamReader))
{
var json = JObject.Load(jsonReader);
frameworkVersion = (string)json?["runtimeOptions"]
?["framework"]
?["version"];
return true;
}
}
catch (Exception)
{
return false;
}
}
private bool TryParseWebConfig(FileInfo webConfig, out bool usesDotnetExe, out string entryPoint)
{
usesDotnetExe = false;
entryPoint = null;
try
{
var xdocument = XDocument.Load(webConfig.FullName);
var aspNetCoreHandler = xdocument.Root?
.Element("system.webServer")
.Element("aspNetCore");
if (aspNetCoreHandler == null)
{
return false;
}
var processPath = (string) aspNetCoreHandler.Attribute("processPath");
var arguments = (string) aspNetCoreHandler.Attribute("arguments");
if (processPath.EndsWith("dotnet", StringComparison.OrdinalIgnoreCase) ||
processPath.EndsWith("dotnet.exe", StringComparison.OrdinalIgnoreCase) &&
!string.IsNullOrWhiteSpace(arguments))
{
usesDotnetExe = true;
var entryPointPart = arguments.Split(new[] {" "}, StringSplitOptions.RemoveEmptyEntries).FirstOrDefault();
if (!string.IsNullOrWhiteSpace(entryPointPart))
{
try
{
entryPoint = Path.GetFullPath(Path.Combine(webConfig.DirectoryName, entryPointPart));
}
catch (Exception)
{
}
}
}
else
{
usesDotnetExe = false;
try
{
entryPoint = Path.GetFullPath(Path.Combine(webConfig.DirectoryName, processPath));
}
catch (Exception)
{
}
}
}
catch (Exception)
{
return false;
}
return true;
}
}
}

15
src/AzureIntegration/src/Microsoft.Extensions.ApplicationModelDetection/Microsoft.Extensions.ApplicationModelDetection.csproj
View File

@ -1,15 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Description>ASP.NET Core integration with Azure AppServices.</Description>
<TargetFramework>netstandard2.0</TargetFramework>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;azure;appservices</PackageTags>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Hosting" Version="$(MicrosoftAspNetCoreHostingPackageVersion)" />
<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonPackageVersion)" />
<PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataPackageVersion)" />
</ItemGroup>
</Project>

12
src/AzureIntegration/src/Microsoft.Extensions.ApplicationModelDetection/RuntimeFramework.cs
View File

@ -1,12 +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.
namespace Microsoft.Extensions.ApplicationModelDetection
{
public enum RuntimeFramework
{
DotNetCore,
DotNetCoreStandalone,
DotNetFramework
}
}

144
src/AzureIntegration/src/Microsoft.Extensions.ApplicationModelDetection/baseline.netcore.json
View File

@ -1,144 +0,0 @@
{
"AssemblyIdentity": "Microsoft.Extensions.ApplicationModelDetection, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60",
"Types": [
{
"Name": "Microsoft.Extensions.ApplicationModelDetection.AppModelDetectionResult",
"Visibility": "Public",
"Kind": "Class",
"ImplementedInterfaces": [],
"Members": [
{
"Kind": "Method",
"Name": "get_Framework",
"Parameters": [],
"ReturnType": "System.Nullable<Microsoft.Extensions.ApplicationModelDetection.RuntimeFramework>",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "set_Framework",
"Parameters": [
{
"Name": "value",
"Type": "System.Nullable<Microsoft.Extensions.ApplicationModelDetection.RuntimeFramework>"
}
],
"ReturnType": "System.Void",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "get_FrameworkVersion",
"Parameters": [],
"ReturnType": "System.String",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "set_FrameworkVersion",
"Parameters": [
{
"Name": "value",
"Type": "System.String"
}
],
"ReturnType": "System.Void",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "get_AspNetCoreVersion",
"Parameters": [],
"ReturnType": "System.String",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "set_AspNetCoreVersion",
"Parameters": [
{
"Name": "value",
"Type": "System.String"
}
],
"ReturnType": "System.Void",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [],
"Visibility": "Public",
"GenericParameter": []
}
],
"GenericParameters": []
},
{
"Name": "Microsoft.Extensions.ApplicationModelDetection.AppModelDetector",
"Visibility": "Public",
"Kind": "Class",
"ImplementedInterfaces": [],
"Members": [
{
"Kind": "Method",
"Name": "Detect",
"Parameters": [
{
"Name": "directory",
"Type": "System.IO.DirectoryInfo"
}
],
"ReturnType": "Microsoft.Extensions.ApplicationModelDetection.AppModelDetectionResult",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [],
"Visibility": "Public",
"GenericParameter": []
}
],
"GenericParameters": []
},
{
"Name": "Microsoft.Extensions.ApplicationModelDetection.RuntimeFramework",
"Visibility": "Public",
"Kind": "Enumeration",
"Sealed": true,
"ImplementedInterfaces": [],
"Members": [
{
"Kind": "Field",
"Name": "DotNetCore",
"Parameters": [],
"GenericParameter": [],
"Literal": "0"
},
{
"Kind": "Field",
"Name": "DotNetCoreStandalone",
"Parameters": [],
"GenericParameter": [],
"Literal": "1"
},
{
"Kind": "Field",
"Name": "DotNetFramework",
"Parameters": [],
"GenericParameter": [],
"Literal": "2"
}
],
"GenericParameters": []
}
]
}

5
src/AzureIntegration/src/Microsoft.Web.Xdt.Extensions/Microsoft.Web.Xdt.Extensions.csproj
View File

@ -3,12 +3,11 @@
<PropertyGroup>
<Description>Additional functionality for Xdt transforms.</Description>
<TargetFramework>net461</TargetFramework>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>xdt</PackageTags>
<IsPackable>false</IsPackable>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Web.Xdt" Version="$(MicrosoftWebXdtPackageVersion)" />
</ItemGroup>
</Project>
</Project>

16
src/AzureIntegration/test/Microsoft.AspNetCore.AzureAppServicesIntegration.Tests/Microsoft.AspNetCore.AzureAppServicesIntegration.Tests.csproj
View File

@ -1,16 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\Microsoft.AspNetCore.AzureAppServicesIntegration\Microsoft.AspNetCore.AzureAppServicesIntegration.csproj" />
<ProjectReference Include="..\..\src\Microsoft.AspNetCore.AzureAppServices.HostingStartup\Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="$(MicrosoftAspNetCoreTestHostPackageVersion)" />
</ItemGroup>
</Project>

229
src/AzureIntegration/test/Microsoft.Extensions.ApplicationModelDetection.Tests/AppModelTests.cs
View File

@ -1,229 +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 Microsoft.AspNetCore.Hosting;
using Xunit;
namespace Microsoft.Extensions.ApplicationModelDetection.Tests
{
public class AppModelTests
{
private const string EmptyWebConfig = @"<?xml version=""1.0"" encoding=""utf-8""?><configuration></configuration>";
[Theory]
[InlineData("dotnet")]
[InlineData("dotnet.exe")]
[InlineData("%HOME%/dotnet")]
[InlineData("%HOME%/dotnet.exe")]
[InlineData("DoTNeT.ExE")]
public void DetectsCoreFrameworkFromWebConfig(string processPath)
{
using (var temp = new TemporaryDirectory()
.WithFile("web.config",GenerateWebConfig(processPath, ".\\app.dll")))
{
var result = new AppModelDetector().Detect(temp.Directory);
Assert.Equal(RuntimeFramework.DotNetCore, result.Framework);
}
}
[Theory]
[InlineData("app")]
[InlineData("app.exe")]
[InlineData("%HOME%/app")]
[InlineData("%HOME%/app.exe")]
public void DetectsFullFrameworkFromWebConfig(string processPath)
{
using (var temp = new TemporaryDirectory()
.WithFile("web.config", GenerateWebConfig(processPath, ".\\app.dll")))
{
var result = new AppModelDetector().Detect(temp.Directory);
Assert.Equal(RuntimeFramework.DotNetFramework, result.Framework);
}
}
[Theory]
[InlineData("2.0.0")]
[InlineData("2.0.0-preview1")]
[InlineData("1.1.3")]
public void DetectsRuntimeVersionFromRuntimeConfig(string runtimeVersion)
{
using (var temp = new TemporaryDirectory()
.WithFile("web.config", GenerateWebConfig("dotnet", ".\\app.dll"))
.WithFile("app.runtimeconfig.json", @"{
""runtimeOptions"": {
""tfm"": ""netcoreapp2.0"",
""framework"": {
""name"": ""Microsoft.NETCore.App"",
""version"": """+ runtimeVersion + @"""
},
""configProperties"": {
""System.GC.Server"": true
}
}
}"))
{
var result = new AppModelDetector().Detect(temp.Directory);
Assert.Equal(RuntimeFramework.DotNetCore, result.Framework);
Assert.Equal(runtimeVersion, result.FrameworkVersion);
}
}
[Theory]
[InlineData("2.0.0")]
[InlineData("2.0.0-preview1")]
[InlineData("1.1.3")]
public void DetectsRuntimeVersionFromRuntimeConfigWitoutEntryPoint(string runtimeVersion)
{
using (var temp = new TemporaryDirectory()
.WithFile("web.config", GenerateWebConfig("dotnet", "%HOME%\\app.dll"))
.WithFile("app.runtimeconfig.json", @"{
""runtimeOptions"": {
""tfm"": ""netcoreapp2.0"",
""framework"": {
""name"": ""Microsoft.NETCore.App"",
""version"": """+ runtimeVersion + @"""
},
""configProperties"": {
""System.GC.Server"": true
}
}
}"))
{
var result = new AppModelDetector().Detect(temp.Directory);
Assert.Equal(RuntimeFramework.DotNetCore, result.Framework);
Assert.Equal(runtimeVersion, result.FrameworkVersion);
}
}
[Theory]
[InlineData("2.0.0")]
[InlineData("2.0.0-preview1")]
[InlineData("1.1.3")]
public void DetectsAspNetCoreVersionFromDepsFile(string runtimeVersion)
{
using (var temp = new TemporaryDirectory()
.WithFile("web.config", GenerateWebConfig("dotnet", "app.dll"))
.WithFile("app.deps.json", @"{
""targets"": {
"".NETCoreApp,Version=v2.7"": {
""Microsoft.AspNetCore.Hosting/" + runtimeVersion + @""": { }
}
}
}"))
{
var result = new AppModelDetector().Detect(temp.Directory);
Assert.Equal(RuntimeFramework.DotNetCore, result.Framework);
Assert.Equal(runtimeVersion, result.AspNetCoreVersion);
}
}
[Theory]
[InlineData("2.0.0")]
[InlineData("2.0.0-preview1")]
[InlineData("1.1.3")]
public void DetectsAspNetCoreVersionFromDepsFileWithoutEntryPoint(string runtimeVersion)
{
using (var temp = new TemporaryDirectory()
.WithFile("web.config", GenerateWebConfig("dotnet", "%HOME%\\app.dll"))
.WithFile("app.deps.json", @"{
""targets"": {
"".NETCoreApp,Version=v2.7"": {
""Microsoft.AspNetCore.Hosting/" + runtimeVersion + @""": { }
}
}
}"))
{
var result = new AppModelDetector().Detect(temp.Directory);
Assert.Equal(RuntimeFramework.DotNetCore, result.Framework);
Assert.Equal(runtimeVersion, result.AspNetCoreVersion);
}
}
[Fact]
public void DetectsFullFrameworkWhenWebConfigExists()
{
using (var temp = new TemporaryDirectory()
.WithFile("web.config", EmptyWebConfig))
{
var result = new AppModelDetector().Detect(temp.Directory);
Assert.Equal(RuntimeFramework.DotNetFramework, result.Framework);
}
}
[Fact]
public void DetectsStandalone_WhenBothDepsAndRuntimeConfigExist()
{
using (var temp = new TemporaryDirectory()
.WithFile("web.config", GenerateWebConfig("app.exe", ""))
.WithFile("app.runtimeconfig.json", "{}")
.WithFile("app.deps.json", "{}"))
{
var result = new AppModelDetector().Detect(temp.Directory);
Assert.Equal(RuntimeFramework.DotNetCoreStandalone, result.Framework);
}
}
[Fact]
public void DetectsAspNetCoreVersionFromHostingDll()
{
using (var temp = new TemporaryDirectory()
.WithFile(typeof(WebHostBuilder).Assembly.Location))
{
var result = new AppModelDetector().Detect(temp.Directory);
Assert.Equal(typeof(WebHostBuilder).Assembly.GetName().Version.ToString(), result.AspNetCoreVersion);
}
}
private static string GenerateWebConfig(string processPath, string arguments)
{
return $@"<?xml version=""1.0"" encoding=""utf-8""?>
<configuration>
<system.webServer>
<handlers>
<add name=""aspNetCore"" path=""*"" verb=""*"" modules=""AspNetCoreModule"" resourceType=""Unspecified"" />
</handlers>
<aspNetCore processPath=""{processPath}"" arguments=""{arguments}"" stdoutLogEnabled=""false"" stdoutLogFile="".\logs\stdout"" />
</system.webServer>
</configuration>
";
}
private class TemporaryDirectory: IDisposable
{
public TemporaryDirectory()
{
Directory = new DirectoryInfo(Path.GetTempPath())
.CreateSubdirectory(Guid.NewGuid().ToString("N"));
}
public DirectoryInfo Directory { get; }
public void Dispose()
{
try
{
Directory.Delete(true);
}
catch (IOException)
{
}
}
public TemporaryDirectory WithFile(string name, string value)
{
File.WriteAllText(Path.Combine(Directory.FullName, name), value);
return this;
}
public TemporaryDirectory WithFile(string name)
{
File.Copy(name, Path.Combine(Directory.FullName, Path.GetFileName(name)));
return this;
}
}
}
}

12
src/AzureIntegration/test/Microsoft.Extensions.ApplicationModelDetection.Tests/Microsoft.Extensions.ApplicationModelDetection.Tests.csproj
View File

@ -1,12 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net461</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp2.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\Microsoft.Extensions.ApplicationModelDetection\Microsoft.Extensions.ApplicationModelDetection.csproj" />
</ItemGroup>
</Project>

3
src/Identity/EntityFrameworkCore/test/EF.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test.csproj
View File

@ -2,6 +2,9 @@
<PropertyGroup>
<TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
<!-- These tests are broken in Azure Pipelines right now due to deadlocks in EFCore on machines with few CPU cores. -->
<SkipTests Condition=" '$(BUILD_REASON)' == 'PullRequest' ">true</SkipTests>
</PropertyGroup>
<ItemGroup>

5
src/Razor/Razor.Design/test/IntegrationTests/IntegrationTests/ProjectDirectory.cs
View File

@ -75,7 +75,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
CopyGlobalJson(solutionRoot, destinationPath);
return new ProjectDirectory(
destinationPath,
destinationPath,
directoryPath,
newProjectFilePath);
}
@ -128,7 +128,8 @@ $@"<Project>
void CopyGlobalJson(string solutionRoot, string projectRoot)
{
var srcGlobalJson = Path.Combine(solutionRoot, "global.json");
var repoRoot = Path.Combine(solutionRoot, "..", "..");
var srcGlobalJson = Path.Combine(repoRoot, "global.json");
if (!File.Exists(srcGlobalJson))
{
throw new InvalidOperationException("global.json at the root of the repository could not be found. Run './build /t:Noop' at the repository root and re-run these tests.");

2
src/Razor/Razor.Design/test/testassets/SimpleMvcFSharp/SimpleMvcFSharp.fsproj
View File

@ -14,7 +14,7 @@
<Import Project="$(SolutionRoot)Mvc.Razor.Extensions\src\build\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.Extensions.props" />
<PropertyGroup>
<TargetFramework>netcoreapp2.0</TargetFramework>
<TargetFramework>netcoreapp2.2</TargetFramework>
</PropertyGroup>
<ItemGroup>

2
src/Security/Security.sln
View File

@ -96,7 +96,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Diagno
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.StaticFiles", "..\Middleware\StaticFiles\src\Microsoft.AspNetCore.StaticFiles.csproj", "{6FFBD7CD-2B7D-4EC9-8D18-54E53F852B04}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IISIntegration", "..\Servers\IIS\src\Microsoft.AspNetCore.Server.IISIntegration\Microsoft.AspNetCore.Server.IISIntegration.csproj", "{43AF597A-FCB8-41A5-8279-345FEE9A61AD}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IISIntegration", "..\Servers\IIS\IISIntegration\src\Microsoft.AspNetCore.Server.IISIntegration.csproj", "{43AF597A-FCB8-41A5-8279-345FEE9A61AD}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel", "..\Servers\Kestrel\Kestrel\src\Microsoft.AspNetCore.Server.Kestrel.csproj", "{707CBFB4-4D35-479E-9BAF-39B4DA9782DE}"
EndProject

2
src/Servers/FunctionalTests.sln
View File

@ -17,7 +17,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Respon
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.HttpSys", "HttpSys\src\Microsoft.AspNetCore.Server.HttpSys.csproj", "{831EA089-7072-41CF-996A-75A3EF39D31E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IISIntegration", "IIS\src\Microsoft.AspNetCore.Server.IISIntegration\Microsoft.AspNetCore.Server.IISIntegration.csproj", "{9DD063D3-CAE1-49C2-9C24-DE3499E79322}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IISIntegration", "IIS\IISIntegration\src\Microsoft.AspNetCore.Server.IISIntegration.csproj", "{9DD063D3-CAE1-49C2-9C24-DE3499E79322}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel", "Kestrel\Kestrel\src\Microsoft.AspNetCore.Server.Kestrel.csproj", "{0DD5F47B-EDA3-405A-A2F3-08CB2566E30D}"
EndProject

22
src/Servers/IIS/IISIntegration.sln
View File

@ -266,18 +266,16 @@ Global
{D182103F-8405-4647-B158-C36F598657EF}.Release|x64.Build.0 = Release|Any CPU
{D182103F-8405-4647-B158-C36F598657EF}.Release|x86.ActiveCfg = Release|Any CPU
{D182103F-8405-4647-B158-C36F598657EF}.Release|x86.Build.0 = Release|Any CPU
{C0310D84-BC2F-4B2E-870E-D35044DB3E3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C0310D84-BC2F-4B2E-870E-D35044DB3E3E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C0310D84-BC2F-4B2E-870E-D35044DB3E3E}.Debug|x64.ActiveCfg = Debug|Any CPU
{C0310D84-BC2F-4B2E-870E-D35044DB3E3E}.Debug|x64.Build.0 = Debug|Any CPU
{C0310D84-BC2F-4B2E-870E-D35044DB3E3E}.Debug|x86.ActiveCfg = Debug|Any CPU
{C0310D84-BC2F-4B2E-870E-D35044DB3E3E}.Debug|x86.Build.0 = Debug|Any CPU
{C0310D84-BC2F-4B2E-870E-D35044DB3E3E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C0310D84-BC2F-4B2E-870E-D35044DB3E3E}.Release|Any CPU.Build.0 = Release|Any CPU
{C0310D84-BC2F-4B2E-870E-D35044DB3E3E}.Release|x64.ActiveCfg = Release|Any CPU
{C0310D84-BC2F-4B2E-870E-D35044DB3E3E}.Release|x64.Build.0 = Release|Any CPU
{C0310D84-BC2F-4B2E-870E-D35044DB3E3E}.Release|x86.ActiveCfg = Release|Any CPU
{C0310D84-BC2F-4B2E-870E-D35044DB3E3E}.Release|x86.Build.0 = Release|Any CPU
{C0310D84-BC2F-4B2E-870E-D35044DB3E3E}.Debug|Any CPU.ActiveCfg = Debug|x86
{C0310D84-BC2F-4B2E-870E-D35044DB3E3E}.Debug|x64.ActiveCfg = Debug|x64
{C0310D84-BC2F-4B2E-870E-D35044DB3E3E}.Debug|x64.Build.0 = Debug|x64
{C0310D84-BC2F-4B2E-870E-D35044DB3E3E}.Debug|x86.ActiveCfg = Debug|x86
{C0310D84-BC2F-4B2E-870E-D35044DB3E3E}.Debug|x86.Build.0 = Debug|x86
{C0310D84-BC2F-4B2E-870E-D35044DB3E3E}.Release|Any CPU.ActiveCfg = Release|x86
{C0310D84-BC2F-4B2E-870E-D35044DB3E3E}.Release|x64.ActiveCfg = Release|x64
{C0310D84-BC2F-4B2E-870E-D35044DB3E3E}.Release|x64.Build.0 = Release|x64
{C0310D84-BC2F-4B2E-870E-D35044DB3E3E}.Release|x86.ActiveCfg = Release|x86
{C0310D84-BC2F-4B2E-870E-D35044DB3E3E}.Release|x86.Build.0 = Release|x86
{D17B7B35-5361-4A50-B499-E03E5C3CC095}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D17B7B35-5361-4A50-B499-E03E5C3CC095}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D17B7B35-5361-4A50-B499-E03E5C3CC095}.Debug|x64.ActiveCfg = Debug|Any CPU

3
src/Servers/IIS/startvs.cmd Normal file
View File

@ -0,0 +1,3 @@
@ECHO OFF
%~dp0..\..\..\startvs.cmd %~dp0IISIntegration.sln

2
src/Servers/test/FunctionalTests/HelloWorldTest.cs
View File

@ -20,7 +20,7 @@ namespace ServerComparison.FunctionalTests
}
public static TestMatrix TestVariants
=> TestMatrix.ForServers(ServerType.IISExpress, ServerType.Kestrel, ServerType.Nginx, ServerType.HttpSys)
=> TestMatrix.ForServers(ServerType.IISExpress, ServerType.Kestrel, /* ServerType.Nginx, https://github.com/aspnet/AspNetCore-Internal/issues/1525 */ ServerType.HttpSys)
.WithTfms(Tfm.NetCoreApp22, Tfm.Net461)
.WithAllApplicationTypes()
.WithAllAncmVersions()

6
src/Servers/test/FunctionalTests/ResponseCompressionTests.cs
View File

@ -32,7 +32,7 @@ namespace ServerComparison.FunctionalTests
}
public static TestMatrix NoCompressionTestVariants
=> TestMatrix.ForServers(ServerType.IISExpress, ServerType.Kestrel, ServerType.Nginx, ServerType.HttpSys)
=> TestMatrix.ForServers(ServerType.IISExpress, ServerType.Kestrel, /* ServerType.Nginx, https://github.com/aspnet/AspNetCore-Internal/issues/1525 */ ServerType.HttpSys)
.WithTfms(Tfm.NetCoreApp22, Tfm.Net461)
.WithAllAncmVersions()
.WithAllHostingModels();
@ -45,7 +45,7 @@ namespace ServerComparison.FunctionalTests
}
public static TestMatrix HostCompressionTestVariants
=> TestMatrix.ForServers(ServerType.IISExpress, ServerType.Nginx)
=> TestMatrix.ForServers(ServerType.IISExpress /*, ServerType.Nginx https://github.com/aspnet/AspNetCore-Internal/issues/1525 */)
.WithTfms(Tfm.NetCoreApp22, Tfm.Net461)
.WithAllAncmVersions()
.WithAllHostingModels();
@ -71,7 +71,7 @@ namespace ServerComparison.FunctionalTests
}
public static TestMatrix HostAndAppCompressionTestVariants
=> TestMatrix.ForServers(ServerType.IISExpress, ServerType.Kestrel, ServerType.Nginx, ServerType.HttpSys)
=> TestMatrix.ForServers(ServerType.IISExpress, ServerType.Kestrel, /* ServerType.Nginx, https://github.com/aspnet/AspNetCore-Internal/issues/1525 */ ServerType.HttpSys)
.WithTfms(Tfm.NetCoreApp22, Tfm.Net461)
.WithAllAncmVersions()
.WithAllHostingModels();

2
src/Servers/test/FunctionalTests/ResponseTests.cs
View File

@ -25,7 +25,7 @@ namespace ServerComparison.FunctionalTests
}
public static TestMatrix TestVariants
=> TestMatrix.ForServers(ServerType.IISExpress, ServerType.Kestrel, ServerType.Nginx, ServerType.HttpSys)
=> TestMatrix.ForServers(ServerType.IISExpress, ServerType.Kestrel, /* ServerType.Nginx, https://github.com/aspnet/AspNetCore-Internal/issues/1525 */ ServerType.HttpSys)
.WithTfms(Tfm.NetCoreApp22)
.WithAllAncmVersions()
.WithAllHostingModels();

6
startvs.cmd
View File

@ -3,11 +3,11 @@
:: This command launches a Visual Studio solution with environment variables required to use a local version of the .NET Core SDK.
IF "%DOTNET_HOME%"=="" (
set DOTNET_HOME=%USERPROFILE%\.dotnet\x64
set DOTNET_HOME=%USERPROFILE%\.dotnet
)
:: This tells .NET Core to use the same dotnet.exe that build scripts use
SET DOTNET_ROOT=%DOTNET_HOME%
SET DOTNET_ROOT=%DOTNET_HOME%\x64
:: This tells .NET Core not to go looking for .NET Core in other places
SET DOTNET_MULTILEVEL_LOOKUP=0
@ -17,7 +17,7 @@ SET PATH=%DOTNET_ROOT%;%PATH%
SET sln=%1
IF NOT EXIST %DOTNET_ROOT%\dotnet.exe (
IF NOT EXIST "%DOTNET_ROOT%\dotnet.exe" (
echo .NET Core has not yet been installed. Run `build.cmd -restore` to install tools
exit /b 1
)