Skip to content

[release/7.0] Fix pinned assembly version 7.0 #84355

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

Merged
ericstj merged 3 commits into from
Apr 6, 2023
Merged

[release/7.0] Fix pinned assembly version 7.0 #84355

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6b341bb
Eight packable projects pin their assembly version for .NET Framework…
ericstj Apr 4, 2023
9ae9a2c
Enable System.Management and System.DirectoryServices.Protocols in se…
ericstj Apr 5, 2023
a7c2fcb
Address feedback
ericstj Apr 5, 2023
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
Prev Previous commit
Address feedback
  • Loading branch information
@ericstj
ericstj committed Apr 5, 2023
commit a7c2fcb79f793a4b85dfd1449eaeea5177061061
4 changes: 2 additions & 2 deletions src/libraries/Microsoft.Windows.Compatibility/src/Microsoft.Windows.Compatibility.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<!-- Reference the outputs for the dependency nodes calculation. -->
<NoTargetsDoNotReferenceOutputAssemblies>false</NoTargetsDoNotReferenceOutputAssemblies>
<IsPackable>true</IsPackable>
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
<ServicingVersion>1</ServicingVersion>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<ServicingVersion>2</ServicingVersion>
<!-- This is a meta package and doesn't contain any libs. -->
<NoWarn>$(NoWarn);NU5128</NoWarn>
<PackageDescription>This Windows Compatibility Pack provides access to APIs that were previously available only for .NET Framework. It can be used from both .NET as well as .NET Standard.</PackageDescription>
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/System.ComponentModel.Composition/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Import Project="..\Directory.Build.targets" />
<PropertyGroup>
<!-- This assembly is inbox in .NETFramework, ensure that the AssemblyVersion
remains <= the desktop version -->
remains <= the .NETFramework version -->
<AssemblyVersion>4.0.0.0</AssemblyVersion>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion src/libraries/System.DirectoryServices.AccountManagement/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Import Project="..\Directory.Build.targets" />
<PropertyGroup>
<!-- This assembly is inbox in .NETFramework, ensure that the AssemblyVersion
remains <= the desktop version -->
remains <= the .NETFramework version -->
<AssemblyVersion>4.0.0.0</AssemblyVersion>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion src/libraries/System.DirectoryServices.Protocols/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Import Project="..\Directory.Build.targets" />
<PropertyGroup>
<!-- This assembly is inbox in .NETFramework, ensure that the .NETStandard assembly
remains <= the desktop version.
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>
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/System.DirectoryServices/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Import Project="..\Directory.Build.targets" />
<PropertyGroup>
<!-- This assembly is inbox in .NETFramework, ensure that the AssemblyVersion
remains <= the desktop version -->
remains <= the .NETFramework version -->
<AssemblyVersion>4.0.0.0</AssemblyVersion>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion src/libraries/System.Management/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Import Project="..\Directory.Build.targets" />
<PropertyGroup>
<!-- This assembly is inbox in .NETFramework, ensure that the .NETStandard assembly
remains <= the desktop version.
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>
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/System.Reflection.Context/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Import Project="..\Directory.Build.targets" />
<PropertyGroup>
<!-- This assembly is inbox in .NETFramework, ensure that the AssemblyVersion
remains <= the desktop version.
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>
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/System.Runtime.Caching/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Import Project="..\Directory.Build.targets" />
<PropertyGroup>
<!-- This assembly is inbox in .NETFramework, ensure that the AssemblyVersion
remains <= the desktop version -->
remains <= the .NETFramework version -->
<AssemblyVersion>4.0.0.0</AssemblyVersion>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion src/libraries/System.Speech/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Import Project="..\Directory.Build.targets" />
<PropertyGroup>
<!-- This assembly is inbox in .NETFramework, ensure that the AssemblyVersion
remains <= the desktop version -->
remains <= the .NETFramework version -->
<AssemblyVersion>4.0.0.0</AssemblyVersion>
</PropertyGroup>
</Project>