Skip to content

Commit 903ddbd

Browse files
committed
Use patchVersion=0 for ref pack dependencies
1 parent 0e4635c commit 903ddbd

File tree

1 file changed

+21
-8
lines changed

1 file changed

+21
-8
lines changed

eng/SharedFramework.External.props

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,19 @@
66
-->
77
<Project>
88

9+
<!-- For the targeting pack, always use packages with PatchVersion=0 -->
10+
<PropertyGroup Condition="'$(MSBuildProjectName)' == 'Microsoft.AspNetCore.App.Ref'">
11+
<SystemIOPipelinesPackageVersionForSharedFramework>$(SystemIOPipelinesPackageVersion.Split('.')[0]).$(SystemIOPipelinesPackageVersion.Split('.')[1]).0</SystemIOPipelinesPackageVersionForSharedFramework>
12+
<SystemSecurityCryptographyXmlPackageVersionForSharedFramework>$(SystemSecurityCryptographyXmlPackageVersion.Split('.')[0]).$(SystemSecurityCryptographyXmlPackageVersion.Split('.')[1]).0</SystemSecurityCryptographyXmlPackageVersionForSharedFramework>
13+
<MicrosoftWin32SystemEventsPackageVersionForSharedFramework>$(MicrosoftWin32SystemEventsPackageVersion.Split('.')[0]).$(MicrosoftWin32SystemEventsPackageVersion.Split('.')[1]).0</MicrosoftWin32SystemEventsPackageVersionForSharedFramework>
14+
<SystemDiagnosticsEventLogPackageVersionForSharedFramework>$(SystemDiagnosticsEventLogPackageVersion.Split('.')[0]).$(SystemDiagnosticsEventLogPackageVersion.Split('.')[1]).0</SystemDiagnosticsEventLogPackageVersionForSharedFramework>
15+
<SystemDrawingCommonPackageVersionForSharedFramework>$(SystemDrawingCommonPackageVersion.Split('.')[0]).$(SystemDrawingCommonPackageVersion.Split('.')[1]).0</SystemDrawingCommonPackageVersionForSharedFramework>
16+
<SystemSecurityCryptographyPkcsPackageVersionForSharedFramework>$(SystemSecurityCryptographyPkcsPackageVersion.Split('.')[0]).$(SystemSecurityCryptographyPkcsPackageVersion.Split('.')[1]).0</SystemSecurityCryptographyPkcsPackageVersionForSharedFramework>
17+
<SystemSecurityPermissionsPackageVersionForSharedFramework>$(SystemSecurityPermissionsPackageVersion.Split('.')[0]).$(SystemSecurityPermissionsPackageVersion.Split('.')[1]).0</SystemSecurityPermissionsPackageVersionForSharedFramework>
18+
<SystemWindowsExtensionsPackageVersionForSharedFramework>$(SystemWindowsExtensionsPackageVersion.Split('.')[0]).$(SystemWindowsExtensionsPackageVersion.Split('.')[1]).0</SystemWindowsExtensionsPackageVersionForSharedFramework>
19+
</PropertyGroup>
20+
21+
922
<ItemGroup>
1023
<!-- Dependencies from aspnet/Extensions -->
1124
<ExternalAspNetCoreAppReference Include="Microsoft.Extensions.Caching.Abstractions" Version="$(MicrosoftExtensionsCachingAbstractionsPackageVersion)" />
@@ -52,8 +65,8 @@
5265
<ExternalAspNetCoreAppReference Include="Microsoft.JSInterop" Version="$(MicrosoftJSInteropPackageVersion)" />
5366

5467
<!-- Dependencies from dotnet/corefx -->
55-
<ExternalAspNetCoreAppReference Include="System.IO.Pipelines" Version="$(SystemIOPipelinesPackageVersion)" />
56-
<ExternalAspNetCoreAppReference Include="System.Security.Cryptography.Xml" Version="$(SystemSecurityCryptographyXmlPackageVersion)" />
68+
<ExternalAspNetCoreAppReference Include="System.IO.Pipelines" Version="$(SystemIOPipelinesPackageVersionForSharedFramework)" />
69+
<ExternalAspNetCoreAppReference Include="System.Security.Cryptography.Xml" Version="$(SystemSecurityCryptographyXmlPackageVersionForSharedFramework)" />
5770

5871
<!--
5972
Transitive dependencies of other assemblies in the shared framework. These are listed separately and should not be included directly
@@ -64,12 +77,12 @@
6477
6578
If these are needed as direct dependencies, it is okay to change them to ExternalAspNetCoreAppReference and move up into sections above.
6679
-->
67-
<_TransitiveExternalAspNetCoreAppReference Include="Microsoft.Win32.SystemEvents" Version="$(MicrosoftWin32SystemEventsPackageVersion)" />
68-
<_TransitiveExternalAspNetCoreAppReference Include="System.Diagnostics.EventLog" Version="$(SystemDiagnosticsEventLogPackageVersion)" />
69-
<_TransitiveExternalAspNetCoreAppReference Include="System.Drawing.Common" Version="$(SystemDrawingCommonPackageVersion)" />
70-
<_TransitiveExternalAspNetCoreAppReference Include="System.Security.Cryptography.Pkcs" Version="$(SystemSecurityCryptographyPkcsPackageVersion)" />
71-
<_TransitiveExternalAspNetCoreAppReference Include="System.Security.Permissions" Version="$(SystemSecurityPermissionsPackageVersion)" />
72-
<_TransitiveExternalAspNetCoreAppReference Include="System.Windows.Extensions" Version="$(SystemWindowsExtensionsPackageVersion)" />
80+
<_TransitiveExternalAspNetCoreAppReference Include="Microsoft.Win32.SystemEvents" Version="$(MicrosoftWin32SystemEventsPackageVersionForSharedFramework)" />
81+
<_TransitiveExternalAspNetCoreAppReference Include="System.Diagnostics.EventLog" Version="$(SystemDiagnosticsEventLogPackageVersionForSharedFramework)" />
82+
<_TransitiveExternalAspNetCoreAppReference Include="System.Drawing.Common" Version="$(SystemDrawingCommonPackageVersionForSharedFramework)" />
83+
<_TransitiveExternalAspNetCoreAppReference Include="System.Security.Cryptography.Pkcs" Version="$(SystemSecurityCryptographyPkcsPackageVersionForSharedFramework)" />
84+
<_TransitiveExternalAspNetCoreAppReference Include="System.Security.Permissions" Version="$(SystemSecurityPermissionsPackageVersionForSharedFramework)" />
85+
<_TransitiveExternalAspNetCoreAppReference Include="System.Windows.Extensions" Version="$(SystemWindowsExtensionsPackageVersionForSharedFramework)" />
7386
</ItemGroup>
7487

7588
<ItemGroup Condition=" '$(IsServicingBuild)' == 'true' ">

0 commit comments

Comments
 (0)