Skip to content
Merged
Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
c15c0bd
Update the minimum msbuild version for .NET 10
marcpopMSFT Jun 23, 2025
61a3340
Update SCI and SRM
marcpopMSFT Jun 23, 2025
190c94e
Update the SCI version in the msbuildsdkresolver project
marcpopMSFT Jun 24, 2025
5ebd2c1
Update all of the runtime versions for msbuildsdk resolvers
marcpopMSFT Jun 25, 2025
d94e9c9
Remove a dependendency that's no longer included
marcpopMSFT Jun 25, 2025
0a11e08
Add System.Diagnostics.DiagnosticSource dependency
AR-May Jun 26, 2025
a63d4d9
Merge branch 'main' into marcpopMSFT-updateminimumMSBuild
AR-May Jun 26, 2025
de0b1ca
Add a comment
AR-May Jun 26, 2025
c0f769e
Merge branch 'main' into marcpopMSFT-updateminimumMSBuild
marcpopMSFT Jun 27, 2025
140d92b
Merge branch 'main' into marcpopMSFT-updateminimumMSBuild
marcpopMSFT Jul 16, 2025
982fb55
A bunch of msbuild sdks depended on an old STJ and so were broken…
marcpopMSFT Jul 18, 2025
39cad94
Merge branch 'main' into marcpopMSFT-updateminimumMSBuild
marcpopMSFT Jul 25, 2025
e5fad35
Merge branch 'main' into marcpopMSFT-updateminimumMSBuild
marcpopMSFT Jul 29, 2025
b7d7a31
Remove diagnosticsource as it's breaking the build
marcpopMSFT Jul 30, 2025
3cedf0e
Remove system.memory which the official build says it shouldn't have
marcpopMSFT Jul 30, 2025
8e2037d
Update Microsoft.DotNet.MSBuildSdkResolver.csproj
marcpopMSFT Jul 30, 2025
6b1984c
Merge branch 'main' into marcpopMSFT-updateminimumMSBuild
marcpopMSFT Jul 31, 2025
2643774
Update the msbuildsdkresolver list locally to try to fix the build br…
marcpopMSFT Jul 31, 2025
bae0fe7
Merge branch 'main' into marcpopMSFT-updateminimumMSBuild
marcpopMSFT Aug 1, 2025
2524657
Merge branch 'main' into marcpopMSFT-updateminimumMSBuild
marcpopMSFT Aug 4, 2025
2176eae
Merge branch 'main' into marcpopMSFT-updateminimumMSBuild
marcpopMSFT Aug 7, 2025
9c7466f
Update the aspire version
marcpopMSFT Aug 7, 2025
a76180d
Add system.diagnostic.diagnosticssource as a pinned version for the f…
marcpopMSFT Aug 7, 2025
3da7695
pin the msbuild sdk resolver as well
marcpopMSFT Aug 8, 2025
9476793
Fix all the version dependencies for the resolver
marcpopMSFT Aug 12, 2025
975606b
Right out a binlog to the root folder and then copy it to the helix o…
marcpopMSFT Aug 14, 2025
b65b312
Try fixing the path to grab the binlog
marcpopMSFT Aug 15, 2025
9422b05
upload msbuild.exe.config as well
marcpopMSFT Aug 18, 2025
171b5e5
Only set the resolver for the framework running tests
marcpopMSFT Aug 19, 2025
3c6490c
Revert the creation of the binlog but leave in place the code to capt…
marcpopMSFT Aug 19, 2025
642dbff
Revert a few version updates that weren't required (keeping the previ…
marcpopMSFT Aug 21, 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
10 changes: 5 additions & 5 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -140,10 +140,10 @@
<MicrosoftBclAsyncInterfacesToolsetPackageVersion>8.0.0</MicrosoftBclAsyncInterfacesToolsetPackageVersion>
<MicrosoftDeploymentDotNetReleasesToolsetPackageVersion>2.0.0-preview.1.24427.4</MicrosoftDeploymentDotNetReleasesToolsetPackageVersion>
<SystemBuffersToolsetPackageVersion>4.5.1</SystemBuffersToolsetPackageVersion>
<SystemCollectionsImmutableToolsetPackageVersion>8.0.0</SystemCollectionsImmutableToolsetPackageVersion>
<SystemCollectionsImmutableToolsetPackageVersion>9.0.0</SystemCollectionsImmutableToolsetPackageVersion>
<SystemMemoryToolsetPackageVersion>4.5.5</SystemMemoryToolsetPackageVersion>
<SystemReflectionMetadataLoadContextToolsetPackageVersion>8.0.0</SystemReflectionMetadataLoadContextToolsetPackageVersion>
<SystemReflectionMetadataToolsetPackageVersion>8.0.0</SystemReflectionMetadataToolsetPackageVersion>
<SystemReflectionMetadataLoadContextToolsetPackageVersion>9.0.0</SystemReflectionMetadataLoadContextToolsetPackageVersion>
<SystemReflectionMetadataToolsetPackageVersion>9.0.0</SystemReflectionMetadataToolsetPackageVersion>
<SystemTextJsonToolsetPackageVersion>8.0.5</SystemTextJsonToolsetPackageVersion>
<SystemThreadingTasksExtensionsToolsetPackageVersion>4.5.4</SystemThreadingTasksExtensionsToolsetPackageVersion>
<SystemResourcesExtensionsToolsetPackageVersion>8.0.0</SystemResourcesExtensionsToolsetPackageVersion>
Expand Down Expand Up @@ -199,8 +199,8 @@
Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent -->
<MicrosoftBuildVersion>17.15.0-preview-25325-106</MicrosoftBuildVersion>
<MicrosoftBuildLocalizationVersion>17.15.0-preview-25325-106</MicrosoftBuildLocalizationVersion>
<MicrosoftBuildMinimumVersion Condition="'$(DotNetBuildSourceOnly)' != 'true'">17.11.4</MicrosoftBuildMinimumVersion>
<MinimumVSVersion>17.13</MinimumVSVersion>
<MicrosoftBuildMinimumVersion Condition="'$(DotNetBuildSourceOnly)' != 'true'">17.14.8</MicrosoftBuildMinimumVersion>
<MinimumVSVersion>17.14</MinimumVSVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/templating -->
Expand Down
2 changes: 1 addition & 1 deletion src/Layout/redist/minimumMSBuildVersion
Original file line number Diff line number Diff line change
@@ -1 +1 @@
17.13.0
17.14.0
Original file line number Diff line number Diff line change
Expand Up @@ -104,19 +104,25 @@
<Output TaskParameter="ResolvedDependencyFiles" ItemName="ResolvedDependencies" />
</ResolveAssemblyReference>

<!-- Define the expected dependencies of the output assembly.
IMPORTANT: When modifying this list, coordinate with the MSBuild team to ensure:
1. Each dependency has a corresponding binding redirect in MSBuild.exe.
2. Dependency version fall within the ranges specified in MSBuild.exe binding redirects.
Note: Verify versions against the binding redirects of the minimum supported MSBuild version, located at: src/Layout/redist/minimumMSBuildVersion
You can find the MSBuild.exe binding redirects here: https://github.com/dotnet/msbuild/blob/<msbuild version branch>/src/MSBuild/app.amd64.config -->
<ItemGroup>
<ExpectedDependencies Include="Microsoft.Deployment.DotNet.Releases, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
<ExpectedDependencies Include="System.Text.Json, Version=8.0.0.5, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" />
<ExpectedDependencies Include="System.Text.Encodings.Web, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" />
<ExpectedDependencies Include="Microsoft.Build.Framework, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<ExpectedDependencies Include="System.Collections.Immutable, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<ExpectedDependencies Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" />
<ExpectedDependencies Include="System.Collections.Immutable, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<ExpectedDependencies Include="System.Diagnostics.DiagnosticSource, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" />
<ExpectedDependencies Include="System.Memory, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" />
<ExpectedDependencies Include="Microsoft.Bcl.AsyncInterfaces, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" />
<ExpectedDependencies Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<ExpectedDependencies Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<ExpectedDependencies Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" />
<ExpectedDependencies Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<ExpectedDependencies Include="System.Numerics.Vectors, Version=4.1.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<ExpectedDependencies Include="System.Buffers, Version=4.0.4.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" />
<ExpectedDependencies Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" />
<ExpectedDependencies Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" />
</ItemGroup>

<!-- Check that the dependencies of the output assembly match our expectations -->
Expand Down
Loading