diff options
| author | Eric St. John <ericstj@microsoft.com> | 2018-03-29 00:51:21 +0300 |
|---|---|---|
| committer | Eric St. John <ericstj@microsoft.com> | 2018-03-30 00:58:33 +0300 |
| commit | 1c6f2fa2845716aadbcab66a07a575a44fa6ad47 (patch) | |
| tree | 08130fad377b7195e19337a9826c6621c46794cc /pkg | |
| parent | 96ca4023fe4b9ab15256360dc85850512b66fa40 (diff) | |
Enable package testing of latest NETCoreApp2.1
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/test/frameworkSettings/netcoreapp2.1/settings.targets | 9 | ||||
| -rw-r--r-- | pkg/test/packageTest.targets | 1 | ||||
| -rw-r--r-- | pkg/test/testPackages.proj | 3 |
3 files changed, 13 insertions, 0 deletions
diff --git a/pkg/test/frameworkSettings/netcoreapp2.1/settings.targets b/pkg/test/frameworkSettings/netcoreapp2.1/settings.targets new file mode 100644 index 0000000000..949dc4c30a --- /dev/null +++ b/pkg/test/frameworkSettings/netcoreapp2.1/settings.targets @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <!-- Enable targeting netcoreapp2.1 even in an older CLI --> + <NETCoreAppMaximumVersion>2.1</NETCoreAppMaximumVersion> + <!-- use the most recent MS.NETCore.App we have from upstack --> + <RuntimeFrameworkVersion>$(MicrosoftNETCoreAppPackageVersion)</RuntimeFrameworkVersion> + </PropertyGroup> +</Project>
\ No newline at end of file diff --git a/pkg/test/packageTest.targets b/pkg/test/packageTest.targets index f8fea1ae87..9287f897f0 100644 --- a/pkg/test/packageTest.targets +++ b/pkg/test/packageTest.targets @@ -8,6 +8,7 @@ </PropertyGroup> <Import Project="tools\Packaging.common.targets" /> + <Import Project="tools\dependencies.props" /> <Import Project="frameworkSettings\$(_targetFrameworkIdentifier)\*.targets" /> <Import Project="frameworkSettings\$(TargetFramework)\*.targets" /> <Import Project="packageSettings\$(TestPackageId)\*.targets" /> diff --git a/pkg/test/testPackages.proj b/pkg/test/testPackages.proj index 09512816ad..1bec7d40b5 100644 --- a/pkg/test/testPackages.proj +++ b/pkg/test/testPackages.proj @@ -60,6 +60,9 @@ <TestSupportFiles Include="$(SourceDir)shims\netfxreference.props"> <DestinationFolder>$(TestToolsDir)</DestinationFolder> </TestSupportFiles> + <TestSupportFiles Include="$(ProjectDir)dependencies.props"> + <DestinationFolder>$(TestToolsDir)</DestinationFolder> + </TestSupportFiles> <TestSupportFiles Include="$(ToolsDir)Packaging.common.targets"> <DestinationFolder>$(TestToolsDir)</DestinationFolder> </TestSupportFiles> |