Skip to content

Commit 038f8e2

Browse files
committed
Try moving workarounds into generated d.b.t
1 parent 4bcd37c commit 038f8e2

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

eng/Workarounds.targets

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,5 @@
11
<!-- Use this file to workaround issues. List the issue tracking the item to fix so we can remove the workaround when the issue is resolved. -->
22
<Project>
3-
<PropertyGroup>
4-
<DefaultNetCoreTargetFrameworkIdentifier>$([MSBuild]::GetTargetFrameworkIdentifier('$(DefaultNetCoreTargetFramework)'))</DefaultNetCoreTargetFrameworkIdentifier>
5-
<DefaultNetCoreTargetFrameworkVersion>v$([MSBuild]::GetTargetFrameworkVersion('$(DefaultNetCoreTargetFramework)', 2))</DefaultNetCoreTargetFrameworkVersion>
6-
7-
<ProjectTargetFrameworkIdentifier>$([MSBuild]::GetTargetFrameworkIdentifier('$(TargetFramework)'))</ProjectTargetFrameworkIdentifier>
8-
<ProjectTargetFrameworkVersion>v$([MSBuild]::GetTargetFrameworkVersion('$(TargetFramework)', 2))</ProjectTargetFrameworkVersion>
9-
</PropertyGroup>
10-
113
<!--
124
Workaround https://github.com/dotnet/aspnetcore/issues/4257.
135
The web sdk adds an implicit framework reference. This removes it until we can update our build to use framework references.

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,14 @@
77
Condition=" '$(UpdateAspNetCoreKnownFramework)' == '' ">true</UpdateAspNetCoreKnownFramework>
88
</PropertyGroup>
99

10+
<PropertyGroup>
11+
<DefaultNetCoreTargetFrameworkIdentifier>$([MSBuild]::GetTargetFrameworkIdentifier('${DefaultNetCoreTargetFramework}'))</DefaultNetCoreTargetFrameworkIdentifier>
12+
<DefaultNetCoreTargetFrameworkVersion>v$([MSBuild]::GetTargetFrameworkVersion('${DefaultNetCoreTargetFramework}', 2))</DefaultNetCoreTargetFrameworkVersion>
13+
14+
<ProjectTargetFrameworkIdentifier>$([MSBuild]::GetTargetFrameworkIdentifier('$(TargetFramework)'))</ProjectTargetFrameworkIdentifier>
15+
<ProjectTargetFrameworkVersion>v$([MSBuild]::GetTargetFrameworkVersion('$(TargetFramework)', 2))</ProjectTargetFrameworkVersion>
16+
</PropertyGroup>
17+
1018
<!-- Workaround when there is no vNext SDK available; copy known apphost/framework reference info from 6.0. -->
1119
<ItemGroup>
1220
<KnownAppHostPack

0 commit comments

Comments
 (0)