diff options
| author | Anirudh Agnihotry <anirudhagnihotry098@gmail.com> | 2020-11-06 06:54:19 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-06 06:54:19 +0300 |
| commit | 5c3c690d6d34ae90094007efd677c7040aeba654 (patch) | |
| tree | c481ddc60b3538d8e6c54b82b6ec0e56afff0514 /eng/BeforeTargetFrameworkInference.targets | |
| parent | 5aaf0c14c236a771e0460c963b5353300c029dd1 (diff) | |
Use targetPlatformMoniker for net5.0 and newer tfms (#43965)
* Use targetPlatformMoniker for net5.0 and newer tfms
* disabling analyzer, update version to 0.0, and use new format.
* update the targetFramework.sdk
* removing supportedOS assembly level attribute
* fix linker errors and addressing feedback
* making _TargetFrameworkWithoutPlatform as private
Diffstat (limited to 'eng/BeforeTargetFrameworkInference.targets')
| -rw-r--r-- | eng/BeforeTargetFrameworkInference.targets | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/eng/BeforeTargetFrameworkInference.targets b/eng/BeforeTargetFrameworkInference.targets index abef4c8981a..93609381fb4 100644 --- a/eng/BeforeTargetFrameworkInference.targets +++ b/eng/BeforeTargetFrameworkInference.targets @@ -3,17 +3,18 @@ <PropertyGroup Condition="$(TargetFramework.Contains('-'))"> <_OriginalTargetFramework>$(TargetFramework)</_OriginalTargetFramework> <TargetFrameworkSuffix>$(TargetFramework.SubString($([MSBuild]::Add($(TargetFramework.IndexOf('-')), 1))))</TargetFrameworkSuffix> - <TargetFramework>$(TargetFramework.SubString(0, $(TargetFramework.IndexOf('-'))))</TargetFramework> + <!-- Strip away the TargetPlatform during the build for frameworks older than net5.0 because the assets file does not know about the TargetPlatform --> + <TargetFramework>$([System.Text.RegularExpressions.Regex]::Replace('$(TargetFramework)', '$(TargetFrameworkPattern)', '${1}'))</TargetFramework> </PropertyGroup> <Import Project="$(MSBuildThisDirectory)targetframeworksuffix.props" Condition="'$(DesignTimeBuild)' == 'true'" /> <PropertyGroup> - <IntermediateOutputPath>$([MSBuild]::NormalizeDirectory('$(BaseIntermediateOutputPath)', '$(TargetFramework)-$(TargetFrameworkSuffix)-$(Configuration)'))</IntermediateOutputPath> - <IntermediateOutputPath Condition="'$(TargetFrameworkSuffix)' == ''">$([MSBuild]::NormalizeDirectory('$(BaseIntermediateOutputPath)', '$(TargetFramework)-$(Configuration)'))</IntermediateOutputPath> + <IntermediateOutputPath>$([MSBuild]::NormalizeDirectory('$(BaseIntermediateOutputPath)', '$(TargetFramework)-$(Configuration)'))</IntermediateOutputPath> + <IntermediateOutputPath Condition="'$(TargetFrameworkSuffix)' != '' and !$(TargetFramework.Contains('-'))">$([MSBuild]::NormalizeDirectory('$(BaseIntermediateOutputPath)', '$(TargetFramework)-$(TargetFrameworkSuffix)-$(Configuration)'))</IntermediateOutputPath> <!-- setting the output paths --> - <OutputPath>$([MSBuild]::NormalizeDirectory('$(BaseOutputPath)', '$(TargetFramework)-$(TargetFrameworkSuffix)-$(Configuration)'))</OutputPath> - <OutputPath Condition="'$(TargetFrameworkSuffix)' == ''">$([MSBuild]::NormalizeDirectory('$(BaseOutputPath)', '$(TargetFramework)-$(Configuration)'))</OutputPath> + <OutputPath>$([MSBuild]::NormalizeDirectory('$(BaseOutputPath)', '$(TargetFramework)-$(Configuration)'))</OutputPath> + <OutputPath Condition="'$(TargetFrameworkSuffix)' != '' and !$(TargetFramework.Contains('-'))">$([MSBuild]::NormalizeDirectory('$(BaseOutputPath)', '$(TargetFramework)-$(TargetFrameworkSuffix)-$(Configuration)'))</OutputPath> </PropertyGroup> </Project> |