Skip to content

Commit a8a5569

Browse files
committed
Remove recently-added @(Compile) and @(Reference) items
- were added due to missing `[InternalsVisibleTo]` attributes in ref/ assemblies or as early workarounds - plus, now transitive references **Just Work:tm:** - expose `ClosedGenericMatcher` in the usual (*.Manual.cs) way - also undo Microsoft.Extensions.ApiDescription.Server workaround
1 parent b28a505 commit a8a5569

File tree

8 files changed

+7
-13
lines changed

8 files changed

+7
-13
lines changed

src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@
2828

2929
<ItemGroup>
3030
<Reference Include="Microsoft.AspNetCore.Hosting" />
31-
<!-- This ref is needed explicitly for the tests running in Selenium -->
32-
<Reference Include="Microsoft.AspNetCore.ResponseCompression" />
3331
<Reference Include="Microsoft.AspNetCore.Server.Kestrel" />
3432
<Reference Include="Microsoft.AspNetCore.StaticFiles" />
3533
<Reference Include="Microsoft.Extensions.Logging.Testing" />

src/Middleware/StaticFiles/test/FunctionalTests/Microsoft.AspNetCore.StaticFiles.FunctionalTests.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
Include="Microsoft.NETCore.DotNetHostPolicy.SetAppPaths"
3232
Value="true" />
3333

34-
<Reference Include="Microsoft.AspNetCore.Hosting.Abstractions" />
3534
<Reference Include="Microsoft.AspNetCore.StaticFiles" />
3635
<Reference Include="Microsoft.AspNetCore.Server.HttpSys" />
3736
<Reference Include="Microsoft.AspNetCore.Server.Kestrel" />
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
namespace Microsoft.Extensions.Internal
2+
{
3+
internal static partial class ClosedGenericMatcher
4+
{
5+
public static System.Type ExtractGenericInterface(System.Type queryType, System.Type interfaceType) { throw null; }
6+
}
7+
}

src/Mvc/Mvc.Core/src/Microsoft.AspNetCore.Mvc.Core.csproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ Microsoft.AspNetCore.Mvc.RouteAttribute</Description>
2020

2121
<ItemGroup>
2222
<Compile Include="$(SharedSourceRoot)ChunkingCookieManager\**\*.cs" />
23-
<Compile Include="$(SharedSourceRoot)ClosedGenericMatcher\**\*.cs" />
2423
<Compile Include="$(SharedSourceRoot)CopyOnWriteDictionary\**\*.cs" />
2524
<Compile Include="$(SharedSourceRoot)ObjectMethodExecutor\**\*.cs" />
2625
<Compile Include="$(SharedSourceRoot)PropertyActivator\**\*.cs" />
@@ -49,7 +48,6 @@ Microsoft.AspNetCore.Mvc.RouteAttribute</Description>
4948
</ItemGroup>
5049

5150
<ItemGroup Label="Sources packages">
52-
<Reference Include="Microsoft.Extensions.HashCodeCombiner.Sources" />
5351
<Reference Include="Microsoft.Extensions.ParameterDefaultValue.Sources" />
5452
<Reference Include="Microsoft.Extensions.TypeNameHelper.Sources" />
5553
<Reference Include="Microsoft.Extensions.ValueStopwatch.Sources" />

src/Mvc/Mvc.Formatters.Xml/src/Microsoft.AspNetCore.Mvc.Formatters.Xml.csproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<Compile Include="$(SharedSourceRoot)ClosedGenericMatcher\**\*.cs" />
15-
1614
<Reference Include="Microsoft.AspNetCore.Mvc.Core" />
1715
</ItemGroup>
1816
</Project>

src/Mvc/Mvc.RazorPages/src/Microsoft.AspNetCore.Mvc.RazorPages.csproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<Compile Include="$(SharedSourceRoot)ClosedGenericMatcher\*.cs" />
15-
1614
<Reference Include="Microsoft.AspNetCore.Mvc.Razor" />
1715
</ItemGroup>
1816

src/Mvc/Mvc.ViewFeatures/src/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
<Compile Include="$(SharedSourceRoot)Components\ServerComponentSerializationSettings.cs" />
3535
<Compile Include="$(SharedSourceRoot)Components\ServerComponentMarker.cs" />
3636
<Compile Include="$(SharedSourceRoot)Components\ServerComponent.cs" />
37-
<Compile Include="$(SharedSourceRoot)ClosedGenericMatcher\**\*.cs" />
3837
</ItemGroup>
3938

4039
</Project>

src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.csproj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@
1313
<PackageTags>MSBuild;Swagger;OpenAPI;code generation;Web API;service reference;document generation</PackageTags>
1414
<IsShippingPackage>true</IsShippingPackage>
1515
<DevelopmentDependency>true</DevelopmentDependency>
16-
<!-- Compiling against reference assemblies breaks ProjectReferenceBuildTargets (TODO: investigate why) -->
17-
<ReferenceImplementationAssemblies>true</ReferenceImplementationAssemblies>
18-
<ReferenceReferenceAssemblies>false</ReferenceReferenceAssemblies>
1916

2017
<!--
2118
Publish the referenced projects when building .NET Core bits. This is not needed for full framework builds

0 commit comments

Comments
 (0)