summaryrefslogtreecommitdiff
path: root/tests/src/Common
diff options
context:
space:
mode:
Diffstat (limited to 'tests/src/Common')
-rw-r--r--tests/src/Common/Platform/platformdefines.cpp4
-rw-r--r--tests/src/Common/Platform/platformdefines.h6
-rw-r--r--tests/src/Common/build_against_pkg_dependencies/build_against_pkg_dependencies.csproj15
-rw-r--r--tests/src/Common/build_against_pkg_dependencies/project.json32
-rw-r--r--tests/src/Common/empty/project.json2
-rw-r--r--tests/src/Common/netcoreapp/project.json74
-rw-r--r--tests/src/Common/targeting_pack_ref/project.json22
-rw-r--r--tests/src/Common/targeting_pack_ref/targeting_pack_ref.csproj12
-rw-r--r--tests/src/Common/test_dependencies/project.json136
-rw-r--r--tests/src/Common/test_dependencies/test_dependencies.csproj4
-rw-r--r--tests/src/Common/test_runtime/project.json5
-rw-r--r--tests/src/Common/test_runtime/test_runtime.csproj4
12 files changed, 237 insertions, 79 deletions
diff --git a/tests/src/Common/Platform/platformdefines.cpp b/tests/src/Common/Platform/platformdefines.cpp
index 4caead59ea..82061ac90d 100644
--- a/tests/src/Common/Platform/platformdefines.cpp
+++ b/tests/src/Common/Platform/platformdefines.cpp
@@ -89,7 +89,7 @@ int TP_slen(LPWSTR str)
return len;
}
-int TP_scmp_s(LPSTR str1, LPSTR str2)
+int TP_scmp_s(LPCSTR str1, LPCSTR str2)
{
// < 0 str1 less than str2
// 0 str1 identical to str2
@@ -277,7 +277,7 @@ DWORD TP_GetFullPathName(LPWSTR fileName, DWORD nBufferLength, LPWSTR lpBuffer)
return GetFullPathNameW(fileName, nBufferLength, lpBuffer, NULL);
#else
char nativeFullPath[MAX_PATH];
- realpath(HackyConvertToSTR(fileName), nativeFullPath);
+ (void)realpath(HackyConvertToSTR(fileName), nativeFullPath);
LPWSTR fullPathForCLR = HackyConvertToWSTR(nativeFullPath);
wcscpy_s(lpBuffer, MAX_PATH, fullPathForCLR);
return wcslen(lpBuffer);
diff --git a/tests/src/Common/Platform/platformdefines.h b/tests/src/Common/Platform/platformdefines.h
index d0760fd6ae..0961e86b2d 100644
--- a/tests/src/Common/Platform/platformdefines.h
+++ b/tests/src/Common/Platform/platformdefines.h
@@ -72,7 +72,7 @@ LPWSTR HackyConvertToWSTR(char* pszInput);
typedef pthread_t THREAD_ID;
typedef void* (*MacWorker)(void*);
-typedef DWORD (*LPTHREAD_START_ROUTINE)(void*);
+typedef DWORD __stdcall (*LPTHREAD_START_ROUTINE)(void*);
#ifdef UNICODE
typedef WCHAR TCHAR;
#else // ANSI
@@ -87,7 +87,7 @@ typedef void* HMODULE;
typedef void* ULONG_PTR;
typedef unsigned error_t;
typedef void* LPVOID;
-typedef char BYTE;
+typedef unsigned char BYTE;
typedef WCHAR OLECHAR;
#endif
@@ -97,7 +97,7 @@ typedef WCHAR OLECHAR;
error_t TP_scpy_s(LPWSTR strDestination, size_t sizeInWords, LPCWSTR strSource);
error_t TP_scat_s(LPWSTR strDestination, size_t sizeInWords, LPCWSTR strSource);
int TP_slen(LPWSTR str);
-int TP_scmp_s(LPSTR str1, LPSTR str2);
+int TP_scmp_s(LPCSTR str1, LPCSTR str2);
int TP_wcmp_s(LPWSTR str1, LPWSTR str2);
error_t TP_getenv_s(size_t* pReturnValue, LPWSTR buffer, size_t sizeInWords, LPCWSTR varname);
error_t TP_putenv_s(LPTSTR name, LPTSTR value);
diff --git a/tests/src/Common/build_against_pkg_dependencies/build_against_pkg_dependencies.csproj b/tests/src/Common/build_against_pkg_dependencies/build_against_pkg_dependencies.csproj
new file mode 100644
index 0000000000..63c54488f2
--- /dev/null
+++ b/tests/src/Common/build_against_pkg_dependencies/build_against_pkg_dependencies.csproj
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <PropertyGroup>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <CLRTestKind>BuildOnly</CLRTestKind>
+ </PropertyGroup>
+ <ItemGroup>
+ <DnuSourceList Include="$(CORE_ROOT)\.nuget\pkg" />
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+ <Target Name="Build"
+ DependsOnTargets="ResolveReferences" />
+</Project>
diff --git a/tests/src/Common/build_against_pkg_dependencies/project.json b/tests/src/Common/build_against_pkg_dependencies/project.json
new file mode 100644
index 0000000000..562485594f
--- /dev/null
+++ b/tests/src/Common/build_against_pkg_dependencies/project.json
@@ -0,0 +1,32 @@
+{
+ "dependencies": {
+ "Microsoft.NETCore.ILAsm": "1.2.0-beta-24820-02",
+ "Microsoft.NETCore.ILDAsm": "1.2.0-beta-24820-02",
+ "Microsoft.NETCore.Jit": "1.2.0-beta-24820-02",
+ "Microsoft.NETCore.Runtime.CoreCLR": "1.2.0-beta-24820-02",
+ "Microsoft.NETCore.TestHost": "1.2.0-beta-24820-02"
+ },
+ "frameworks": {
+ "netcoreapp1.1": {
+ "imports": [
+ "dnxcore50",
+ "portable-net45+win8"
+ ]
+ }
+ },
+ "runtimes": {
+ "win7-x86": {},
+ "win7-x64": {},
+ "win10-arm64": {},
+ "ubuntu.14.04-x64": {},
+ "ubuntu.16.04-x64": {},
+ "ubuntu.16.10-x64": {},
+ "osx.10.10-x64": {},
+ "centos.7-x64": {},
+ "rhel.7-x64": {},
+ "debian.8-x64": {},
+ "fedora.23-x64": {},
+ "opensuse.13.2-x64": {},
+ "opensuse.42.1-x64": {}
+ }
+}
diff --git a/tests/src/Common/empty/project.json b/tests/src/Common/empty/project.json
index c6d5104033..1954111901 100644
--- a/tests/src/Common/empty/project.json
+++ b/tests/src/Common/empty/project.json
@@ -2,7 +2,7 @@
"dependencies": {
},
"frameworks": {
- "netcoreapp1.0": {}
+ "netcoreapp1.1": {}
},
"runtimes": {
"win7-x86": {},
diff --git a/tests/src/Common/netcoreapp/project.json b/tests/src/Common/netcoreapp/project.json
new file mode 100644
index 0000000000..51193fc015
--- /dev/null
+++ b/tests/src/Common/netcoreapp/project.json
@@ -0,0 +1,74 @@
+{
+ "version": "1.0.0-*",
+ "buildOptions": {
+ "debugType": "portable",
+ "emitEntryPoint": true
+ },
+ "dependencies": {
+ "Microsoft.NETCore.Platforms": "1.2.0-beta-24820-02",
+ "Microsoft.NETCore.Targets": "1.2.0-beta-24820-02",
+ "System.Threading.Thread": "4.4.0-beta-24820-02",
+ "System.Collections": "4.4.0-beta-24820-02",
+ "System.Xml.XmlSerializer": "4.4.0-beta-24820-02",
+ "System.Collections.Concurrent": "4.4.0-beta-24820-02",
+ "System.ObjectModel": "4.4.0-beta-24820-02",
+ "System.Runtime.Numerics": "4.4.0-beta-24820-02",
+ "System.Collections.NonGeneric": "4.4.0-beta-24820-02",
+ "System.Collections.Specialized": "4.4.0-beta-24820-02",
+ "System.ComponentModel": "4.4.0-beta-24820-02",
+ "System.Reflection.Emit.Lightweight": "4.4.0-beta-24820-02",
+ "System.Reflection.TypeExtensions": "4.4.0-beta-24820-02",
+ "System.Console": "4.4.0-beta-24820-02",
+ "System.Diagnostics.Contracts": "4.4.0-beta-24820-02",
+ "System.Diagnostics.Debug": "4.4.0-beta-24820-02",
+ "System.Diagnostics.Process": "4.4.0-beta-24820-02",
+ "System.Diagnostics.Tools": "4.4.0-beta-24820-02",
+ "System.Diagnostics.Tracing": "4.4.0-beta-24820-02",
+ "System.Dynamic.Runtime": "4.4.0-beta-24820-02",
+ "System.Globalization": "4.4.0-beta-24820-02",
+ "System.Globalization.Calendars": "4.4.0-beta-24820-02",
+ "System.IO": "4.4.0-beta-24820-02",
+ "System.IO.FileSystem": "4.4.0-beta-24820-02",
+ "System.IO.FileSystem.Primitives": "4.4.0-beta-24820-02",
+ "System.Linq": "4.4.0-beta-24820-02",
+ "System.Linq.Queryable": "4.4.0-beta-24820-02",
+ "System.Linq.Expressions": "4.4.0-beta-24820-02",
+ "System.Reflection": "4.4.0-beta-24820-02",
+ "System.Reflection.Extensions": "4.4.0-beta-24820-02",
+ "System.Resources.ResourceManager": "4.4.0-beta-24820-02",
+ "System.Runtime": "4.4.0-beta-24820-02",
+ "System.Runtime.CompilerServices.Unsafe": "4.4.0-beta-24820-02",
+ "System.Runtime.Extensions": "4.4.0-beta-24820-02",
+ "System.Runtime.Handles": "4.4.0-beta-24820-02",
+ "System.Runtime.InteropServices": "4.4.0-beta-24820-02",
+ "System.Runtime.InteropServices.RuntimeInformation": "4.4.0-beta-24820-02",
+ "System.Runtime.Loader": "4.4.0-beta-24820-02",
+ "System.Security.Cryptography.Algorithms": "4.4.0-beta-24820-02",
+ "System.Text.Encoding": "4.4.0-beta-24820-02",
+ "System.Text.Encoding.Extensions": "4.4.0-beta-24820-02",
+ "System.Text.RegularExpressions": "4.4.0-beta-24820-02",
+ "System.Threading": "4.4.0-beta-24820-02",
+ "System.Threading.AccessControl": "4.4.0-beta-24820-02",
+ "System.Threading.Overlapped": "4.4.0-beta-24820-02",
+ "System.Threading.Tasks": "4.4.0-beta-24820-02",
+ "System.Threading.Tasks.Parallel": "4.4.0-beta-24820-02",
+ "System.Threading.ThreadPool": "4.4.0-beta-24820-02",
+ "System.Threading.Timer": "4.4.0-beta-24820-02",
+ "System.Xml.ReaderWriter": "4.4.0-beta-24820-02",
+ "System.Xml.XDocument": "4.4.0-beta-24820-02",
+ "System.Xml.XmlDocument": "4.4.0-beta-24820-02",
+ "System.Xml.XPath": "4.4.0-beta-24820-02",
+ "System.Xml.XPath.XmlDocument": "4.4.0-beta-24820-02",
+ "System.Numerics.Vectors": "4.4.0-beta-24820-02"
+ },
+ "frameworks": {
+ "netcoreapp1.1": {
+ "dependencies": {
+ "Microsoft.NETCore.Runtime.CoreCLR": "1.2.0-beta-24820-02"
+ }
+ }
+ },
+ "runtimes": {
+ "win7-x64": {}
+ }
+}
diff --git a/tests/src/Common/targeting_pack_ref/project.json b/tests/src/Common/targeting_pack_ref/project.json
new file mode 100644
index 0000000000..c1f033b946
--- /dev/null
+++ b/tests/src/Common/targeting_pack_ref/project.json
@@ -0,0 +1,22 @@
+{
+ "dependencies": {
+ "Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24820-02"
+ },
+ "frameworks": {
+ "netcoreapp1.1": {
+ "imports": [
+ "dnxcore50",
+ "portable-net45+win8"
+ ]
+ }
+ },
+ "runtimes": {
+ "win7-x86": {},
+ "win7-x64": {},
+ "ubuntu.14.04-x64": {},
+ "osx.10.10-x64": {},
+ "centos.7-x64": {},
+ "rhel.7-x64": {},
+ "debian.8-x64": {}
+ }
+}
diff --git a/tests/src/Common/targeting_pack_ref/targeting_pack_ref.csproj b/tests/src/Common/targeting_pack_ref/targeting_pack_ref.csproj
new file mode 100644
index 0000000000..65e37c03c3
--- /dev/null
+++ b/tests/src/Common/targeting_pack_ref/targeting_pack_ref.csproj
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <PropertyGroup>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <CLRTestKind>BuildOnly</CLRTestKind>
+ </PropertyGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+ <Target Name="Build"
+ DependsOnTargets="ResolveReferences" />
+</Project>
diff --git a/tests/src/Common/test_dependencies/project.json b/tests/src/Common/test_dependencies/project.json
index 46e2601eeb..5f059148b8 100644
--- a/tests/src/Common/test_dependencies/project.json
+++ b/tests/src/Common/test_dependencies/project.json
@@ -1,76 +1,76 @@
{
"dependencies": {
- "xunit": "2.1.0",
- "xunit.console.netcore": "1.0.2-prerelease-00101",
- "xunit.runner.utility": "2.1.0",
+ "xunit": "2.2.0-beta2-build3300",
+ "xunit.console.netcore": "1.0.2-prerelease-00177",
+ "xunit.runner.utility": "2.2.0-beta2-build3300",
"Microsoft.CodeAnalysis.Compilers": "1.1.1",
- "Microsoft.DotNet.xunit.performance": "1.0.0-alpha-build0035",
- "Microsoft.DotNet.xunit.performance.analysis": "1.0.0-alpha-build0035",
- "Microsoft.DotNet.xunit.performance.runner.Windows": "1.0.0-alpha-build0035",
- "Microsoft.Win32.Primitives": "4.3.0",
- "Newtonsoft.Json": "7.0.1",
- "Microsoft.NETCore.Platforms": "1.1.0",
- "Microsoft.NETCore.Targets": "1.1.0",
- "System.Collections.Immutable": "1.3.0",
- "System.Threading.Thread": "4.3.0",
- "System.Collections": "4.3.0",
- "System.Xml.XmlSerializer": "4.3.0",
- "System.Collections.Concurrent": "4.3.0",
- "System.ObjectModel": "4.3.0",
- "System.Runtime.Numerics": "4.3.0",
- "System.Collections.NonGeneric": "4.3.0",
- "System.Collections.Specialized": "4.3.0",
- "System.ComponentModel": "4.3.0",
- "System.Reflection.Emit.Lightweight": "4.3.0",
- "System.Reflection.TypeExtensions": "4.3.0",
- "System.Console": "4.3.0",
- "System.Diagnostics.Contracts": "4.3.0",
- "System.Diagnostics.Debug": "4.3.0",
- "System.Diagnostics.Process": "4.3.0",
- "System.Diagnostics.Tools": "4.3.0",
- "System.Diagnostics.Tracing": "4.3.0",
- "System.Dynamic.Runtime": "4.3.0",
- "System.Globalization": "4.3.0",
- "System.Globalization.Calendars": "4.3.0",
- "System.IO": "4.3.0",
- "System.IO.FileSystem": "4.3.0",
- "System.IO.FileSystem.Primitives": "4.3.0",
- "System.Linq": "4.3.0",
- "System.Linq.Queryable": "4.3.0",
- "System.Linq.Expressions": "4.3.0",
- "System.Reflection": "4.3.0",
- "System.Reflection.Extensions": "4.3.0",
- "System.Resources.ResourceManager": "4.3.0",
- "System.Runtime": "4.3.0",
- "System.Runtime.CompilerServices.Unsafe": "4.3.0",
- "System.Runtime.Extensions": "4.3.0",
- "System.Runtime.Handles": "4.3.0",
- "System.Runtime.InteropServices": "4.3.0",
- "System.Runtime.InteropServices.RuntimeInformation": "4.3.0",
- "System.Runtime.Loader": "4.3.0",
- "System.Runtime.Serialization.Json": "4.3.0",
- "System.Runtime.Serialization.Primitives": "4.1.1",
- "System.Runtime.Serialization.Xml": "4.3.0",
- "System.Security.Cryptography.Algorithms": "4.3.0",
- "System.Text.Encoding": "4.3.0",
- "System.Text.Encoding.Extensions": "4.3.0",
- "System.Text.RegularExpressions": "4.3.0",
- "System.Threading": "4.3.0",
- "System.Threading.AccessControl": "4.3.0",
- "System.Threading.Overlapped": "4.3.0",
- "System.Threading.Tasks": "4.3.0",
- "System.Threading.Tasks.Parallel": "4.3.0",
- "System.Threading.ThreadPool": "4.3.0",
- "System.Threading.Timer": "4.3.0",
- "System.Xml.ReaderWriter": "4.3.0",
- "System.Xml.XDocument": "4.3.0",
- "System.Xml.XmlDocument": "4.3.0",
- "System.Xml.XPath": "4.3.0",
- "System.Xml.XPath.XmlDocument": "4.3.0",
- "System.Numerics.Vectors": "4.3.0"
+ "Microsoft.DotNet.xunit.performance": "1.0.0-alpha-build0040",
+ "Microsoft.DotNet.xunit.performance.analysis": "1.0.0-alpha-build0040",
+ "Microsoft.DotNet.xunit.performance.runner.Windows": "1.0.0-alpha-build0040",
+ "Microsoft.Win32.Primitives": "4.4.0-beta-24820-02",
+ "Newtonsoft.Json": "8.0.3",
+ "Microsoft.NETCore.Platforms": "1.2.0-beta-24820-02",
+ "Microsoft.NETCore.Targets": "1.2.0-beta-24820-02",
+ "System.Collections.Immutable": "1.4.0-beta-24820-02",
+ "System.Threading.Thread": "4.4.0-beta-24820-02",
+ "System.Collections": "4.4.0-beta-24820-02",
+ "System.Xml.XmlSerializer": "4.4.0-beta-24820-02",
+ "System.Collections.Concurrent": "4.4.0-beta-24820-02",
+ "System.ObjectModel": "4.4.0-beta-24820-02",
+ "System.Runtime.Numerics": "4.4.0-beta-24820-02",
+ "System.Collections.NonGeneric": "4.4.0-beta-24820-02",
+ "System.Collections.Specialized": "4.4.0-beta-24820-02",
+ "System.ComponentModel": "4.4.0-beta-24820-02",
+ "System.Reflection.Emit.Lightweight": "4.4.0-beta-24820-02",
+ "System.Reflection.TypeExtensions": "4.4.0-beta-24820-02",
+ "System.Console": "4.4.0-beta-24820-02",
+ "System.Diagnostics.Contracts": "4.4.0-beta-24820-02",
+ "System.Diagnostics.Debug": "4.4.0-beta-24820-02",
+ "System.Diagnostics.Process": "4.4.0-beta-24820-02",
+ "System.Diagnostics.Tools": "4.4.0-beta-24820-02",
+ "System.Diagnostics.Tracing": "4.4.0-beta-24820-02",
+ "System.Dynamic.Runtime": "4.4.0-beta-24820-02",
+ "System.Globalization": "4.4.0-beta-24820-02",
+ "System.Globalization.Calendars": "4.4.0-beta-24820-02",
+ "System.IO": "4.4.0-beta-24820-02",
+ "System.IO.FileSystem": "4.4.0-beta-24820-02",
+ "System.IO.FileSystem.Primitives": "4.4.0-beta-24820-02",
+ "System.Linq": "4.4.0-beta-24820-02",
+ "System.Linq.Queryable": "4.4.0-beta-24820-02",
+ "System.Linq.Expressions": "4.4.0-beta-24820-02",
+ "System.Reflection": "4.4.0-beta-24820-02",
+ "System.Reflection.Extensions": "4.4.0-beta-24820-02",
+ "System.Resources.ResourceManager": "4.4.0-beta-24820-02",
+ "System.Runtime": "4.4.0-beta-24820-02",
+ "System.Runtime.CompilerServices.Unsafe": "4.4.0-beta-24820-02",
+ "System.Runtime.Extensions": "4.4.0-beta-24820-02",
+ "System.Runtime.Handles": "4.4.0-beta-24820-02",
+ "System.Runtime.InteropServices": "4.4.0-beta-24820-02",
+ "System.Runtime.InteropServices.RuntimeInformation": "4.4.0-beta-24820-02",
+ "System.Runtime.Loader": "4.4.0-beta-24820-02",
+ "System.Runtime.Serialization.Json": "4.4.0-beta-24820-02",
+ "System.Runtime.Serialization.Primitives": "4.4.0-beta-24820-02",
+ "System.Runtime.Serialization.Xml": "4.4.0-beta-24820-02",
+ "System.Security.Cryptography.Algorithms": "4.4.0-beta-24820-02",
+ "System.Text.Encoding": "4.4.0-beta-24820-02",
+ "System.Text.Encoding.Extensions": "4.4.0-beta-24820-02",
+ "System.Text.RegularExpressions": "4.4.0-beta-24820-02",
+ "System.Threading": "4.4.0-beta-24820-02",
+ "System.Threading.AccessControl": "4.4.0-beta-24820-02",
+ "System.Threading.Overlapped": "4.4.0-beta-24820-02",
+ "System.Threading.Tasks": "4.4.0-beta-24820-02",
+ "System.Threading.Tasks.Parallel": "4.4.0-beta-24820-02",
+ "System.Threading.ThreadPool": "4.4.0-beta-24820-02",
+ "System.Threading.Timer": "4.4.0-beta-24820-02",
+ "System.Xml.ReaderWriter": "4.4.0-beta-24820-02",
+ "System.Xml.XDocument": "4.4.0-beta-24820-02",
+ "System.Xml.XmlDocument": "4.4.0-beta-24820-02",
+ "System.Xml.XPath": "4.4.0-beta-24820-02",
+ "System.Xml.XPath.XmlDocument": "4.4.0-beta-24820-02",
+ "System.Numerics.Vectors": "4.4.0-beta-24820-02"
},
"frameworks": {
- "netcoreapp1.0": {
+ "netcoreapp1.1": {
"imports": [
"dnxcore50",
"portable-net45+win8"
diff --git a/tests/src/Common/test_dependencies/test_dependencies.csproj b/tests/src/Common/test_dependencies/test_dependencies.csproj
index f4757725c6..0649d2b1e7 100644
--- a/tests/src/Common/test_dependencies/test_dependencies.csproj
+++ b/tests/src/Common/test_dependencies/test_dependencies.csproj
@@ -5,10 +5,10 @@
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<CLRTestKind>BuildOnly</CLRTestKind>
- <CoreRootPackagesDir>$(CORE_ROOT)\.nuget\pkg</CoreRootPackagesDir>
+ <NugetTargetMoniker>.NETCoreApp,Version=v1.1</NugetTargetMoniker>
</PropertyGroup>
<ItemGroup>
- <DnuSourceList Include="$(CoreRootPackagesDir)" Condition="Exists('$(CoreRootPackagesDir)')" />
+ <DnuSourceList Include="$(CORE_ROOT)\.nuget\pkg" />
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
<Target Name="Build"
diff --git a/tests/src/Common/test_runtime/project.json b/tests/src/Common/test_runtime/project.json
index 9c6fdf1633..2c7c15f414 100644
--- a/tests/src/Common/test_runtime/project.json
+++ b/tests/src/Common/test_runtime/project.json
@@ -1,9 +1,12 @@
{
"dependencies": {
"Microsoft.DotNet.CoreCLR.TestDependencies": "1.0.0-prerelease",
+ "jit-dasm": "0.0.1.1",
+ "cijobs": "0.0.1.2",
+ "jit-analyze": "0.0.1.0"
},
"frameworks": {
- "netcoreapp1.0": {
+ "netcoreapp1.1": {
"imports": [
"dnxcore50",
"portable-net45+win8"
diff --git a/tests/src/Common/test_runtime/test_runtime.csproj b/tests/src/Common/test_runtime/test_runtime.csproj
index 009655dd6d..ad0093adfc 100644
--- a/tests/src/Common/test_runtime/test_runtime.csproj
+++ b/tests/src/Common/test_runtime/test_runtime.csproj
@@ -8,10 +8,10 @@
<!-- Reset the Default project.json-->
<ProjectJson></ProjectJson>
<ProjectLockJson></ProjectLockJson>
- <CoreRootPackagesDir>$(CORE_ROOT)\.nuget\pkg</CoreRootPackagesDir>
+ <NugetTargetMoniker>.NETCoreApp,Version=v1.1</NugetTargetMoniker>
</PropertyGroup>
<ItemGroup>
- <DnuSourceList Include="$(CoreRootPackagesDir)" Condition="Exists('$(CoreRootPackagesDir)')" />
+ <DnuSourceList Include="$(CORE_ROOT)\.nuget\pkg" />
</ItemGroup>
<ItemGroup>
<None Include="project.json" />
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-10 07:32:58 +0000