Skip to content

Commit

Permalink
[msbuild] Sync be26b4c: Flow live version of System.Security.Permissi…
Browse files Browse the repository at this point in the history
…ons for source-build (#9158)

When .NET is source-built with the mono runtime, there can be scenarios where MSBuild is made to attempt to load a reference assembly for System.Security.Permissions. See dotnet/source-build#3571 (comment) for such a scenario.

The reason a reference assembly exists in this case is because MSBuild has a reference to the 7.0.0 version of System.Security.Permissions. When building with source-build, it loads that reference from SBRP (which only contains reference assemblies) in order to fulfill compile time references. The problem is that the assembly is also getting included in the output. This should have been detected by poison leak detection but that doesn't yet handle reference assemblies.

The solution is to update Version.Details so that the "live" version of System.Security.Permissions, that was previously built with source-build, will flow to the build of the MSBuild repo. Essentially, this causes the SystemSecurityPermissionsVersion property to be overridden with the live version.

Fixes dotnet/source-build#3571

Original commit: dotnet/msbuild@be26b4c

[[ commit created by automation ]]
  • Loading branch information
mthalman authored and dotnet-maestro[bot] committed Aug 25, 2023
1 parent 2dae189 commit 3a406bc
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 8 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ To enable full offline source-building of the VMR, we have no other choice than
- `src/installer`
*[dotnet/installer@7d97d4e](https://github.com/dotnet/installer/commit/7d97d4e116b1af549241fded58ef3efa42197012)*
- `src/msbuild`
*[dotnet/msbuild@3cb18c9](https://github.com/dotnet/msbuild/commit/3cb18c917252e18d8d310a86e6333ded0077fcb1)*
*[dotnet/msbuild@be26b4c](https://github.com/dotnet/msbuild/commit/be26b4c6697f551c822129cc1534297e921ca298)*
- `src/nuget-client`
*[nuget/nuget.client@4514d60](https://github.com/nuget/nuget.client/commit/4514d6022f0b46e4ae72d72eb5173e3b804cc014)*
- `src/nuget-client/submodules/NuGet.Build.Localization`
Expand Down
4 changes: 2 additions & 2 deletions prereqs/git-info/AllRepoVersions.props
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
<fsharpOutputPackageVersion>8.0.100-beta.23424.5</fsharpOutputPackageVersion>
<installerGitCommitHash>7d97d4e116b1af549241fded58ef3efa42197012</installerGitCommitHash>
<installerOutputPackageVersion>8.0.100</installerOutputPackageVersion>
<msbuildGitCommitHash>3cb18c917252e18d8d310a86e6333ded0077fcb1</msbuildGitCommitHash>
<msbuildOutputPackageVersion>17.8.0-preview-23425-02</msbuildOutputPackageVersion>
<msbuildGitCommitHash>be26b4c6697f551c822129cc1534297e921ca298</msbuildGitCommitHash>
<msbuildOutputPackageVersion>17.8.0-preview-23425-03</msbuildOutputPackageVersion>
<nugetclientGitCommitHash>4514d6022f0b46e4ae72d72eb5173e3b804cc014</nugetclientGitCommitHash>
<nugetclientOutputPackageVersion>6.8.0-preview.1.75</nugetclientOutputPackageVersion>
<razorGitCommitHash>e5829d96c376650e66e91e7e47d1f6be19453c2d</razorGitCommitHash>
Expand Down
6 changes: 3 additions & 3 deletions prereqs/git-info/msbuild.props
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>
<PropertyGroup>
<GitCommitHash>3cb18c917252e18d8d310a86e6333ded0077fcb1</GitCommitHash>
<OfficialBuildId>20230825.2</OfficialBuildId>
<OutputPackageVersion>17.8.0-preview-23425-02</OutputPackageVersion>
<GitCommitHash>be26b4c6697f551c822129cc1534297e921ca298</GitCommitHash>
<OfficialBuildId>20230825.3</OfficialBuildId>
<OutputPackageVersion>17.8.0-preview-23425-03</OutputPackageVersion>
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
<IsStable>false</IsStable>
</PropertyGroup>
Expand Down
5 changes: 5 additions & 0 deletions src/msbuild/eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,11 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
</Dependency>
<!-- Necessary for source-build. This allows the live version of the package to be used by source-build. -->
<Dependency Name="System.Security.Permissions" Version="7.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
</Dependency>
<Dependency Name="System.Text.Json" Version="7.0.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5b20af47d99620150c53eaf5db8636fdf730b126</Sha>
Expand Down
4 changes: 2 additions & 2 deletions src/source-manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,10 @@
"commitSha": "7d97d4e116b1af549241fded58ef3efa42197012"
},
{
"packageVersion": "17.8.0-preview-23425-02",
"packageVersion": "17.8.0-preview-23425-03",
"path": "msbuild",
"remoteUri": "https://github.com/dotnet/msbuild",
"commitSha": "3cb18c917252e18d8d310a86e6333ded0077fcb1"
"commitSha": "be26b4c6697f551c822129cc1534297e921ca298"
},
{
"packageVersion": "6.8.0-preview.1.75",
Expand Down

0 comments on commit 3a406bc

Please sign in to comment.