-
Notifications
You must be signed in to change notification settings - Fork 4.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[release/7.0] Fix pinned assembly version 7.0 (#84355)
* Eight packable projects pin their assembly version for .NET Framework compatibility. The incremental package servicing infrastructure didn't check if the assembly version is pinned and changed it during servicing. As an example, System.Speech pins its assembly version to 4.0.0.0 but that version gets overwritten during servicing. I.e. for .NET 7 the version would then change to "7.0.0.$(ServicingVersion)" which is incorrect. Please find the full list of impacted assemblies below: - System.ComponentModel.Composition - System.DirectoryServices - System.DirectoryServices.AccountManagement - System.DirectoryServices.Protocols - System.Management - System.Reflection.Context - System.Runtime.Caching - System.Speech For System.DirectoryServices.Protocols and System.Management we'll only pin the version for the .NETStandard assembly since those previously shipped the newer versions in servicing. * Enable System.Management and System.DirectoryServices.Protocols in servicing * Address feedback
- Loading branch information
Showing
20 changed files
with
76 additions
and
33 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 change: 0 additions & 1 deletion
1
src/libraries/System.ComponentModel.Composition/Directory.Build.props
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,6 @@ | ||
<Project> | ||
<Import Project="..\Directory.Build.props" /> | ||
<PropertyGroup> | ||
<AssemblyVersion>4.0.0.0</AssemblyVersion> | ||
<StrongNameKeyId>ECMA</StrongNameKeyId> | ||
</PropertyGroup> | ||
</Project> |
8 changes: 8 additions & 0 deletions
8
src/libraries/System.ComponentModel.Composition/Directory.Build.targets
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
<Project> | ||
<Import Project="..\Directory.Build.targets" /> | ||
<PropertyGroup> | ||
<!-- This assembly is inbox in .NETFramework, ensure that the AssemblyVersion | ||
remains <= the .NETFramework version --> | ||
<AssemblyVersion>4.0.0.0</AssemblyVersion> | ||
</PropertyGroup> | ||
</Project> |
4 changes: 0 additions & 4 deletions
4
src/libraries/System.DirectoryServices.AccountManagement/Directory.Build.props
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 8 additions & 0 deletions
8
src/libraries/System.DirectoryServices.AccountManagement/Directory.Build.targets
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
<Project> | ||
<Import Project="..\Directory.Build.targets" /> | ||
<PropertyGroup> | ||
<!-- This assembly is inbox in .NETFramework, ensure that the AssemblyVersion | ||
remains <= the .NETFramework version --> | ||
<AssemblyVersion>4.0.0.0</AssemblyVersion> | ||
</PropertyGroup> | ||
</Project> |
4 changes: 0 additions & 4 deletions
4
src/libraries/System.DirectoryServices.Protocols/Directory.Build.props
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 10 additions & 0 deletions
10
src/libraries/System.DirectoryServices.Protocols/Directory.Build.targets
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
<Project> | ||
<Import Project="..\Directory.Build.targets" /> | ||
<PropertyGroup> | ||
<!-- This assembly is inbox in .NETFramework, ensure that the .NETStandard assembly | ||
remains <= the .NETFramework version. | ||
Allow non-NETStandard assemblies to version to be compatible with past serviced packages which | ||
shipped higher versions. --> | ||
<AssemblyVersion Condition="'$(TargetFramework)' == 'netstandard2.0'">4.0.0.0</AssemblyVersion> | ||
</PropertyGroup> | ||
</Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 8 additions & 0 deletions
8
src/libraries/System.DirectoryServices/Directory.Build.targets
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
<Project> | ||
<Import Project="..\Directory.Build.targets" /> | ||
<PropertyGroup> | ||
<!-- This assembly is inbox in .NETFramework, ensure that the AssemblyVersion | ||
remains <= the .NETFramework version --> | ||
<AssemblyVersion>4.0.0.0</AssemblyVersion> | ||
</PropertyGroup> | ||
</Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
<Project> | ||
<Import Project="..\Directory.Build.targets" /> | ||
<PropertyGroup> | ||
<!-- This assembly is inbox in .NETFramework, ensure that the .NETStandard assembly | ||
remains <= the .NETFramework version. | ||
Allow non-NETStandard assemblies to version to be compatible with past serviced packages which | ||
shipped higher versions. --> | ||
<AssemblyVersion Condition="'$(TargetFramework)' == 'netstandard2.0'">4.0.0.0</AssemblyVersion> | ||
</PropertyGroup> | ||
</Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,6 @@ | ||
<Project> | ||
<Import Project="..\Directory.Build.props" /> | ||
<PropertyGroup> | ||
<AssemblyVersion>4.0.3.0</AssemblyVersion> | ||
<StrongNameKeyId>ECMA</StrongNameKeyId> | ||
</PropertyGroup> | ||
</Project> |
9 changes: 9 additions & 0 deletions
9
src/libraries/System.Reflection.Context/Directory.Build.targets
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
<Project> | ||
<Import Project="..\Directory.Build.targets" /> | ||
<PropertyGroup> | ||
<!-- This assembly is inbox in .NETFramework, ensure that the AssemblyVersion | ||
remains <= the .NETFramework version. | ||
4.0.3.0 breaks this causing https://github.com/dotnet/runtime/issues/84320 --> | ||
<AssemblyVersion>4.0.3.0</AssemblyVersion> | ||
</PropertyGroup> | ||
</Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
<Project> | ||
<Import Project="..\Directory.Build.targets" /> | ||
<PropertyGroup> | ||
<!-- This assembly is inbox in .NETFramework, ensure that the AssemblyVersion | ||
remains <= the .NETFramework version --> | ||
<AssemblyVersion>4.0.0.0</AssemblyVersion> | ||
</PropertyGroup> | ||
</Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
<Project> | ||
<Import Project="..\Directory.Build.targets" /> | ||
<PropertyGroup> | ||
<!-- This assembly is inbox in .NETFramework, ensure that the AssemblyVersion | ||
remains <= the .NETFramework version --> | ||
<AssemblyVersion>4.0.0.0</AssemblyVersion> | ||
</PropertyGroup> | ||
</Project> |