Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
e4d46bb
Backflow from https://github.com/dotnet/dotnet / 5aef8ea build 287866
dotnet-maestro[bot] Oct 21, 2025
512f5d9
Merge release/10.0.1xx into darc-release/10.0.1xx-75f22058-2538-40e7-…
dotnet-maestro[bot] Oct 21, 2025
e7800ea
Update dependencies from https://github.com/dotnet/dotnet build 287866
dotnet-maestro[bot] Oct 21, 2025
28de8de
Merge branch 'release/10.0.1xx' into darc-release/10.0.1xx-75f22058-2…
SimonZhao888 Oct 21, 2025
e5e79be
Merge branch 'release/10.0.1xx' into darc-release/10.0.1xx-75f22058-2…
SimonZhao888 Oct 22, 2025
ace7e3c
Update dependencies from https://github.com/dotnet/dotnet build 287966
dotnet-maestro[bot] Oct 22, 2025
6cc3f88
Merge branch 'release/10.0.1xx' into darc-release/10.0.1xx-75f22058-2…
SimonZhao888 Oct 23, 2025
547b4d8
Merge branch 'release/10.0.1xx' into darc-release/10.0.1xx-75f22058-2…
SimonZhao888 Oct 24, 2025
213c8cf
Merge branch 'release/10.0.1xx' into darc-release/10.0.1xx-75f22058-2…
SimonZhao888 Oct 24, 2025
0ed63df
Merge branch 'release/10.0.1xx' into darc-release/10.0.1xx-75f22058-2…
SimonZhao888 Oct 27, 2025
23051b4
Merge branch 'release/10.0.1xx' into darc-release/10.0.1xx-75f22058-2…
nagilson Oct 29, 2025
6012240
Merge branch 'release/10.0.1xx' into darc-release/10.0.1xx-75f22058-2…
SimonZhao888 Oct 31, 2025
e7b6b29
Merge branch 'release/10.0.1xx' into darc-release/10.0.1xx-75f22058-2…
SimonZhao888 Nov 3, 2025
ba45307
Merge branch 'release/10.0.1xx' into darc-release/10.0.1xx-75f22058-2…
SimonZhao888 Nov 3, 2025
090b021
Merge branch 'release/10.0.1xx' into darc-release/10.0.1xx-75f22058-2…
DonnaChen888 Nov 4, 2025
5d12634
Merge branch 'release/10.0.1xx' into darc-release/10.0.1xx-75f22058-2…
DonnaChen888 Nov 5, 2025
82cdd3e
Merge branch 'release/10.0.1xx' into darc-release/10.0.1xx-75f22058-2…
DonnaChen888 Nov 6, 2025
b2f8922
Merge branch 'release/10.0.1xx' into darc-release/10.0.1xx-75f22058-2…
DonnaChen888 Nov 7, 2025
0a4caf6
Merge branch 'release/10.0.1xx' into darc-release/10.0.1xx-75f22058-2…
nagilson Nov 7, 2025
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
Next Next commit
Backflow from https://github.com/dotnet/dotnet / 5aef8ea build 287866
[[ commit created by automation ]]
  • Loading branch information
dotnet-maestro[bot] committed Oct 21, 2025
commit e4d46bbd18ebba3a4ccd2fdd9bb3cd5a259ff52b
4 changes: 2 additions & 2 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes.

Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent -->
<MicrosoftBuildMinimumVersion Condition="'$(DotNetBuildSourceOnly)' != 'true'">17.14.8</MicrosoftBuildMinimumVersion>
<MicrosoftBuildMinimumVersion Condition="'$(DotNetBuildSourceOnly)' != 'true'">17.14.28</MicrosoftBuildMinimumVersion>
<MinimumVSVersion>18.0</MinimumVSVersion>
</PropertyGroup>
<PropertyGroup>
Expand All @@ -125,7 +125,7 @@
</PropertyGroup>
<PropertyGroup Label="Manually updated">
<!-- Dependencies from https://github.com/microsoft/MSBuildLocator -->
<MicrosoftBuildLocatorPackageVersion>1.8.1</MicrosoftBuildLocatorPackageVersion>
<MicrosoftBuildLocatorPackageVersion>1.10.2</MicrosoftBuildLocatorPackageVersion>
<MicrosoftCodeAnalysisCSharpAnalyzerPinnedVersionPackageVersion>4.0.1</MicrosoftCodeAnalysisCSharpAnalyzerPinnedVersionPackageVersion>
</PropertyGroup>
<!-- Get .NET Framework reference assemblies from NuGet packages -->
Expand Down
2 changes: 2 additions & 0 deletions src/Layout/redist/targets/OverlaySdkOnLKG.targets
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@
</ItemGroup>

<!-- Copy artifacts to the testhost folder. -->
<!-- Using hard linking below will cause the SDK testing overlay to create changes in the installer layout.
Needs review and fix. https://github.com/dotnet/sdk/issues/51112 -->
<Copy DestinationFiles="@(InstallerOutputFile)"
SourceFiles="@(InstallerOutputFile->Metadata('Source'))"
SkipUnchangedFiles="true"
Expand Down