Skip to content

Commit 6adfa32

Browse files
jkotaliknatemcmaster
jkotalik
authored and
natemcmaster
committed
Merge branch 'release/2.1' into release/2.2
2 parents 5e6c220 + 429719b commit 6adfa32

File tree

570 files changed

+1289
-2467
lines changed

Some content is hidden

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

570 files changed

+1289
-2467
lines changed

‎.azure/pipelines/ci.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ 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
1919
- template: jobs/iisintegration-job.yml
2020
parameters:
@@ -44,3 +44,4 @@ jobs:
4444
SkipIISExpressTests: true
4545
SkipIISForwardsCompatibilityTests: true
4646
SkipIISBackwardsCompatibilityTests: false
47+

‎.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/

‎build/artifacts.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@
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" Category="noship" />
129130
<PackageArtifact Include="Microsoft.AspNetCore.Server.IntegrationTesting.IIS" Category="noship" />
130131
<PackageArtifact Include="Microsoft.AspNetCore.Server.Kestrel.Core" Category="ship" />
131132
<PackageArtifact Include="Microsoft.AspNetCore.Server.Kestrel.Https" 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.props

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,8 @@
137137
<LibuvPackageVersion>1.10.0</LibuvPackageVersion>
138138
<MessagePackPackageVersion>1.7.3.4</MessagePackPackageVersion>
139139
<MicrosoftApplicationInsightsAspNetCorePackageVersion>2.1.1</MicrosoftApplicationInsightsAspNetCorePackageVersion>
140+
<MicrosoftAspNetCoreAspNetCoreModuleStablePackageVersion>2.2.0</MicrosoftAspNetCoreAspNetCoreModuleStablePackageVersion>
141+
<MicrosoftAspNetCoreAspNetCoreModuleV2StablePackageVersion>2.2.0</MicrosoftAspNetCoreAspNetCoreModuleV2StablePackageVersion>
140142
<MicrosoftAspNetIdentityEntityFrameworkPackageVersion>2.2.1</MicrosoftAspNetIdentityEntityFrameworkPackageVersion>
141143
<MicrosoftAspNetWebApiClientPackageVersion>5.2.6</MicrosoftAspNetWebApiClientPackageVersion>
142144
<MicrosoftAzureDocumentDBCorePackageVersion>1.7.1</MicrosoftAzureDocumentDBCorePackageVersion>

‎build/repo.props

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,8 @@
7878
$(RepositoryRoot)src\Hosting\**\*.*proj;
7979
$(RepositoryRoot)src\Http\**\*.*proj;
8080
$(RepositoryRoot)src\Html\**\*.*proj;
81-
$(RepositoryRoot)src\Servers\**\*.*proj;
81+
$(RepositoryRoot)src\Servers\**\*.csproj;
82+
$(RepositoryRoot)src\Servers\**\*.pkgproj;
8283
$(RepositoryRoot)src\Tools\**\*.*proj;
8384
$(RepositoryRoot)src\Middleware\**\*.*proj;
8485
"

‎eng/Baseline.Designer.props

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -421,6 +421,36 @@
421421
<BaselinePackageReference Include="Microsoft.Win32.Registry" Version="[4.5.0, )" />
422422
<BaselinePackageReference Include="System.Security.Principal.Windows" Version="[4.5.0, )" />
423423
</ItemGroup>
424+
<!-- Package: Microsoft.AspNetCore.Server.IISIntegration-->
425+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Server.IISIntegration' ">
426+
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
427+
</PropertyGroup>
428+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Server.IISIntegration' AND '$(TargetFramework)' == 'netstandard2.0' ">
429+
<BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.Core" Version="[2.2.0, )" />
430+
<BaselinePackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="[2.2.0, )" />
431+
<BaselinePackageReference Include="Microsoft.AspNetCore.Http" Version="[2.2.0, )" />
432+
<BaselinePackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="[2.2.0, )" />
433+
<BaselinePackageReference Include="Microsoft.AspNetCore.HttpOverrides" Version="[2.2.0, )" />
434+
<BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[2.2.0, )" />
435+
<BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.2.0, )" />
436+
<BaselinePackageReference Include="System.Buffers" Version="[4.5.0, )" />
437+
<BaselinePackageReference Include="System.IO.Pipelines" Version="[4.5.2, )" />
438+
<BaselinePackageReference Include="System.Memory" Version="[4.5.1, )" />
439+
<BaselinePackageReference Include="System.Numerics.Vectors" Version="[4.5.0, )" />
440+
<BaselinePackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="[4.5.1, )" />
441+
<BaselinePackageReference Include="System.Security.Principal.Windows" Version="[4.5.0, )" />
442+
</ItemGroup>
443+
<!-- Package: Microsoft.AspNetCore.Server.IIS-->
444+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Server.IIS' ">
445+
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
446+
</PropertyGroup>
447+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Server.IIS' AND '$(TargetFramework)' == 'netstandard2.0' ">
448+
<BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.Core" Version="[2.2.0, )" />
449+
<BaselinePackageReference Include="Microsoft.AspNetCore.Connections.Abstractions" Version="[2.2.0, )" />
450+
<BaselinePackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="[2.2.0, )" />
451+
<BaselinePackageReference Include="System.IO.Pipelines" Version="[4.5.2, )" />
452+
<BaselinePackageReference Include="System.Security.Principal.Windows" Version="[4.5.0, )" />
453+
</ItemGroup>
424454
<!-- Package: Microsoft.AspNetCore.Server.Kestrel.Core-->
425455
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Server.Kestrel.Core' ">
426456
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>

‎eng/Baseline.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@
4646
<Package Id="Microsoft.AspNetCore.Routing.Abstractions" Version="2.2.0" />
4747
<Package Id="Microsoft.AspNetCore.Routing" Version="2.2.0" />
4848
<Package Id="Microsoft.AspNetCore.Server.HttpSys" Version="2.2.0" />
49+
<Package Id="Microsoft.AspNetCore.Server.IISIntegration" Version="2.2.0" />
50+
<Package Id="Microsoft.AspNetCore.Server.IIS" Version="2.2.0" Condition="'$(OS)' == 'Windows_NT'"/>
4951
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Core" Version="2.2.0" />
5052
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Https" Version="2.2.0" />
5153
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions" Version="2.2.0" />

‎eng/Dependencies.props

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
<LatestPackageReference Include="Microsoft.Extensions.Localization" Version="$(MicrosoftExtensionsLocalizationPackageVersion)" />
3939
<LatestPackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="$(MicrosoftExtensionsLoggingAbstractionsPackageVersion)" />
4040
<LatestPackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsolePackageVersion)" />
41+
<LatestPackageReference Include="Microsoft.Extensions.Logging.Debug" Version="$(MicrosoftExtensionsLoggingDebugPackageVersion)" />
4142
<LatestPackageReference Include="Microsoft.Extensions.Logging.Testing" Version="$(MicrosoftExtensionsLoggingTestingPackageVersion)" />
4243
<LatestPackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingPackageVersion)" />
4344
<LatestPackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="$(MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion)" />
@@ -50,15 +51,22 @@
5051
<LatestPackageReference Include="Microsoft.Extensions.WebEncoders.Sources" Version="$(MicrosoftExtensionsWebEncodersSourcesPackageVersion)" />
5152
<LatestPackageReference Include="Microsoft.Extensions.WebEncoders" Version="$(MicrosoftExtensionsWebEncodersPackageVersion)" />
5253
<LatestPackageReference Include="Microsoft.Internal.AspNetCore.H2Spec.All" Version="$(MicrosoftInternalAspNetCoreH2SpecAllPackageVersion)" />
54+
<LatestPackageReference Include="Microsoft.Web.Administration" Version="$(MicrosoftWebAdministrationPackageVersion)" />
5355
<LatestPackageReference Include="Microsoft.NETCore.Windows.ApiSets" Version="$(MicrosoftNETCoreWindowsApiSetsPackageVersion)" />
56+
<LatestPackageReference Include="System.Buffers" Version="$(SystemBuffersPackageVersion)" />
5457
<LatestPackageReference Include="System.Data.SqlClient" Version="$(SystemDataSqlClientPackageVersion)" />
58+
<LatestPackageReference Include="System.IO.Pipelines" Version="$(SystemIOPipelinesPackageVersion)" />
5559
<LatestPackageReference Include="System.Memory" Version="$(SystemMemoryPackageVersion)" />
56-
<LatestPackageReference Include="System.Net.Http.WinHttpHandler" Version="$(SystemNetHttpWinHttpHandlerPackageVersion)" />
5760
<LatestPackageReference Include="System.Net.WebSockets.WebSocketProtocol" Version="$(SystemNetWebSocketsWebSocketProtocolPackageVersion)" />
61+
<LatestPackageReference Include="System.Net.Http.WinHttpHandler" Version="$(SystemNetHttpWinHttpHandlerPackageVersion)" />
62+
<LatestPackageReference Include="System.Numerics.Vectors" Version="$(SystemNumericsVectorsPackageVersion)" />
5863
<LatestPackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="$(SystemRuntimeCompilerServicesUnsafePackageVersion)" />
5964
<LatestPackageReference Include="System.Security.Cryptography.Cng" Version="$(SystemSecurityCryptographyCngPackageVersion)" />
65+
<LatestPackageReference Include="System.Security.Principal.Windows" Version="$(SystemSecurityPrincipalWindowsPackageVersion)" />
6066
<LatestPackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebPackageVersion)" />
6167
<LatestPackageReference Include="System.Net.Http.WinHttpHandler" Version="$(SystemNetHttpWinHttpHandlerPackageVersion)" />
68+
<LatestPackageReference Include="System.ServiceProcess.ServiceController" Version="$(SystemServiceProcessServiceControllerPackageVersion)" />
69+
<LatestPackageReference Include="System.Diagnostics.EventLog" Version="$(SystemDiagnosticsEventLogPackageVersion)" />
6270
</ItemGroup>
6371

6472
<ItemGroup Label="External dependencies">

0 commit comments

Comments
 (0)