Skip to content

Merging internal commits for release/9.0.1xx #49322

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
wants to merge 18 commits into
base: release/9.0.1xx
Choose a base branch
from
Open

Merging internal commits for release/9.0.1xx #49322

wants to merge 18 commits into from

Conversation

vseanreesermsft
Copy link
Contributor

No description provided.

Mirroring and others added 14 commits May 8, 2025 02:17
Merge commit '0b051d433b1273a98e7252c1f806a50cacc84502'
8c2334d
Merge commit '66e2bc83e53ac35e59059582c6b510c5767e7f87'
ef2bf3e
@dotnet-bot
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
0416520 
…otnet-runtime build 20250516.5

Microsoft.Bcl.AsyncInterfaces , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Console , Microsoft.NET.HostModel , Microsoft.NET.ILLink.Tasks , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.Platforms , Microsoft.Win32.SystemEvents , System.CodeDom , System.Composition.AttributedModel , System.Composition.Convention , System.Composition.Hosting , System.Composition.Runtime , System.Composition.TypedParts , System.Configuration.ConfigurationManager , System.Formats.Asn1 , System.Reflection.MetadataLoadContext , System.Resources.Extensions , System.Security.Cryptography.Pkcs , System.Security.Cryptography.ProtectedData , System.Security.Cryptography.Xml , System.Security.Permissions , System.ServiceProcess.ServiceController , System.Text.Encoding.CodePages , System.Text.Json , System.Windows.Extensions , VS.Redist.Common.NetCore.SharedFramework.x64.9.0 , VS.Redist.Common.NetCore.TargetingPack.x64.9.0 , Microsoft.SourceBuild.Intermediate.runtime.linux-x64
 From Version 9.0.5 -> To Version 9.0.6

Dependency coherency updates

Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport,Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100,Microsoft.SourceBuild.Intermediate.emsdk
 From Version 9.0.5-servicing.25212.1 -> To Version 9.0.6-servicing.25258.2 (parent: Microsoft.NETCore.App.Runtime.win-x64
Merge commit '546d11abc748c10683200fe0f8fc0b1beb3051c6'
7bec915
@vseanreesermsft
Merged PR 50118: [internal/release/9.0.1xx] Update dependencies from …
2b576c2 
…dnceng/internal/dotnet-runtime

This pull request updates the following dependencies

[marker]: <> (Begin:Coherency Updates)
## Coherency Updates

The following updates ensure that dependencies with a *CoherentParentDependency*
attribute were produced in a build used as input to the parent dependency's build.
See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview)

[DependencyUpdate]: <> (Begin)

- **Coherency Updates**:
  - **Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport**: from 9.0.5-servicing.25212.1 to 9.0.6-servicing.25258.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
  - **Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100**: from 9.0.5 to 9.0.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
  - **Microsoft.SourceBuild.Intermediate.emsdk**: from 9.0.5-servicing.25212.1 to 9.0.6-servicing.25258.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)

[DependencyUpdate]: <> (End)

[marker]: <> (End:Coherency Updates)

[marker]: <> (Begin:57bb26e6-6f64-40cf-a4ea-5b973f41bc22)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- **Subscription**: [57bb26e6-6f64-40cf-a4ea-5b973f41bc22](https://maestro.dot.net/subscriptions?search=57bb26e6-6f64-40cf-a4ea-5b973f41bc22)
- **Build**: [20250516.5](https://dev.azure.com/dnceng/internal/_build/results?buildId=2710543)
- **Date Produced**: May 16, 2025 2:10:15 PM UTC
- **Commit**: [ee65eb43cd4028e5ec18877f3d9c997faf4671f0](https://dev.azure.com/dnceng/internal/_git/dotnet-runtime?_a=history&version=GCee65eb43cd4028e5ec18877f3d9c997faf4671f0)
- **Branch**: refs/heads/internal/release/9.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.Bcl.AsyncInterfaces**: [from 9.0.5 to 9.0.6][1]
  - **Microsoft.Extensions.DependencyModel**: [from 9.0.5 to 9.0.6][1]
  - **Microsoft.Extensions.FileProviders.Abstractions**: [from 9.0.5 to 9.0.6][1]
  - **Microsoft.Extensions.FileSystemGlobbing**: [from 9.0.5 to 9.0.6][1]
  - **Microsoft.Extensions.Logging**: [from 9.0.5 to 9.0.6][1]
  - **Microsoft.Extensions.Logging.Abstractions**: [from 9.0.5 to 9.0.6][1]
  - **Microsoft.Extensions.Logging.Console**: [from 9.0.5 to 9.0.6][1]
  - **Microsoft.NET.HostModel**: [from 9.0.5-servicing.25215.9 to 9.0.6-servicing.25266.5][1]
  - **Microsoft.NET.ILLink.Tasks**: [from 9.0.5 to 9.0.6][1]
  - **Microsoft.NETCore.App.Host.win-x64**: [from 9.0.5 to 9.0.6][1]
  - **Microsoft.NETCore.App.Ref**: [from 9.0.5 to 9.0.6][1]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 9.0.5 to 9.0.6][1]
  - **Microsoft.NETCore.Platforms**: [from 9.0.5-servicing.25215.9 to 9.0.6-servicing.25266.5][1]
  - **Microsoft.Win32.SystemEvents**: [from 9.0.5 to 9.0.6][1]
  - **System.CodeDom**: [from 9.0.5 to 9.0.6][1]
  - **System.Composition.AttributedModel**: [from 9.0.5 to 9.0.6][1]
  - **System.Composition.Convention**: [from 9.0.5 to 9.0.6][1]
  - **System.Composition.Hosting**: [from 9.0.5 to 9.0.6][1]
  - **System.Compos...
Merge commit 'eb26993269d62efab361c7436799b91ea2dac4a0'
bc93c8d
@dotnet-bot
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
3054dba 
…otnet-runtime build 20250516.13

Microsoft.Bcl.AsyncInterfaces , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Console , Microsoft.NET.HostModel , Microsoft.NET.ILLink.Tasks , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.Platforms , Microsoft.Win32.SystemEvents , System.CodeDom , System.Composition.AttributedModel , System.Composition.Convention , System.Composition.Hosting , System.Composition.Runtime , System.Composition.TypedParts , System.Configuration.ConfigurationManager , System.Formats.Asn1 , System.Reflection.MetadataLoadContext , System.Resources.Extensions , System.Security.Cryptography.Pkcs , System.Security.Cryptography.ProtectedData , System.Security.Cryptography.Xml , System.Security.Permissions , System.ServiceProcess.ServiceController , System.Text.Encoding.CodePages , System.Text.Json , System.Windows.Extensions , VS.Redist.Common.NetCore.SharedFramework.x64.9.0 , VS.Redist.Common.NetCore.TargetingPack.x64.9.0 , Microsoft.SourceBuild.Intermediate.runtime.linux-x64
 From Version 9.0.6 -> To Version 9.0.6
@vseanreesermsft
Merged PR 50156: [internal/release/9.0.1xx] Update dependencies from …
6fc4549 
…dnceng/internal/dotnet-runtime

This pull request updates the following dependencies

[marker]: <> (Begin:57bb26e6-6f64-40cf-a4ea-5b973f41bc22)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- **Subscription**: [57bb26e6-6f64-40cf-a4ea-5b973f41bc22](https://maestro.dot.net/subscriptions?search=57bb26e6-6f64-40cf-a4ea-5b973f41bc22)
- **Build**: [20250516.13](https://dev.azure.com/dnceng/internal/_build/results?buildId=2710918)
- **Date Produced**: May 16, 2025 10:54:51 PM UTC
- **Commit**: [3875b54e7b10b10606b105340199946d0b877754](https://dev.azure.com/dnceng/internal/_git/dotnet-runtime?_a=history&version=GC3875b54e7b10b10606b105340199946d0b877754)
- **Branch**: refs/heads/internal/release/9.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.Bcl.AsyncInterfaces**: [from 9.0.6 to 9.0.6][1]
  - **Microsoft.Extensions.DependencyModel**: [from 9.0.6 to 9.0.6][1]
  - **Microsoft.Extensions.FileProviders.Abstractions**: [from 9.0.6 to 9.0.6][1]
  - **Microsoft.Extensions.FileSystemGlobbing**: [from 9.0.6 to 9.0.6][1]
  - **Microsoft.Extensions.Logging**: [from 9.0.6 to 9.0.6][1]
  - **Microsoft.Extensions.Logging.Abstractions**: [from 9.0.6 to 9.0.6][1]
  - **Microsoft.Extensions.Logging.Console**: [from 9.0.6 to 9.0.6][1]
  - **Microsoft.NET.HostModel**: [from 9.0.6-servicing.25266.5 to 9.0.6-servicing.25266.13][1]
  - **Microsoft.NET.ILLink.Tasks**: [from 9.0.6 to 9.0.6][1]
  - **Microsoft.NETCore.App.Host.win-x64**: [from 9.0.6 to 9.0.6][1]
  - **Microsoft.NETCore.App.Ref**: [from 9.0.6 to 9.0.6][1]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 9.0.6 to 9.0.6][1]
  - **Microsoft.NETCore.Platforms**: [from 9.0.6-servicing.25266.5 to 9.0.6-servicing.25266.13][1]
  - **Microsoft.Win32.SystemEvents**: [from 9.0.6 to 9.0.6][1]
  - **System.CodeDom**: [from 9.0.6 to 9.0.6][1]
  - **System.Composition.AttributedModel**: [from 9.0.6 to 9.0.6][1]
  - **System.Composition.Convention**: [from 9.0.6 to 9.0.6][1]
  - **System.Composition.Hosting**: [from 9.0.6 to 9.0.6][1]
  - **System.Composition.Runtime**: [from 9.0.6 to 9.0.6][1]
  - **System.Composition.TypedParts**: [from 9.0.6 to 9.0.6][1]
  - **System.Configuration.ConfigurationManager**: [from 9.0.6 to 9.0.6][1]
  - **System.Formats.Asn1**: [from 9.0.6 to 9.0.6][1]
  - **System.Reflection.MetadataLoadContext**: [from 9.0.6 to 9.0.6][1]
  - **System.Resources.Extensions**: [from 9.0.6 to 9.0.6][1]
  - **System.Security.Cryptography.Pkcs**: [from 9.0.6 to 9.0.6][1]
  - **System.Security.Cryptography.ProtectedData**: [from 9.0.6 to 9.0.6][1]
  - **System.Security.Cryptography.Xml**: [from 9.0.6 to 9.0.6][1]
  - **System.Security.Permissions**: [from 9.0.6 to 9.0.6][1]
  - **System.ServiceProcess.ServiceController**: [from 9.0.6 to 9.0.6][1]
  - **System.Text.Encoding.CodePages**: [from 9.0.6 to 9.0.6][1]
  - **System.Text.Json**: [from 9.0.6 to 9.0.6][1]
  - **System.Windows.Extensions**: [from 9.0.6 to 9.0.6][1]
  - **VS.Redist.Common.NetCore.SharedFramework.x64.9.0**: [from 9.0.6-servicing.25266...
@dotnet-bot
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
bf75c88 
…otnet-aspnetcore build 20250517.1

dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.Extensions.ObjectPool , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0 , Microsoft.SourceBuild.Intermediate.aspnetcore
 From Version 9.0.5-servicing.25229.4 -> To Version 9.0.6-servicing.25267.1
@dotnet-bot
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
71f9745 
…otnet-windowsdesktop build 20250517.2

Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0
 From Version 9.0.5 -> To Version 9.0.6

Dependency coherency updates

Microsoft.NET.Sdk.WindowsDesktop,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.DotNet.Wpf.ProjectTemplates
 From Version 9.0.5-rtm.25216.2 -> To Version 9.0.6-rtm.25267.1 (parent: Microsoft.WindowsDesktop.App.Ref
@vseanreesermsft
Merged PR 50175: [internal/release/9.0.1xx] Update dependencies from …
b78419f 
…dnceng/internal/dotnet-aspnetcore

This pull request updates the following dependencies

[marker]: <> (Begin:7c429c14-b12b-40f6-ae9e-395f98f369df)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- **Subscription**: [7c429c14-b12b-40f6-ae9e-395f98f369df](https://maestro.dot.net/subscriptions?search=7c429c14-b12b-40f6-ae9e-395f98f369df)
- **Build**: [20250517.1](https://dev.azure.com/dnceng/internal/_build/results?buildId=2711661)
- **Date Produced**: May 17, 2025 10:48:13 PM UTC
- **Commit**: [379bfc7b2559e7cc9f42f997a497b2f2dd8e12d2](https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore?_a=history&version=GC379bfc7b2559e7cc9f42f997a497b2f2dd8e12d2)
- **Branch**: refs/heads/internal/release/9.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **dotnet-dev-certs**: [from 9.0.5-servicing.25229.4 to 9.0.6-servicing.25267.1][1]
  - **dotnet-user-jwts**: [from 9.0.5-servicing.25229.4 to 9.0.6-servicing.25267.1][1]
  - **dotnet-user-secrets**: [from 9.0.5-servicing.25229.4 to 9.0.6-servicing.25267.1][1]
  - **Microsoft.AspNetCore.Analyzers**: [from 9.0.5-servicing.25229.4 to 9.0.6-servicing.25267.1][1]
  - **Microsoft.AspNetCore.App.Ref**: [from 9.0.5 to 9.0.6][1]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 9.0.5-servicing.25229.4 to 9.0.6-servicing.25267.1][1]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 9.0.5 to 9.0.6][1]
  - **Microsoft.AspNetCore.Authorization**: [from 9.0.5 to 9.0.6][1]
  - **Microsoft.AspNetCore.Components.SdkAnalyzers**: [from 9.0.5-servicing.25229.4 to 9.0.6-servicing.25267.1][1]
  - **Microsoft.AspNetCore.Components.Web**: [from 9.0.5 to 9.0.6][1]
  - **Microsoft.AspNetCore.DeveloperCertificates.XPlat**: [from 9.0.5-servicing.25229.4 to 9.0.6-servicing.25267.1][1]
  - **Microsoft.AspNetCore.Mvc.Analyzers**: [from 9.0.5-servicing.25229.4 to 9.0.6-servicing.25267.1][1]
  - **Microsoft.AspNetCore.Mvc.Api.Analyzers**: [from 9.0.5-servicing.25229.4 to 9.0.6-servicing.25267.1][1]
  - **Microsoft.AspNetCore.TestHost**: [from 9.0.5 to 9.0.6][1]
  - **Microsoft.Extensions.FileProviders.Embedded**: [from 9.0.5 to 9.0.6][1]
  - **Microsoft.Extensions.ObjectPool**: [from 9.0.5 to 9.0.6][1]
  - **Microsoft.JSInterop**: [from 9.0.5 to 9.0.6][1]
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0**: [from 9.0.5-servicing.25229.4 to 9.0.6-servicing.25267.1][1]
  - **Microsoft.SourceBuild.Intermediate.aspnetcore**: [from 9.0.5-servicing.25229.4 to 9.0.6-servicing.25267.1][1]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GCed74665e773dd1ebea3289c5662d71c590305932&targetVersion=GC379bfc7b2559e7cc9f42f997a497b2f2dd8e12d2&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:7c429c14-b12b-40f6-ae9e-395f98f369df)
@vseanreesermsft
Merged PR 50178: [internal/release/9.0.1xx] Update dependencies from …
ef50dc9 
…dnceng/internal/dotnet-windowsdesktop

This pull request updates the following dependencies

[marker]: <> (Begin:Coherency Updates)
## Coherency Updates

The following updates ensure that dependencies with a *CoherentParentDependency*
attribute were produced in a build used as input to the parent dependency's build.
See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview)

[DependencyUpdate]: <> (Begin)

- **Coherency Updates**:
  - **Microsoft.NET.Sdk.WindowsDesktop**: from 9.0.5-rtm.25216.2 to 9.0.6-rtm.25267.1 (parent: Microsoft.WindowsDesktop.App.Ref)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 9.0.5-servicing.25216.1 to 9.0.6-servicing.25266.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 9.0.5-rtm.25216.2 to 9.0.6-rtm.25267.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

[DependencyUpdate]: <> (End)

[marker]: <> (End:Coherency Updates)

[marker]: <> (Begin:87db4525-6885-42da-8dd0-7ce296d7fd1a)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- **Subscription**: [87db4525-6885-42da-8dd0-7ce296d7fd1a](https://maestro.dot.net/subscriptions?search=87db4525-6885-42da-8dd0-7ce296d7fd1a)
- **Build**: [20250517.2](https://dev.azure.com/dnceng/internal/_build/results?buildId=2711771)
- **Date Produced**: May 18, 2025 2:21:02 AM UTC
- **Commit**: [c7cc0b3d8bd0ee206eb06ba1ad7e201218fc3d32](https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop?_a=history&version=GCc7cc0b3d8bd0ee206eb06ba1ad7e201218fc3d32)
- **Branch**: refs/heads/internal/release/9.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.WindowsDesktop.App.Ref**: [from 9.0.5 to 9.0.6][1]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 9.0.5 to 9.0.6][1]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0**: [from 9.0.5-servicing.25216.2 to 9.0.6-servicing.25267.2][1]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0**: [from 9.0.5-servicing.25216.2 to 9.0.6-servicing.25267.2][1]
  - **Microsoft.NET.Sdk.WindowsDesktop**: [from 9.0.5-rtm.25216.2 to 9.0.6-rtm.25267.1][2]
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 9.0.5-servicing.25216.1 to 9.0.6-servicing.25266.5][3]
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 9.0.5-rtm.25216.2 to 9.0.6-rtm.25267.1][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GCb141ff423da53a66cda0be31dad3059317be52f6&targetVersion=GCc7cc0b3d8bd0ee206eb06ba1ad7e201218fc3d32&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GC6df813d45ebffd2739980b7f372767ac5fd68e2a&targetVersion=GC620a20376852ae35038cd4251552ea8425f6cfe6&_a=files
[3]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC711ee9fe3398d64b89f2ae70b94c66d9d495cf72&targetVersion=GCf0fc61ead7dc20cbce05eb81a42089e28c90c409&_a=files

[DependencyUpdate]:...
@vseanreesermsft
Merge commit 'ef50dc9d27e0c36134ca05979b16e9f942b6b7b4' into internal…
26a30e5 
…-merge-9.0.1xx-2025-06-10-1319
@MiYanni
Merge branch 'release/9.0.1xx' into internal-merge-9.0.1xx-2025-06-10…
6e17b20 
…-1319
@MiYanni
Copy link
Member

MiYanni commented Jun 11, 2025

@vseanreesermsft PR has a merge conflict.

@build-analysis build-analysis bot mentioned this pull request Jun 11, 2025
Open
@v-wuzhai
Copy link
Member

@dotnet/source-build Could you take a look at the SB failures here?

@ellahathaway
Copy link
Member

@dotnet/source-build Could you take a look at the SB failures here?

Error is

warning: in the working copy of 'src/runtime/src/libraries/System.Runtime.Loader/tests/ApplyUpdate/System.Reflection.Metadata.ApplyUpdate.Test.IncreaseMetadataRowSize/IncreaseMetadataRowSize.cs', CRLF will be replaced by LF the next time Git touches it
      warning: in the working copy of 'src/runtime/src/libraries/System.Runtime.Loader/tests/ApplyUpdate/System.Reflection.Metadata.ApplyUpdate.Test.IncreaseMetadataRowSize/IncreaseMetadataRowSize_v1.cs', CRLF will be replaced by LF the next time Git touches it
      warning: in the working copy of 'src/runtime/src/libraries/System.Runtime.Loader/tests/ApplyUpdate/System.Reflection.Metadata.ApplyUpdate.Test.IncreaseMetadataRowSize/System.Reflection.Metadata.ApplyUpdate.Test.IncreaseMetadataRowSize.csproj', CRLF will be replaced by LF the next time Git touches it
      error: Your local changes to the following files would be overwritten by merge:
      	src/runtime/src/libraries/System.Runtime.Loader/tests/ApplyUpdate/System.Reflection.Metadata.ApplyUpdate.Test.IncreaseMetadataRowSize/IncreaseMetadataRowSize.cs
      	src/runtime/src/libraries/System.Runtime.Loader/tests/ApplyUpdate/System.Reflection.Metadata.ApplyUpdate.Test.IncreaseMetadataRowSize/IncreaseMetadataRowSize_v1.cs
      	src/runtime/src/libraries/System.Runtime.Loader/tests/ApplyUpdate/System.Reflection.Metadata.ApplyUpdate.Test.IncreaseMetadataRowSize/System.Reflection.Metadata.ApplyUpdate.Test.IncreaseMetadataRowSize.csproj
      Please commit your changes or stash them before you merge.
      Aborting
      Merge with strategy ort failed.

This is a resurfacing of dotnet/source-build#5207, which we saw in the internal VMR sync a few weeks ago.

@dotnet/prodconsvcs - Can you provide guidance? TIA

@build-analysis build-analysis bot mentioned this pull request Jun 11, 2025
Open
3 tasks
@marcpopMSFT
Copy link
Member

@dotnet/product-construction source build leg failure on syncing the repo. It's complaining about src/runtime changes getting overwritten.

@mmitche
Copy link
Member

mmitche commented Jun 13, 2025

.Could very well be that there is a line ending issue

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@vseanreesermsft @MiYanni @v-wuzhai @ellahathaway @marcpopMSFT @mmitche @dotnet-bot