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

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

Merged
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 2 commits
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
2 changes: 1 addition & 1 deletion eng/packaging.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<_IsWindowsDesktopApp Condition="$(WindowsDesktopCoreAppLibrary.Contains('$(AssemblyName);'))">true</_IsWindowsDesktopApp>
<_IsAspNetCoreApp Condition="$(AspNetCoreAppLibrary.Contains('$(AssemblyName);'))">true</_IsAspNetCoreApp>
<_AssemblyInTargetingPack Condition="('$(IsNETCoreAppSrc)' == 'true' or '$(IsNetCoreAppRef)' == 'true' or '$(_IsAspNetCoreApp)' == 'true' or '$(_IsWindowsDesktopApp)' == 'true') and '$(TargetFrameworkIdentifier)' != '.NETFramework'">true</_AssemblyInTargetingPack>
<!-- Assembly version do not get updated in non-netfx ref pack assemblies. -->
<!-- The assembly version gets updated when the assembly isn't part of a targeting pack. -->
<AssemblyVersion Condition="'$(_AssemblyInTargetingPack)' != 'true'">$(MajorVersion).$(MinorVersion).0.$(ServicingVersion)</AssemblyVersion>
</PropertyGroup>

Expand Down
1 change: 0 additions & 1 deletion src/libraries/System.ComponentModel.Composition/Directory.Build.props
View file
Open in desktop
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 src/libraries/System.ComponentModel.Composition/Directory.Build.targets
View file
Open in desktop
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 desktop version -->
<AssemblyVersion>4.0.0.0</AssemblyVersion>
</PropertyGroup>
</Project>
4 changes: 0 additions & 4 deletions src/libraries/System.DirectoryServices.AccountManagement/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
<Project>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<!-- this assembly is inbox in desktop, do not version it unless you
plan on shipping a new desktop version out of band. Instead add API
to a different assembly. -->
<AssemblyVersion>4.0.0.0</AssemblyVersion>
<StrongNameKeyId>ECMA</StrongNameKeyId>
<SupportedOSPlatforms>windows</SupportedOSPlatforms>
</PropertyGroup>
Expand Down
8 changes: 8 additions & 0 deletions src/libraries/System.DirectoryServices.AccountManagement/Directory.Build.targets
View file
Open in desktop
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 desktop version -->
<AssemblyVersion>4.0.0.0</AssemblyVersion>
</PropertyGroup>
</Project>
4 changes: 0 additions & 4 deletions src/libraries/System.DirectoryServices.Protocols/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
<Project>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<!-- this assembly is inbox in desktop, do not version it unless you
plan on shipping a new desktop version out of band. Instead add API
to a different assembly. -->
<AssemblyVersion>4.0.0.0</AssemblyVersion>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
<IncludePlatformAttributes>true</IncludePlatformAttributes>
<UnsupportedOSPlatforms>browser;android;ios;tvos</UnsupportedOSPlatforms>
Expand Down
10 changes: 10 additions & 0 deletions src/libraries/System.DirectoryServices.Protocols/Directory.Build.targets
View file
Open in desktop
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 desktop 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>
4 changes: 2 additions & 2 deletions ...ibraries/System.DirectoryServices.Protocols/src/System.DirectoryServices.Protocols.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<IncludeDllSafeSearchPathAttribute>true</IncludeDllSafeSearchPathAttribute>
<IsPackable>true</IsPackable>
<!-- If you enable GeneratePackageOnBuild for this package and bump ServicingVersion, make sure to also bump ServicingVersion in Microsoft.Windows.Compatibility.csproj once for the next release. -->
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
<ServicingVersion>0</ServicingVersion>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<ServicingVersion>1</ServicingVersion>
<Nullable>annotations</Nullable>
<AddNETFrameworkPlaceholderFileToPackage>true</AddNETFrameworkPlaceholderFileToPackage>
<AddNETFrameworkAssemblyReferenceToPackage>true</AddNETFrameworkAssemblyReferenceToPackage>
Expand Down
4 changes: 0 additions & 4 deletions src/libraries/System.DirectoryServices/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
<Project>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<!-- this assembly is inbox in desktop, do not version it unless you
plan on shipping a new desktop version out of band. Instead add API
to a different assembly. -->
<AssemblyVersion>4.0.0.0</AssemblyVersion>
<!-- Since this assembly version is pinned, we don't want to validate that it matches
the expected assembly version on the targeting pack. -->
<SkipValidateAssemblyVersion>true</SkipValidateAssemblyVersion>
Expand Down
8 changes: 8 additions & 0 deletions src/libraries/System.DirectoryServices/Directory.Build.targets
View file
Open in desktop
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 desktop version -->
<AssemblyVersion>4.0.0.0</AssemblyVersion>
</PropertyGroup>
</Project>
4 changes: 0 additions & 4 deletions src/libraries/System.Management/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
<Project>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<!-- this assembly is inbox in desktop, do not version it unless you
plan on shipping a new desktop version out of band. Instead add API
to a different assembly. -->
<AssemblyVersion>4.0.0.0</AssemblyVersion>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
<SupportedOSPlatforms>windows</SupportedOSPlatforms>
</PropertyGroup>
Expand Down
10 changes: 10 additions & 0 deletions src/libraries/System.Management/Directory.Build.targets
View file
Open in desktop
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 desktop 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>
4 changes: 2 additions & 2 deletions src/libraries/System.Management/src/System.Management.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
<IncludeDllSafeSearchPathAttribute>true</IncludeDllSafeSearchPathAttribute>
<IsPackable>true</IsPackable>
<!-- If you enable GeneratePackageOnBuild for this package and bump ServicingVersion, make sure to also bump ServicingVersion in Microsoft.Windows.Compatibility.csproj once for the next release. -->
ericstj marked this conversation as resolved.
Show resolved Hide resolved
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
<ServicingVersion>1</ServicingVersion>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<ServicingVersion>2</ServicingVersion>
<AddNETFrameworkPlaceholderFileToPackage>true</AddNETFrameworkPlaceholderFileToPackage>
<AddNETFrameworkAssemblyReferenceToPackage>true</AddNETFrameworkAssemblyReferenceToPackage>
<PackageDescription>Provides access to a rich set of management information and management events about the system, devices, and applications instrumented to the Windows Management Instrumentation (WMI) infrastructure.
Expand Down
1 change: 0 additions & 1 deletion src/libraries/System.Reflection.Context/Directory.Build.props
View file
Open in desktop
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 src/libraries/System.Reflection.Context/Directory.Build.targets
View file
Open in desktop
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 desktop version.
4.0.3.0 breaks this causing https://github.com/dotnet/runtime/issues/84320 -->
<AssemblyVersion>4.0.3.0</AssemblyVersion>
</PropertyGroup>
</Project>
4 changes: 0 additions & 4 deletions src/libraries/System.Runtime.Caching/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
<Project>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<!-- this assembly is inbox in desktop, do not version it unless you
plan on shipping a new desktop version out of band. Instead add API
to a different assembly. -->
<AssemblyVersion>4.0.0.0</AssemblyVersion>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
<IncludePlatformAttributes>true</IncludePlatformAttributes>
</PropertyGroup>
Expand Down
8 changes: 8 additions & 0 deletions src/libraries/System.Runtime.Caching/Directory.Build.targets
View file
Open in desktop
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 desktop version -->
<AssemblyVersion>4.0.0.0</AssemblyVersion>
</PropertyGroup>
</Project>
4 changes: 0 additions & 4 deletions src/libraries/System.Speech/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
<Project>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<!-- this assembly is inbox in desktop, do not version it unless you
plan on shipping a new desktop version out of band. Instead add API
to a different assembly. -->
<AssemblyVersion>4.0.0.0</AssemblyVersion>
<StrongNameKeyId>MicrosoftShared</StrongNameKeyId>
<SupportedOSPlatforms>windows</SupportedOSPlatforms>
</PropertyGroup>
Expand Down
8 changes: 8 additions & 0 deletions src/libraries/System.Speech/Directory.Build.targets
View file
Open in desktop
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 desktop version -->
<AssemblyVersion>4.0.0.0</AssemblyVersion>
</PropertyGroup>
</Project>