Skip to content

[automated] Merge branch 'release/10.0.3xx' => 'main' #53580

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

Merged
marcpopMSFT merged 11 commits into from
Apr 6, 2026
Merged

[automated] Merge branch 'release/10.0.3xx' => 'main' #53580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
26c175b
Localized file check-in by OneLocBuild Task: Build definition ID 140:…
dotnet-bot Mar 20, 2026
c0c9e96
Localized file check-in by OneLocBuild Task: Build definition ID 140:…
dotnet-bot Mar 21, 2026
e16303a
Localized file check-in by OneLocBuild Task: Build definition ID 140:…
dotnet-bot Mar 24, 2026
2de3165
[release/10.0.3xx] Source code updates from dotnet/dotnet (#53510)
dotnet-maestro[bot] Mar 24, 2026
25262e4
Localized file check-in by OneLocBuild Task: Build definition ID 140:…
marcpopMSFT Mar 24, 2026
21a7c88
Reset files to main
github-actions[bot] Mar 24, 2026
bceb79c
Merge branch 'main' of https://github.com/dotnet/sdk into merge/relea…
DonnaChen888 Mar 25, 2026
3cfd812
Fix MSB3030 error: skip .tlb copy when file not present in package
nagilson Mar 26, 2026
490ca49
Merge branch 'main' into merge/release/10.0.3xx-to-main
nagilson Mar 26, 2026
637d595
Merge branch 'main' into merge/release/10.0.3xx-to-main
SimonZhao888 Apr 3, 2026
dd43bcf
Merge branch 'main' into merge/release/10.0.3xx-to-main
marcpopMSFT Apr 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...tibility/ApiCompat/Microsoft.DotNet.ApiCompat.Task/Microsoft.DotNet.ApiCompat.Task.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Build.Framework" ExcludeAssets="Runtime" />
<PackageReference Include="Microsoft.Build.Utilities.Core" ExcludeAssets="Runtime" />
<PackageReference Include="Microsoft.Build.Framework" ExcludeAssets="runtime;buildTransitive" />
<PackageReference Include="Microsoft.Build.Utilities.Core" ExcludeAssets="runtime;buildTransitive" />
<!-- We carry NuGet as part of the package in case the package is used with an older SDKs or with full framework MSBuild. -->
<PackageReference Include="NuGet.Packaging" PrivateAssets="All" Publish="true" />
<!-- The ApiCompatibility/PackageValidation stuff depends on CodeAnalysis.CSharp at the version that is
Expand Down
4 changes: 2 additions & 2 deletions src/Compatibility/GenAPI/Microsoft.DotNet.GenAPI.Task/Microsoft.DotNet.GenAPI.Task.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Build.Framework" ExcludeAssets="Runtime" />
<PackageReference Include="Microsoft.Build.Utilities.Core" ExcludeAssets="Runtime" />
<PackageReference Include="Microsoft.Build.Framework" ExcludeAssets="runtime;buildTransitive" />
<PackageReference Include="Microsoft.Build.Utilities.Core" ExcludeAssets="runtime;buildTransitive" />
<ProjectReference Include="..\Microsoft.DotNet.GenAPI\Microsoft.DotNet.GenAPI.csproj" />
</ItemGroup>

Expand Down
6 changes: 3 additions & 3 deletions src/Dotnet.Watch/dotnet-watch/xlf/Resources.cs.xlf
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions src/Dotnet.Watch/dotnet-watch/xlf/Resources.de.xlf
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions src/Dotnet.Watch/dotnet-watch/xlf/Resources.es.xlf
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions src/Dotnet.Watch/dotnet-watch/xlf/Resources.fr.xlf
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions src/Dotnet.Watch/dotnet-watch/xlf/Resources.it.xlf
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions src/Dotnet.Watch/dotnet-watch/xlf/Resources.ja.xlf
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions src/Dotnet.Watch/dotnet-watch/xlf/Resources.ko.xlf
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions src/Dotnet.Watch/dotnet-watch/xlf/Resources.pl.xlf
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions src/Dotnet.Watch/dotnet-watch/xlf/Resources.pt-BR.xlf
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions src/Dotnet.Watch/dotnet-watch/xlf/Resources.ru.xlf
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions src/Dotnet.Watch/dotnet-watch/xlf/Resources.tr.xlf
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions src/Dotnet.Watch/dotnet-watch/xlf/Resources.zh-Hans.xlf
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions src/Dotnet.Watch/dotnet-watch/xlf/Resources.zh-Hant.xlf
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/Layout/redist/targets/GenerateLayout.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
<Copy SourceFiles="$(_FrameworkTlbPath)"
DestinationFolder="%(_MSBuildAppHost.RootDir)%(_MSBuildAppHost.Directory)"
SkipUnchangedFiles="true"
Condition="$(SharedFrameworkRid.StartsWith('win'))" />
Condition="$(SharedFrameworkRid.StartsWith('win')) AND Exists('$(_FrameworkTlbPath)')" />

<Exec Command="codesign --sign - --force --entitlements '$(MSBuildProjectDirectory)/msbuild-entitlements.plist' %(_MSBuildAppHost.RootDir)%(_MSBuildAppHost.Directory)%(_MSBuildAppHost.Filename)$(ExeExtension)"
Condition="$(SharedFrameworkRid.StartsWith('osx'))" />
Expand Down
4 changes: 2 additions & 2 deletions test/HelixTasks/HelixTasks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Build" ExcludeAssets="runtime" />
<PackageReference Include="Microsoft.Build.Utilities.Core" ExcludeAssets="runtime" />
<PackageReference Include="Microsoft.Build" ExcludeAssets="runtime;buildTransitive" />
<PackageReference Include="Microsoft.Build.Utilities.Core" ExcludeAssets="runtime;buildTransitive" />
<PackageReference Include="Newtonsoft.Json" />
<PackageReference Include="System.Reflection.MetadataLoadContext" VersionOverride="$(SystemReflectionMetadataLoadContextToolsetPackageVersion)" />
<PackageReference Include="NuGet.ProjectModel" />
Expand Down
Loading