Skip to content

Commit 5678f22

Browse files
dotnet-maestro[bot]mthalmanakoeplingerjkotas
authored
[main] Source code updates from dotnet/dotnet (#62019)
* [VMR] Codeflow e26a16c-e26a16c [[ commit created by automation ]] * Update dependencies from https://github.com/dotnet/dotnet build 268973 No dependency updates to commit * Align M.CA package versions * Update dependencies from https://github.com/dotnet/dotnet build 269082 Updated Dependencies: dotnet-ef, Microsoft.EntityFrameworkCore.InMemory, Microsoft.EntityFrameworkCore.Relational, Microsoft.EntityFrameworkCore.Sqlite, Microsoft.EntityFrameworkCore.SqlServer, Microsoft.EntityFrameworkCore.Tools, Microsoft.EntityFrameworkCore, Microsoft.EntityFrameworkCore.Design (Version 10.0.0-preview.4.25269.109 -> 10.0.0-preview.4.25265.101) Microsoft.Extensions.Caching.Abstractions, Microsoft.Extensions.Caching.Memory, Microsoft.Extensions.Configuration.Abstractions, Microsoft.Extensions.Configuration.Binder, Microsoft.Extensions.Configuration.CommandLine, Microsoft.Extensions.Configuration.EnvironmentVariables, Microsoft.Extensions.Configuration.FileExtensions, Microsoft.Extensions.Configuration.Ini, Microsoft.Extensions.Configuration.Json, Microsoft.Extensions.Configuration.UserSecrets, Microsoft.Extensions.Configuration.Xml, Microsoft.Extensions.Configuration, Microsoft.Extensions.DependencyInjection.Abstractions, Microsoft.Extensions.DependencyInjection, Microsoft.Extensions.Diagnostics, Microsoft.Extensions.Diagnostics.Abstractions, Microsoft.Extensions.FileProviders.Abstractions, Microsoft.Extensions.FileProviders.Composite, Microsoft.Extensions.FileProviders.Physical, Microsoft.Extensions.FileSystemGlobbing, Microsoft.Extensions.HostFactoryResolver.Sources, Microsoft.Extensions.Hosting.Abstractions, Microsoft.Extensions.Hosting, Microsoft.Extensions.Http, Microsoft.Extensions.Logging.Abstractions, Microsoft.Extensions.Logging.Configuration, Microsoft.Extensions.Logging.Console, Microsoft.Extensions.Logging.Debug, Microsoft.Extensions.Logging.EventSource, Microsoft.Extensions.Logging.EventLog, Microsoft.Extensions.Logging.TraceSource, Microsoft.Extensions.Logging, Microsoft.Extensions.Options.ConfigurationExtensions, Microsoft.Extensions.Options.DataAnnotations, Microsoft.Extensions.Options, Microsoft.Extensions.Primitives, Microsoft.Internal.Runtime.AspNetCore.Transport, System.Configuration.ConfigurationManager, System.Diagnostics.DiagnosticSource, System.Diagnostics.EventLog, System.DirectoryServices.Protocols, System.Formats.Asn1, System.IO.Pipelines, System.Net.Http.Json, System.Net.Http.WinHttpHandler, System.Net.ServerSentEvents, System.Reflection.Metadata, System.Resources.Extensions, System.Security.Cryptography.Pkcs, System.Security.Cryptography.Xml, System.Security.Permissions, System.ServiceProcess.ServiceController, System.Text.Encodings.Web, System.Text.Json, System.Threading.AccessControl, System.Threading.Channels, System.Threading.RateLimiting, Microsoft.Extensions.DependencyModel, Microsoft.NETCore.App.Ref, Microsoft.NET.Runtime.MonoAOTCompiler.Task, Microsoft.NET.Runtime.WebAssembly.Sdk, Microsoft.Bcl.AsyncInterfaces, Microsoft.Bcl.TimeProvider, System.Collections.Immutable, System.Diagnostics.PerformanceCounter, System.IO.Hashing, System.Memory.Data, System.Numerics.Tensors, System.Runtime.Caching, Microsoft.NETCore.App.Runtime.win-x64, Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm, Microsoft.NETCore.BrowserDebugHost.Transport, System.Composition, Microsoft.NETCore.Platforms (Version 10.0.0-preview.5.25269.109 -> 10.0.0-preview.5.25265.101) Microsoft.Web.Xdt (Version 10.0.0-preview.25269.109 -> 10.0.0-preview.25265.101) Microsoft.DotNet.HotReload.Agent, Microsoft.DotNet.HotReload.Agent.Data (Version 10.0.100-preview.5.25269.109 -> 10.0.100-preview.5.25265.101) Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Archives, Microsoft.DotNet.Build.Tasks.Installers, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.Helix.Sdk, Microsoft.DotNet.RemoteExecutor, Microsoft.DotNet.SharedFramework.Sdk (Version 10.0.0-beta.25269.109 -> 10.0.0-beta.25265.101) * Add System.Threading.AccessControl to expected assemblies It was added in dotnet/runtime#110416 * Adjust expected exit code in ShutdownTests.cs This is a behavior change introduced by dotnet/runtime#115494 * Fix method name, kill by default sends TERM not INT * Revert "Adjust expected exit code in ShutdownTests.cs" This reverts commit 3c695d2. * React to dotnet/runtime#115494 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Matt Thalman <[email protected]> Co-authored-by: Alexander Köplinger <[email protected]> Co-authored-by: Jan Kotas <[email protected]>
1 parent 671d5d9 commit 5678f22

23 files changed

+925
-329
lines changed

‎eng/Build.props‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,14 @@
5656
$(RepoRoot)src\SignalR\perf\benchmarkapps\**\*.csproj;
5757
" />
5858

59-
<!-- In the VMR, we don't build the native ANCM bits in pass 1 -->
59+
<!-- In the .NET product build mode, don't build the native ANCM bits in pass 1 -->
6060
<ProjectToExclude Include="
6161
$(RepoRoot)src\Installers\**\*.vcxproj;
6262
"
6363
Condition=" '$(BuildNative)' == 'true' and '$(DotNetBuild)' == 'true' and ('$(DotNetBuildPass)' == '' or '$(DotNetBuildPass)' == '1') " />
6464

6565

66-
<!-- This project requires inputs from x64, x86, and arm64 on Windows - therefore in the VMR, we build it in pass 2 -->
66+
<!-- This project requires inputs from x64, x86, and arm64 on Windows - therefore in the .NET product build mode, build it in pass 2 -->
6767
<ProjectToExclude Include="
6868
$(RepoRoot)src\Servers\IIS/IntegrationTesting.IIS\src\Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj;
6969
"
@@ -83,7 +83,7 @@
8383
</ProjectToBuild>
8484
</ItemGroup>
8585
</When>
86-
<!-- Projects to build in VMR build pass 2 -->
86+
<!-- Projects to build in .NET product build pass 2 -->
8787
<When Condition="'$(DotNetBuildPass)' == '2'">
8888
<ItemGroup Condition=" '$(DotNetBuild)' == 'true' AND '$(TargetOsName)' == 'win' AND '$(TargetArchitecture)' == 'x64' ">
8989
<!-- Build Hosting Bundle -->
@@ -264,7 +264,7 @@
264264
<_VcxTargetPlatform Condition="'$(TargetArchitecture)' == 'arm64'">ARM64</_VcxTargetPlatform>
265265
</PropertyGroup>
266266

267-
<!-- In the VMR, we build the installers entirely via HostingBundle ProjectReferences in pass 2 -->
267+
<!-- In .NET product build mode, build the installers entirely via HostingBundle ProjectReferences in pass 2 -->
268268
<ItemGroup Condition="'$(DotNetBuild)' != 'true' and '$(_BuildWindowsInstallers)' == 'true' ">
269269
<!-- Build the ANCM custom action -->
270270
<InstallerProject Include="$(RepoRoot)src\Installers\Windows\AspNetCoreModule-Setup\CustomAction\aspnetcoreCA.vcxproj" AdditionalProperties="Platform=x64" />

‎eng/Common.props‎

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

1212
<TargetRuntimeIdentifier Condition="'$(TargetRuntimeIdentifier)' == ''">$(TargetOsName)-$(TargetArchitecture)</TargetRuntimeIdentifier>
1313
<PortableBuild Condition="'$(PortableBuild)' == ''">true</PortableBuild>
14-
<DefaultAppHostRuntimeIdentifier Condition=" '$(DotNetBuild)' == 'true' ">$(TargetRuntimeIdentifier)</DefaultAppHostRuntimeIdentifier>
14+
<DefaultAppHostRuntimeIdentifier Condition="'$(DotNetBuild)' == 'true'">$(TargetRuntimeIdentifier)</DefaultAppHostRuntimeIdentifier>
1515

1616
<BuildNodeJS>$(BuildNodeJSUnlessSourcebuild)</BuildNodeJS>
1717
<BuildNodeJS Condition="'$(DotNetBuildSourceOnly)' == 'true'">false</BuildNodeJS>

‎eng/Dependencies.props‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -258,4 +258,23 @@ and are generated based on the last package release.
258258
Condition=" $([System.String]::new('%(Identity)').StartsWith('Microsoft.NETCore.App.Runtime.')) or $([System.String]::new('%(Identity)').StartsWith('Microsoft.NETCore.App.Crossgen2.'))">$(MicrosoftNETCoreAppRefVersion)</Version>
259259
</LatestPackageReference>
260260
</ItemGroup>
261+
262+
<!-- Replicates the same overriding of versions that occurs on Roslyn package versions for source only builds -->
263+
<ItemGroup Label="Source only build overrides" Condition="'$(DotNetBuildSourceOnly)' == 'true'">
264+
<LatestPackageReference Update="Microsoft.CodeAnalysis.Common">
265+
<Version>$(MicrosoftCodeAnalysisVersion_LatestVS)</Version>
266+
</LatestPackageReference>
267+
<LatestPackageReference Update="Microsoft.CodeAnalysis.CSharp">
268+
<Version>$(MicrosoftCodeAnalysisVersion_LatestVS)</Version>
269+
</LatestPackageReference>
270+
<LatestPackageReference Update="Microsoft.CodeAnalysis.CSharp.Workspaces">
271+
<Version>$(MicrosoftCodeAnalysisVersion_LatestVS)</Version>
272+
</LatestPackageReference>
273+
<LatestPackageReference Update="Microsoft.CodeAnalysis.ExternalAccess.AspNetCore">
274+
<Version>$(MicrosoftCodeAnalysisVersion_LatestVS)</Version>
275+
</LatestPackageReference>
276+
<LatestPackageReference Update="Microsoft.CodeAnalysis.Razor">
277+
<Version>$(MicrosoftCodeAnalysisVersion_LatestVS)</Version>
278+
</LatestPackageReference>
279+
</ItemGroup>
261280
</Project>

‎eng/Publishing.props‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
<Project>
2+
23
<PropertyGroup>
34
<ProducesDotNetReleaseShippingAssets>true</ProducesDotNetReleaseShippingAssets>
45

5-
<!-- Do not push .nupkg files from Linux and macOS builds. They'll be packed up separately and signed on Windows.
6-
Do not remove if post build sign is true, as we avoid the xplat codesign jobs, and need to have
7-
the nupkgs pushed. Do not do this if building from source, since we want the source build intermediate package
8-
to be published. Use DotNetBuildRepo is only set in the internal source build,
9-
and Build.proj is invoked from the wrapper build. -->
6+
<!-- Don't sign and publish rid agnostic nuget packages from other builds than windows when not building
7+
inside the VMR. Do not remove if post build sign is true, as we avoid the xplat codesign jobs, and need to have
8+
the nupkgs pushed. -->
109
<EnableDefaultArtifacts Condition="'$(OS)' != 'Windows_NT' and
1110
'$(PostBuildSign)' != 'true' and
12-
'$(DotNetBuildRepo)' != 'true'">false</EnableDefaultArtifacts>
11+
'$(DotNetBuild)' != 'true'">false</EnableDefaultArtifacts>
1312

1413
<!-- This avoids creating VS.*.symbols.nupkg packages that are identical to the original package. -->
1514
<AutoGenerateSymbolPackages>false</AutoGenerateSymbolPackages>

‎eng/SharedFramework.External.props‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
<ExternalAspNetCoreAppReference Include="Microsoft.Extensions.Options" Version="$(MicrosoftExtensionsOptionsVersion)" />
4444
<ExternalAspNetCoreAppReference Include="Microsoft.Extensions.Primitives" Version="$(MicrosoftExtensionsPrimitivesVersion)" />
4545
<ExternalAspNetCoreAppReference Include="System.Security.Cryptography.Xml" Version="$(SystemSecurityCryptographyXmlVersion)" />
46+
<ExternalAspNetCoreAppReference Include="System.Threading.AccessControl" Version="$(SystemThreadingAccessControlVersion)" />
4647
<ExternalAspNetCoreAppReference Include="System.Threading.RateLimiting" Version="$(SystemThreadingRateLimitingVersion)" />
4748

4849
<!--

0 commit comments

Comments
 (0)