Skip to content
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

[main] Update dependencies from dotnet/msbuild #44011

Merged
merged 6 commits into from
Oct 17, 2024
Merged

[main] Update dependencies from dotnet/msbuild #44011

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
74f63d7
Update dependencies from https://github.com/dotnet/msbuild build 2024…
dotnet-maestro[bot] Oct 9, 2024
1c0b8ba
Update dependencies from https://github.com/dotnet/msbuild build 2024…
dotnet-maestro[bot] Oct 10, 2024
ee59aaf
Update dependencies from https://github.com/dotnet/msbuild build 2024…
dotnet-maestro[bot] Oct 14, 2024
02bca30
Update dependencies from https://github.com/dotnet/msbuild build 2024…
dotnet-maestro[bot] Oct 16, 2024
c05ed67
Remove backported msbuild patch
MichaelSimons Oct 16, 2024
0097fa2
Update dependencies from https://github.com/dotnet/msbuild build 2024…
dotnet-maestro[bot] Oct 17, 2024
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
12 changes: 6 additions & 6 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,18 +73,18 @@
<Sha>4ea46baeaf74d5a99cb93593362b6d8263b10550</Sha>
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.Build" Version="17.13.0-preview-24504-04">
<Dependency Name="Microsoft.Build" Version="17.13.0-preview-24517-05">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>c4d51a11b84b4aabd9e5da1e3099f2c7c85024fe</Sha>
<Sha>b8f46eb171f3b1c7e3bddb8afaff9fbb0ba59e9d</Sha>
</Dependency>
<Dependency Name="Microsoft.Build.Localization" Version="17.13.0-preview-24504-04">
<Dependency Name="Microsoft.Build.Localization" Version="17.13.0-preview-24517-05">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>c4d51a11b84b4aabd9e5da1e3099f2c7c85024fe</Sha>
<Sha>b8f46eb171f3b1c7e3bddb8afaff9fbb0ba59e9d</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.13.0-preview-24504-04">
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.13.0-preview-24517-05">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>c4d51a11b84b4aabd9e5da1e3099f2c7c85024fe</Sha>
<Sha>b8f46eb171f3b1c7e3bddb8afaff9fbb0ba59e9d</Sha>
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.9.100-beta.24510.7">
Expand Down
4 changes: 2 additions & 2 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,8 +219,8 @@
then use that in Directory.Packages.props.

At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. -->
<MicrosoftBuildVersion>17.13.0-preview-24504-04</MicrosoftBuildVersion>
<MicrosoftBuildLocalizationVersion>17.13.0-preview-24504-04</MicrosoftBuildLocalizationVersion>
<MicrosoftBuildVersion>17.13.0-preview-24517-05</MicrosoftBuildVersion>
<MicrosoftBuildLocalizationVersion>17.13.0-preview-24517-05</MicrosoftBuildLocalizationVersion>
<MicrosoftBuildMinimumVersion Condition="Exists('$(RepoRoot)src\Layout\redist\minimumMSBuildVersion') and '$(DotNetBuildSourceOnly)' != 'true'">$([System.IO.File]::ReadAllText('$(RepoRoot)src\Layout\redist\minimumMSBuildVersion').Trim())</MicrosoftBuildMinimumVersion>
</PropertyGroup>
<PropertyGroup>
Expand Down
23 changes: 0 additions & 23 deletions src/SourceBuild/patches/msbuild/0001-remove-buildxl-feed.patch
View file
Open in desktop

This file was deleted.