Skip to content

Commit 04fc8ae

Browse files
author
Nate McMaster
committed
Update targets and projects to build BasicMiddleware projects
1 parent 0843320 commit 04fc8ae

20 files changed

+314
-17
lines changed

‎.gitmodules

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
[submodule "modules/BasicMiddleware"]
2-
path = modules/BasicMiddleware
3-
url = https://github.com/aspnet/BasicMiddleware.git
4-
branch = release/2.1
51
[submodule "modules/EntityFrameworkCore"]
62
path = modules/EntityFrameworkCore
73
url = https://github.com/aspnet/EntityFrameworkCore.git

‎Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<IsBenchmarkProject Condition="$(MSBuildProjectName.EndsWith('.Performance'))">true</IsBenchmarkProject>
2727
<IsTestProject Condition="$(MSBuildProjectName.EndsWith('Tests')) OR $(MSBuildProjectName.EndsWith('.Test'))">true</IsTestProject>
2828
<IsTestAssetProject Condition="$(RepoRelativeProjectDir.Contains('testassets'))">true</IsTestAssetProject>
29-
<IsSampleProject Condition="$(RepoRelativeProjectDir.Contains('samples'))">true</IsSampleProject>
29+
<IsSampleProject Condition="$(RepoRelativeProjectDir.Contains('sample'))">true</IsSampleProject>
3030

3131
<IncludeSource>false</IncludeSource>
3232
<IncludeSymbols>true</IncludeSymbols>

‎Directory.Build.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<IsPackable Condition="'$(IsPackable)' == '' AND ( '$(IsTestProject)' == 'true' OR '$(IsTestAssetProject)' == 'true' OR '$(IsBenchmarkProject)' == 'true' OR '$(IsSampleProject)' == 'true' ) ">false</IsPackable>
66
</PropertyGroup>
77

8-
<Import Project="eng\Baseline.props" />
8+
<Import Project="eng\Baseline.Designer.props" />
99

1010
<PropertyGroup Condition=" '$(IsPackable)' != 'false' AND '$(AspNetCorePatchVersion)' != '0' ">
1111
<!-- Always include framework metapackages in patch updates. -->

‎build/artifacts.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
<PackageArtifact Include="Microsoft.AspNetCore.Authorization" AllMetapackage="true" AppMetapackage="true" Category="ship" />
5252
<PackageArtifact Include="Microsoft.AspNetCore.AzureAppServices.HostingStartup" AllMetapackage="true" Category="ship" />
5353
<PackageArtifact Include="Microsoft.AspNetCore.AzureAppServicesIntegration" AllMetapackage="true" Category="ship" />
54-
<PackageArtifact Include="Microsoft.AspNetCore.Buffering" Category="noship" />
5554
<PackageArtifact Include="Microsoft.AspNetCore.ChunkingCookieManager.Sources" Category="noship" />
5655
<PackageArtifact Include="Microsoft.AspNetCore.Connections.Abstractions" AllMetapackage="true" AppMetapackage="true" Category="ship" />
5756
<PackageArtifact Include="Microsoft.AspNetCore.CookiePolicy" AllMetapackage="true" AppMetapackage="true" 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="HttpSysServer" Order="8" RootPath="$(RepositoryRoot)src\HttpSysServer\" />
13-
<RepositoryBuildOrder Include="BasicMiddleware" Order="9" />
1413
<RepositoryBuildOrder Include="Antiforgery" Order="9" RootPath="$(RepositoryRoot)src\Antiforgery\" />
1514
<RepositoryBuildOrder Include="IISIntegration" Order="10" RootPath="$(RepositoryRoot)src\IISIntegration\" />
1615
<RepositoryBuildOrder Include="CORS" Order="11" RootPath="$(RepositoryRoot)src\CORS\" />

‎build/submodules.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
<ShippedRepository Include="AADIntegration" RootPath="$(RepositoryRoot)src\AADIntegration\" />
5252
<ShippedRepository Include="Antiforgery" RootPath="$(RepositoryRoot)src\Antiforgery\" />
5353
<ShippedRepository Include="AzureIntegration" RootPath="$(RepositoryRoot)src\AzureIntegration\" />
54-
<ShippedRepository Include="BasicMiddleware" />
5554
<ShippedRepository Include="CORS" RootPath="$(RepositoryRoot)src\CORS\" />
5655
<ShippedRepository Include="EntityFrameworkCore" />
5756
<ShippedRepository Include="HttpSysServer" RootPath="$(RepositoryRoot)src\HttpSysServer\" />

‎eng/Baseline.props renamed to ‎eng/Baseline.Designer.props

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,16 @@
154154
<BaselinePackageReference Include="System.Diagnostics.DiagnosticSource" Version="[4.5.0, )" />
155155
<BaselinePackageReference Include="System.Reflection.Metadata" Version="[1.6.0, )" />
156156
</ItemGroup>
157+
<!-- Package: Microsoft.AspNetCore.HostFiltering-->
158+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.HostFiltering' ">
159+
<BaselinePackageVersion>2.1.1</BaselinePackageVersion>
160+
</PropertyGroup>
161+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.HostFiltering' AND '$(TargetFramework)' == 'netstandard2.0' ">
162+
<BaselinePackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="[2.1.1, )" />
163+
<BaselinePackageReference Include="Microsoft.AspNetCore.Http" Version="[2.1.1, )" />
164+
<BaselinePackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="[2.1.1, )" />
165+
<BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.1.1, )" />
166+
</ItemGroup>
157167
<!-- Package: Microsoft.AspNetCore.Hosting.Abstractions-->
158168
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Hosting.Abstractions' ">
159169
<BaselinePackageVersion>2.1.1</BaselinePackageVersion>
@@ -244,6 +254,26 @@
244254
<BaselinePackageReference Include="Microsoft.Extensions.ObjectPool" Version="[2.1.1, )" />
245255
<BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.1.1, )" />
246256
</ItemGroup>
257+
<!-- Package: Microsoft.AspNetCore.HttpOverrides-->
258+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.HttpOverrides' ">
259+
<BaselinePackageVersion>2.1.1</BaselinePackageVersion>
260+
</PropertyGroup>
261+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.HttpOverrides' AND '$(TargetFramework)' == 'netstandard2.0' ">
262+
<BaselinePackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="[2.1.1, )" />
263+
<BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[2.1.1, )" />
264+
<BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.1.1, )" />
265+
</ItemGroup>
266+
<!-- Package: Microsoft.AspNetCore.HttpsPolicy-->
267+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.HttpsPolicy' ">
268+
<BaselinePackageVersion>2.1.1</BaselinePackageVersion>
269+
</PropertyGroup>
270+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.HttpsPolicy' AND '$(TargetFramework)' == 'netstandard2.0' ">
271+
<BaselinePackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="[2.1.1, )" />
272+
<BaselinePackageReference Include="Microsoft.AspNetCore.Http" Version="[2.1.1, )" />
273+
<BaselinePackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="[2.1.1, )" />
274+
<BaselinePackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="[2.1.1, )" />
275+
<BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.1.1, )" />
276+
</ItemGroup>
247277
<!-- Package: Microsoft.AspNetCore.JsonPatch-->
248278
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.JsonPatch' ">
249279
<BaselinePackageVersion>2.1.1</BaselinePackageVersion>
@@ -268,6 +298,30 @@
268298
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Owin' AND '$(TargetFramework)' == 'netstandard2.0' ">
269299
<BaselinePackageReference Include="Microsoft.AspNetCore.Http" Version="[2.1.1, )" />
270300
</ItemGroup>
301+
<!-- Package: Microsoft.AspNetCore.ResponseCompression-->
302+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.ResponseCompression' ">
303+
<BaselinePackageVersion>2.1.1</BaselinePackageVersion>
304+
</PropertyGroup>
305+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.ResponseCompression' AND '$(TargetFramework)' == 'net461' ">
306+
<BaselinePackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="[2.1.1, )" />
307+
<BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.1.1, )" />
308+
</ItemGroup>
309+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.ResponseCompression' AND '$(TargetFramework)' == 'netstandard2.0' ">
310+
<BaselinePackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="[2.1.1, )" />
311+
<BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.1.1, )" />
312+
</ItemGroup>
313+
<!-- Package: Microsoft.AspNetCore.Rewrite-->
314+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Rewrite' ">
315+
<BaselinePackageVersion>2.1.1</BaselinePackageVersion>
316+
</PropertyGroup>
317+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Rewrite' AND '$(TargetFramework)' == 'netstandard2.0' ">
318+
<BaselinePackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="[2.1.1, )" />
319+
<BaselinePackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="[2.1.1, )" />
320+
<BaselinePackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="[2.1.1, )" />
321+
<BaselinePackageReference Include="Microsoft.Extensions.FileProviders.Abstractions" Version="[2.1.1, )" />
322+
<BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[2.1.1, )" />
323+
<BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.1.1, )" />
324+
</ItemGroup>
271325
<!-- Package: Microsoft.AspNetCore.Server.Kestrel.Core-->
272326
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Server.Kestrel.Core' ">
273327
<BaselinePackageVersion>2.1.3</BaselinePackageVersion>

‎eng/tools/BaselineGenerator/baseline.xml renamed to ‎eng/Baseline.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<Package Id="Microsoft.AspNetCore.Diagnostics.Abstractions" Version="2.1.1" />
1919
<Package Id="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="2.1.1" />
2020
<Package Id="Microsoft.AspNetCore.Diagnostics" Version="2.1.1" />
21+
<Package Id="Microsoft.AspNetCore.HostFiltering" Version="2.1.1" />
2122
<Package Id="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.1.1" />
2223
<Package Id="Microsoft.AspNetCore.Hosting.Server.Abstractions" Version="2.1.1" />
2324
<Package Id="Microsoft.AspNetCore.Hosting.WindowsServices" Version="2.1.1" />
@@ -27,9 +28,13 @@
2728
<Package Id="Microsoft.AspNetCore.Http.Extensions" Version="2.1.1" />
2829
<Package Id="Microsoft.AspNetCore.Http.Features" Version="2.1.1" />
2930
<Package Id="Microsoft.AspNetCore.Http" Version="2.1.1" />
31+
<Package Id="Microsoft.AspNetCore.HttpOverrides" Version="2.1.1" />
32+
<Package Id="Microsoft.AspNetCore.HttpsPolicy" Version="2.1.1" />
3033
<Package Id="Microsoft.AspNetCore.JsonPatch" Version="2.1.1" />
3134
<Package Id="Microsoft.AspNetCore.MiddlewareAnalysis" Version="2.1.1" />
3235
<Package Id="Microsoft.AspNetCore.Owin" Version="2.1.1" />
36+
<Package Id="Microsoft.AspNetCore.ResponseCompression" Version="2.1.1" />
37+
<Package Id="Microsoft.AspNetCore.Rewrite" Version="2.1.1" />
3338
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Core" Version="2.1.3" />
3439
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Https" Version="2.1.3" />
3540
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions" Version="2.1.3" />

‎eng/Dependencies.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
<LatestPackageReference Include="Microsoft.Extensions.Logging.Testing" Version="$(MicrosoftExtensionsLoggingTestingPackageVersion)" />
3232
<LatestPackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingPackageVersion)" />
3333
<LatestPackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="$(MicrosoftExtensionsFileProvidersEmbeddedPackageVersion)" />
34+
<LatestPackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="$(MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion)" />
3435
<LatestPackageReference Include="Microsoft.Extensions.Options" Version="$(MicrosoftExtensionsOptionsPackageVersion)" />
3536
<LatestPackageReference Include="Microsoft.Extensions.Process.Sources" Version="$(MicrosoftExtensionsProcessSourcesPackageVersion)" />
3637
<LatestPackageReference Include="Microsoft.Extensions.RazorViews.Sources" Version="$(MicrosoftExtensionsRazorViewsSourcesPackageVersion)" />

‎eng/ProjectReferences.props

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,12 @@
4242
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Diagnostics.Abstractions" ProjectPath="$(RepositoryRoot)src\Middleware\Diagnostics.Abstractions\src\Microsoft.AspNetCore.Diagnostics.Abstractions.csproj" />
4343
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" ProjectPath="$(RepositoryRoot)src\Middleware\Diagnostics.EntityFrameworkCore\src\Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.csproj" />
4444
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Diagnostics" ProjectPath="$(RepositoryRoot)src\Middleware\Diagnostics\src\Microsoft.AspNetCore.Diagnostics.csproj" />
45+
<ProjectReferenceProvider Include="Microsoft.AspNetCore.HostFiltering" ProjectPath="$(RepositoryRoot)src\Middleware\HostFiltering\src\Microsoft.AspNetCore.HostFiltering.csproj" />
46+
<ProjectReferenceProvider Include="Microsoft.AspNetCore.HttpOverrides" ProjectPath="$(RepositoryRoot)src\Middleware\HttpOverrides\src\Microsoft.AspNetCore.HttpOverrides.csproj" />
47+
<ProjectReferenceProvider Include="Microsoft.AspNetCore.HttpsPolicy" ProjectPath="$(RepositoryRoot)src\Middleware\HttpsPolicy\src\Microsoft.AspNetCore.HttpsPolicy.csproj" />
4548
<ProjectReferenceProvider Include="Microsoft.AspNetCore.MiddlewareAnalysis" ProjectPath="$(RepositoryRoot)src\Middleware\MiddlewareAnalysis\src\Microsoft.AspNetCore.MiddlewareAnalysis.csproj" />
49+
<ProjectReferenceProvider Include="Microsoft.AspNetCore.ResponseCompression" ProjectPath="$(RepositoryRoot)src\Middleware\ResponseCompression\src\Microsoft.AspNetCore.ResponseCompression.csproj" />
50+
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Rewrite" ProjectPath="$(RepositoryRoot)src\Middleware\Rewrite\src\Microsoft.AspNetCore.Rewrite.csproj" />
4651
<ProjectReferenceProvider Include="Microsoft.AspNetCore.WebSockets" ProjectPath="$(RepositoryRoot)src\Middleware\WebSockets\src\Microsoft.AspNetCore.WebSockets.csproj" />
4752
</ItemGroup>
4853
</Project>

0 commit comments

Comments
 (0)