Skip to content

Commit 037aba8

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
committed
Backflow from https://github.com/dotnet/dotnet / e9f665e build 278626
[[ commit created by automation ]]
1 parent 6e1e958 commit 037aba8

File tree

31 files changed

+163
-330
lines changed

31 files changed

+163
-330
lines changed

‎eng/testing/linker/SupportFiles/Directory.Build.targets‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,18 @@
11
<Project>
2+
3+
<PropertyGroup>
4+
<!-- Used to silence the warning caused by the workaround for https://github.com/dotnet/runtime/issues/81382 -->
5+
<SuppressGenerateILCompilerExplicitPackageReferenceWarning>true</SuppressGenerateILCompilerExplicitPackageReferenceWarning>
6+
</PropertyGroup>
7+
8+
<!-- needed to reference a specific version of NetCoreApp. Workaround https://github.com/dotnet/runtime/issues/81382 -->
29
<ItemGroup>
310
<FrameworkReference Update="Microsoft.NETCore.App"
411
RuntimeFrameworkVersion="$(MicrosoftNETCoreAppRefVersion)" />
512

13+
<PackageReference Include="Microsoft.DotNet.ILCompiler"
14+
Version="$(MicrosoftNETCoreAppRefVersion)" />
15+
616
<!-- Workaround when there is no vNext SDK available; copy known packs info from 9.0. -->
717
<KnownAppHostPack Include="@(KnownAppHostPack->WithMetadataValue('TargetFramework', 'net9.0'))"
818
TargetFramework="$(TargetFramework)"
@@ -54,13 +64,6 @@
5464
<AppHostRuntimeIdentifiers Condition=" '$(DotNetBuildSourceOnly)' == 'true' ">$(TargetRuntimeIdentifier)</AppHostRuntimeIdentifiers>
5565
</KnownRuntimePack>
5666

57-
<KnownILCompilerPack Update="Microsoft.DotNet.ILCompiler">
58-
<ILCompilerPackVersion>$(MicrosoftNETCoreAppRefVersion)</ILCompilerPackVersion>
59-
</KnownILCompilerPack>
60-
61-
<KnownILLinkPack Update="Microsoft.NET.ILLink.Tasks">
62-
<ILLinkPackVersion>$(MicrosoftNETCoreAppRefVersion)</ILLinkPackVersion>
63-
</KnownILLinkPack>
6467
</ItemGroup>
6568

6669
<!--

‎eng/tools/GenerateFiles/Directory.Build.props.in‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,8 @@
44
<ArtifactsShippingPackagesDir>${ArtifactsShippingPackagesDir}</ArtifactsShippingPackagesDir>
55
<TreatWarningsAsErrors Condition="'$(BuildingInsideVisualStudio)' != 'true'">true</TreatWarningsAsErrors>
66
<LibNetHostAppPackVersion Condition=" '$(LibNetHostAppPackVersion)' == '' ">${LibNetHostAppPackVersion}</LibNetHostAppPackVersion>
7+
8+
<!-- Temporarily hardcoded to true -->
9+
<SuppressGenerateILCompilerExplicitPackageReferenceWarning>true</SuppressGenerateILCompilerExplicitPackageReferenceWarning>
710
</PropertyGroup>
811
</Project>

‎eng/tools/GenerateFiles/Directory.Build.targets.in‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,10 @@
5656
Condition=" (('$(ProjectTargetFrameworkIdentifier)' == '${DefaultNetCoreTargetFramework}') AND '${DefaultNetCoreTargetFramework}' == '$(ProjectTargetFrameworkVersion)') AND '$(TargetLatestDotNetRuntime)' != 'false' "
5757
RuntimeFrameworkVersion="${MicrosoftNETCoreAppRefVersion}"
5858
TargetingPackVersion="${MicrosoftNETCoreAppRefVersion}" />
59+
60+
<PackageReference Include="Microsoft.DotNet.ILCompiler"
61+
Condition=" '$(PublishAot)' == 'true' "
62+
Version="${MicrosoftNETCoreAppRefVersion}" />
5963
</ItemGroup>
6064

6165
<ItemGroup>
@@ -114,11 +118,6 @@
114118
Condition=" '%(TargetFramework)' == '${DefaultNetCoreTargetFramework}' ">${MicrosoftNETCoreAppRefVersion}</ILLinkPackVersion>
115119
</KnownILLinkPack>
116120

117-
<KnownILCompilerPack Update="Microsoft.DotNet.ILCompiler">
118-
<ILCompilerPackVersion
119-
Condition="'%(TargetFramework)' == '${DefaultNetCoreTargetFramework}'">$(MicrosoftNETCoreAppRefVersion)</ILCompilerPackVersion>
120-
</KnownILCompilerPack>
121-
122121
<!-- Use the just-built ASP.NET Core shared framework if available except when building product code in servicing. -->
123122
<KnownFrameworkReference Update="Microsoft.AspNetCore.App" Condition=" $(UpdateAspNetCoreKnownFramework) ">
124123
<LatestRuntimeFrameworkVersion

‎src/Components/test/testassets/GlobalizationWasmApp/wwwroot/index.html‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<!DOCTYPE html>
22
<head>
3-
<base href="/subdir/" />
43
<style>
54
#blazor-error-ui { display: none }
65
</style>

‎src/Servers/Connections.Abstractions/src/IMemoryPoolFactory.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ public interface IMemoryPoolFactory<T>
1313
/// <summary>
1414
/// Creates a new instance of a memory pool.
1515
/// </summary>
16-
/// <param name="options">Options for configuring the memory pool.</param>
1716
/// <returns>A new memory pool instance.</returns>
18-
MemoryPool<T> Create(MemoryPoolOptions? options = null);
17+
MemoryPool<T> Create();
1918
}

‎src/Servers/Connections.Abstractions/src/MemoryPoolOptions.cs‎

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

‎src/Servers/Connections.Abstractions/src/PublicAPI/net10.0/PublicAPI.Unshipped.txt‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
11
#nullable enable
22
Microsoft.AspNetCore.Connections.IMemoryPoolFactory<T>
3-
Microsoft.AspNetCore.Connections.IMemoryPoolFactory<T>.Create(Microsoft.AspNetCore.Connections.MemoryPoolOptions? options = null) -> System.Buffers.MemoryPool<T>!
4-
Microsoft.AspNetCore.Connections.MemoryPoolOptions
5-
Microsoft.AspNetCore.Connections.MemoryPoolOptions.MemoryPoolOptions() -> void
6-
Microsoft.AspNetCore.Connections.MemoryPoolOptions.Owner.get -> string?
7-
Microsoft.AspNetCore.Connections.MemoryPoolOptions.Owner.set -> void
3+
Microsoft.AspNetCore.Connections.IMemoryPoolFactory<T>.Create() -> System.Buffers.MemoryPool<T>!

‎src/Servers/Connections.Abstractions/src/PublicAPI/net462/PublicAPI.Unshipped.txt‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
11
#nullable enable
22
Microsoft.AspNetCore.Connections.IMemoryPoolFactory<T>
3-
Microsoft.AspNetCore.Connections.IMemoryPoolFactory<T>.Create(Microsoft.AspNetCore.Connections.MemoryPoolOptions? options = null) -> System.Buffers.MemoryPool<T>!
4-
Microsoft.AspNetCore.Connections.MemoryPoolOptions
5-
Microsoft.AspNetCore.Connections.MemoryPoolOptions.MemoryPoolOptions() -> void
6-
Microsoft.AspNetCore.Connections.MemoryPoolOptions.Owner.get -> string?
7-
Microsoft.AspNetCore.Connections.MemoryPoolOptions.Owner.set -> void
3+
Microsoft.AspNetCore.Connections.IMemoryPoolFactory<T>.Create() -> System.Buffers.MemoryPool<T>!

‎src/Servers/Connections.Abstractions/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
11
#nullable enable
22
Microsoft.AspNetCore.Connections.IMemoryPoolFactory<T>
3-
Microsoft.AspNetCore.Connections.IMemoryPoolFactory<T>.Create(Microsoft.AspNetCore.Connections.MemoryPoolOptions? options = null) -> System.Buffers.MemoryPool<T>!
4-
Microsoft.AspNetCore.Connections.MemoryPoolOptions
5-
Microsoft.AspNetCore.Connections.MemoryPoolOptions.MemoryPoolOptions() -> void
6-
Microsoft.AspNetCore.Connections.MemoryPoolOptions.Owner.get -> string?
7-
Microsoft.AspNetCore.Connections.MemoryPoolOptions.Owner.set -> void
3+
Microsoft.AspNetCore.Connections.IMemoryPoolFactory<T>.Create() -> System.Buffers.MemoryPool<T>!

‎src/Servers/Connections.Abstractions/src/PublicAPI/netstandard2.1/PublicAPI.Unshipped.txt‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
11
#nullable enable
22
Microsoft.AspNetCore.Connections.IMemoryPoolFactory<T>
3-
Microsoft.AspNetCore.Connections.IMemoryPoolFactory<T>.Create(Microsoft.AspNetCore.Connections.MemoryPoolOptions? options = null) -> System.Buffers.MemoryPool<T>!
4-
Microsoft.AspNetCore.Connections.MemoryPoolOptions
5-
Microsoft.AspNetCore.Connections.MemoryPoolOptions.MemoryPoolOptions() -> void
6-
Microsoft.AspNetCore.Connections.MemoryPoolOptions.Owner.get -> string?
7-
Microsoft.AspNetCore.Connections.MemoryPoolOptions.Owner.set -> void
3+
Microsoft.AspNetCore.Connections.IMemoryPoolFactory<T>.Create() -> System.Buffers.MemoryPool<T>!

0 commit comments

Comments
 (0)