Skip to content

Commit 02780ba

Browse files
author
Nate McMaster
committed
Merge branch 'release/2.2'
2 parents 436b546 + cb5458e commit 02780ba

File tree

744 files changed

+9852
-2675
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

744 files changed

+9852
-2675
lines changed

‎.azure/pipelines/ci.yml

Lines changed: 38 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -14,33 +14,44 @@ jobs:
1414
jobDisplayName: "Build and test: Windows"
1515
agentOs: Windows
1616
beforeBuild:
17-
- powershell: "& ./src/IISIntegration/tools/UpdateIISExpressCertificate.ps1; & ./src/IISIntegration/tools/update_schema.ps1"
17+
- powershell: "& ./src/Servers/IIS/tools/UpdateIISExpressCertificate.ps1; & ./src/Servers/IIS/tools/update_schema.ps1"
1818
displayName: Setup IISExpress test certificates and schema
19-
- template: jobs/iisintegration-job.yml
20-
parameters:
21-
TestGroupName: IIS
22-
SkipIISTests: false
23-
SkipIISExpressTests: true
24-
SkipIISForwardsCompatibilityTests: true
25-
SkipIISBackwardsCompatibilityTests: true
26-
- template: jobs/iisintegration-job.yml
27-
parameters:
28-
TestGroupName: IISExpress
29-
SkipIISTests: true
30-
SkipIISExpressTests: false
31-
SkipIISForwardsCompatibilityTests: true
32-
SkipIISBackwardsCompatibilityTests: true
33-
- template: jobs/iisintegration-job.yml
19+
- template: jobs/default-build.yml
3420
parameters:
35-
TestGroupName: IISForwardCompat
36-
SkipIISTests: true
37-
SkipIISExpressTests: true
38-
SkipIISForwardsCompatibilityTests: false
39-
SkipIISBackwardsCompatibilityTests: true
40-
- template: jobs/iisintegration-job.yml
21+
jobName: MacOs_Build
22+
jobDisplayName: "Build and test: macOS"
23+
agentOs: macOs
24+
- template: jobs/default-build.yml
4125
parameters:
42-
TestGroupName: IISBackCompat
43-
SkipIISTests: true
44-
SkipIISExpressTests: true
45-
SkipIISForwardsCompatibilityTests: true
46-
SkipIISBackwardsCompatibilityTests: false
26+
jobName: Linux_Build
27+
jobDisplayName: "Build and test: Linux"
28+
agentOs: Linux
29+
# - template: jobs/iisintegration-job.yml
30+
# parameters:
31+
# TestGroupName: IIS
32+
# SkipIISTests: false
33+
# SkipIISExpressTests: true
34+
# SkipIISForwardsCompatibilityTests: true
35+
# SkipIISBackwardsCompatibilityTests: true
36+
# - template: jobs/iisintegration-job.yml
37+
# parameters:
38+
# TestGroupName: IISExpress
39+
# SkipIISTests: true
40+
# SkipIISExpressTests: false
41+
# SkipIISForwardsCompatibilityTests: true
42+
# SkipIISBackwardsCompatibilityTests: true
43+
# - template: jobs/iisintegration-job.yml
44+
# parameters:
45+
# TestGroupName: IISForwardCompat
46+
# SkipIISTests: true
47+
# SkipIISExpressTests: true
48+
# SkipIISForwardsCompatibilityTests: false
49+
# SkipIISBackwardsCompatibilityTests: true
50+
# - template: jobs/iisintegration-job.yml
51+
# parameters:
52+
# TestGroupName: IISBackCompat
53+
# SkipIISTests: true
54+
# SkipIISExpressTests: true
55+
# SkipIISForwardsCompatibilityTests: true
56+
# SkipIISBackwardsCompatibilityTests: false
57+

‎.azure/pipelines/jobs/iisintegration-job.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ jobs:
22
- template: default-build.yml
33
parameters:
44
beforeBuild:
5-
- powershell: "& ./src/IISIntegration/tools/UpdateIISExpressCertificate.ps1; & ./src/IISIntegration/tools/update_schema.ps1; & ./src/IISIntegration/tools/SetupTestEnvironment.ps1 Setup"
5+
- powershell: "& ./src/Servers/IIS/tools/UpdateIISExpressCertificate.ps1; & ./src/Servers/IIS/tools/update_schema.ps1; & ./src/Servers/IIS/tools/SetupTestEnvironment.ps1 Setup"
66
displayName: Prepare repo
77
afterBuild:
8-
- powershell: "& ./src/IISIntegration/tools/SetupTestEnvironment.ps1 Shutdown"
8+
- powershell: "& ./src/Servers/IIS/tools/SetupTestEnvironment.ps1 Shutdown"
99
displayName: Stop AppVerifier
1010
condition: always()
1111
- task: PublishBuildArtifacts@1
@@ -15,7 +15,7 @@ jobs:
1515
artifactName: logs
1616
artifactType: Container
1717
pathtoPublish: src/IISIntegration/artifacts/logs
18-
buildDirectory: src/IISIntegration
18+
buildDirectory: src/Servers/IIS
1919
buildArgs: "/p:SkipIISBackwardsCompatibilityTests=${{ parameters.SkipIISBackwardsCompatibilityTests }} /p:SkipIISTests=${{ parameters.SkipIISTests }} /p:SkipIISExpressTests=${{ parameters.SkipIISExpressTests }} /p:SkipIISForwardsCompatibilityTests=${{ parameters.SkipIISBackwardsCompatibilityTests }}"
2020
jobName: IISIntegration_${{ parameters.TestGroupName }}
2121
jobDisplayName: IISIntegration_${{ parameters.TestGroupName }}

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,4 @@ src/**/global.json
2828
launchSettings.json
2929
BenchmarkDotNet.Artifacts/
3030
korebuild-lock.txt
31+
.gradle/

‎.gitmodules

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
[submodule "src/IISIntegration/test/gtest/googletest"]
2-
path = src/IISIntegration/test/gtest/googletest
1+
[submodule "googletest"]
2+
path = src/submodules/googletest
33
url = https://github.com/google/googletest

‎Directory.Build.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@
8585
<IncludeSymbols>true</IncludeSymbols>
8686

8787
<SharedSourceRoot>$(MSBuildThisFileDirectory)src\Shared\</SharedSourceRoot>
88+
<GoogleTestSubmoduleRoot>$(RepositoryRoot)src\submodules\googletest\</GoogleTestSubmoduleRoot>
8889

8990
<SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
9091
</PropertyGroup>

‎build/CodeSign.props

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,15 @@
4949
<FilesToSign Include="Microsoft.Extensions.Primitives.dll" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
5050
<FilesToSign Include="Microsoft.Extensions.WebEncoders.dll" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
5151

52+
<!-- ANCM -->
53+
<FilesToSign Include="aspnetcore.dll" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
54+
<FilesToSign Include="aspnetcorev2.dll" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
55+
<FilesToSign Include="aspnetcorev2_inprocess.dll" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
56+
<FilesToSign Include="aspnetcorev2_outofprocess.dll" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
57+
58+
<!-- This is a text file which doesn't need to be code signed, even though some .mof files can be signed. -->
59+
<FilesToExcludeFromSigning Include="ancm.mof" />
60+
5261
<!-- These files came from partner teams. They have to be re-signed because we crossgen them and redistributable them in our installers. -->
5362

5463
<!-- Microsoft.AspNetCore.App -->

‎build/buildorder.props

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,8 @@
88

99
<ItemGroup>
1010
<RepositoryBuildOrder Include="Razor" Order="6" />
11-
<RepositoryBuildOrder Include="IISIntegration" Order="10" />
1211
<RepositoryBuildOrder Include="ServerTests" Order="11" />
1312
<RepositoryBuildOrder Include="Security" Order="13" />
14-
<RepositoryBuildOrder Include="MetaPackages" Order="13" />
1513
<RepositoryBuildOrder Include="Mvc" Order="14" />
1614
<RepositoryBuildOrder Include="AADIntegration" Order="15" />
1715
<RepositoryBuildOrder Include="Identity" Order="15" />

‎build/dependencies.folderbuilds.props

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,7 @@
11
<!-- This file is temporary while we rework dependencies management. It is used when building individual folders as if they were repos. -->
22
<Project>
33
<PropertyGroup>
4-
<InternalAspNetCoreSdkPackageVersion Condition="'$(InternalAspNetCoreSdkPackageVersion)' == ''">3.0.0-build-20181120.4</InternalAspNetCoreSdkPackageVersion>
5-
<MicrosoftAspNetCoreAspNetCoreModulePackageVersion>3.0.0-preview-18606-0098</MicrosoftAspNetCoreAspNetCoreModulePackageVersion>
4+
<InternalAspNetCoreSdkPackageVersion Condition="'$(InternalAspNetCoreSdkPackageVersion)' == ''">3.0.0-build-20181214.1</InternalAspNetCoreSdkPackageVersion>
65
<MicrosoftAspNetCoreAuthenticationCorePackageVersion>3.0.0-preview-18606-0098</MicrosoftAspNetCoreAuthenticationCorePackageVersion>
7-
<MicrosoftAspNetCoreConnectionsAbstractionsPackageVersion>3.0.0-preview-18606-0098</MicrosoftAspNetCoreConnectionsAbstractionsPackageVersion>
8-
<MicrosoftAspNetCoreDiagnosticsPackageVersion>3.0.0-preview-18606-0098</MicrosoftAspNetCoreDiagnosticsPackageVersion>
9-
<MicrosoftAspNetCoreHostingAbstractionsPackageVersion>3.0.0-preview-18606-0098</MicrosoftAspNetCoreHostingAbstractionsPackageVersion>
10-
<MicrosoftAspNetCoreHostingPackageVersion>3.0.0-preview-18606-0098</MicrosoftAspNetCoreHostingPackageVersion>
11-
<MicrosoftAspNetCoreHttpExtensionsPackageVersion>3.0.0-preview-18606-0098</MicrosoftAspNetCoreHttpExtensionsPackageVersion>
12-
<MicrosoftAspNetCoreHttpOverridesPackageVersion>3.0.0-preview-18606-0098</MicrosoftAspNetCoreHttpOverridesPackageVersion>
13-
<MicrosoftAspNetCoreHttpPackageVersion>3.0.0-preview-18606-0098</MicrosoftAspNetCoreHttpPackageVersion>
14-
<MicrosoftAspNetCoreHttpSysSourcesPackageVersion>3.0.0-preview-18606-0098</MicrosoftAspNetCoreHttpSysSourcesPackageVersion>
15-
<MicrosoftAspNetCoreResponseCompressionPackageVersion>3.0.0-preview-18606-0098</MicrosoftAspNetCoreResponseCompressionPackageVersion>
16-
<MicrosoftAspNetCoreServerHttpSysPackageVersion>3.0.0-preview-18606-0098</MicrosoftAspNetCoreServerHttpSysPackageVersion>
17-
<MicrosoftAspNetCoreServerIISIntegrationPackageVersion>3.0.0-preview-18606-0098</MicrosoftAspNetCoreServerIISIntegrationPackageVersion>
18-
<MicrosoftAspNetCoreServerIntegrationTestingPackageVersion>0.3.0-preview-18606-0098</MicrosoftAspNetCoreServerIntegrationTestingPackageVersion>
19-
<MicrosoftAspNetCoreServerKestrelHttpsPackageVersion>3.0.0-preview-18606-0098</MicrosoftAspNetCoreServerKestrelHttpsPackageVersion>
20-
<MicrosoftAspNetCoreServerKestrelPackageVersion>3.0.0-preview-18606-0098</MicrosoftAspNetCoreServerKestrelPackageVersion>
21-
<MicrosoftAspNetCoreStaticFilesPackageVersion>3.0.0-preview-18606-0098</MicrosoftAspNetCoreStaticFilesPackageVersion>
22-
<MicrosoftAspNetCoreTestHostPackageVersion>3.0.0-preview-18606-0098</MicrosoftAspNetCoreTestHostPackageVersion>
23-
<MicrosoftAspNetCoreWebUtilitiesPackageVersion>3.0.0-preview-18606-0098</MicrosoftAspNetCoreWebUtilitiesPackageVersion>
24-
<MicrosoftExtensionsBuffersMemoryPoolSourcesPackageVersion>3.0.0-preview-18606-0098</MicrosoftExtensionsBuffersMemoryPoolSourcesPackageVersion>
25-
<MicrosoftNetHttpHeadersPackageVersion>3.0.0-preview-18606-0098</MicrosoftNetHttpHeadersPackageVersion>
266
</PropertyGroup>
277
</Project>

‎build/dependencies.props

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,12 @@
3939
<InternalAspNetCoreAnalyzersPackageVersion>3.0.0-preview.18605.1</InternalAspNetCoreAnalyzersPackageVersion>
4040
<MicrosoftAspNetCoreAnalyzerTestingPackageVersion>3.0.0-preview.18605.1</MicrosoftAspNetCoreAnalyzerTestingPackageVersion>
4141
<MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>3.0.0-preview.18605.1</MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>
42-
<MicrosoftAspNetCoreCertificatesGenerationSourcesPackageVersion>3.0.0-preview.18605.1</MicrosoftAspNetCoreCertificatesGenerationSourcesPackageVersion>
4342
<MicrosoftAspNetCoreTestingPackageVersion>3.0.0-preview.18605.1</MicrosoftAspNetCoreTestingPackageVersion>
4443
<MicrosoftExtensionsActivatorUtilitiesSourcesPackageVersion>3.0.0-preview.18605.1</MicrosoftExtensionsActivatorUtilitiesSourcesPackageVersion>
4544
<MicrosoftExtensionsCachingAbstractionsPackageVersion>3.0.0-preview.18605.1</MicrosoftExtensionsCachingAbstractionsPackageVersion>
4645
<MicrosoftExtensionsCachingMemoryPackageVersion>3.0.0-preview.18605.1</MicrosoftExtensionsCachingMemoryPackageVersion>
4746
<MicrosoftExtensionsCachingSqlServerPackageVersion>3.0.0-preview.18605.1</MicrosoftExtensionsCachingSqlServerPackageVersion>
4847
<MicrosoftExtensionsCachingStackExchangeRedisPackageVersion>3.0.0-preview.18605.1</MicrosoftExtensionsCachingStackExchangeRedisPackageVersion>
49-
<MicrosoftExtensionsClosedGenericMatcherSourcesPackageVersion>3.0.0-preview.18605.1</MicrosoftExtensionsClosedGenericMatcherSourcesPackageVersion>
5048
<MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>3.0.0-preview.18605.1</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>
5149
<MicrosoftExtensionsConfigurationAbstractionsPackageVersion>3.0.0-preview.18605.1</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
5250
<MicrosoftExtensionsConfigurationAzureKeyVaultPackageVersion>3.0.0-preview.18605.1</MicrosoftExtensionsConfigurationAzureKeyVaultPackageVersion>
@@ -60,7 +58,6 @@
6058
<MicrosoftExtensionsConfigurationPackageVersion>3.0.0-preview.18605.1</MicrosoftExtensionsConfigurationPackageVersion>
6159
<MicrosoftExtensionsConfigurationUserSecretsPackageVersion>3.0.0-preview.18605.1</MicrosoftExtensionsConfigurationUserSecretsPackageVersion>
6260
<MicrosoftExtensionsConfigurationXmlPackageVersion>3.0.0-preview.18605.1</MicrosoftExtensionsConfigurationXmlPackageVersion>
63-
<MicrosoftExtensionsCopyOnWriteDictionarySourcesPackageVersion>3.0.0-preview.18605.1</MicrosoftExtensionsCopyOnWriteDictionarySourcesPackageVersion>
6461
<MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>3.0.0-preview.18605.1</MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>
6562
<MicrosoftExtensionsDependencyInjectionPackageVersion>3.0.0-preview.18605.1</MicrosoftExtensionsDependencyInjectionPackageVersion>
6663
<MicrosoftExtensionsDependencyInjectionSpecificationTestsPackageVersion>3.0.0-preview.18605.1</MicrosoftExtensionsDependencyInjectionSpecificationTestsPackageVersion>
@@ -88,23 +85,15 @@
8885
<MicrosoftExtensionsLoggingTestingPackageVersion>3.0.0-preview.18605.1</MicrosoftExtensionsLoggingTestingPackageVersion>
8986
<MicrosoftExtensionsLoggingTraceSourcePackageVersion>3.0.0-preview.18605.1</MicrosoftExtensionsLoggingTraceSourcePackageVersion>
9087
<MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>3.0.0-preview.18605.1</MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>
91-
<MicrosoftExtensionsObjectMethodExecutorSourcesPackageVersion>3.0.0-preview.18605.1</MicrosoftExtensionsObjectMethodExecutorSourcesPackageVersion>
9288
<MicrosoftExtensionsObjectPoolPackageVersion>3.0.0-preview.18605.1</MicrosoftExtensionsObjectPoolPackageVersion>
9389
<MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion>3.0.0-preview.18605.1</MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion>
9490
<MicrosoftExtensionsOptionsDataAnnotationsPackageVersion>3.0.0-preview.18605.1</MicrosoftExtensionsOptionsDataAnnotationsPackageVersion>
9591
<MicrosoftExtensionsOptionsPackageVersion>3.0.0-preview.18605.1</MicrosoftExtensionsOptionsPackageVersion>
9692
<MicrosoftExtensionsParameterDefaultValueSourcesPackageVersion>3.0.0-preview.18605.1</MicrosoftExtensionsParameterDefaultValueSourcesPackageVersion>
9793
<MicrosoftExtensionsPrimitivesPackageVersion>3.0.0-preview.18605.1</MicrosoftExtensionsPrimitivesPackageVersion>
98-
<MicrosoftExtensionsProcessSourcesPackageVersion>3.0.0-preview.18605.1</MicrosoftExtensionsProcessSourcesPackageVersion>
99-
<MicrosoftExtensionsPropertyActivatorSourcesPackageVersion>3.0.0-preview.18605.1</MicrosoftExtensionsPropertyActivatorSourcesPackageVersion>
100-
<MicrosoftExtensionsPropertyHelperSourcesPackageVersion>3.0.0-preview.18605.1</MicrosoftExtensionsPropertyHelperSourcesPackageVersion>
101-
<MicrosoftExtensionsRazorViewsSourcesPackageVersion>3.0.0-preview.18605.1</MicrosoftExtensionsRazorViewsSourcesPackageVersion>
102-
<MicrosoftExtensionsSecurityHelperSourcesPackageVersion>3.0.0-preview.18605.1</MicrosoftExtensionsSecurityHelperSourcesPackageVersion>
103-
<MicrosoftExtensionsStackTraceSourcesPackageVersion>3.0.0-preview.18605.1</MicrosoftExtensionsStackTraceSourcesPackageVersion>
10494
<MicrosoftExtensionsTypeNameHelperSourcesPackageVersion>3.0.0-preview.18605.1</MicrosoftExtensionsTypeNameHelperSourcesPackageVersion>
10595
<MicrosoftExtensionsValueStopwatchSourcesPackageVersion>3.0.0-preview.18605.1</MicrosoftExtensionsValueStopwatchSourcesPackageVersion>
10696
<MicrosoftExtensionsWebEncodersPackageVersion>3.0.0-preview.18605.1</MicrosoftExtensionsWebEncodersPackageVersion>
107-
<MicrosoftExtensionsWebEncodersSourcesPackageVersion>3.0.0-preview.18605.1</MicrosoftExtensionsWebEncodersSourcesPackageVersion>
10897

10998
<!-- Packages from aspnet/EntityFrameworkCore -->
11099
<MicrosoftEntityFrameworkCoreAbstractionsPackageVersion>3.0.0-preview.18604.3</MicrosoftEntityFrameworkCoreAbstractionsPackageVersion>
@@ -125,7 +114,7 @@
125114
<!-- Determined by build tools -->
126115
<InternalAspNetCoreSdkPackageVersion>$(KoreBuildVersion)</InternalAspNetCoreSdkPackageVersion>
127116
<InternalAspNetCoreSiteExtensionSdkPackageVersion>$(KoreBuildVersion)</InternalAspNetCoreSiteExtensionSdkPackageVersion>
128-
<InternalAspNetCoreSdkPackageVersion Condition=" '$(KoreBuildVersion)' == '' ">3.0.0-build-20181120.4</InternalAspNetCoreSdkPackageVersion>
117+
<InternalAspNetCoreSdkPackageVersion Condition=" '$(KoreBuildVersion)' == '' ">3.0.0-build-20181214.1</InternalAspNetCoreSdkPackageVersion>
129118
</PropertyGroup>
130119

131120
<!-- These are package versions that should not be overridden or updated by automation. -->
@@ -157,6 +146,8 @@
157146
<LibuvPackageVersion>1.10.0</LibuvPackageVersion>
158147
<MessagePackPackageVersion>1.7.3.4</MessagePackPackageVersion>
159148
<MicrosoftApplicationInsightsAspNetCorePackageVersion>2.1.1</MicrosoftApplicationInsightsAspNetCorePackageVersion>
149+
<MicrosoftAspNetCoreAspNetCoreModuleStablePackageVersion>2.2.0</MicrosoftAspNetCoreAspNetCoreModuleStablePackageVersion>
150+
<MicrosoftAspNetCoreAspNetCoreModuleV2StablePackageVersion>2.2.0</MicrosoftAspNetCoreAspNetCoreModuleV2StablePackageVersion>
160151
<MicrosoftAspNetIdentityEntityFrameworkPackageVersion>2.2.1</MicrosoftAspNetIdentityEntityFrameworkPackageVersion>
161152
<MicrosoftAspNetWebApiClientPackageVersion>5.2.6</MicrosoftAspNetWebApiClientPackageVersion>
162153
<MicrosoftAzureKeyVaultPackageVersion>2.3.2</MicrosoftAzureKeyVaultPackageVersion>

0 commit comments

Comments
 (0)