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

[release/9.0.1xx] Update dependencies from dotnet/msbuild #43078

Merged
merged 4 commits into from
Aug 30, 2024
Merged

[release/9.0.1xx] Update dependencies from dotnet/msbuild #43078

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
60ac569
Update dependencies from https://github.com/dotnet/msbuild build 2024…
dotnet-maestro[bot] Aug 29, 2024
e0e0be9
Update Microsoft.DotNet.Cli.Utils.csproj
MichalPavlik Aug 29, 2024
0320159
Let resolvers for core target current TF
rainersigwald Aug 29, 2024
1b0ee73
Merge branch 'release/9.0.1xx' of https://github.com/dotnet/sdk into …
v-wuzhai Aug 30, 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
7 changes: 2 additions & 5 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,8 @@
<ToolsetTargetFramework>$(SdkTargetFramework)</ToolsetTargetFramework>
<VisualStudioServiceTargetFramework>net8.0</VisualStudioServiceTargetFramework>

<!-- VS for Mac may run on a lower version of .NET than the SDK is targeting, but needs to load the resolvers. So the resolvers and dependencies
may target a lower version of .NET -->
<ResolverTargetFramework>net8.0</ResolverTargetFramework>
<!-- Source build does not need to worry about running on VS for Mac -->
<ResolverTargetFramework Condition="'$(DotNetBuildSourceOnly)' == 'true'">$(SdkTargetFramework)</ResolverTargetFramework>
<!-- We used to have scenarios where the MSBuild host (VSMac) had an older .NET, but don't any more. -->
<ResolverTargetFramework>$(SdkTargetFramework)</ResolverTargetFramework>

<!-- NU1701 Disable implicit package target fallback, and disable warning for when we explicitly add it (currently needed for
Microsoft.ApplicationInsights) -->
Expand Down
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 @@ -69,18 +69,18 @@
<Sha>84d642485896a97e0e443be75345c6bb1469a338</Sha>
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.Build" Version="17.12.0-preview-24427-01">
<Dependency Name="Microsoft.Build" Version="17.12.0-preview-24428-06">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>c256bcca00827368c080b03b001cac2a2c82017f</Sha>
<Sha>b82694a16d4963b5765e36fdc89d270fa00dde8e</Sha>
</Dependency>
<Dependency Name="Microsoft.Build.Localization" Version="17.12.0-preview-24427-01">
<Dependency Name="Microsoft.Build.Localization" Version="17.12.0-preview-24428-06">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>c256bcca00827368c080b03b001cac2a2c82017f</Sha>
<Sha>b82694a16d4963b5765e36fdc89d270fa00dde8e</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.12.0-preview-24427-01">
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.12.0-preview-24428-06">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>c256bcca00827368c080b03b001cac2a2c82017f</Sha>
<Sha>b82694a16d4963b5765e36fdc89d270fa00dde8e</Sha>
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.9.100-beta.24427.4">
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 @@ -212,8 +212,8 @@
then use that in Directory.Packages.props.

At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. -->
<MicrosoftBuildVersion>17.12.0-preview-24427-01</MicrosoftBuildVersion>
<MicrosoftBuildLocalizationVersion>17.12.0-preview-24427-01</MicrosoftBuildLocalizationVersion>
<MicrosoftBuildVersion>17.12.0-preview-24428-06</MicrosoftBuildVersion>
<MicrosoftBuildLocalizationVersion>17.12.0-preview-24428-06</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
2 changes: 1 addition & 1 deletion src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
for Mac and other VS scenarios. During source-build, we only have access to
the latest version, which targets NetCurrent. -->
<PropertyGroup>
<MSBuildPathInPackage>$(PkgMicrosoft_Build_Runtime)\contentFiles\any\net8.0\MSBuild.dll</MSBuildPathInPackage>
<MSBuildPathInPackage>$(PkgMicrosoft_Build_Runtime)\contentFiles\any\net9.0\MSBuild.dll</MSBuildPathInPackage>
<MSBuildPathInPackage Condition="'$(DotNetBuildSourceOnly)' == 'true' and !Exists($(MSBuildPathInPackage))">$(PkgMicrosoft_Build_Runtime)\contentFiles\any\$(NetCurrent)\MSBuild.dll</MSBuildPathInPackage>
</PropertyGroup>
<Error Condition="!Exists('$(MSBuildPathInPackage)')" Text="Something moved around in Microsoft.Build.Runtime, adjust code here accordingly." />
Expand Down
Loading