Skip to content

Commit 3b0d125

Browse files
dotnet-botdotnet-bot
committed
Merge in 'release/2.2' changes
2 parents f1bfecf + 206db05 commit 3b0d125

File tree

587 files changed

+1668
-2673
lines changed

Some content is hidden

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

587 files changed

+1668
-2673
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
@@ -27,3 +27,4 @@ scripts/tmp/
2727
src/**/global.json
2828
launchSettings.json
2929
korebuild-lock.txt
30+
.gradle/

‎.gitmodules

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
path = modules/Scaffolding
77
url = https://github.com/aspnet/Scaffolding.git
88
branch = release/2.2
9-
[submodule "src/IISIntegration/test/gtest/googletest"]
10-
path = src/IISIntegration/test/gtest/googletest
9+
[submodule "googletest"]
10+
path = src/submodules/googletest
1111
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: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,12 @@
6565
<FilesToSign Include="Microsoft.Extensions.Primitives.dll" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
6666
<FilesToSign Include="Microsoft.Extensions.WebEncoders.dll" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
6767

68+
<!-- ANCM -->
69+
<FilesToSign Include="aspnetcore.dll" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
70+
<FilesToSign Include="aspnetcorev2.dll" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
71+
<FilesToSign Include="aspnetcorev2_inprocess.dll" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
72+
<FilesToSign Include="aspnetcorev2_outofprocess.dll" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
73+
6874
<!-- These files came from partner teams. They have to be re-signed because we crossgen them and redistributable them in our installers. -->
6975

7076
<!-- Microsoft.AspNetCore.All -->

‎build/artifacts.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,6 @@
126126
<PackageArtifact Include="Microsoft.AspNetCore.Server.HttpSys" Category="ship" />
127127
<PackageArtifact Include="Microsoft.AspNetCore.Server.IIS" Category="ship" />
128128
<PackageArtifact Include="Microsoft.AspNetCore.Server.IISIntegration" Category="ship" />
129-
<PackageArtifact Include="Microsoft.AspNetCore.Server.IntegrationTesting.IIS" Category="noship" />
130129
<PackageArtifact Include="Microsoft.AspNetCore.Server.Kestrel.Core" Category="ship" />
131130
<PackageArtifact Include="Microsoft.AspNetCore.Server.Kestrel.Https" Category="ship" />
132131
<PackageArtifact Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions" Category="ship" />

‎build/buildorder.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
<ItemGroup>
1010
<RepositoryBuildOrder Include="Razor" Order="6" RootPath="$(RepositoryRoot)src\Razor\" />
1111
<RepositoryBuildOrder Include="EntityFrameworkCore" Order="8" />
12-
<RepositoryBuildOrder Include="IISIntegration" Order="10" RootPath="$(RepositoryRoot)src\IISIntegration\" />
1312
<RepositoryBuildOrder Include="ServerTests" Order="11" RootPath="$(RepositoryRoot)src\ServerTests\" />
1413
<RepositoryBuildOrder Include="Security" Order="13" RootPath="$(RepositoryRoot)src\Security\" />
1514
<RepositoryBuildOrder Include="MetaPackages" Order="13" RootPath="$(RepositoryRoot)src\MetaPackages\" />

‎build/dependencies.folderbuilds.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +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>2.2.1-build-20181114.3</InternalAspNetCoreSdkPackageVersion>
4+
<InternalAspNetCoreSdkPackageVersion>2.2.1-build-20181213.2</InternalAspNetCoreSdkPackageVersion>
55
<MicrosoftAspNetCoreAspNetCoreModulePackageVersion>2.2.0</MicrosoftAspNetCoreAspNetCoreModulePackageVersion>
66
<MicrosoftAspNetCoreAuthenticationCorePackageVersion>2.2.0</MicrosoftAspNetCoreAuthenticationCorePackageVersion>
77
<MicrosoftAspNetCoreConnectionsAbstractionsPackageVersion>2.2.0</MicrosoftAspNetCoreConnectionsAbstractionsPackageVersion>

‎build/dependencies.props

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<MicrosoftAspNetCoreBuildToolsApiCheckPackageVersion>$(KoreBuildVersion)</MicrosoftAspNetCoreBuildToolsApiCheckPackageVersion>
2828
<InternalAspNetCoreSdkPackageVersion>$(KoreBuildVersion)</InternalAspNetCoreSdkPackageVersion>
2929
<InternalAspNetCoreSiteExtensionSdkPackageVersion>$(KoreBuildVersion)</InternalAspNetCoreSiteExtensionSdkPackageVersion>
30-
<InternalAspNetCoreSdkPackageVersion Condition=" '$(KoreBuildVersion)' == '' ">2.2.1-build-20181114.3</InternalAspNetCoreSdkPackageVersion>
30+
<InternalAspNetCoreSdkPackageVersion Condition=" '$(KoreBuildVersion)' == '' ">2.2.1-build-20181213.2</InternalAspNetCoreSdkPackageVersion>
3131
</PropertyGroup>
3232

3333
<!-- These are package versions that should not be overridden or updated by automation. -->
@@ -109,6 +109,7 @@
109109
<MicrosoftExtensionsBuffersMemoryPoolSourcesPackageVersion>2.2.0</MicrosoftExtensionsBuffersMemoryPoolSourcesPackageVersion>
110110
<InternalWebHostBuilderFactorySourcesPackageVersion>2.2.0</InternalWebHostBuilderFactorySourcesPackageVersion>
111111
<MicrosoftAspNetCoreServerIntegrationTestingPackageVersion>0.6.0-rtm-final</MicrosoftAspNetCoreServerIntegrationTestingPackageVersion>
112+
<MicrosoftAspNetCoreServerIntegrationTestingIISPackageVersion>2.2.0-rtm-35687</MicrosoftAspNetCoreServerIntegrationTestingIISPackageVersion>
112113

113114
<!-- 3rd party dependencies -->
114115
<AngleSharpPackageVersion>0.9.9</AngleSharpPackageVersion>
@@ -138,6 +139,8 @@
138139
<LibuvPackageVersion>1.10.0</LibuvPackageVersion>
139140
<MessagePackPackageVersion>1.7.3.4</MessagePackPackageVersion>
140141
<MicrosoftApplicationInsightsAspNetCorePackageVersion>2.1.1</MicrosoftApplicationInsightsAspNetCorePackageVersion>
142+
<MicrosoftAspNetCoreAspNetCoreModuleStablePackageVersion>2.2.0</MicrosoftAspNetCoreAspNetCoreModuleStablePackageVersion>
143+
<MicrosoftAspNetCoreAspNetCoreModuleV2StablePackageVersion>2.2.0</MicrosoftAspNetCoreAspNetCoreModuleV2StablePackageVersion>
141144
<MicrosoftAspNetIdentityEntityFrameworkPackageVersion>2.2.1</MicrosoftAspNetIdentityEntityFrameworkPackageVersion>
142145
<MicrosoftAspNetWebApiClientPackageVersion>5.2.6</MicrosoftAspNetWebApiClientPackageVersion>
143146
<MicrosoftAzureDocumentDBCorePackageVersion>1.7.1</MicrosoftAzureDocumentDBCorePackageVersion>

0 commit comments

Comments
 (0)