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-06 12:13:05 -08:00
parent 7f95d6af34 67c3a099ec
commit df46dfee73
No known key found for this signature in database
GPG Key ID: A778D9601BD78810
12 changed files with 82 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.azure/pipelines/jobs/default-build.yml
View File

@ -51,7 +51,6 @@ parameters:
codeSign: false codeSign: false
variables: {} variables: {}
dependsOn: '' dependsOn: ''
# buildSteps: ''- don't define an empty object default because there is no way in template expression yet to check "if isEmpty(parameters.buildSteps)"
# jobName: '' - use agentOs by default. # jobName: '' - use agentOs by default.
# jobDisplayName: '' - use agentOs by default. # jobDisplayName: '' - use agentOs by default.
# matrix: {} - don't define an empty object default because there is no way in template expression yet to check "if isEmpty(parameters.matrix)" # matrix: {} - don't define an empty object default because there is no way in template expression yet to check "if isEmpty(parameters.matrix)"
@ -59,7 +58,6 @@ parameters:
publish: true publish: true
path: 'artifacts/' path: 'artifacts/'
buildDirectory: '' buildDirectory: ''
buildSteps: []
jobs: jobs:
- job: ${{ coalesce(parameters.jobName, parameters.agentOs) }} - job: ${{ coalesce(parameters.jobName, parameters.agentOs) }}
@ -112,10 +110,10 @@ jobs:
signType: $(_SignType) signType: $(_SignType)
zipSources: false zipSources: false
- ${{ parameters.beforeBuild }} - ${{ parameters.beforeBuild }}
- ${{ if eq(parameters.agentOs, 'Windows')}}: - ${{ if eq(parameters.agentOs, 'Windows') }}:
- script: .\$(BuildDirectory)\build.cmd -ci /p:SignType=$(_SignType) /p:Configuration=$(BuildConfiguration) $(BuildScriptArgs) - script: .\$(BuildDirectory)\build.cmd -ci /p:SignType=$(_SignType) /p:Configuration=$(BuildConfiguration) $(BuildScriptArgs)
displayName: Run build.cmd displayName: Run build.cmd
- ${{ if ne(parameters.agentOs, 'Windows')}}: - ${{ if ne(parameters.agentOs, 'Windows') }}:
- script: ./$(BuildDirectory)/build.sh -ci -p:Configuration=$(BuildConfiguration) $(BuildScriptArgs) - script: ./$(BuildDirectory)/build.sh -ci -p:Configuration=$(BuildConfiguration) $(BuildScriptArgs)
displayName: Run build.sh displayName: Run build.sh
- task: PublishTestResults@2 - task: PublishTestResults@2

2
.azure/pipelines/project-ci.yml
View File

@ -15,6 +15,7 @@
# This build definition is enabled for code signing. (Only applies to Windows) # This build definition is enabled for code signing. (Only applies to Windows)
# buildDirectory: string # buildDirectory: string
# Specifies what directory to run build.sh/cmd # Specifies what directory to run build.sh/cmd
parameters: parameters:
buildArgs: '' buildArgs: ''
beforeBuild: [] beforeBuild: []
@ -27,6 +28,7 @@ parameters:
Debug: Debug:
BuildConfiguration: Debug BuildConfiguration: Debug
buildDirectory: '' buildDirectory: ''
jobs: jobs:
- template: jobs/default-build.yml - template: jobs/default-build.yml
parameters: parameters:

4
.gitmodules vendored
View File

@ -22,10 +22,6 @@
path = modules/Caching path = modules/Caching
url = https://github.com/aspnet/Caching.git url = https://github.com/aspnet/Caching.git
branch = master branch = master
[submodule "modules/Configuration"]
path = modules/Configuration
url = https://github.com/aspnet/Configuration.git
branch = master
[submodule "modules/CORS"] [submodule "modules/CORS"]
path = modules/CORS path = modules/CORS
url = https://github.com/aspnet/CORS.git url = https://github.com/aspnet/CORS.git

25
build/CodeSign.props
View File

@ -9,16 +9,27 @@
<FilesToSign Include="System.Interactive.Async.dll" Certificate="$(AssemblySigning3rdPartyCertName)" Container="Microsoft.AspNetCore.App" /> <FilesToSign Include="System.Interactive.Async.dll" Certificate="$(AssemblySigning3rdPartyCertName)" Container="Microsoft.AspNetCore.App" />
<!-- These files came from the aspnet/Extensions build, but have to be re-signed because we crossgen them. --> <!-- These files came from the aspnet/Extensions build, but have to be re-signed because we crossgen them. -->
<FilesToSign Include="Microsoft.Extensions.DependencyInjection.dll" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" /> <FilesToSign Include="Microsoft.Extensions.Configuration.Abstractions.dll" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
<FilesToSign Include="Microsoft.Extensions.Configuration.Binder.dll" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
<FilesToSign Include="Microsoft.Extensions.Configuration.CommandLine.dll" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
<FilesToSign Include="Microsoft.Extensions.Configuration.dll" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
<FilesToSign Include="Microsoft.Extensions.Configuration.EnvironmentVariables.dll" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
<FilesToSign Include="Microsoft.Extensions.Configuration.FileExtensions.dll" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
<FilesToSign Include="Microsoft.Extensions.Configuration.Ini.dll" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
<FilesToSign Include="Microsoft.Extensions.Configuration.Json.dll" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
<FilesToSign Include="Microsoft.Extensions.Configuration.KeyPerFile.dll" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
<FilesToSign Include="Microsoft.Extensions.Configuration.UserSecrets.dll" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
<FilesToSign Include="Microsoft.Extensions.Configuration.Xml.dll" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
<FilesToSign Include="Microsoft.Extensions.DependencyInjection.Abstractions.dll" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" /> <FilesToSign Include="Microsoft.Extensions.DependencyInjection.Abstractions.dll" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
<FilesToSign Include="Microsoft.Extensions.DependencyInjection.dll" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
<FilesToSign Include="Microsoft.Extensions.DiagnosticAdapter.dll" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" /> <FilesToSign Include="Microsoft.Extensions.DiagnosticAdapter.dll" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
<FilesToSign Include="Microsoft.Extensions.FileProviders.Abstractions.dll" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
<FilesToSign Include="Microsoft.Extensions.FileProviders.Composite.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.FileSystemGlobbing.dll" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
<FilesToSign Include="Microsoft.Extensions.ObjectPool.dll" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" /> <FilesToSign Include="Microsoft.Extensions.ObjectPool.dll" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
<FilesToSign Include="Microsoft.Extensions.Primitives.dll" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" /> <FilesToSign Include="Microsoft.Extensions.Primitives.dll" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
<FilesToSign Include="Microsoft.Extensions.FileProviders.Abstractions.dll" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
<FilesToSign Include="Microsoft.Extensions.FileProviders.Composite.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.FileSystemGlobbing.dll" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
<!-- These files came from partner teams. They have to be re-signed because we crossgen them and redistributable them in our installers. --> <!-- These files came from partner teams. They have to be re-signed because we crossgen them and redistributable them in our installers. -->

12
build/artifacts.props
View File

@ -186,18 +186,6 @@
<PackageArtifact Include="Microsoft.Extensions.Caching.Memory" Category="ship" /> <PackageArtifact Include="Microsoft.Extensions.Caching.Memory" Category="ship" />
<PackageArtifact Include="Microsoft.Extensions.Caching.StackExchangeRedis" Category="ship" /> <PackageArtifact Include="Microsoft.Extensions.Caching.StackExchangeRedis" Category="ship" />
<PackageArtifact Include="Microsoft.Extensions.Caching.SqlServer" Category="ship" /> <PackageArtifact Include="Microsoft.Extensions.Caching.SqlServer" Category="ship" />
<PackageArtifact Include="Microsoft.Extensions.Configuration.Abstractions" Category="ship" />
<PackageArtifact Include="Microsoft.Extensions.Configuration.AzureKeyVault" Category="ship" />
<PackageArtifact Include="Microsoft.Extensions.Configuration.Binder" Category="ship" />
<PackageArtifact Include="Microsoft.Extensions.Configuration.CommandLine" Category="ship" />
<PackageArtifact Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Category="ship" />
<PackageArtifact Include="Microsoft.Extensions.Configuration.FileExtensions" Category="ship" />
<PackageArtifact Include="Microsoft.Extensions.Configuration.Ini" Category="ship" />
<PackageArtifact Include="Microsoft.Extensions.Configuration.Json" Category="ship" />
<PackageArtifact Include="Microsoft.Extensions.Configuration.KeyPerFile" Category="ship" />
<PackageArtifact Include="Microsoft.Extensions.Configuration.UserSecrets" Category="ship" />
<PackageArtifact Include="Microsoft.Extensions.Configuration.Xml" Category="ship" />
<PackageArtifact Include="Microsoft.Extensions.Configuration" Category="ship" />
<PackageArtifact Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Category="ship" /> <PackageArtifact Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Category="ship" />
<PackageArtifact Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Category="ship" /> <PackageArtifact Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Category="ship" />
<PackageArtifact Include="Microsoft.Extensions.Diagnostics.HealthChecks" Category="ship" /> <PackageArtifact Include="Microsoft.Extensions.Diagnostics.HealthChecks" Category="ship" />

1
build/buildorder.props
View File

@ -8,7 +8,6 @@
<ItemGroup> <ItemGroup>
<RepositoryBuildOrder Include="JsonPatch" Order="2" /> <RepositoryBuildOrder Include="JsonPatch" Order="2" />
<RepositoryBuildOrder Include="Configuration" Order="3" />
<RepositoryBuildOrder Include="Options" Order="4" /> <RepositoryBuildOrder Include="Options" Order="4" />
<RepositoryBuildOrder Include="DotNetTools" Order="4" /> <RepositoryBuildOrder Include="DotNetTools" Order="4" />
<RepositoryBuildOrder Include="Caching" Order="5" /> <RepositoryBuildOrder Include="Caching" Order="5" />

78
build/dependencies.props
View File

@ -31,39 +31,51 @@
<SystemThreadingTasksExtensionsPackageVersion>4.6.0-preview1-26907-04</SystemThreadingTasksExtensionsPackageVersion> <SystemThreadingTasksExtensionsPackageVersion>4.6.0-preview1-26907-04</SystemThreadingTasksExtensionsPackageVersion>
<SystemValueTuplePackageVersion>4.6.0-preview1-26829-04</SystemValueTuplePackageVersion> <SystemValueTuplePackageVersion>4.6.0-preview1-26829-04</SystemValueTuplePackageVersion>
<!-- Packages from aspnet/Extensions --> <!-- Packages from aspnet/Extensions -->
<InternalAspNetCoreAnalyzersPackageVersion>3.0.0-preview-181105-05</InternalAspNetCoreAnalyzersPackageVersion> <InternalAspNetCoreAnalyzersPackageVersion>3.0.0-preview-181106-04</InternalAspNetCoreAnalyzersPackageVersion>
<MicrosoftAspNetCoreAnalyzerTestingPackageVersion>3.0.0-preview-181105-05</MicrosoftAspNetCoreAnalyzerTestingPackageVersion> <MicrosoftAspNetCoreAnalyzerTestingPackageVersion>3.0.0-preview-181106-04</MicrosoftAspNetCoreAnalyzerTestingPackageVersion>
<MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>3.0.0-preview-181105-05</MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion> <MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>3.0.0-preview-181106-04</MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>
<MicrosoftAspNetCoreCertificatesGenerationSourcesPackageVersion>3.0.0-preview-181105-05</MicrosoftAspNetCoreCertificatesGenerationSourcesPackageVersion> <MicrosoftAspNetCoreCertificatesGenerationSourcesPackageVersion>3.0.0-preview-181106-04</MicrosoftAspNetCoreCertificatesGenerationSourcesPackageVersion>
<MicrosoftAspNetCoreTestingPackageVersion>3.0.0-preview-181105-05</MicrosoftAspNetCoreTestingPackageVersion> <MicrosoftAspNetCoreTestingPackageVersion>3.0.0-preview-181106-04</MicrosoftAspNetCoreTestingPackageVersion>
<MicrosoftExtensionsActivatorUtilitiesSourcesPackageVersion>3.0.0-preview-181105-05</MicrosoftExtensionsActivatorUtilitiesSourcesPackageVersion> <MicrosoftExtensionsActivatorUtilitiesSourcesPackageVersion>3.0.0-preview-181106-04</MicrosoftExtensionsActivatorUtilitiesSourcesPackageVersion>
<MicrosoftExtensionsClosedGenericMatcherSourcesPackageVersion>3.0.0-preview-181105-05</MicrosoftExtensionsClosedGenericMatcherSourcesPackageVersion> <MicrosoftExtensionsClosedGenericMatcherSourcesPackageVersion>3.0.0-preview-181106-04</MicrosoftExtensionsClosedGenericMatcherSourcesPackageVersion>
<MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>3.0.0-preview-181105-05</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion> <MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>3.0.0-preview-181106-04</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>
<MicrosoftExtensionsCopyOnWriteDictionarySourcesPackageVersion>3.0.0-preview-181105-05</MicrosoftExtensionsCopyOnWriteDictionarySourcesPackageVersion> <MicrosoftExtensionsConfigurationAbstractionsPackageVersion>3.0.0-preview-181106-04</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
<MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>3.0.0-preview-181105-05</MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion> <MicrosoftExtensionsConfigurationAzureKeyVaultPackageVersion>3.0.0-preview-181106-04</MicrosoftExtensionsConfigurationAzureKeyVaultPackageVersion>
<MicrosoftExtensionsDependencyInjectionPackageVersion>3.0.0-preview-181105-05</MicrosoftExtensionsDependencyInjectionPackageVersion> <MicrosoftExtensionsConfigurationBinderPackageVersion>3.0.0-preview-181106-04</MicrosoftExtensionsConfigurationBinderPackageVersion>
<MicrosoftExtensionsDependencyInjectionSpecificationTestsPackageVersion>3.0.0-preview-181105-05</MicrosoftExtensionsDependencyInjectionSpecificationTestsPackageVersion> <MicrosoftExtensionsConfigurationCommandLinePackageVersion>3.0.0-preview-181106-04</MicrosoftExtensionsConfigurationCommandLinePackageVersion>
<MicrosoftExtensionsDiagnosticAdapterPackageVersion>3.0.0-preview-181105-05</MicrosoftExtensionsDiagnosticAdapterPackageVersion> <MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>3.0.0-preview-181106-04</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
<MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>3.0.0-preview-181105-05</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion> <MicrosoftExtensionsConfigurationFileExtensionsPackageVersion>3.0.0-preview-181106-04</MicrosoftExtensionsConfigurationFileExtensionsPackageVersion>
<MicrosoftExtensionsFileProvidersCompositePackageVersion>3.0.0-preview-181105-05</MicrosoftExtensionsFileProvidersCompositePackageVersion> <MicrosoftExtensionsConfigurationIniPackageVersion>3.0.0-preview-181106-04</MicrosoftExtensionsConfigurationIniPackageVersion>
<MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>3.0.0-preview-181105-05</MicrosoftExtensionsFileProvidersEmbeddedPackageVersion> <MicrosoftExtensionsConfigurationJsonPackageVersion>3.0.0-preview-181106-04</MicrosoftExtensionsConfigurationJsonPackageVersion>
<MicrosoftExtensionsFileProvidersPhysicalPackageVersion>3.0.0-preview-181105-05</MicrosoftExtensionsFileProvidersPhysicalPackageVersion> <MicrosoftExtensionsConfigurationKeyPerFilePackageVersion>3.0.0-preview-181106-04</MicrosoftExtensionsConfigurationKeyPerFilePackageVersion>
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>3.0.0-preview-181105-05</MicrosoftExtensionsFileSystemGlobbingPackageVersion> <MicrosoftExtensionsConfigurationPackageVersion>3.0.0-preview-181106-04</MicrosoftExtensionsConfigurationPackageVersion>
<MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>3.0.0-preview-181105-05</MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion> <MicrosoftExtensionsConfigurationUserSecretsPackageVersion>3.0.0-preview-181106-04</MicrosoftExtensionsConfigurationUserSecretsPackageVersion>
<MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>3.0.0-preview-181105-05</MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion> <MicrosoftExtensionsConfigurationXmlPackageVersion>3.0.0-preview-181106-04</MicrosoftExtensionsConfigurationXmlPackageVersion>
<MicrosoftExtensionsObjectMethodExecutorSourcesPackageVersion>3.0.0-preview-181105-05</MicrosoftExtensionsObjectMethodExecutorSourcesPackageVersion> <MicrosoftExtensionsCopyOnWriteDictionarySourcesPackageVersion>3.0.0-preview-181106-04</MicrosoftExtensionsCopyOnWriteDictionarySourcesPackageVersion>
<MicrosoftExtensionsObjectPoolPackageVersion>3.0.0-preview-181105-05</MicrosoftExtensionsObjectPoolPackageVersion> <MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>3.0.0-preview-181106-04</MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>
<MicrosoftExtensionsParameterDefaultValueSourcesPackageVersion>3.0.0-preview-181105-05</MicrosoftExtensionsParameterDefaultValueSourcesPackageVersion> <MicrosoftExtensionsDependencyInjectionPackageVersion>3.0.0-preview-181106-04</MicrosoftExtensionsDependencyInjectionPackageVersion>
<MicrosoftExtensionsPrimitivesPackageVersion>3.0.0-preview-181105-05</MicrosoftExtensionsPrimitivesPackageVersion> <MicrosoftExtensionsDependencyInjectionSpecificationTestsPackageVersion>3.0.0-preview-181106-04</MicrosoftExtensionsDependencyInjectionSpecificationTestsPackageVersion>
<MicrosoftExtensionsProcessSourcesPackageVersion>3.0.0-preview-181105-05</MicrosoftExtensionsProcessSourcesPackageVersion> <MicrosoftExtensionsDiagnosticAdapterPackageVersion>3.0.0-preview-181106-04</MicrosoftExtensionsDiagnosticAdapterPackageVersion>
<MicrosoftExtensionsPropertyActivatorSourcesPackageVersion>3.0.0-preview-181105-05</MicrosoftExtensionsPropertyActivatorSourcesPackageVersion> <MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>3.0.0-preview-181106-04</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>
<MicrosoftExtensionsPropertyHelperSourcesPackageVersion>3.0.0-preview-181105-05</MicrosoftExtensionsPropertyHelperSourcesPackageVersion> <MicrosoftExtensionsFileProvidersCompositePackageVersion>3.0.0-preview-181106-04</MicrosoftExtensionsFileProvidersCompositePackageVersion>
<MicrosoftExtensionsRazorViewsSourcesPackageVersion>3.0.0-preview-181105-05</MicrosoftExtensionsRazorViewsSourcesPackageVersion> <MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>3.0.0-preview-181106-04</MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>
<MicrosoftExtensionsSecurityHelperSourcesPackageVersion>3.0.0-preview-181105-05</MicrosoftExtensionsSecurityHelperSourcesPackageVersion> <MicrosoftExtensionsFileProvidersPhysicalPackageVersion>3.0.0-preview-181106-04</MicrosoftExtensionsFileProvidersPhysicalPackageVersion>
<MicrosoftExtensionsStackTraceSourcesPackageVersion>3.0.0-preview-181105-05</MicrosoftExtensionsStackTraceSourcesPackageVersion> <MicrosoftExtensionsFileSystemGlobbingPackageVersion>3.0.0-preview-181106-04</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
<MicrosoftExtensionsTypeNameHelperSourcesPackageVersion>3.0.0-preview-181105-05</MicrosoftExtensionsTypeNameHelperSourcesPackageVersion> <MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>3.0.0-preview-181106-04</MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>
<MicrosoftExtensionsValueStopwatchSourcesPackageVersion>3.0.0-preview-181105-05</MicrosoftExtensionsValueStopwatchSourcesPackageVersion> <MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>3.0.0-preview-181106-04</MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>
<MicrosoftExtensionsWebEncodersSourcesPackageVersion>3.0.0-preview-181105-05</MicrosoftExtensionsWebEncodersSourcesPackageVersion> <MicrosoftExtensionsObjectMethodExecutorSourcesPackageVersion>3.0.0-preview-181106-04</MicrosoftExtensionsObjectMethodExecutorSourcesPackageVersion>
<MicrosoftExtensionsObjectPoolPackageVersion>3.0.0-preview-181106-04</MicrosoftExtensionsObjectPoolPackageVersion>
<MicrosoftExtensionsParameterDefaultValueSourcesPackageVersion>3.0.0-preview-181106-04</MicrosoftExtensionsParameterDefaultValueSourcesPackageVersion>
<MicrosoftExtensionsPrimitivesPackageVersion>3.0.0-preview-181106-04</MicrosoftExtensionsPrimitivesPackageVersion>
<MicrosoftExtensionsProcessSourcesPackageVersion>3.0.0-preview-181106-04</MicrosoftExtensionsProcessSourcesPackageVersion>
<MicrosoftExtensionsPropertyActivatorSourcesPackageVersion>3.0.0-preview-181106-04</MicrosoftExtensionsPropertyActivatorSourcesPackageVersion>
<MicrosoftExtensionsPropertyHelperSourcesPackageVersion>3.0.0-preview-181106-04</MicrosoftExtensionsPropertyHelperSourcesPackageVersion>
<MicrosoftExtensionsRazorViewsSourcesPackageVersion>3.0.0-preview-181106-04</MicrosoftExtensionsRazorViewsSourcesPackageVersion>
<MicrosoftExtensionsSecurityHelperSourcesPackageVersion>3.0.0-preview-181106-04</MicrosoftExtensionsSecurityHelperSourcesPackageVersion>
<MicrosoftExtensionsStackTraceSourcesPackageVersion>3.0.0-preview-181106-04</MicrosoftExtensionsStackTraceSourcesPackageVersion>
<MicrosoftExtensionsTypeNameHelperSourcesPackageVersion>3.0.0-preview-181106-04</MicrosoftExtensionsTypeNameHelperSourcesPackageVersion>
<MicrosoftExtensionsValueStopwatchSourcesPackageVersion>3.0.0-preview-181106-04</MicrosoftExtensionsValueStopwatchSourcesPackageVersion>
<MicrosoftExtensionsWebEncodersSourcesPackageVersion>3.0.0-preview-181106-04</MicrosoftExtensionsWebEncodersSourcesPackageVersion>
</PropertyGroup> </PropertyGroup>
<Import Project="$(DotNetPackageVersionPropsPath)" Condition="'$(DotNetPackageVersionPropsPath)' != ''" /> <Import Project="$(DotNetPackageVersionPropsPath)" Condition="'$(DotNetPackageVersionPropsPath)' != ''" />

11
build/external-dependencies.props
View File

@ -19,6 +19,17 @@
<ExternalDependency Include="Microsoft.Extensions.ClosedGenericMatcher.Sources" Version="$(MicrosoftExtensionsClosedGenericMatcherSourcesPackageVersion)" /> <ExternalDependency Include="Microsoft.Extensions.ClosedGenericMatcher.Sources" Version="$(MicrosoftExtensionsClosedGenericMatcherSourcesPackageVersion)" />
<ExternalDependency Include="Microsoft.Extensions.ClosedGenericMatcher.Sources" Version="$(MicrosoftExtensionsClosedGenericMatcherSourcesPackageVersion)" /> <ExternalDependency Include="Microsoft.Extensions.ClosedGenericMatcher.Sources" Version="$(MicrosoftExtensionsClosedGenericMatcherSourcesPackageVersion)" />
<ExternalDependency Include="Microsoft.Extensions.CommandLineUtils.Sources" Version="$(MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion)" /> <ExternalDependency Include="Microsoft.Extensions.CommandLineUtils.Sources" Version="$(MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion)" />
<ExternalDependency Include="Microsoft.Extensions.Configuration.Abstractions" Version="$(MicrosoftExtensionsConfigurationAbstractionsPackageVersion)" />
<ExternalDependency Include="Microsoft.Extensions.Configuration.Binder" Version="$(MicrosoftExtensionsConfigurationBinderPackageVersion)" />
<ExternalDependency Include="Microsoft.Extensions.Configuration.CommandLine" Version="$(MicrosoftExtensionsConfigurationCommandLinePackageVersion)" />
<ExternalDependency Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion)" />
<ExternalDependency Include="Microsoft.Extensions.Configuration.FileExtensions" Version="$(MicrosoftExtensionsConfigurationFileExtensionsPackageVersion)" />
<ExternalDependency Include="Microsoft.Extensions.Configuration.Ini" Version="$(MicrosoftExtensionsConfigurationIniPackageVersion)" />
<ExternalDependency Include="Microsoft.Extensions.Configuration.Json" Version="$(MicrosoftExtensionsConfigurationJsonPackageVersion)" />
<ExternalDependency Include="Microsoft.Extensions.Configuration.KeyPerFile" Version="$(MicrosoftExtensionsConfigurationKeyPerFilePackageVersion)" />
<ExternalDependency Include="Microsoft.Extensions.Configuration.UserSecrets" Version="$(MicrosoftExtensionsConfigurationUserSecretsPackageVersion)" />
<ExternalDependency Include="Microsoft.Extensions.Configuration.Xml" Version="$(MicrosoftExtensionsConfigurationXmlPackageVersion)" />
<ExternalDependency Include="Microsoft.Extensions.Configuration" Version="$(MicrosoftExtensionsConfigurationPackageVersion)" />
<ExternalDependency Include="Microsoft.Extensions.CopyOnWriteDictionary.Sources" Version="$(MicrosoftExtensionsCopyOnWriteDictionarySourcesPackageVersion)" /> <ExternalDependency Include="Microsoft.Extensions.CopyOnWriteDictionary.Sources" Version="$(MicrosoftExtensionsCopyOnWriteDictionarySourcesPackageVersion)" />
<ExternalDependency Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="$(MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion)" /> <ExternalDependency Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="$(MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion)" />
<ExternalDependency Include="Microsoft.Extensions.DependencyInjection.Specification.Tests" Version="$(MicrosoftExtensionsDependencyInjectionSpecificationTestsPackageVersion)" /> <ExternalDependency Include="Microsoft.Extensions.DependencyInjection.Specification.Tests" Version="$(MicrosoftExtensionsDependencyInjectionSpecificationTestsPackageVersion)" />

1
build/repo.targets
View File

@ -143,6 +143,7 @@
<Category>noship</Category> <Category>noship</Category>
<IsLineup>true</IsLineup> <IsLineup>true</IsLineup>
</ArtifactInfo> </ArtifactInfo>
<FilesToSign Include="$(BuildDir)Internal.AspNetCore.Universe.Lineup.$(PackageVersion).nupkg" Certificate="$(PackageSigningCertName)" />
</ItemGroup> </ItemGroup>
</Target> </Target>

1
build/submodules.props
View File

@ -41,7 +41,6 @@
<Repository Include="AzureIntegration" /> <Repository Include="AzureIntegration" />
<Repository Include="BasicMiddleware" /> <Repository Include="BasicMiddleware" />
<Repository Include="Caching" /> <Repository Include="Caching" />
<Repository Include="Configuration" />
<Repository Include="CORS" /> <Repository Include="CORS" />
<Repository Include="DataProtection" RootPath="$(RepositoryRoot)src\DataProtection\" /> <Repository Include="DataProtection" RootPath="$(RepositoryRoot)src\DataProtection\" />
<Repository Include="Diagnostics" /> <Repository Include="Diagnostics" />

1
modules/Configuration

@ -1 +0,0 @@
Subproject commit fdeabf601682d6d85b1f37a79449972f8d469e8a

2
src/Installers/Windows/build.ps1
View File

@ -13,6 +13,7 @@ param(
[Alias("x64")] [Alias("x64")]
[string]$Runtime64Zip, [string]$Runtime64Zip,
[string]$BuildNumber = 't000', [string]$BuildNumber = 't000',
[switch]$IsFinalBuild,
[string]$SignType = '', [string]$SignType = '',
[string]$PackageVersionPropsUrl = $null, [string]$PackageVersionPropsUrl = $null,
[string]$AccessTokenSuffix = $null, [string]$AccessTokenSuffix = $null,
@ -89,6 +90,7 @@ try {
"-p:Configuration=$Configuration" ` "-p:Configuration=$Configuration" `
"-p:BuildNumber=$BuildNumber" ` "-p:BuildNumber=$BuildNumber" `
"-p:SignType=$SignType" ` "-p:SignType=$SignType" `
"-p:IsFinalBuild=$IsFinalBuild" `
"-bl:$repoRoot/artifacts/logs/installers.msbuild.binlog" ` "-bl:$repoRoot/artifacts/logs/installers.msbuild.binlog" `
@msbuildArgs @msbuildArgs
} }