huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add conditions to workarounds in TemplateTests.props

This commit is contained in:
wtgodbe 2019-09-25 15:32:42 -07:00
parent 28c46645d2
commit 3ad85f984d
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/ProjectTemplates/test/Infrastructure/TemplateTests.props.in
View File

@ -9,12 +9,14 @@
<ItemGroup> <ItemGroup>
<KnownFrameworkReference <KnownFrameworkReference
Condition="'%(KnownFrameworkReference.TargetFramework)' == '${DefaultNetCoreTargetFramework}'
Update="Microsoft.NETCore.App" Update="Microsoft.NETCore.App"
DefaultRuntimeFrameworkVersion="${MicrosoftNETCoreAppRuntimeVersion}" DefaultRuntimeFrameworkVersion="${MicrosoftNETCoreAppRuntimeVersion}"
LatestRuntimeFrameworkVersion="${MicrosoftNETCoreAppRuntimeVersion}" LatestRuntimeFrameworkVersion="${MicrosoftNETCoreAppRuntimeVersion}"
TargetingPackVersion="${MicrosoftNETCoreAppRefPackageVersion}" /> TargetingPackVersion="${MicrosoftNETCoreAppRefPackageVersion}" />
<KnownFrameworkReference <KnownFrameworkReference
Condition="'%(KnownFrameworkReference.TargetFramework)' == '${DefaultNetCoreTargetFramework}'
Update="Microsoft.AspNetCore.App" Update="Microsoft.AspNetCore.App"
TargetFramework="${DefaultNetCoreTargetFramework}" TargetFramework="${DefaultNetCoreTargetFramework}"
DefaultRuntimeFrameworkVersion="${MicrosoftAspNetCoreAppRuntimePackageVersion}" DefaultRuntimeFrameworkVersion="${MicrosoftAspNetCoreAppRuntimePackageVersion}"
@ -23,15 +25,6 @@
RuntimePackRuntimeIdentifiers="${SupportedRuntimeIdentifiers}" /> RuntimePackRuntimeIdentifiers="${SupportedRuntimeIdentifiers}" />
</ItemGroup> </ItemGroup>
<!-- This can be removed after we update our build to use .NET Core Preivew7 SDK or newer. (Needs https://github.com/dotnet/core-sdk/pull/2401) -->
<ItemGroup>
<KnownFrameworkReference
Update="Microsoft.NETCore.App"
RuntimePackNamePatterns="Microsoft.NETCore.App.Runtime.**RID**"
AppHostPackNamePattern=""
AppHostRuntimeIdentifiers="" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Net.Compilers.Toolset" <PackageReference Include="Microsoft.Net.Compilers.Toolset"
Version="${MicrosoftNetCompilersToolsetPackageVersion}" Version="${MicrosoftNetCompilersToolsetPackageVersion}"