Skip to content

Commit 429719b

Browse files
jkotalikjkotalik
authored
Make IISIntegration use Reference instead of PackageReference (and reactionary work) (#4311)
1 parent 7475342 commit 429719b

File tree

308 files changed

+626
-35826
lines changed

Some content is hidden

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

308 files changed

+626
-35826
lines changed

‎.azure/pipelines/ci.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,5 @@ jobs:
1414
jobDisplayName: "Build and test: Windows"
1515
agentOs: Windows
1616
beforeBuild:
17-
- powershell: "& ./src/IISIntegration/tools/UpdateIISExpressCertificate.ps1"
17+
- powershell: "& ./src/Servers/IIS/tools/UpdateIISExpressCertificate.ps1"
1818
displayName: Setup IISExpress test certificates
19-
- template: jobs/iisintegration-job.yml
20-
parameters:
21-
variables:
22-
_FolderName: IISIntegration

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

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,4 @@ scripts/tmp/
2727
.tools/
2828
launchSettings.json
2929
korebuild-lock.txt
30+
.gradle/

‎build/artifacts.props

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@
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' " />
34-
<PackageArtifact Include="Microsoft.AspNetCore.AspNetCoreModuleV1" Category="noship" Condition=" '$(OS)' == 'Windows_NT' " />
33+
<PackageArtifact Include="Microsoft.AspNetCore.AspNetCoreModuleV1" Category="noship" />
3534
<PackageArtifact Include="Microsoft.AspNetCore.Authentication.Abstractions" AllMetapackage="true" AppMetapackage="true" Category="ship" />
3635
<PackageArtifact Include="Microsoft.AspNetCore.Authentication.AzureAD.UI" Category="ship" />
3736
<PackageArtifact Include="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" 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/repo.props

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,16 @@
6464
$(RepositoryRoot)src\Tools\dotnet-watch\test\TestProjects\**\*.csproj
6565
" />
6666

67+
<ProjectToBuild Include="@(NativeProjects)" Condition="'$(OS)' == 'Windows_NT'"/>
6768
<ProjectToBuild Include="
6869
$(RepositoryRoot)src\Features\JsonPatch\**\*.*proj;
6970
$(RepositoryRoot)src\DataProtection\**\*.*proj;
7071
$(RepositoryRoot)src\Antiforgery\**\*.*proj;
7172
$(RepositoryRoot)src\Hosting\**\*.*proj;
7273
$(RepositoryRoot)src\Http\**\*.*proj;
7374
$(RepositoryRoot)src\Html\**\*.*proj;
74-
$(RepositoryRoot)src\Servers\**\*.*proj;
75+
$(RepositoryRoot)src\Servers\**\*.csproj;
76+
$(RepositoryRoot)src\Servers\**\*.pkgproj;
7577
$(RepositoryRoot)src\Tools\**\*.*proj;
7678
$(RepositoryRoot)src\Middleware\**\*.*proj;
7779
"

‎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
@@ -296,6 +296,25 @@
296296
<BaselinePackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="[2.1.1, )" />
297297
<BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.1.1, )" />
298298
</ItemGroup>
299+
<!-- Package: Microsoft.AspNetCore.Server.IISIntegration-->
300+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Server.IISIntegration' ">
301+
<BaselinePackageVersion>2.1.2</BaselinePackageVersion>
302+
</PropertyGroup>
303+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Server.IISIntegration' AND '$(TargetFramework)' == 'netstandard2.0' ">
304+
<BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.Core" Version="[2.1.1, )" />
305+
<BaselinePackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="[2.1.1, )" />
306+
<BaselinePackageReference Include="Microsoft.AspNetCore.Http" Version="[2.1.1, )" />
307+
<BaselinePackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="[2.1.1, )" />
308+
<BaselinePackageReference Include="Microsoft.AspNetCore.HttpOverrides" Version="[2.1.1, )" />
309+
<BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[2.1.1, )" />
310+
<BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.1.1, )" />
311+
<BaselinePackageReference Include="System.Buffers" Version="[4.5.0, )" />
312+
<BaselinePackageReference Include="System.IO.Pipelines" Version="[4.5.2, )" />
313+
<BaselinePackageReference Include="System.Memory" Version="[4.5.1, )" />
314+
<BaselinePackageReference Include="System.Numerics.Vectors" Version="[4.5.0, )" />
315+
<BaselinePackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="[4.5.2, )" />
316+
<BaselinePackageReference Include="System.Security.Principal.Windows" Version="[4.5.1, )" />
317+
</ItemGroup>
299318
<!-- Package: Microsoft.AspNetCore.JsonPatch-->
300319
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.JsonPatch' ">
301320
<BaselinePackageVersion>2.1.1</BaselinePackageVersion>

‎eng/Baseline.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
<Package Id="Microsoft.AspNetCore.Rewrite" Version="2.1.1" />
4444
<Package Id="Microsoft.AspNetCore.Routing.Abstractions" Version="2.1.1" />
4545
<Package Id="Microsoft.AspNetCore.Routing" Version="2.1.1" />
46+
<Package Id="Microsoft.AspNetCore.Server.IISIntegration" Version="2.1.2" />
4647
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Core" Version="2.1.3" />
4748
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Https" Version="2.1.3" />
4849
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions" Version="2.1.3" />

‎eng/Dependencies.props

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
<LatestPackageReference Include="Microsoft.Extensions.Localization" Version="$(MicrosoftExtensionsLocalizationPackageVersion)" />
3737
<LatestPackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="$(MicrosoftExtensionsLoggingAbstractionsPackageVersion)" />
3838
<LatestPackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsolePackageVersion)" />
39+
<LatestPackageReference Include="Microsoft.Extensions.Logging.Debug" Version="$(MicrosoftExtensionsLoggingDebugPackageVersion)" />
3940
<LatestPackageReference Include="Microsoft.Extensions.Logging.Testing" Version="$(MicrosoftExtensionsLoggingTestingPackageVersion)" />
4041
<LatestPackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingPackageVersion)" />
4142
<LatestPackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="$(MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion)" />
@@ -48,12 +49,16 @@
4849
<LatestPackageReference Include="Microsoft.Extensions.WebEncoders.Sources" Version="$(MicrosoftExtensionsWebEncodersSourcesPackageVersion)" />
4950
<LatestPackageReference Include="Microsoft.Extensions.WebEncoders" Version="$(MicrosoftExtensionsWebEncodersPackageVersion)" />
5051
<LatestPackageReference Include="Microsoft.NETCore.Windows.ApiSets" Version="$(MicrosoftNETCoreWindowsApiSetsPackageVersion)" />
52+
<LatestPackageReference Include="System.Buffers" Version="$(SystemBuffersPackageVersion)" />
5153
<LatestPackageReference Include="System.Data.SqlClient" Version="$(SystemDataSqlClientPackageVersion)" />
54+
<LatestPackageReference Include="System.IO.Pipelines" Version="$(SystemIOPipelinesPackageVersion)" />
5255
<LatestPackageReference Include="System.Memory" Version="$(SystemMemoryPackageVersion)" />
53-
<LatestPackageReference Include="System.Net.Http.WinHttpHandler" Version="$(SystemNetHttpWinHttpHandlerPackageVersion)" />
5456
<LatestPackageReference Include="System.Net.WebSockets.WebSocketProtocol" Version="$(SystemNetWebSocketsWebSocketProtocolPackageVersion)" />
57+
<LatestPackageReference Include="System.Net.Http.WinHttpHandler" Version="$(SystemNetHttpWinHttpHandlerPackageVersion)" />
58+
<LatestPackageReference Include="System.Numerics.Vectors" Version="$(SystemNumericsVectorsPackageVersion)" />
5559
<LatestPackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="$(SystemRuntimeCompilerServicesUnsafePackageVersion)" />
5660
<LatestPackageReference Include="System.Security.Cryptography.Cng" Version="$(SystemSecurityCryptographyCngPackageVersion)" />
61+
<LatestPackageReference Include="System.Security.Principal.Windows" Version="$(SystemSecurityPrincipalWindowsPackageVersion)" />
5762
<LatestPackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebPackageVersion)" />
5863
</ItemGroup>
5964

‎eng/ProjectReferences.props

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