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

[main] Update dependencies from dotnet/msbuild #42641

Merged
merged 21 commits into from
Sep 2, 2024
Merged

[main] Update dependencies from dotnet/msbuild #42641

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
88e8aa4
Update dependencies from https://github.com/dotnet/msbuild build 2024…
dotnet-maestro[bot] Aug 9, 2024
e66254f
Update dependencies from https://github.com/dotnet/msbuild build 2024…
dotnet-maestro[bot] Aug 10, 2024
bf88fc5
Update dependencies from https://github.com/dotnet/msbuild build 2024…
dotnet-maestro[bot] Aug 12, 2024
5418840
Update dependencies from https://github.com/dotnet/msbuild build 2024…
dotnet-maestro[bot] Aug 13, 2024
156d436
Update dependencies from https://github.com/dotnet/msbuild build 2024…
dotnet-maestro[bot] Aug 14, 2024
47c1d67
Update dependencies from https://github.com/dotnet/msbuild build 2024…
dotnet-maestro[bot] Aug 15, 2024
921e4f2
Update dependencies from https://github.com/dotnet/msbuild build 2024…
dotnet-maestro[bot] Aug 16, 2024
36e9fb5
Merge branch 'main' of https://github.com/dotnet/sdk into darc-main-4…
v-wuzhai Aug 19, 2024
a41090d
Update dependencies from https://github.com/dotnet/msbuild build 2024…
dotnet-maestro[bot] Aug 21, 2024
ae9227d
Update dependencies from https://github.com/dotnet/msbuild build 2024…
dotnet-maestro[bot] Aug 22, 2024
7df330c
Merge branch 'main' into darc-main-4def985b-323a-4bc9-81dc-c5c9ebfd4bd7
lewing Aug 23, 2024
f8b9eb3
Update dependencies from https://github.com/dotnet/msbuild build 2024…
dotnet-maestro[bot] Aug 23, 2024
899f3b1
Update dependencies from https://github.com/dotnet/msbuild build 2024…
dotnet-maestro[bot] Aug 24, 2024
fa83833
Update dependencies from https://github.com/dotnet/msbuild build 2024…
dotnet-maestro[bot] Aug 26, 2024
19431c1
Update dependencies from https://github.com/dotnet/msbuild build 2024…
dotnet-maestro[bot] Aug 27, 2024
af60e33
Update dependencies from https://github.com/dotnet/msbuild build 2024…
dotnet-maestro[bot] Aug 29, 2024
2a23acb
Update msbuild TFM in Microsoft.DotNet.Cli.Utils.csproj
akoeplinger Aug 29, 2024
f400f2e
Merge branch 'main' into darc-main-4def985b-323a-4bc9-81dc-c5c9ebfd4bd7
f-alizada Aug 30, 2024
0d620ed
Update dependencies from https://github.com/dotnet/msbuild build 2024…
dotnet-maestro[bot] Aug 30, 2024
93a3236
ResolverTargetFramework to use current target framework
Sep 1, 2024
1d437da
Merge branch 'main' into darc-main-4def985b-323a-4bc9-81dc-c5c9ebfd4bd7
f-alizada Sep 1, 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>edf3e90fa25b1fc4f7f63ceb45ef70f49c6b121a</Sha>
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.Build" Version="17.12.0-preview-24407-03">
<Dependency Name="Microsoft.Build" Version="17.12.0-preview-24429-01">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>6bc91d5e2d3d8a199fdbe367ed015b55daf57046</Sha>
<Sha>01e53f4161996ce73408117d012f24c2c1737e58</Sha>
</Dependency>
<Dependency Name="Microsoft.Build.Localization" Version="17.12.0-preview-24407-03">
<Dependency Name="Microsoft.Build.Localization" Version="17.12.0-preview-24429-01">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>6bc91d5e2d3d8a199fdbe367ed015b55daf57046</Sha>
<Sha>01e53f4161996ce73408117d012f24c2c1737e58</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.12.0-preview-24407-03">
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.12.0-preview-24429-01">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>6bc91d5e2d3d8a199fdbe367ed015b55daf57046</Sha>
<Sha>01e53f4161996ce73408117d012f24c2c1737e58</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 @@ -215,8 +215,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-24407-03</MicrosoftBuildVersion>
<MicrosoftBuildLocalizationVersion>17.12.0-preview-24407-03</MicrosoftBuildLocalizationVersion>
<MicrosoftBuildVersion>17.12.0-preview-24429-01</MicrosoftBuildVersion>
<MicrosoftBuildLocalizationVersion>17.12.0-preview-24429-01</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