Skip to content

Commit 711d9dc

Browse files
committed
Special case X.Y.1 in Directory.Build.targets.in
- do not update `%(TargetingPackVersion)` until X.Y.0 versions have been released - address an odd timing issue I missed in #37120 - fine to stick w/ SDK's bundled targeting pack for one release
1 parent 68bf233 commit 711d9dc

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

eng/tools/GenerateFiles/Directory.Build.targets.in

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,9 @@
4747
Condition=" '%(TargetFramework)' == '${DefaultNetCoreTargetFramework}' ">${MicrosoftAspNetCoreAppRuntimeVersion}</LatestRuntimeFrameworkVersion>
4848
<RuntimePackRuntimeIdentifiers
4949
Condition=" '%(TargetFramework)' == '${DefaultNetCoreTargetFramework}' ">${SupportedRuntimeIdentifiers}</RuntimePackRuntimeIdentifiers>
50+
<!-- Do not update %(TargetingPackVersion) until X.Y.0 versions have been released. -->
5051
<TargetingPackVersion
51-
Condition=" '%(TargetFramework)' == '${DefaultNetCoreTargetFramework}' ">${MicrosoftAspNetCoreAppRefVersion}</TargetingPackVersion>
52+
Condition=" '%(TargetFramework)' == '${DefaultNetCoreTargetFramework}' AND '${AspNetCorePatchVersion}' != '1' ">${MicrosoftAspNetCoreAppRefVersion}</TargetingPackVersion>
5253
<DefaultRuntimeFrameworkVersion Condition=" '$(IsServicingBuild)' != 'true' AND
5354
'%(TargetFramework)' == '${DefaultNetCoreTargetFramework}' ">${MicrosoftAspNetCoreAppRuntimeVersion}</DefaultRuntimeFrameworkVersion>
5455
</KnownFrameworkReference>

eng/tools/GenerateFiles/GenerateFiles.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<Target Name="GenerateDirectoryBuildFiles">
1414
<PropertyGroup>
1515
<_TemplateProperties>
16+
AspNetCorePatchVersion=$(AspNetCorePatchVersion);
1617
DefaultNetCoreTargetFramework=$(DefaultNetCoreTargetFramework);
1718
MicrosoftAspNetCoreAppRefVersion=$(TargetingPackVersion);
1819
MicrosoftAspNetCoreAppRuntimeVersion=$(SharedFxVersion);

0 commit comments

Comments
 (0)