Merge branch 'release/2.2'
This commit is contained in:
Nate McMaster
commit
edfb2ab8ab
|
|
@ -28,3 +28,11 @@ jobs:
|
|||
jobDisplayName: "Build only : Linux"
|
||||
agentOs: Linux
|
||||
buildArgs: --all --pack
|
||||
- job: Code_check
|
||||
displayName: Code check
|
||||
workspace:
|
||||
clean: all
|
||||
pool:
|
||||
vmImage: vs2017-win2016
|
||||
steps:
|
||||
- powershell: ./eng/scripts/CodeCheck.ps1 -ci
|
||||
|
|
|
|||
|
|
@ -90,9 +90,6 @@ This can be done once #4246 is complete, and done in conjunction with converting
|
|||
<!-- This package contains API for the .NET CLI to generate the aspnet HTTPs dev cert during CLI first-run initialization. -->
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Category="noship" />
|
||||
|
||||
<!-- This packages contain bits used by Azure site extensions, and are not currently deployed to NuGet.org automatically like the rest of our packages. -->
|
||||
<PackageArtifact Include="Microsoft.Extensions.ApplicationModelDetection" Category="noship" />
|
||||
|
||||
<!-- This packages are produce for testing purposes only. -->
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.Server.IntegrationTesting.IIS" Category="noship" />
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.Server.IntegrationTesting" Category="noship" />
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@
|
|||
</ItemDefinitionGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<RepositoryBuildOrder Include="AzureIntegration" Order="15" />
|
||||
<RepositoryBuildOrder Include="MusicStore" Order="16" />
|
||||
<RepositoryBuildOrder Include="SignalR" Order="16" />
|
||||
<RepositoryBuildOrder Include="AuthSamples" Order="16" />
|
||||
|
|
|
|||
|
|
@ -36,7 +36,6 @@
|
|||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Repository Include="AzureIntegration" />
|
||||
<Repository Include="Components" />
|
||||
<Repository Include="SignalR" />
|
||||
<Repository Include="Templating" PatchPolicy="AlwaysUpdateAndCascadeVersions" />
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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" />
|
||||
|
|
|
|||
|
|
@ -68,6 +68,7 @@ and are generated based on the last package release.
|
|||
<LatestPackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="$(MicrosoftExtensionsLocalizationAbstractionsPackageVersion)" />
|
||||
<LatestPackageReference Include="Microsoft.Extensions.Localization" Version="$(MicrosoftExtensionsLocalizationPackageVersion)" />
|
||||
<LatestPackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="$(MicrosoftExtensionsLoggingAbstractionsPackageVersion)" />
|
||||
<LatestPackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="$(MicrosoftExtensionsLoggingAzureAppServicesPackageVersion)" />
|
||||
<LatestPackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="$(MicrosoftExtensionsLoggingConfigurationPackageVersion)" />
|
||||
<LatestPackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsolePackageVersion)" />
|
||||
<LatestPackageReference Include="Microsoft.Extensions.Logging.Debug" Version="$(MicrosoftExtensionsLoggingDebugPackageVersion)" />
|
||||
|
|
|
|||
|
|
@ -111,5 +111,7 @@
|
|||
<ProjectReferenceProvider Include="Microsoft.Extensions.ApiDescription.Tasks" ProjectPath="$(RepositoryRoot)src\Mvc\src\Microsoft.Extensions.ApiDescription.Design\Microsoft.Extensions.ApiDescription.Design.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>
|
||||
|
|
|
|||
|
|
@ -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
|
||||
}
|
||||
}
|
||||
|
|
@ -3,6 +3,6 @@
|
|||
"version": "3.0.100-preview-009750"
|
||||
},
|
||||
"msbuild-sdks": {
|
||||
"Internal.AspNetCore.Sdk": "3.0.0-build-20181214.1"
|
||||
"Internal.AspNetCore.Sdk": "3.0.0-build-20190104.3"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
version:3.0.0-build-20181214.1
|
||||
commithash:0872134136bf3d181e3ca3fa700b7ff392c055b3
|
||||
version:3.0.0-build-20190104.3
|
||||
commithash:1cc7b8211d23fd469ad03c73ff45e4d291b24be7
|
||||
|
|
|
|||
|
|
@ -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}
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
@ -11,11 +11,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>
|
||||
|
|
@ -11,8 +11,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,0 +1,13 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>netcoreapp3.0</TargetFramework>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Reference Include="Microsoft.AspNetCore.AzureAppServicesIntegration" />
|
||||
<Reference Include="Microsoft.AspNetCore.AzureAppServices.HostingStartup" />
|
||||
<Reference Include="Microsoft.AspNetCore.TestHost" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk.Web">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>netcoreapp3.0</TargetFramework>
|
||||
</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,0 +1,15 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk.Web">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>netcoreapp3.0</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>
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
[Oo]bj/
|
||||
[Bb]in/
|
||||
TestResults/
|
||||
.nuget/
|
||||
_ReSharper.*/
|
||||
packages/
|
||||
artifacts/
|
||||
PublishProfiles/
|
||||
*.user
|
||||
*.suo
|
||||
*.cache
|
||||
*.docstates
|
||||
_ReSharper.*
|
||||
nuget.exe
|
||||
*net45.csproj
|
||||
*net451.csproj
|
||||
*k10.csproj
|
||||
*.psess
|
||||
*.vsp
|
||||
*.pidb
|
||||
*.userprefs
|
||||
*DS_Store
|
||||
*.ncrunchsolution
|
||||
*.*sdf
|
||||
*.ipch
|
||||
*.sln.ide
|
||||
project.lock.json
|
||||
.vs
|
||||
.build/
|
||||
.testPublish/
|
||||
global.json
|
||||
msbuild.binlog
|
||||
.test-dotnet/
|
||||
.deps/
|
||||
|
|
@ -1,90 +0,0 @@
|
|||
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio Version 16
|
||||
VisualStudioVersion = 16.0.28315.86
|
||||
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
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{2FFE2B87-BF8A-4B38-ADAB-2FE2F9BC4A7C}"
|
||||
ProjectSection(SolutionItems) = preProject
|
||||
build\dependencies.props = build\dependencies.props
|
||||
Directory.Build.props = Directory.Build.props
|
||||
Directory.Build.targets = Directory.Build.targets
|
||||
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.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}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
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
|
||||
{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
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
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}
|
||||
{F0CABFE8-A5B1-487B-A451-A486D26742D3} = {FF9B744E-6C59-40CC-9E41-9D2EBD292435}
|
||||
{15664836-2B94-4D2D-AC18-6DED01FCCCBD} = {CD650B4B-81C2-4A44-AEF2-A251A877C1F0}
|
||||
EndGlobalSection
|
||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||
SolutionGuid = {5743DFE7-1AA5-439D-84AE-A480EA389927}
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
|
|
@ -1,30 +0,0 @@
|
|||
<Project>
|
||||
<Import
|
||||
Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), AspNetCoreSettings.props))\AspNetCoreSettings.props"
|
||||
Condition=" '$(CI)' != 'true' AND '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), AspNetCoreSettings.props))' != '' " />
|
||||
|
||||
<Import Project="version.props" />
|
||||
<Import Project="build\dependencies.props" />
|
||||
<Import Project="build\sources.props" />
|
||||
|
||||
<PropertyGroup>
|
||||
<Product>Microsoft ASP.NET Core</Product>
|
||||
<RepositoryUrl>https://github.com/aspnet/AspNetCore</RepositoryUrl>
|
||||
<RepositoryType>git</RepositoryType>
|
||||
<RepositoryRoot>$(MSBuildThisFileDirectory)</RepositoryRoot>
|
||||
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)..\..\eng\AspNetCore.snk</AssemblyOriginatorKeyFile>
|
||||
<SignAssembly>true</SignAssembly>
|
||||
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
|
||||
<SharedSourceRoot>$(MSBuildThisFileDirectory)..\Shared\</SharedSourceRoot>
|
||||
</PropertyGroup>
|
||||
|
||||
<!-- Artifacts layout -->
|
||||
<PropertyGroup>
|
||||
<ArtifactsDir>$(MSBuildThisFileDirectory)..\..\artifacts\</ArtifactsDir>
|
||||
<ArtifactsConfigurationDir>$(ArtifactsDir)$(Configuration)\</ArtifactsConfigurationDir>
|
||||
<BasePackageOutputPath>$(ArtifactsConfigurationDir)packages\</BasePackageOutputPath>
|
||||
<ProductPackageOutputPath>$(BasePackageOutputPath)product\</ProductPackageOutputPath>
|
||||
<InternalPackageOutputPath>$(BasePackageOutputPath)internal\</InternalPackageOutputPath>
|
||||
</PropertyGroup>
|
||||
|
||||
</Project>
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
<Project>
|
||||
<PropertyGroup>
|
||||
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp3.0' ">$(MicrosoftNETCoreAppPackageVersion)</RuntimeFrameworkVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
<!--
|
||||
By default, all projects which produce packages are not intended to ship to NuGet.org as a product package.
|
||||
Packages which are intended to ship to NuGet.org must opt-in by setting this to true in the project file.
|
||||
-->
|
||||
<IsProductPackage Condition=" '$(IsProductPackage)' == '' ">false</IsProductPackage>
|
||||
|
||||
<PackageOutputPath Condition=" '$(IsProductPackage)' == 'true' ">$(ProductPackageOutputPath)</PackageOutputPath>
|
||||
<PackageOutputPath Condition=" '$(IsProductPackage)' != 'true' ">$(InternalPackageOutputPath)</PackageOutputPath>
|
||||
</PropertyGroup>
|
||||
|
||||
</Project>
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
{
|
||||
"adx": { // Packages written by the ADX team and that ship on NuGet.org
|
||||
"rules": [
|
||||
"AdxVerificationCompositeRule"
|
||||
],
|
||||
"packages": {
|
||||
"Microsoft.AspNetCore.AzureAppServicesIntegration": { },
|
||||
"Microsoft.Extensions.ApplicationModelDetection": { }
|
||||
}
|
||||
},
|
||||
"Default": { // Rules to run for packages not listed in any other set.
|
||||
"rules": [
|
||||
"DefaultCompositeRule"
|
||||
]
|
||||
}
|
||||
}
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
AzureIntegration
|
||||
===
|
||||
|
||||
Features that integrate ASP.NET Core with Azure.
|
||||
|
||||
This project is part of ASP.NET Core. You can find samples, documentation and getting started instructions for ASP.NET Core at the [Home](https://github.com/aspnet/home) repo.
|
||||
|
||||
|
||||
SiteExtensions
|
||||
===
|
||||
|
||||
To install a nightly preview of the ASP.NET Core runtime site extension for testing purposes:
|
||||
1. In the Azure portal select App Services -> your site -> Application settings
|
||||
1. Set `SCM_SITEEXTENSIONS_FEED_URL` application setting to `https://dotnet.myget.org/F/aspnetcore-dev/`
|
||||
1. Go to `DEVELOPMENT TOOLS` -> `Advanced Tools` -> `Site extensions` -> `Gallery`
|
||||
1. Enter `AspNetCoreRuntime` into `Search` box and click `Search`
|
||||
1. Click `+` to install site extension and wait untill installation animation finishes
|
||||
1. `Extensions` tab should now show newly installed site extension
|
||||
1. Click `Restart site` on the right side of the page when installation finishes (this would only restart Kudu site, not the main one)
|
||||
1. Restart site in `Overview` tab of `App service`
|
||||
|
||||
|
||||
To update ASP.NET Core runtime site extension:
|
||||
1. Stop site in `Overview` tab of `App service`
|
||||
1. Go to `DEVELOPMENT TOOLS` -> `Advanced Tools` -> `Site extensions`
|
||||
1. Click update on site extension
|
||||
1. Start site in `Overview` tab of `App service`
|
||||
|
|
@ -1,46 +0,0 @@
|
|||
<Project>
|
||||
<PropertyGroup>
|
||||
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Label="Package Versions">
|
||||
<InternalAspNetCoreSdkPackageVersion>3.0.0-build-20181114.5</InternalAspNetCoreSdkPackageVersion>
|
||||
<InternalAspNetCoreSiteExtensionSdkPackageVersion>3.0.0-build-20181114.5</InternalAspNetCoreSiteExtensionSdkPackageVersion>
|
||||
<MicrosoftAspNetCoreAspNetCoreModulePackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreAspNetCoreModulePackageVersion>
|
||||
<MicrosoftAspNetCoreAspNetCoreModuleV2PackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreAspNetCoreModuleV2PackageVersion>
|
||||
<MicrosoftAspNetCoreAzureAppServicesHostingStartupPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreAzureAppServicesHostingStartupPackageVersion>
|
||||
<MicrosoftAspNetCoreDataProtectionAzureKeyVaultPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreDataProtectionAzureKeyVaultPackageVersion>
|
||||
<MicrosoftAspNetCoreHostingAbstractionsPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreHostingAbstractionsPackageVersion>
|
||||
<MicrosoftAspNetCoreHostingPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreHostingPackageVersion>
|
||||
<MicrosoftAspNetCoreMvcPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreMvcPackageVersion>
|
||||
<MicrosoftAspNetCoreRazorRuntimePackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreRazorRuntimePackageVersion>
|
||||
<MicrosoftAspNetCoreServerIISIntegrationPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreServerIISIntegrationPackageVersion>
|
||||
<MicrosoftAspNetCoreServerIntegrationTestingPackageVersion>0.7.0-alpha1-10742</MicrosoftAspNetCoreServerIntegrationTestingPackageVersion>
|
||||
<MicrosoftAspNetCoreServerKestrelPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreServerKestrelPackageVersion>
|
||||
<MicrosoftAspNetCoreTestHostPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreTestHostPackageVersion>
|
||||
<MicrosoftAzureManagementFluentPackageVersion>1.1.3</MicrosoftAzureManagementFluentPackageVersion>
|
||||
<MicrosoftAzureServicesAppAuthenticationPackageVersion>1.0.3</MicrosoftAzureServicesAppAuthenticationPackageVersion>
|
||||
<MicrosoftExtensionsConfigurationAzureKeyVaultPackageVersion>3.0.0-alpha1-10670</MicrosoftExtensionsConfigurationAzureKeyVaultPackageVersion>
|
||||
<MicrosoftExtensionsConfigurationCommandLinePackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsConfigurationCommandLinePackageVersion>
|
||||
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
|
||||
<MicrosoftExtensionsConfigurationJsonPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsConfigurationJsonPackageVersion>
|
||||
<MicrosoftExtensionsDiagnosticAdapterPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsDiagnosticAdapterPackageVersion>
|
||||
<MicrosoftExtensionsLoggingAzureAppServicesPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsLoggingAzureAppServicesPackageVersion>
|
||||
<MicrosoftExtensionsLoggingConfigurationPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsLoggingConfigurationPackageVersion>
|
||||
<MicrosoftExtensionsLoggingConsolePackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsLoggingConsolePackageVersion>
|
||||
<MicrosoftExtensionsLoggingPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsLoggingPackageVersion>
|
||||
<MicrosoftExtensionsLoggingTestingPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsLoggingTestingPackageVersion>
|
||||
<MicrosoftNETCoreAppPackageVersion>3.0.0-preview1-26907-05</MicrosoftNETCoreAppPackageVersion>
|
||||
<MicrosoftNETSdkRazorPackageVersion>3.0.0-preview-18579-0056</MicrosoftNETSdkRazorPackageVersion>
|
||||
<MicrosoftNETTestSdkPackageVersion>15.6.1</MicrosoftNETTestSdkPackageVersion>
|
||||
<MicrosoftWebXdtPackageVersion>1.4.0</MicrosoftWebXdtPackageVersion>
|
||||
<MoqPackageVersion>4.10.0</MoqPackageVersion>
|
||||
<NETStandardLibrary20PackageVersion>2.0.3</NETStandardLibrary20PackageVersion>
|
||||
<NewtonsoftJsonPackageVersion>12.0.1</NewtonsoftJsonPackageVersion>
|
||||
<SystemReflectionMetadataPackageVersion>1.7.0-preview1-26907-04</SystemReflectionMetadataPackageVersion>
|
||||
<WindowsAzureStoragePackageVersion>8.1.4</WindowsAzureStoragePackageVersion>
|
||||
<XunitPackageVersion>2.3.1</XunitPackageVersion>
|
||||
<XunitRunnerVisualStudioPackageVersion>2.4.0</XunitRunnerVisualStudioPackageVersion>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(DotNetPackageVersionPropsPath)" Condition=" '$(DotNetPackageVersionPropsPath)' != '' " />
|
||||
<PropertyGroup Label="Package Versions: Pinned" />
|
||||
</Project>
|
||||
|
|
@ -1,35 +0,0 @@
|
|||
<Project>
|
||||
<Import Project="dependencies.props" />
|
||||
|
||||
<PropertyGroup>
|
||||
<OverridePackageOutputPath>false</OverridePackageOutputPath>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
<FunctionalTestsProject>$(RepositoryRoot)test\Microsoft.AspNetCore.AzureAppServices.FunctionalTests\Microsoft.AspNetCore.AzureAppServices.FunctionalTests.csproj</FunctionalTestsProject>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<SiteExtensions Include="$(RepositoryRoot)extensions\Microsoft.AspNetCore.Runtime.SiteExtension\Microsoft.AspNetCore.Runtime.SiteExtension.csproj" PackageName="AspNetCoreRuntime.3.0.x64" BuildProperties="RuntimeArch=x64;" />
|
||||
<SiteExtensions Include="$(RepositoryRoot)extensions\Microsoft.AspNetCore.Runtime.SiteExtension\Microsoft.AspNetCore.Runtime.SiteExtension.csproj" PackageName="AspNetCoreRuntime.3.0.x86" BuildProperties="RuntimeArch=x86;" />
|
||||
<SiteExtensions Include="$(RepositoryRoot)extensions\Microsoft.AspNetCore.AzureAppServices.SiteExtension\Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj" PackageName="Microsoft.AspNetCore.AzureAppServices.SiteExtension.3.0" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ExcludeFromTest
|
||||
Condition="'$(AntaresTests)' != ''"
|
||||
Include="$(RepositoryRoot)test\*\*.csproj"
|
||||
Exclude="$(FunctionalTestsProject)" />
|
||||
|
||||
<ExcludeFromTest
|
||||
Condition="'$(AntaresTests)' == ''"
|
||||
Include="$(FunctionalTestsProject)" />
|
||||
|
||||
<ExcludeFromTest Include="$(RepositoryRoot)test\Microsoft.AspNetCore.AzureAppServices.SiteExtension.Tests\*.csproj" Condition="'$(OS)' != 'Windows_NT'" />
|
||||
<ExcludeFromTest Include="$(RepositoryRoot)test\Microsoft.Web.Xdt.Extensions.Tests\*.csproj" Condition="'$(OS)' != 'Windows_NT'" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<DotNetCoreRuntime Include="$(MicrosoftNETCoreAppPackageVersion)" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
@ -1,94 +0,0 @@
|
|||
<Project>
|
||||
|
||||
<PropertyGroup>
|
||||
<ComposeSdk Condition="$(SITE_EXTENSION_SDK_VERSION) == ''">True</ComposeSdk>
|
||||
<_SdkVersion>$(SITE_EXTENSION_SDK_VERSION)</_SdkVersion>
|
||||
<_SdkVersion Condition="'$(_SdkVersion)' == ''">$([System.IO.Path]::GetFileName($([System.IO.Path]::GetDirectoryName('$(MSBuildExtensionsPath)'))))</_SdkVersion>
|
||||
<_SdkFeed>$(SITE_EXTENSION_SDK_FEED)</_SdkFeed>
|
||||
<_SdkFeed Condition="'$(_SdkFeed)' == ''">$(DefaultDotNetAssetFeed)</_SdkFeed>
|
||||
<TestDotNetPath>$(RepositoryRoot).test-dotnet\</TestDotNetPath>
|
||||
<AppsArtifactDirectory>$(RepositoryRoot)artifacts\apps</AppsArtifactDirectory>
|
||||
<SiteExtensionWorkingDirectory>$(TestDotNetPath)extension\$(SiteExtensionArch)\</SiteExtensionWorkingDirectory>
|
||||
<SiteExtensionOutputDirectory>$(RepositoryRoot)artifacts\build</SiteExtensionOutputDirectory>
|
||||
<TestProjectDirectory>$(RepositoryRoot)\test\Microsoft.AspNetCore.AzureAppServices.FunctionalTests\</TestProjectDirectory>
|
||||
<SiteExtensionFeed Condition="$(SiteExtensionFeed) == ''">https://dotnet.myget.org/F/aspnetcore-dev/</SiteExtensionFeed>
|
||||
<SiteExtensionNETCoreAppPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</SiteExtensionNETCoreAppPackageVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<Target Name="_AddTestRuntimes">
|
||||
<ItemGroup>
|
||||
<DotNetCoreSdk Include="2.0.0" InstallDir="$(TestDotNetPath)2.0\" FallbackPackageCache="True" />
|
||||
<DotNetCoreSdk Include="$(_SdkVersion)" InstallDir="$(TestDotNetPath)latest\" FallbackPackageCache="True" />
|
||||
</ItemGroup>
|
||||
</Target>
|
||||
|
||||
<Target Name="_CleanSiteExtension">
|
||||
<RemoveDir Directories="$(SiteExtensionWorkingDirectory)" Condition="Exists($(SiteExtensionWorkingDirectory))" />
|
||||
</Target>
|
||||
|
||||
<Target Name="_AddSiteExtensionRuntime">
|
||||
<ItemGroup>
|
||||
<DotNetCoreRuntime
|
||||
Include="$(SiteExtensionNETCoreAppPackageVersion)"
|
||||
InstallDir="$(SiteExtensionWorkingDirectory)"
|
||||
Arch="$(SiteExtensionArch)"
|
||||
Feed="$(DotNetAssetRootUrl)"
|
||||
FeedCredential="$(DotNetAssetRootAccessTokenSuffix)" />
|
||||
</ItemGroup>
|
||||
</Target>
|
||||
|
||||
<Target Name="PrepareSiteExtensionSdk" DependsOnTargets="_AddSiteExtensionRuntime;InstallDotNet">
|
||||
<UnzipArchive File="$(ArtifactDependencyLocation)\aspnetcore-runtime-internal-$(PackageVersion)-win-$(SiteExtensionArch).zip" Destination="$(SiteExtensionWorkingDirectory)" Overwrite="true" />
|
||||
</Target>
|
||||
|
||||
<Target Name="PrepareSiteExtensionSdks">
|
||||
<MSBuild Projects="$(MSBuildProjectFullPath)" Targets="PrepareSiteExtensionSdk" Properties="SiteExtensionArch=x86" />
|
||||
<MSBuild Projects="$(MSBuildProjectFullPath)" Targets="PrepareSiteExtensionSdk" Properties="SiteExtensionArch=x64" />
|
||||
</Target>
|
||||
|
||||
<Target Name="BuildSiteExtension" DependsOnTargets="_CleanSiteExtension;PrepareSiteExtensionSdks">
|
||||
<MSBuild Projects="%(SiteExtensions.Identity)"
|
||||
Targets="Restore"
|
||||
Properties="VersionSuffix=$(VersionSuffix);BuildNumberSuffix=$(BuildNumberSuffix)" />
|
||||
|
||||
<MSBuild Projects="%(SiteExtensions.Identity)"
|
||||
Targets="Pack"
|
||||
Properties="%(SiteExtensions.BuildProperties);DotnetHomeDirectory=$(SiteExtensionWorkingDirectory);VersionSuffix=$(VersionSuffix);BuildNumberSuffix=$(BuildNumberSuffix);PackageOutputPath=$(SiteExtensionOutputDirectory)" />
|
||||
</Target>
|
||||
|
||||
<Target Name="PushSiteExtension" DependsOnTargets="BuildSiteExtension">
|
||||
<ItemGroup>
|
||||
<RepositoryNupkgs Include="$(SiteExtensionOutputDirectory)\%(SiteExtensions.PackageName).*.nupkg" />
|
||||
</ItemGroup>
|
||||
|
||||
<PushNuGetPackages
|
||||
Packages="@(RepositoryNupkgs)"
|
||||
Feed="$(SiteExtensionFeed)"
|
||||
ApiKey="$(APIKey)"
|
||||
TimeoutSeconds="600"/>
|
||||
|
||||
</Target>
|
||||
|
||||
<Target Name="TestSiteExtension" DependsOnTargets="_AddTestRuntimes;InstallDotNet;Restore">
|
||||
|
||||
<Copy SourceFiles="$(TestProjectDirectory)NuGet.config.template" DestinationFiles="$(RepositoryRoot)artifacts\NuGet.config" />
|
||||
<Copy SourceFiles="$(TestProjectDirectory)global.json.template" DestinationFiles="$(RepositoryRoot)artifacts\global.json" />
|
||||
<Copy SourceFiles="$(TestProjectDirectory)Directory.Build.props.template" DestinationFiles="$(RepositoryRoot)artifacts\Directory.Build.props" />
|
||||
<Copy SourceFiles="$(TestProjectDirectory)Directory.Build.targets.template" DestinationFiles="$(RepositoryRoot)artifacts\Directory.Build.targets" />
|
||||
|
||||
<Exec Command="%(DotNetCoreSdk.InstallDir)dotnet msbuild /version" WorkingDirectory="$(RepositoryRoot)artifacts\" />
|
||||
|
||||
<Exec Command="dotnet run" WorkingDirectory="$(TestProjectDirectory)"/>
|
||||
|
||||
</Target>
|
||||
|
||||
<Target Name="CleanArtifactsApplications" BeforeTargets="CleanArtifacts" >
|
||||
<!--
|
||||
git deploy creates read-only files which msbuild is unable to remove
|
||||
NOTE: we run tests only on windows
|
||||
-->
|
||||
<Exec Command="rmdir /S /Q "$(AppsArtifactDirectory)"" Condition="Exists($(AppsArtifactDirectory))" />
|
||||
<RemoveDir Directories="$(SiteExtensionOutputDirectory)" Condition="Exists($(SiteExtensionOutputDirectory))" />
|
||||
</Target>
|
||||
|
||||
</Project>
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
<Project>
|
||||
<Import Project="$(DotNetRestoreSourcePropsPath)" Condition="'$(DotNetRestoreSourcePropsPath)' != ''"/>
|
||||
|
||||
<PropertyGroup Label="RestoreSources">
|
||||
<RestoreSources>$(DotNetRestoreSources)</RestoreSources>
|
||||
<RestoreSources Condition="'$(DotNetBuildOffline)' != 'true' AND '$(AspNetUniverseBuildOffline)' != 'true' ">
|
||||
$(RestoreSources);
|
||||
https://dotnet.myget.org/F/dotnet-core/api/v3/index.json;
|
||||
https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json;
|
||||
https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json;
|
||||
</RestoreSources>
|
||||
<RestoreSources Condition="'$(DotNetBuildOffline)' != 'true'">
|
||||
$(RestoreSources);
|
||||
https://api.nuget.org/v3/index.json;
|
||||
</RestoreSources>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
|
|
@ -1,18 +0,0 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk.Web">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>netcoreapp3.0</TargetFramework>
|
||||
</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>
|
||||
|
|
@ -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
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,18 +0,0 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk.Web">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>netcoreapp3.0</TargetFramework>
|
||||
</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>
|
||||
|
|
@ -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
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
<Project>
|
||||
<Import Project="..\Directory.Build.props" />
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Internal.AspNetCore.Sdk" PrivateAssets="All" Version="$(InternalAspNetCoreSdkPackageVersion)" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
|
@ -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; }
|
||||
}
|
||||
}
|
||||
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<PropertyGroup>
|
||||
<Description>ASP.NET Core integration with Azure AppServices.</Description>
|
||||
<TargetFramework>netcoreapp3.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>
|
||||
|
|
@ -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
|
||||
}
|
||||
}
|
||||
|
|
@ -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": []
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
<Project>
|
||||
<Import Project="..\Directory.Build.props" />
|
||||
|
||||
<ItemGroup Condition="'$(IsTestProject)' != 'false'">
|
||||
<PackageReference Include="Internal.AspNetCore.Sdk" PrivateAssets="All" Version="$(InternalAspNetCoreSdkPackageVersion)" />
|
||||
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkPackageVersion)" />
|
||||
<PackageReference Include="Moq" Version="$(MoqPackageVersion)" />
|
||||
<PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVisualStudioPackageVersion)" />
|
||||
<PackageReference Include="xunit" Version="$(XunitPackageVersion)" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>netcoreapp3.0</TargetFramework>
|
||||
</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>
|
||||
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>netcoreapp3.0</TargetFramework>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\..\src\Microsoft.Extensions.ApplicationModelDetection\Microsoft.Extensions.ApplicationModelDetection.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
<Project>
|
||||
<Import Project="..\..\version.props" />
|
||||
</Project>
|
||||
|
|
@ -2,6 +2,9 @@
|
|||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>netcoreapp3.0</TargetFramework>
|
||||
|
||||
<!-- 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>
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@
|
|||
<UIFrameworkVersionMoniker Include="V4" />
|
||||
</ItemGroup>
|
||||
|
||||
<Target Name="BuildRazorViews" AfterTargets="Build">
|
||||
<Target Name="BuildRazorViews" DependsOnTargets="Compile" BeforeTargets="Build">
|
||||
<Message Text="Building razor views assemblies" Importance="High" />
|
||||
<MSbuild Projects="$(MSBuildThisFile)"
|
||||
Targets="BuildForUI"
|
||||
|
|
@ -124,10 +124,11 @@
|
|||
Name="_GetRazorDlls" BeforeTargets="GetCopyToOutputDirectoryItems">
|
||||
|
||||
<ItemGroup>
|
||||
<_AllItemsFullPathWithTargetPath Include="$(MSBuildThisFileDirectory)$(IntermediateOutputPath)%(UIFrameworkVersionMoniker.Identity)\$(TargetName).Views.%(UIFrameworkVersionMoniker.Identity).*" />
|
||||
<_GeneratedRazorViews Include="$(TargetDir)$(TargetName).Views.%(UIFrameworkVersionMoniker.Identity).dll" />
|
||||
<_GeneratedRazorViews Include="$(TargetDir)$(TargetName).Views.%(UIFrameworkVersionMoniker.Identity).pdb" />
|
||||
|
||||
<AllItemsFullPathWithTargetPath Include="%(_AllItemsFullPathWithTargetPath.FullPath)">
|
||||
<TargetPath>%(Filename)%(Extension)</TargetPath>
|
||||
<AllItemsFullPathWithTargetPath Include="%(_GeneratedRazorViews.FullPath)">
|
||||
<TargetPath>%(FileName)%(Extension)</TargetPath>
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</AllItemsFullPathWithTargetPath>
|
||||
</ItemGroup>
|
||||
|
|
@ -149,8 +150,8 @@
|
|||
|
||||
<Target Name="VerifyBuildOutputs" AfterTargets="BuildRazorViews">
|
||||
<ItemGroup>
|
||||
<ExpectedOutputFile Include="$(OutputPath)Microsoft.AspNetCore.Identity.UI.Views.V3.dll" />
|
||||
<ExpectedOutputFile Include="$(OutputPath)Microsoft.AspNetCore.Identity.UI.Views.V4.dll" />
|
||||
<ExpectedOutputFile Include="$(TargetDir)Microsoft.AspNetCore.Identity.UI.Views.V3.dll" />
|
||||
<ExpectedOutputFile Include="$(TargetDir)Microsoft.AspNetCore.Identity.UI.Views.V4.dll" />
|
||||
</ItemGroup>
|
||||
|
||||
<Error Text="Unable to find precompiled view file %(ExpectedOutputFile.Identity)"
|
||||
|
|
|
|||
|
|
@ -23,24 +23,4 @@
|
|||
</ItemGroup>
|
||||
|
||||
<Import Project="$(MvcTestingTargets)" Condition="'$(MvcTestingTargets)' != ''" />
|
||||
|
||||
<Target Name="CopyViews" AfterTargets="Build" Condition="$(TargetFramework) != ''">
|
||||
<ItemGroup>
|
||||
<_IdentityUIViewsAssemblies Include="$(MSBuildThisFileDirectory)..\..\UI\src\bin\$(Configuration)\netcoreapp3.0\Microsoft.AspNetCore.Identity.UI.Views.*.dll" />
|
||||
</ItemGroup>
|
||||
<Copy
|
||||
SourceFiles="@(_IdentityUIViewsAssemblies)"
|
||||
DestinationFolder="$(OutputPath)" />
|
||||
</Target>
|
||||
|
||||
<Target Name="VerifyBuildOutputs" AfterTargets="Build" Condition="$(TargetFramework) != ''">
|
||||
<ItemGroup>
|
||||
<ExpectedOutputFile Include="$(OutputPath)Microsoft.AspNetCore.Identity.UI.Views.V3.dll" />
|
||||
<ExpectedOutputFile Include="$(OutputPath)Microsoft.AspNetCore.Identity.UI.Views.V4.dll" />
|
||||
</ItemGroup>
|
||||
|
||||
<Error Text="Unable to find precompiled view file %(ExpectedOutputFile.Identity)"
|
||||
Condition="!Exists('%(ExpectedOutputFile.Identity)')" />
|
||||
</Target>
|
||||
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -0,0 +1,3 @@
|
|||
@ECHO OFF
|
||||
|
||||
%~dp0..\..\..\startvs.cmd %~dp0IISIntegration.sln
|
||||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in New Issue