Merge branch 'release/2.2'
This commit is contained in:
Nate McMaster
commit
df46dfee73
|
|
@ -51,7 +51,6 @@ parameters:
|
|||
codeSign: false
|
||||
variables: {}
|
||||
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.
|
||||
# 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)"
|
||||
|
|
@ -59,7 +58,6 @@ parameters:
|
|||
publish: true
|
||||
path: 'artifacts/'
|
||||
buildDirectory: ''
|
||||
buildSteps: []
|
||||
|
||||
jobs:
|
||||
- job: ${{ coalesce(parameters.jobName, parameters.agentOs) }}
|
||||
|
|
@ -112,10 +110,10 @@ jobs:
|
|||
signType: $(_SignType)
|
||||
zipSources: false
|
||||
- ${{ parameters.beforeBuild }}
|
||||
- ${{ if eq(parameters.agentOs, 'Windows')}}:
|
||||
- ${{ if eq(parameters.agentOs, 'Windows') }}:
|
||||
- script: .\$(BuildDirectory)\build.cmd -ci /p:SignType=$(_SignType) /p:Configuration=$(BuildConfiguration) $(BuildScriptArgs)
|
||||
displayName: Run build.cmd
|
||||
- ${{ if ne(parameters.agentOs, 'Windows')}}:
|
||||
- ${{ if ne(parameters.agentOs, 'Windows') }}:
|
||||
- script: ./$(BuildDirectory)/build.sh -ci -p:Configuration=$(BuildConfiguration) $(BuildScriptArgs)
|
||||
displayName: Run build.sh
|
||||
- task: PublishTestResults@2
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@
|
|||
# This build definition is enabled for code signing. (Only applies to Windows)
|
||||
# buildDirectory: string
|
||||
# Specifies what directory to run build.sh/cmd
|
||||
|
||||
parameters:
|
||||
buildArgs: ''
|
||||
beforeBuild: []
|
||||
|
|
@ -27,6 +28,7 @@ parameters:
|
|||
Debug:
|
||||
BuildConfiguration: Debug
|
||||
buildDirectory: ''
|
||||
|
||||
jobs:
|
||||
- template: jobs/default-build.yml
|
||||
parameters:
|
||||
|
|
@ -55,4 +57,4 @@ jobs:
|
|||
beforeBuild: ${{ parameters.beforeBuild }}
|
||||
afterBuild: ${{ parameters.afterBuild }}
|
||||
variables: ${{ parameters.variables }}
|
||||
buildDirectory: ${{ parameters.buildDirectory }}
|
||||
buildDirectory: ${{ parameters.buildDirectory }}
|
||||
|
|
|
|||
|
|
@ -22,10 +22,6 @@
|
|||
path = modules/Caching
|
||||
url = https://github.com/aspnet/Caching.git
|
||||
branch = master
|
||||
[submodule "modules/Configuration"]
|
||||
path = modules/Configuration
|
||||
url = https://github.com/aspnet/Configuration.git
|
||||
branch = master
|
||||
[submodule "modules/CORS"]
|
||||
path = modules/CORS
|
||||
url = https://github.com/aspnet/CORS.git
|
||||
|
|
|
|||
|
|
@ -9,16 +9,27 @@
|
|||
<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. -->
|
||||
<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.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.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" />
|
||||
<FilesToSign Include="Microsoft.Extensions.Primitives.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. -->
|
||||
|
||||
|
|
|
|||
|
|
@ -186,18 +186,6 @@
|
|||
<PackageArtifact Include="Microsoft.Extensions.Caching.Memory" Category="ship" />
|
||||
<PackageArtifact Include="Microsoft.Extensions.Caching.StackExchangeRedis" 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.EntityFrameworkCore" Category="ship" />
|
||||
<PackageArtifact Include="Microsoft.Extensions.Diagnostics.HealthChecks" Category="ship" />
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@
|
|||
|
||||
<ItemGroup>
|
||||
<RepositoryBuildOrder Include="JsonPatch" Order="2" />
|
||||
<RepositoryBuildOrder Include="Configuration" Order="3" />
|
||||
<RepositoryBuildOrder Include="Options" Order="4" />
|
||||
<RepositoryBuildOrder Include="DotNetTools" Order="4" />
|
||||
<RepositoryBuildOrder Include="Caching" Order="5" />
|
||||
|
|
|
|||
|
|
@ -31,39 +31,51 @@
|
|||
<SystemThreadingTasksExtensionsPackageVersion>4.6.0-preview1-26907-04</SystemThreadingTasksExtensionsPackageVersion>
|
||||
<SystemValueTuplePackageVersion>4.6.0-preview1-26829-04</SystemValueTuplePackageVersion>
|
||||
<!-- Packages from aspnet/Extensions -->
|
||||
<InternalAspNetCoreAnalyzersPackageVersion>3.0.0-preview-181105-05</InternalAspNetCoreAnalyzersPackageVersion>
|
||||
<MicrosoftAspNetCoreAnalyzerTestingPackageVersion>3.0.0-preview-181105-05</MicrosoftAspNetCoreAnalyzerTestingPackageVersion>
|
||||
<MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>3.0.0-preview-181105-05</MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>
|
||||
<MicrosoftAspNetCoreCertificatesGenerationSourcesPackageVersion>3.0.0-preview-181105-05</MicrosoftAspNetCoreCertificatesGenerationSourcesPackageVersion>
|
||||
<MicrosoftAspNetCoreTestingPackageVersion>3.0.0-preview-181105-05</MicrosoftAspNetCoreTestingPackageVersion>
|
||||
<MicrosoftExtensionsActivatorUtilitiesSourcesPackageVersion>3.0.0-preview-181105-05</MicrosoftExtensionsActivatorUtilitiesSourcesPackageVersion>
|
||||
<MicrosoftExtensionsClosedGenericMatcherSourcesPackageVersion>3.0.0-preview-181105-05</MicrosoftExtensionsClosedGenericMatcherSourcesPackageVersion>
|
||||
<MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>3.0.0-preview-181105-05</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>
|
||||
<MicrosoftExtensionsCopyOnWriteDictionarySourcesPackageVersion>3.0.0-preview-181105-05</MicrosoftExtensionsCopyOnWriteDictionarySourcesPackageVersion>
|
||||
<MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>3.0.0-preview-181105-05</MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>
|
||||
<MicrosoftExtensionsDependencyInjectionPackageVersion>3.0.0-preview-181105-05</MicrosoftExtensionsDependencyInjectionPackageVersion>
|
||||
<MicrosoftExtensionsDependencyInjectionSpecificationTestsPackageVersion>3.0.0-preview-181105-05</MicrosoftExtensionsDependencyInjectionSpecificationTestsPackageVersion>
|
||||
<MicrosoftExtensionsDiagnosticAdapterPackageVersion>3.0.0-preview-181105-05</MicrosoftExtensionsDiagnosticAdapterPackageVersion>
|
||||
<MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>3.0.0-preview-181105-05</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>
|
||||
<MicrosoftExtensionsFileProvidersCompositePackageVersion>3.0.0-preview-181105-05</MicrosoftExtensionsFileProvidersCompositePackageVersion>
|
||||
<MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>3.0.0-preview-181105-05</MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>
|
||||
<MicrosoftExtensionsFileProvidersPhysicalPackageVersion>3.0.0-preview-181105-05</MicrosoftExtensionsFileProvidersPhysicalPackageVersion>
|
||||
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>3.0.0-preview-181105-05</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
|
||||
<MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>3.0.0-preview-181105-05</MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>
|
||||
<MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>3.0.0-preview-181105-05</MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>
|
||||
<MicrosoftExtensionsObjectMethodExecutorSourcesPackageVersion>3.0.0-preview-181105-05</MicrosoftExtensionsObjectMethodExecutorSourcesPackageVersion>
|
||||
<MicrosoftExtensionsObjectPoolPackageVersion>3.0.0-preview-181105-05</MicrosoftExtensionsObjectPoolPackageVersion>
|
||||
<MicrosoftExtensionsParameterDefaultValueSourcesPackageVersion>3.0.0-preview-181105-05</MicrosoftExtensionsParameterDefaultValueSourcesPackageVersion>
|
||||
<MicrosoftExtensionsPrimitivesPackageVersion>3.0.0-preview-181105-05</MicrosoftExtensionsPrimitivesPackageVersion>
|
||||
<MicrosoftExtensionsProcessSourcesPackageVersion>3.0.0-preview-181105-05</MicrosoftExtensionsProcessSourcesPackageVersion>
|
||||
<MicrosoftExtensionsPropertyActivatorSourcesPackageVersion>3.0.0-preview-181105-05</MicrosoftExtensionsPropertyActivatorSourcesPackageVersion>
|
||||
<MicrosoftExtensionsPropertyHelperSourcesPackageVersion>3.0.0-preview-181105-05</MicrosoftExtensionsPropertyHelperSourcesPackageVersion>
|
||||
<MicrosoftExtensionsRazorViewsSourcesPackageVersion>3.0.0-preview-181105-05</MicrosoftExtensionsRazorViewsSourcesPackageVersion>
|
||||
<MicrosoftExtensionsSecurityHelperSourcesPackageVersion>3.0.0-preview-181105-05</MicrosoftExtensionsSecurityHelperSourcesPackageVersion>
|
||||
<MicrosoftExtensionsStackTraceSourcesPackageVersion>3.0.0-preview-181105-05</MicrosoftExtensionsStackTraceSourcesPackageVersion>
|
||||
<MicrosoftExtensionsTypeNameHelperSourcesPackageVersion>3.0.0-preview-181105-05</MicrosoftExtensionsTypeNameHelperSourcesPackageVersion>
|
||||
<MicrosoftExtensionsValueStopwatchSourcesPackageVersion>3.0.0-preview-181105-05</MicrosoftExtensionsValueStopwatchSourcesPackageVersion>
|
||||
<MicrosoftExtensionsWebEncodersSourcesPackageVersion>3.0.0-preview-181105-05</MicrosoftExtensionsWebEncodersSourcesPackageVersion>
|
||||
<InternalAspNetCoreAnalyzersPackageVersion>3.0.0-preview-181106-04</InternalAspNetCoreAnalyzersPackageVersion>
|
||||
<MicrosoftAspNetCoreAnalyzerTestingPackageVersion>3.0.0-preview-181106-04</MicrosoftAspNetCoreAnalyzerTestingPackageVersion>
|
||||
<MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>3.0.0-preview-181106-04</MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>
|
||||
<MicrosoftAspNetCoreCertificatesGenerationSourcesPackageVersion>3.0.0-preview-181106-04</MicrosoftAspNetCoreCertificatesGenerationSourcesPackageVersion>
|
||||
<MicrosoftAspNetCoreTestingPackageVersion>3.0.0-preview-181106-04</MicrosoftAspNetCoreTestingPackageVersion>
|
||||
<MicrosoftExtensionsActivatorUtilitiesSourcesPackageVersion>3.0.0-preview-181106-04</MicrosoftExtensionsActivatorUtilitiesSourcesPackageVersion>
|
||||
<MicrosoftExtensionsClosedGenericMatcherSourcesPackageVersion>3.0.0-preview-181106-04</MicrosoftExtensionsClosedGenericMatcherSourcesPackageVersion>
|
||||
<MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>3.0.0-preview-181106-04</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>
|
||||
<MicrosoftExtensionsConfigurationAbstractionsPackageVersion>3.0.0-preview-181106-04</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
|
||||
<MicrosoftExtensionsConfigurationAzureKeyVaultPackageVersion>3.0.0-preview-181106-04</MicrosoftExtensionsConfigurationAzureKeyVaultPackageVersion>
|
||||
<MicrosoftExtensionsConfigurationBinderPackageVersion>3.0.0-preview-181106-04</MicrosoftExtensionsConfigurationBinderPackageVersion>
|
||||
<MicrosoftExtensionsConfigurationCommandLinePackageVersion>3.0.0-preview-181106-04</MicrosoftExtensionsConfigurationCommandLinePackageVersion>
|
||||
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>3.0.0-preview-181106-04</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
|
||||
<MicrosoftExtensionsConfigurationFileExtensionsPackageVersion>3.0.0-preview-181106-04</MicrosoftExtensionsConfigurationFileExtensionsPackageVersion>
|
||||
<MicrosoftExtensionsConfigurationIniPackageVersion>3.0.0-preview-181106-04</MicrosoftExtensionsConfigurationIniPackageVersion>
|
||||
<MicrosoftExtensionsConfigurationJsonPackageVersion>3.0.0-preview-181106-04</MicrosoftExtensionsConfigurationJsonPackageVersion>
|
||||
<MicrosoftExtensionsConfigurationKeyPerFilePackageVersion>3.0.0-preview-181106-04</MicrosoftExtensionsConfigurationKeyPerFilePackageVersion>
|
||||
<MicrosoftExtensionsConfigurationPackageVersion>3.0.0-preview-181106-04</MicrosoftExtensionsConfigurationPackageVersion>
|
||||
<MicrosoftExtensionsConfigurationUserSecretsPackageVersion>3.0.0-preview-181106-04</MicrosoftExtensionsConfigurationUserSecretsPackageVersion>
|
||||
<MicrosoftExtensionsConfigurationXmlPackageVersion>3.0.0-preview-181106-04</MicrosoftExtensionsConfigurationXmlPackageVersion>
|
||||
<MicrosoftExtensionsCopyOnWriteDictionarySourcesPackageVersion>3.0.0-preview-181106-04</MicrosoftExtensionsCopyOnWriteDictionarySourcesPackageVersion>
|
||||
<MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>3.0.0-preview-181106-04</MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>
|
||||
<MicrosoftExtensionsDependencyInjectionPackageVersion>3.0.0-preview-181106-04</MicrosoftExtensionsDependencyInjectionPackageVersion>
|
||||
<MicrosoftExtensionsDependencyInjectionSpecificationTestsPackageVersion>3.0.0-preview-181106-04</MicrosoftExtensionsDependencyInjectionSpecificationTestsPackageVersion>
|
||||
<MicrosoftExtensionsDiagnosticAdapterPackageVersion>3.0.0-preview-181106-04</MicrosoftExtensionsDiagnosticAdapterPackageVersion>
|
||||
<MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>3.0.0-preview-181106-04</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>
|
||||
<MicrosoftExtensionsFileProvidersCompositePackageVersion>3.0.0-preview-181106-04</MicrosoftExtensionsFileProvidersCompositePackageVersion>
|
||||
<MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>3.0.0-preview-181106-04</MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>
|
||||
<MicrosoftExtensionsFileProvidersPhysicalPackageVersion>3.0.0-preview-181106-04</MicrosoftExtensionsFileProvidersPhysicalPackageVersion>
|
||||
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>3.0.0-preview-181106-04</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
|
||||
<MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>3.0.0-preview-181106-04</MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>
|
||||
<MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>3.0.0-preview-181106-04</MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>
|
||||
<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>
|
||||
|
||||
<Import Project="$(DotNetPackageVersionPropsPath)" Condition="'$(DotNetPackageVersionPropsPath)' != ''" />
|
||||
|
|
|
|||
|
|
@ -19,6 +19,17 @@
|
|||
<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.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.DependencyInjection.Abstractions" Version="$(MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion)" />
|
||||
<ExternalDependency Include="Microsoft.Extensions.DependencyInjection.Specification.Tests" Version="$(MicrosoftExtensionsDependencyInjectionSpecificationTestsPackageVersion)" />
|
||||
|
|
|
|||
|
|
@ -143,6 +143,7 @@
|
|||
<Category>noship</Category>
|
||||
<IsLineup>true</IsLineup>
|
||||
</ArtifactInfo>
|
||||
<FilesToSign Include="$(BuildDir)Internal.AspNetCore.Universe.Lineup.$(PackageVersion).nupkg" Certificate="$(PackageSigningCertName)" />
|
||||
</ItemGroup>
|
||||
</Target>
|
||||
|
||||
|
|
|
|||
|
|
@ -41,7 +41,6 @@
|
|||
<Repository Include="AzureIntegration" />
|
||||
<Repository Include="BasicMiddleware" />
|
||||
<Repository Include="Caching" />
|
||||
<Repository Include="Configuration" />
|
||||
<Repository Include="CORS" />
|
||||
<Repository Include="DataProtection" RootPath="$(RepositoryRoot)src\DataProtection\" />
|
||||
<Repository Include="Diagnostics" />
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
Subproject commit fdeabf601682d6d85b1f37a79449972f8d469e8a
|
||||
|
|
@ -13,6 +13,7 @@ param(
|
|||
[Alias("x64")]
|
||||
[string]$Runtime64Zip,
|
||||
[string]$BuildNumber = 't000',
|
||||
[switch]$IsFinalBuild,
|
||||
[string]$SignType = '',
|
||||
[string]$PackageVersionPropsUrl = $null,
|
||||
[string]$AccessTokenSuffix = $null,
|
||||
|
|
@ -89,6 +90,7 @@ try {
|
|||
"-p:Configuration=$Configuration" `
|
||||
"-p:BuildNumber=$BuildNumber" `
|
||||
"-p:SignType=$SignType" `
|
||||
"-p:IsFinalBuild=$IsFinalBuild" `
|
||||
"-bl:$repoRoot/artifacts/logs/installers.msbuild.binlog" `
|
||||
@msbuildArgs
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue