Skip to content

Commit b180f84

Browse files
author
John Luo
committed
Feedback
1 parent 0174bb2 commit b180f84

8 files changed

+99
-27
lines changed

‎eng/Workarounds.FileProviders.Embedded.props

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

‎eng/Workarounds.targets

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,4 @@
6767
<TransitiveFrameworkReference Remove="NETStandard.Library" />
6868
</ItemGroup>
6969
</Target>
70-
71-
<!-- Workaround target import for project references to Microsoft.Extensions.FileProviders.Embedded -->
72-
<Import
73-
Project="$(RepoRoot)src\FileProviders\Embedded\src\build\netstandard2.0\Microsoft.Extensions.FileProviders.Embedded.targets"
74-
Condition="'$(GenerateEmbeddedFilesManifest)' == 'true'" />
7570
</Project>

‎src/Components/Server/src/Directory.Build.targets

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<Project>
2+
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.targets))\Directory.Build.targets" />
3+
<!-- Workaround target import for project references to Microsoft.Extensions.FileProviders.Embedded -->
4+
<Import
5+
Project="$(RepoRoot)src\FileProviders\Embedded\src\build\netstandard2.0\Microsoft.Extensions.FileProviders.Embedded.targets" />
6+
</Project>

‎src/Components/Server/src/Microsoft.AspNetCore.Components.Server.csproj

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
3-
<Import Project="$(RepoRoot)eng/Workarounds.FileProviders.Embedded.props" />
4-
52
<PropertyGroup>
63
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
74
<Description>Runtime server features for ASP.NET Core Components.</Description>
@@ -12,6 +9,7 @@
129
<NoWarn>CS0436;$(NoWarn)</NoWarn>
1310
<DefineConstants>$(DefineConstants);ENABLE_UNSAFE_MSGPACK;SPAN_BUILTIN;MESSAGEPACK_INTERNAL;COMPONENTS_SERVER</DefineConstants>
1411
<IsShippingPackage>false</IsShippingPackage>
12+
<EmbeddedFilesManifestFileName>Microsoft.Extensions.FileProviders.Embedded.Manifest.xml</EmbeddedFilesManifestFileName>
1513
</PropertyGroup>
1614

1715
<ItemGroup>
@@ -42,6 +40,15 @@
4240
<MessagePackRoot>$(RepoRoot)src\submodules\MessagePack-CSharp\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\</MessagePackRoot>
4341
</PropertyGroup>
4442

43+
<!-- This workaround is required when referencing FileProviders.Embedded as a project -->
44+
<PropertyGroup>
45+
<_FileProviderTaskAssembly>$(ArtifactsDir)bin\Microsoft.Extensions.FileProviders.Embedded.Manifest.Task\$(Configuration)\netstandard2.0\Microsoft.Extensions.FileProviders.Embedded.Manifest.Task.dll</_FileProviderTaskAssembly>
46+
</PropertyGroup>
47+
48+
<UsingTask
49+
AssemblyFile="$(_FileProviderTaskAssembly)"
50+
TaskName="Microsoft.Extensions.FileProviders.Embedded.Manifest.Task.GenerateEmbeddedResourcesManifest" />
51+
4552
<ItemGroup>
4653
<Compile Include="$(ComponentsSharedSourceRoot)src\CacheHeaderSettings.cs" Link="Shared\CacheHeaderSettings.cs" />
4754
<Compile Include="$(ComponentsSharedSourceRoot)src\ArrayBuilder.cs" LinkBase="Circuits" />

‎src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<IsAspNetCoreApp>true</IsAspNetCoreApp>
1313
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1414
<PackageTags>files;filesystem</PackageTags>
15-
<NoWarn>$(NoWarn);NU5100</NoWarn>
15+
<NoPackageAnalysis>true</NoPackageAnalysis>
1616
</PropertyGroup>
1717

1818
<ItemGroup>

‎src/ObjectPool/ref/Microsoft.Extensions.ObjectPool.csproj

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
<!-- This file is automatically generated. -->
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
55
</PropertyGroup>
66
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
77
<Compile Include="Microsoft.Extensions.ObjectPool.netstandard2.0.cs" />
88

9+
</ItemGroup>
10+
<ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'">
11+
<Compile Include="Microsoft.Extensions.ObjectPool.netcoreapp.cs" />
12+
913
</ItemGroup>
1014
</Project>

‎src/ObjectPool/ref/Microsoft.Extensions.ObjectPool.netcoreapp.cs

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
// Copyright (c) .NET Foundation. All rights reserved.
2+
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
3+
4+
namespace Microsoft.Extensions.ObjectPool
5+
{
6+
public partial class DefaultObjectPoolProvider : Microsoft.Extensions.ObjectPool.ObjectPoolProvider
7+
{
8+
public DefaultObjectPoolProvider() { }
9+
public int MaximumRetained { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
10+
public override Microsoft.Extensions.ObjectPool.ObjectPool<T> Create<T>(Microsoft.Extensions.ObjectPool.IPooledObjectPolicy<T> policy) { throw null; }
11+
}
12+
public partial class DefaultObjectPool<T> : Microsoft.Extensions.ObjectPool.ObjectPool<T> where T : class
13+
{
14+
public DefaultObjectPool(Microsoft.Extensions.ObjectPool.IPooledObjectPolicy<T> policy) { }
15+
public DefaultObjectPool(Microsoft.Extensions.ObjectPool.IPooledObjectPolicy<T> policy, int maximumRetained) { }
16+
public override T Get() { throw null; }
17+
public override void Return(T obj) { }
18+
}
19+
public partial class DefaultPooledObjectPolicy<T> : Microsoft.Extensions.ObjectPool.PooledObjectPolicy<T> where T : class, new()
20+
{
21+
public DefaultPooledObjectPolicy() { }
22+
public override T Create() { throw null; }
23+
public override bool Return(T obj) { throw null; }
24+
}
25+
public partial interface IPooledObjectPolicy<T>
26+
{
27+
T Create();
28+
bool Return(T obj);
29+
}
30+
public partial class LeakTrackingObjectPoolProvider : Microsoft.Extensions.ObjectPool.ObjectPoolProvider
31+
{
32+
public LeakTrackingObjectPoolProvider(Microsoft.Extensions.ObjectPool.ObjectPoolProvider inner) { }
33+
public override Microsoft.Extensions.ObjectPool.ObjectPool<T> Create<T>(Microsoft.Extensions.ObjectPool.IPooledObjectPolicy<T> policy) { throw null; }
34+
}
35+
public partial class LeakTrackingObjectPool<T> : Microsoft.Extensions.ObjectPool.ObjectPool<T> where T : class
36+
{
37+
public LeakTrackingObjectPool(Microsoft.Extensions.ObjectPool.ObjectPool<T> inner) { }
38+
public override T Get() { throw null; }
39+
public override void Return(T obj) { }
40+
}
41+
public static partial class ObjectPool
42+
{
43+
public static Microsoft.Extensions.ObjectPool.ObjectPool<T> Create<T>(Microsoft.Extensions.ObjectPool.IPooledObjectPolicy<T> policy = null) where T : class, new() { throw null; }
44+
}
45+
public abstract partial class ObjectPoolProvider
46+
{
47+
protected ObjectPoolProvider() { }
48+
public Microsoft.Extensions.ObjectPool.ObjectPool<T> Create<T>() where T : class, new() { throw null; }
49+
public abstract Microsoft.Extensions.ObjectPool.ObjectPool<T> Create<T>(Microsoft.Extensions.ObjectPool.IPooledObjectPolicy<T> policy) where T : class;
50+
}
51+
public static partial class ObjectPoolProviderExtensions
52+
{
53+
public static Microsoft.Extensions.ObjectPool.ObjectPool<System.Text.StringBuilder> CreateStringBuilderPool(this Microsoft.Extensions.ObjectPool.ObjectPoolProvider provider) { throw null; }
54+
public static Microsoft.Extensions.ObjectPool.ObjectPool<System.Text.StringBuilder> CreateStringBuilderPool(this Microsoft.Extensions.ObjectPool.ObjectPoolProvider provider, int initialCapacity, int maximumRetainedCapacity) { throw null; }
55+
}
56+
public abstract partial class ObjectPool<T> where T : class
57+
{
58+
protected ObjectPool() { }
59+
public abstract T Get();
60+
public abstract void Return(T obj);
61+
}
62+
public abstract partial class PooledObjectPolicy<T> : Microsoft.Extensions.ObjectPool.IPooledObjectPolicy<T>
63+
{
64+
protected PooledObjectPolicy() { }
65+
public abstract T Create();
66+
public abstract bool Return(T obj);
67+
}
68+
public partial class StringBuilderPooledObjectPolicy : Microsoft.Extensions.ObjectPool.PooledObjectPolicy<System.Text.StringBuilder>
69+
{
70+
public StringBuilderPooledObjectPolicy() { }
71+
public int InitialCapacity { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
72+
public int MaximumRetainedCapacity { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
73+
public override System.Text.StringBuilder Create() { throw null; }
74+
public override bool Return(System.Text.StringBuilder obj) { throw null; }
75+
}
76+
}

‎src/ObjectPool/src/Microsoft.Extensions.ObjectPool.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<Description>A simple object pool implementation.</Description>
5-
<TargetFramework>netstandard2.0</TargetFramework>
5+
<TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
66
<NoWarn>$(NoWarn);CS1591</NoWarn>
77
<GenerateDocumentationFile>true</GenerateDocumentationFile>
88
<PackageTags>pooling</PackageTags>

0 commit comments

Comments
 (0)