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

Update msbuild version to 17.3.4 #73283

Merged
merged 6 commits into from
May 14, 2024
Merged

Update msbuild version to 17.3.4 #73283

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
70a697e
Update msbuild version to 17.3.4
marcpopMSFT Apr 30, 2024
e5f2d78
Update the source build version to 17.3.4
marcpopMSFT Apr 30, 2024
0487326
Update to the source build build with the 17.3.4 msbuild version
marcpopMSFT May 7, 2024
a67892b
try updating externals to the 8.0 version as well to see if that fixe…
marcpopMSFT May 10, 2024
c25070a
Add allowed prebuilts for assemblies declared in Version.Details.xml …
MichaelSimons May 13, 2024
7f68dc4
Add System.Threading.Tasks.Dataflow product dependency
MichaelSimons May 13, 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
8 changes: 4 additions & 4 deletions eng/Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@
-->

<ItemGroup Condition="'$(DotnetBuildFromSource)' == 'true'">
<PackageVersion Include="Microsoft.Build" Version="17.3.2" />
<PackageVersion Include="Microsoft.Build.Framework" Version="17.3.2" />
<PackageVersion Include="Microsoft.Build.Tasks.Core" Version="17.3.2" />
<PackageVersion Include="Microsoft.Build" Version="17.3.4" />
<PackageVersion Include="Microsoft.Build.Framework" Version="17.3.4" />
<PackageVersion Include="Microsoft.Build.Tasks.Core" Version="17.3.4" />
</ItemGroup>

<ItemGroup Condition="'$(DotnetBuildFromSource)' != 'true' and '$(TargetFramework)' != 'net472'">
Expand Down Expand Up @@ -202,7 +202,7 @@
<PackageVersion Include="System.Security.Principal" Version="4.3.0" />
<PackageVersion Include="System.Text.Encoding.CodePages" Version="7.0.0" />
<PackageVersion Include="System.Text.Encoding.Extensions" Version="4.3.0" />
<PackageVersion Include="System.Threading.Tasks.Dataflow" Version="8.0.0" />
<PackageVersion Include="System.Threading.Tasks.Dataflow" Version="$(SystemThreadingTasksDataflowVersion)" />
<PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
<PackageVersion Include="System.Windows.Extensions" Version="$(SystemWindowsExtensionsVersion)" />

Expand Down
8 changes: 7 additions & 1 deletion eng/SourceBuildPrebuiltBaseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,21 +22,27 @@
<UsagePattern IdentityGlob="Microsoft.NETCore.App.Ref/7.0*" />

<!-- This is upgraded to latest version in full source-build and can be baselined for repo build -->
<UsagePattern IdentityGlob="Microsoft.Bcl.AsyncInterfaces/8.0*" />
<UsagePattern IdentityGlob="Microsoft.Extensions.DependencyInjection.Abstractions/8.0*" />
<UsagePattern IdentityGlob="Microsoft.Extensions.Configuration*/8.0*" />
<UsagePattern IdentityGlob="Microsoft.Extensions.DependencyInjection/8.0*" />
<UsagePattern IdentityGlob="Microsoft.Extensions.Logging*/8.0*" />
<UsagePattern IdentityGlob="Microsoft.Extensions.Options.ConfigurationExtension*/8.0*" />
<UsagePattern IdentityGlob="Microsoft.Extensions.Options/8.0*" />
<UsagePattern IdentityGlob="Microsoft.Extensions.Primitives/8.0*" />
<UsagePattern IdentityGlob="System.Composition*/7.0*" />
<UsagePattern IdentityGlob="System.Collections.Immutable/8.0*" />
<UsagePattern IdentityGlob="System.Composition*/8.0*" />
<UsagePattern IdentityGlob="System.Configuration.ConfigurationManager/8.0*" />
<UsagePattern IdentityGlob="System.Diagnostics.DiagnosticSource/8.0*" />
<UsagePattern IdentityGlob="System.Diagnostics.EventLog/8.0*" />
<UsagePattern IdentityGlob="System.IO.Pipelines/8.0*" />
<UsagePattern IdentityGlob="System.Reflection.Metadata/8.0*" />
<UsagePattern IdentityGlob="System.Resources.Extensions/8.0*" />
<UsagePattern IdentityGlob="System.Security.Cryptography.ProtectedData/8.0*" />
<UsagePattern IdentityGlob="System.Security.Permissions/8.0*" />
<UsagePattern IdentityGlob="System.Text.Encodings.Web/8.0*" />
<UsagePattern IdentityGlob="System.Text.Json/8.0*" />
<UsagePattern IdentityGlob="System.Threading.Tasks.Dataflow/8.0*" />
<UsagePattern IdentityGlob="System.Windows.Extensions/8.0*" />
<UsagePattern IdentityGlob="Microsoft.Extensions.Configuration*/7.0*" />
<UsagePattern IdentityGlob="Microsoft.Extensions.Logging*/7.0*" />
Expand Down
14 changes: 9 additions & 5 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
<Dependencies>
<ProductDependencies>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="9.0.0-alpha.1.24168.3">
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.24256.1">
<Uri>https://github.com/dotnet/source-build-externals</Uri>
<Sha>b46b7e6859f4094cd7f3e00dc0471d62f5d8d051</Sha>
<Sha>2b7510ccda2be01e2a2b48598498dca24fb69c3a</Sha>
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="9.0.0-alpha.1.24161.2">
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.24257.1">
marcpopMSFT marked this conversation as resolved.
Show resolved Hide resolved
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
<Sha>8d6e9cf10f64ff8fc02e434b516f6ca87c4b7215</Sha>
<Sha>2ae84974a931d184c92865610453a65903118796</Sha>
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
</Dependency>
<Dependency Name="System.CommandLine" Version="2.0.0-beta4.24126.1">
Expand Down Expand Up @@ -84,6 +84,10 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
</Dependency>
<Dependency Name="System.Threading.Tasks.Dataflow" Version="8.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
</Dependency>
<Dependency Name="System.Reflection.Metadata" Version="8.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
Expand Down Expand Up @@ -125,7 +129,7 @@
<Sha>73f0850939d96131c28cf6ea6ee5aacb4da0083a</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.xliff-tasks" Version="1.0.0-beta.23475.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Dependency Name="Microsoft.SourceBuild.Intermediate.xliff-tasks" Version="1.0.0-beta.23475.1">
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
<Sha>73f0850939d96131c28cf6ea6ee5aacb4da0083a</Sha>
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
Expand Down
1 change: 1 addition & 0 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
<!-- Note: When updating SystemTextJsonVersion ensure that the version is no higher than what is used by MSBuild. -->
<SystemTextEncodingsWebVersion>8.0.0</SystemTextEncodingsWebVersion>
<SystemTextJsonVersion>8.0.0</SystemTextJsonVersion>
<SystemThreadingTasksDataflowVersion>8.0.0</SystemThreadingTasksDataflowVersion>
<SystemWindowsExtensionsVersion>8.0.0</SystemWindowsExtensionsVersion>
<MicrosoftBclAsyncInterfacesVersion>8.0.0</MicrosoftBclAsyncInterfacesVersion>
<MicrosoftCodeAnalysisAnalyzersVersion>3.3.4</MicrosoftCodeAnalysisAnalyzersVersion>
Expand Down
8 changes: 4 additions & 4 deletions ...kspaces/Core/MSBuild.BuildHost/Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@
<PlatformTarget>AnyCPU</PlatformTarget>
</PropertyGroup>
<ItemGroup>
<!-- We specifically reference Microsoft.Build 17.3.2, since it's the oldest version still compatible net6.0. The version targeted is only used for build time, since
<!-- We specifically reference Microsoft.Build 17.3.4, since it's the oldest version still compatible net6.0. The version targeted is only used for build time, since
we use MSBuildLocator to discover the proper version at runtime. -->
<PackageReference Include="Microsoft.Build" VersionOverride="17.3.2" ExcludeAssets="Runtime" PrivateAssets="All" />
<PackageReference Include="Microsoft.Build.Framework" VersionOverride="17.3.2" ExcludeAssets="Runtime" />
<PackageReference Include="Microsoft.Build.Tasks.Core" VersionOverride="17.3.2" ExcludeAssets="Runtime" PrivateAssets="All" />
<PackageReference Include="Microsoft.Build" VersionOverride="17.3.4" ExcludeAssets="Runtime" PrivateAssets="All" />
<PackageReference Include="Microsoft.Build.Framework" VersionOverride="17.3.4" ExcludeAssets="Runtime" />
<PackageReference Include="Microsoft.Build.Tasks.Core" VersionOverride="17.3.4" ExcludeAssets="Runtime" PrivateAssets="All" />
<PackageReference Include="Microsoft.Build.Locator" PrivateAssets="All" />
<PackageReference Include="System.Text.Json" />
<PackageReference Include="System.CommandLine" />
Expand Down
Loading