Skip to content

Commit a0ac480

Browse files
jkotalikjkotalik
committed
make 2.1 work with IISIntegration
1 parent 5d777b2 commit a0ac480

File tree

306 files changed

+625
-35759
lines changed

Some content is hidden

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

306 files changed

+625
-35759
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ jobs:
44
jobName: 'IISIntegration'
55
jobDisplayName: 'IISIntegration'
66
beforeBuild:
7-
- powershell: "& ./src/IISIntegration/tools/UpdateIISExpressCertificate.ps1; & ./src/IISIntegration/tools/SetupTestEnvironment.ps1 Setup"
7+
- powershell: "& ./src/servers/IIS/tools/UpdateIISExpressCertificate.ps1; & ./src/servers/IIS/tools/SetupTestEnvironment.ps1 Setup"
88
displayName: Prepare repo
99
afterBuild:
10-
- powershell: "& ./src/IISIntegration/tools/SetupTestEnvironment.ps1 Shutdown"
10+
- powershell: "& ./src/servers/IIS/tools/SetupTestEnvironment.ps1 Shutdown"
1111
displayName: Stop AppVerifier
1212
condition: always()
1313
- task: PublishBuildArtifacts@1
@@ -16,5 +16,5 @@ jobs:
1616
inputs:
1717
artifactName: logs
1818
artifactType: Container
19-
pathtoPublish: src/IISIntegration/artifacts/logs
20-
buildDirectory: src/IISIntegration
19+
pathtoPublish: src/servers/IIS/artifacts/logs
20+
buildDirectory: src/servers/IIS

‎build/artifacts.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
<PackageArtifact Include="Microsoft.AspNetCore.Antiforgery" AllMetapackage="true" AppMetapackage="true" Category="ship" />
3131
<PackageArtifact Include="Microsoft.AspNetCore.App" Category="ship" />
3232
<PackageArtifact Include="Microsoft.AspNetCore.ApplicationInsights.HostingStartup" AllMetapackage="true" Category="ship" />
33-
<PackageArtifact Include="Microsoft.AspNetCore.AspNetCoreModule" Category="noship" Condition=" '$(OS)' == 'Windows_NT' " />
3433
<PackageArtifact Include="Microsoft.AspNetCore.AspNetCoreModuleV1" Category="noship" Condition=" '$(OS)' == 'Windows_NT' " />
3534
<PackageArtifact Include="Microsoft.AspNetCore.Authentication.Abstractions" AllMetapackage="true" AppMetapackage="true" Category="ship" />
3635
<PackageArtifact Include="Microsoft.AspNetCore.Authentication.AzureAD.UI" Category="ship" />

‎build/buildorder.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
<RepositoryBuildOrder Include="Razor" Order="6" RootPath="$(RepositoryRoot)src\Razor\" />
1111
<RepositoryBuildOrder Include="EntityFrameworkCore" Order="8" />
1212
<RepositoryBuildOrder Include="Antiforgery" Order="9" RootPath="$(RepositoryRoot)src\Antiforgery\" />
13-
<RepositoryBuildOrder Include="IISIntegration" Order="10" RootPath="$(RepositoryRoot)src\IISIntegration\" />
1413
<RepositoryBuildOrder Include="CORS" Order="11" RootPath="$(RepositoryRoot)src\CORS\" />
1514
<RepositoryBuildOrder Include="StaticFiles" Order="11" RootPath="$(RepositoryRoot)src\StaticFiles\" />
1615
<RepositoryBuildOrder Include="ResponseCaching" Order="11" RootPath="$(RepositoryRoot)src\ResponseCaching\" />

‎build/repo.props

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,15 @@
5757
$(RepositoryRoot)src\Tools\dotnet-watch\test\TestProjects\**\*.csproj
5858
" />
5959

60+
<ProjectToBuild Include="@(NativeProjects)" Condition="'$(OS)' == 'Windows_NT'"/>
6061
<ProjectToBuild Include="
6162
$(RepositoryRoot)src\Features\JsonPatch\**\*.*proj;
6263
$(RepositoryRoot)src\DataProtection\**\*.*proj;
6364
$(RepositoryRoot)src\Hosting\**\*.*proj;
6465
$(RepositoryRoot)src\Http\**\*.*proj;
6566
$(RepositoryRoot)src\Html\**\*.*proj;
66-
$(RepositoryRoot)src\Servers\**\*.*proj;
67+
$(RepositoryRoot)src\Servers\**\*.csproj;
68+
$(RepositoryRoot)src\Servers\**\*.pkgproj;
6769
$(RepositoryRoot)src\Tools\**\*.*proj;
6870
$(RepositoryRoot)src\Middleware\**\*.*proj;
6971
"

‎build/submodules.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
</PropertyGroup>
3737

3838
<ItemGroup>
39-
<Repository Include="IISIntegration" RootPath="$(RepositoryRoot)src\IISIntegration\" />
4039
<Repository Include="MetaPackages" PatchPolicy="CascadeVersions" RootPath="$(RepositoryRoot)src\MetaPackages\" />
4140
<Repository Include="Scaffolding" PatchPolicy="AlwaysUpdate" />
4241
<Repository Include="Templating" PatchPolicy="AlwaysUpdateAndCascadeVersions" RootPath="$(RepositoryRoot)src\Templating\" />

‎eng/Baseline.Designer.props

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,25 @@
274274
<BaselinePackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="[2.1.1, )" />
275275
<BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.1.1, )" />
276276
</ItemGroup>
277+
<!-- Package: Microsoft.AspNetCore.Server.IISIntegration-->
278+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Server.IISIntegration' ">
279+
<BaselinePackageVersion>2.1.2</BaselinePackageVersion>
280+
</PropertyGroup>
281+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Server.IISIntegration' AND '$(TargetFramework)' == 'netstandard2.0' ">
282+
<BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.Core" Version="[2.1.1, )" />
283+
<BaselinePackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="[2.1.1, )" />
284+
<BaselinePackageReference Include="Microsoft.AspNetCore.Http" Version="[2.1.1, )" />
285+
<BaselinePackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="[2.1.1, )" />
286+
<BaselinePackageReference Include="Microsoft.AspNetCore.HttpOverrides" Version="[2.1.1, )" />
287+
<BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[2.1.1, )" />
288+
<BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.1.1, )" />
289+
<BaselinePackageReference Include="System.Buffers" Version="[4.5.0, )" />
290+
<BaselinePackageReference Include="System.IO.Pipelines" Version="[4.5.2, )" />
291+
<BaselinePackageReference Include="System.Memory" Version="[4.5.1, )" />
292+
<BaselinePackageReference Include="System.Numerics.Vectors" Version="[4.5.0, )" />
293+
<BaselinePackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="[4.5.2, )" />
294+
<BaselinePackageReference Include="System.Security.Principal.Windows" Version="[4.5.1, )" />
295+
</ItemGroup>
277296
<!-- Package: Microsoft.AspNetCore.JsonPatch-->
278297
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.JsonPatch' ">
279298
<BaselinePackageVersion>2.1.1</BaselinePackageVersion>

‎eng/Baseline.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
<Package Id="Microsoft.AspNetCore.Rewrite" Version="2.1.1" />
4040
<Package Id="Microsoft.AspNetCore.Routing.Abstractions" Version="2.1.1" />
4141
<Package Id="Microsoft.AspNetCore.Routing" Version="2.1.1" />
42+
<Package Id="Microsoft.AspNetCore.Server.IISIntegration" Version="2.1.2" />
4243
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Core" Version="2.1.3" />
4344
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Https" Version="2.1.3" />
4445
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions" Version="2.1.3" />

‎eng/Dependencies.props

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
<LatestPackageReference Include="Microsoft.Extensions.Localization" Version="$(MicrosoftExtensionsLocalizationPackageVersion)" />
3434
<LatestPackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="$(MicrosoftExtensionsLoggingAbstractionsPackageVersion)" />
3535
<LatestPackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsolePackageVersion)" />
36+
<LatestPackageReference Include="Microsoft.Extensions.Logging.Debug" Version="$(MicrosoftExtensionsLoggingDebugPackageVersion)" />
3637
<LatestPackageReference Include="Microsoft.Extensions.Logging.Testing" Version="$(MicrosoftExtensionsLoggingTestingPackageVersion)" />
3738
<LatestPackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingPackageVersion)" />
3839
<LatestPackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="$(MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion)" />
@@ -45,12 +46,16 @@
4546
<LatestPackageReference Include="Microsoft.Extensions.WebEncoders.Sources" Version="$(MicrosoftExtensionsWebEncodersSourcesPackageVersion)" />
4647
<LatestPackageReference Include="Microsoft.Extensions.WebEncoders" Version="$(MicrosoftExtensionsWebEncodersPackageVersion)" />
4748
<LatestPackageReference Include="Microsoft.NETCore.Windows.ApiSets" Version="$(MicrosoftNETCoreWindowsApiSetsPackageVersion)" />
49+
<LatestPackageReference Include="System.Buffers" Version="$(SystemBuffersPackageVersion)" />
4850
<LatestPackageReference Include="System.Data.SqlClient" Version="$(SystemDataSqlClientPackageVersion)" />
49-
<LatestPackageReference Include="System.Memory" Version="$(SystemMemoryPackageVersion)" />
50-
<LatestPackageReference Include="System.Net.Http.WinHttpHandler" Version="$(SystemNetHttpWinHttpHandlerPackageVersion)" />
51+
<LatestPackageReference Include="System.IO.Pipelines" Version="$(SystemIOPipelinesPackageVersion)" />
5152
<LatestPackageReference Include="System.Net.WebSockets.WebSocketProtocol" Version="$(SystemNetWebSocketsWebSocketProtocolPackageVersion)" />
53+
<LatestPackageReference Include="System.Net.Http.WinHttpHandler" Version="$(SystemNetHttpWinHttpHandlerPackageVersion)" />
54+
<LatestPackageReference Include="System.Numerics.Vectors" Version="$(SystemNumericsVectorsPackageVersion)" />
55+
<LatestPackageReference Include="System.Memory" Version="$(SystemMemoryPackageVersion)" />
5256
<LatestPackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="$(SystemRuntimeCompilerServicesUnsafePackageVersion)" />
5357
<LatestPackageReference Include="System.Security.Cryptography.Cng" Version="$(SystemSecurityCryptographyCngPackageVersion)" />
58+
<LatestPackageReference Include="System.Security.Principal.Windows" Version="$(SystemSecurityPrincipalWindowsPackageVersion)" />
5459
<LatestPackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebPackageVersion)" />
5560
</ItemGroup>
5661

‎eng/ProjectReferences.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Html.Abstractions" ProjectPath="$(RepositoryRoot)src\Html\Abstractions\src\Microsoft.AspNetCore.Html.Abstractions.csproj" />
3232
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Connections.Abstractions" ProjectPath="$(RepositoryRoot)src\Servers\Connections.Abstractions\src\Microsoft.AspNetCore.Connections.Abstractions.csproj" />
3333
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Server.HttpSys" ProjectPath="$(RepositoryRoot)src\Servers\HttpSys\src\Microsoft.AspNetCore.Server.HttpSys.csproj" />
34+
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Server.IISIntegration" ProjectPath="$(RepositoryRoot)src\Servers\IIS\src\Microsoft.AspNetCore.Server.IISIntegration\Microsoft.AspNetCore.Server.IISIntegration.csproj" />
3435
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Server.Kestrel.Core" ProjectPath="$(RepositoryRoot)src\Servers\Kestrel\Core\src\Microsoft.AspNetCore.Server.Kestrel.Core.csproj" />
3536
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Server.Kestrel.Https" ProjectPath="$(RepositoryRoot)src\Servers\Kestrel\Https\src\Microsoft.AspNetCore.Server.Kestrel.Https.csproj" />
3637
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Server.Kestrel" ProjectPath="$(RepositoryRoot)src\Servers\Kestrel\Kestrel\src\Microsoft.AspNetCore.Server.Kestrel.csproj" />

‎eng/targets/Cpp.Common.targets

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,6 @@
33

44
<Import Project="$(MicroBuildPluginDirectory)\MicroBuild.Plugins.*\**\build\MicroBuild.Plugins.*.targets" Condition="'$(DisableMicroBuild)' != 'true' AND '$(MicroBuildPluginDirectory)' != ''" />
55

6+
<Target Name="Pack" />
7+
<Target Name="Restore" />
68
</Project>

‎src/IISIntegration/Directory.Build.props

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎src/IISIntegration/Directory.Build.targets

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)