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

Merge branch 'release/2.2'

This commit is contained in:
Nate McMaster 2018-11-19 20:53:02 -08:00
parent 78eb188014 ae619e6b7f
commit 7c6bf7f75d
No known key found for this signature in database
GPG Key ID: A778D9601BD78810
12 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitmodules vendored
View File

@ -26,10 +26,6 @@
path = modules/HttpAbstractions path = modules/HttpAbstractions
url = https://github.com/aspnet/HttpAbstractions.git url = https://github.com/aspnet/HttpAbstractions.git
branch = master branch = master
[submodule "modules/HttpClientFactory"]
path = modules/HttpClientFactory
url = https://github.com/aspnet/HttpClientFactory.git
branch = master
[submodule "modules/HttpSysServer"] [submodule "modules/HttpSysServer"]
path = modules/HttpSysServer path = modules/HttpSysServer
url = https://github.com/aspnet/HttpSysServer.git url = https://github.com/aspnet/HttpSysServer.git

1
build/CodeSign.props
View File

@ -31,6 +31,7 @@
<FilesToSign Include="Microsoft.Extensions.FileProviders.Embedded.dll" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" /> <FilesToSign Include="Microsoft.Extensions.FileProviders.Embedded.dll" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
<FilesToSign Include="Microsoft.Extensions.FileProviders.Physical.dll" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" /> <FilesToSign Include="Microsoft.Extensions.FileProviders.Physical.dll" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
<FilesToSign Include="Microsoft.Extensions.FileSystemGlobbing.dll" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" /> <FilesToSign Include="Microsoft.Extensions.FileSystemGlobbing.dll" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
<FilesToSign Include="Microsoft.Extensions.Http.dll" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
<FilesToSign Include="Microsoft.Extensions.Logging.Abstractions.dll" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" /> <FilesToSign Include="Microsoft.Extensions.Logging.Abstractions.dll" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
<FilesToSign Include="Microsoft.Extensions.Logging.Configuration.dll" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" /> <FilesToSign Include="Microsoft.Extensions.Logging.Configuration.dll" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
<FilesToSign Include="Microsoft.Extensions.Logging.Console.dll" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" /> <FilesToSign Include="Microsoft.Extensions.Logging.Console.dll" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />

2
build/Publish.targets
View File

@ -58,7 +58,7 @@
Value="$(PackageVersion)" /> Value="$(PackageVersion)" />
</Target> </Target>
<Target Name="GetFilesToPublish" DependsOnTargets="GetAllRidPackages;GetArtifactInfo;GeneratePublishFiles"> <Target Name="GetFilesToPublish" DependsOnTargets="GetArtifactInfo;GeneratePublishFiles">
<PropertyGroup> <PropertyGroup>
<BlobBasePath>aspnetcore/Runtime/$(PackageVersion)/</BlobBasePath> <BlobBasePath>aspnetcore/Runtime/$(PackageVersion)/</BlobBasePath>
<NpmBlobBasePath>aspnetcore/npm/</NpmBlobBasePath> <NpmBlobBasePath>aspnetcore/npm/</NpmBlobBasePath>

2
build/artifacts.props
View File

@ -166,8 +166,6 @@
<PackageArtifact Include="Microsoft.Extensions.Diagnostics.HealthChecks" Category="ship" /> <PackageArtifact Include="Microsoft.Extensions.Diagnostics.HealthChecks" Category="ship" />
<PackageArtifact Include="Microsoft.Extensions.Hosting.Abstractions" Category="ship" /> <PackageArtifact Include="Microsoft.Extensions.Hosting.Abstractions" Category="ship" />
<PackageArtifact Include="Microsoft.Extensions.Hosting" Category="ship" /> <PackageArtifact Include="Microsoft.Extensions.Hosting" Category="ship" />
<PackageArtifact Include="Microsoft.Extensions.Http.Polly" Category="ship" />
<PackageArtifact Include="Microsoft.Extensions.Http" Category="ship" />
<PackageArtifact Include="Microsoft.Extensions.Identity.Core" Category="ship" /> <PackageArtifact Include="Microsoft.Extensions.Identity.Core" Category="ship" />
<PackageArtifact Include="Microsoft.Extensions.Identity.Stores" Category="ship" /> <PackageArtifact Include="Microsoft.Extensions.Identity.Stores" Category="ship" />
<PackageArtifact Include="Microsoft.Extensions.Localization.Abstractions" Category="ship" /> <PackageArtifact Include="Microsoft.Extensions.Localization.Abstractions" Category="ship" />

3
build/buildorder.props
View File

@ -9,7 +9,6 @@
<ItemGroup> <ItemGroup>
<RepositoryBuildOrder Include="Razor" Order="6" /> <RepositoryBuildOrder Include="Razor" Order="6" />
<RepositoryBuildOrder Include="HttpAbstractions" Order="6" /> <RepositoryBuildOrder Include="HttpAbstractions" Order="6" />
<RepositoryBuildOrder Include="HttpClientFactory" Order="6" />
<RepositoryBuildOrder Include="Hosting" Order="7" /> <RepositoryBuildOrder Include="Hosting" Order="7" />
<RepositoryBuildOrder Include="HttpSysServer" Order="8" /> <RepositoryBuildOrder Include="HttpSysServer" Order="8" />
<RepositoryBuildOrder Include="BasicMiddleware" Order="9" /> <RepositoryBuildOrder Include="BasicMiddleware" Order="9" />
@ -33,6 +32,6 @@
<RepositoryBuildOrder Include="MusicStore" Order="16" RootPath="$(RepositoryRoot)src\MusicStore\" /> <RepositoryBuildOrder Include="MusicStore" Order="16" RootPath="$(RepositoryRoot)src\MusicStore\" />
<RepositoryBuildOrder Include="SignalR" Order="16" /> <RepositoryBuildOrder Include="SignalR" Order="16" />
<RepositoryBuildOrder Include="AuthSamples" Order="16" RootPath="$(RepositoryRoot)src\AuthSamples\" /> <RepositoryBuildOrder Include="AuthSamples" Order="16" RootPath="$(RepositoryRoot)src\AuthSamples\" />
<RepositoryBuildOrder Include="Templating" Order="17" RootPath="$(RepositoryRoot)src\Templating\" /> <RepositoryBuildOrder Include="Templating" Order="17" RootPath="$(RepositoryRoot)src\templating\" />
</ItemGroup> </ItemGroup>
</Project> </Project>

3
build/dependencies.props
View File

@ -69,6 +69,7 @@
<MicrosoftExtensionsFileProvidersPhysicalPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsFileProvidersPhysicalPackageVersion> <MicrosoftExtensionsFileProvidersPhysicalPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsFileProvidersPhysicalPackageVersion>
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsFileSystemGlobbingPackageVersion> <MicrosoftExtensionsFileSystemGlobbingPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
<MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion> <MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>
<MicrosoftExtensionsHttpPackageVersion>3.0.0-alpha1-10742</MicrosoftExtensionsHttpPackageVersion>
<MicrosoftExtensionsLoggingAbstractionsPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsLoggingAbstractionsPackageVersion> <MicrosoftExtensionsLoggingAbstractionsPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
<MicrosoftExtensionsLoggingAzureAppServicesPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsLoggingAzureAppServicesPackageVersion> <MicrosoftExtensionsLoggingAzureAppServicesPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsLoggingAzureAppServicesPackageVersion>
<MicrosoftExtensionsLoggingConfigurationPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsLoggingConfigurationPackageVersion> <MicrosoftExtensionsLoggingConfigurationPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsLoggingConfigurationPackageVersion>
@ -220,8 +221,6 @@
<NETStandardLibrary20PackageVersion>2.0.3</NETStandardLibrary20PackageVersion> <NETStandardLibrary20PackageVersion>2.0.3</NETStandardLibrary20PackageVersion>
<NewtonsoftJsonBsonPackageVersion>1.0.1</NewtonsoftJsonBsonPackageVersion> <NewtonsoftJsonBsonPackageVersion>1.0.1</NewtonsoftJsonBsonPackageVersion>
<NewtonsoftJsonPackageVersion>11.0.2</NewtonsoftJsonPackageVersion> <NewtonsoftJsonPackageVersion>11.0.2</NewtonsoftJsonPackageVersion>
<PollyExtensionsHttpPackageVersion>2.0.1</PollyExtensionsHttpPackageVersion>
<PollyPackageVersion>6.0.1</PollyPackageVersion>
<SeleniumFirefoxWebDriverPackageVersion>0.20.0</SeleniumFirefoxWebDriverPackageVersion> <SeleniumFirefoxWebDriverPackageVersion>0.20.0</SeleniumFirefoxWebDriverPackageVersion>
<SeleniumSupportPackageVersion>3.12.1</SeleniumSupportPackageVersion> <SeleniumSupportPackageVersion>3.12.1</SeleniumSupportPackageVersion>
<SeleniumWebDriverChromeDriverPackageVersion>2.43.0</SeleniumWebDriverChromeDriverPackageVersion> <SeleniumWebDriverChromeDriverPackageVersion>2.43.0</SeleniumWebDriverChromeDriverPackageVersion>

3
build/external-dependencies.props
View File

@ -45,6 +45,7 @@
<ExternalDependency Include="Microsoft.Extensions.FileProviders.Physical" Version="$(MicrosoftExtensionsFileProvidersPhysicalPackageVersion)" /> <ExternalDependency Include="Microsoft.Extensions.FileProviders.Physical" Version="$(MicrosoftExtensionsFileProvidersPhysicalPackageVersion)" />
<ExternalDependency Include="Microsoft.Extensions.FileSystemGlobbing" Version="$(MicrosoftExtensionsFileSystemGlobbingPackageVersion)" /> <ExternalDependency Include="Microsoft.Extensions.FileSystemGlobbing" Version="$(MicrosoftExtensionsFileSystemGlobbingPackageVersion)" />
<ExternalDependency Include="Microsoft.Extensions.HashCodeCombiner.Sources" Version="$(MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion)" /> <ExternalDependency Include="Microsoft.Extensions.HashCodeCombiner.Sources" Version="$(MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion)" />
<ExternalDependency Include="Microsoft.Extensions.Http" Version="$(MicrosoftExtensionsHttpPackageVersion)" />
<ExternalDependency Include="Microsoft.Extensions.Logging.Abstractions" Version="$(MicrosoftExtensionsLoggingAbstractionsPackageVersion)" /> <ExternalDependency Include="Microsoft.Extensions.Logging.Abstractions" Version="$(MicrosoftExtensionsLoggingAbstractionsPackageVersion)" />
<ExternalDependency Include="Microsoft.Extensions.Logging.AzureAppServices" Version="$(MicrosoftExtensionsLoggingAzureAppServicesPackageVersion)" /> <ExternalDependency Include="Microsoft.Extensions.Logging.AzureAppServices" Version="$(MicrosoftExtensionsLoggingAzureAppServicesPackageVersion)" />
<ExternalDependency Include="Microsoft.Extensions.Logging.Configuration" Version="$(MicrosoftExtensionsLoggingConfigurationPackageVersion)" /> <ExternalDependency Include="Microsoft.Extensions.Logging.Configuration" Version="$(MicrosoftExtensionsLoggingConfigurationPackageVersion)" />
@ -204,8 +205,6 @@
<ExternalDependency Include="Newtonsoft.Json" Version="$(VisualStudio_NewtonsoftJsonPackageVersion)" VariableName="VisualStudio_NewtonsoftJsonPackageVersion" /> <ExternalDependency Include="Newtonsoft.Json" Version="$(VisualStudio_NewtonsoftJsonPackageVersion)" VariableName="VisualStudio_NewtonsoftJsonPackageVersion" />
<ExternalDependency Include="Newtonsoft.Json.Bson" Version="$(NewtonsoftJsonBsonPackageVersion)" /> <ExternalDependency Include="Newtonsoft.Json.Bson" Version="$(NewtonsoftJsonBsonPackageVersion)" />
<ExternalDependency Include="Polly.Extensions.Http" Version="$(PollyExtensionsHttpPackageVersion)" />
<ExternalDependency Include="Polly" Version="$(PollyPackageVersion)" />
<ExternalDependency Include="Selenium.Firefox.WebDriver" Version="$(SeleniumFirefoxWebDriverPackageVersion)" /> <ExternalDependency Include="Selenium.Firefox.WebDriver" Version="$(SeleniumFirefoxWebDriverPackageVersion)" />
<ExternalDependency Include="Selenium.Support" Version="$(SeleniumSupportPackageVersion)" /> <ExternalDependency Include="Selenium.Support" Version="$(SeleniumSupportPackageVersion)" />
<ExternalDependency Include="Selenium.WebDriver.MicrosoftDriver" Version="$(SeleniumWebDriverMicrosoftDriverPackageVersion)" /> <ExternalDependency Include="Selenium.WebDriver.MicrosoftDriver" Version="$(SeleniumWebDriverMicrosoftDriverPackageVersion)" />

3
build/submodules.props
View File

@ -44,7 +44,6 @@
<Repository Include="Diagnostics" /> <Repository Include="Diagnostics" />
<Repository Include="Hosting" /> <Repository Include="Hosting" />
<Repository Include="HttpAbstractions" /> <Repository Include="HttpAbstractions" />
<Repository Include="HttpClientFactory" />
<Repository Include="HttpSysServer" /> <Repository Include="HttpSysServer" />
<Repository Include="Identity" /> <Repository Include="Identity" />
<Repository Include="IISIntegration" RootPath="$(RepositoryRoot)src\IISIntegration\" /> <Repository Include="IISIntegration" RootPath="$(RepositoryRoot)src\IISIntegration\" />
@ -59,7 +58,7 @@
<Repository Include="Session" /> <Repository Include="Session" />
<Repository Include="SignalR" /> <Repository Include="SignalR" />
<Repository Include="StaticFiles" /> <Repository Include="StaticFiles" />
<Repository Include="Templating" RootPath="$(RepositoryRoot)src\Templating\" PatchPolicy="AlwaysUpdateAndCascadeVersions" /> <Repository Include="Templating" RootPath="$(RepositoryRoot)src\templating\" PatchPolicy="AlwaysUpdateAndCascadeVersions" />
<!-- Test-only repos --> <!-- Test-only repos -->
<Repository Include="AuthSamples" RootPath="$(RepositoryRoot)src\AuthSamples\" PatchPolicy="AlwaysUpdateAndCascadeVersions" /> <Repository Include="AuthSamples" RootPath="$(RepositoryRoot)src\AuthSamples\" PatchPolicy="AlwaysUpdateAndCascadeVersions" />

1
modules/HttpClientFactory

@ -1 +0,0 @@
Subproject commit 7c4f9479b4753a37c8b0669a883002e5e448cc94

6
scripts/GenerateTags.ps1
View File

@ -43,10 +43,10 @@ function New-GitTag {
Invoke-Block { & git tag -m "v$Tag" $Tag HEAD } Invoke-Block { & git tag -m "v$Tag" $Tag HEAD }
Write-Host -f Magenta "${Repo}: added tag '$Tag'" Write-Host -f Magenta "${Repo}: added tag '$Tag'"
} }
}
if ($Push -and $PSCmdlet.ShouldProcess($Repo, "Push tag $Tag to origin")) { if ($Push -and $PSCmdlet.ShouldProcess($Repo, "Push tag $Tag to origin")) {
Invoke-Block { & git push origin refs/tags/$Tag } Invoke-Block { & git push origin refs/tags/$Tag }
}
} }
} }
finally { finally {

2
src/SiteExtensions/build/repo.props
View File

@ -3,5 +3,7 @@
<PropertyGroup> <PropertyGroup>
<!-- Disable KoreBuild restrictions while we re-work dependency management. --> <!-- Disable KoreBuild restrictions while we re-work dependency management. -->
<DisablePackageReferenceRestrictions>true</DisablePackageReferenceRestrictions> <DisablePackageReferenceRestrictions>true</DisablePackageReferenceRestrictions>
<SignCheckExclusionsFile>$(RepositoryRoot)eng\signcheck.exclusions.txt</SignCheckExclusionsFile>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

1
src/SiteExtensions/eng/signcheck.exclusions.txt Normal file
View File

@ -0,0 +1 @@
content/store/*/apphost.exe;Microsoft.AspNetCore.AzureAppServices.SiteExtension.*.nupkg; Exclude the apphost because this is expected to be code-signed by customers after the SDK modifies it.