Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/corert.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--DotnetCLIVersion.txt2
-rw-r--r--init-tools.cmd8
-rwxr-xr-xinit-tools.sh102
-rw-r--r--src/ILCompiler.Compiler/src/project.json9
-rw-r--r--src/ILCompiler.DependencyAnalysisFramework/src/project.json5
-rw-r--r--src/ILCompiler.DependencyAnalysisFramework/tests/project.json9
-rw-r--r--src/ILCompiler.MetadataTransform/src/project.json4
-rw-r--r--src/ILCompiler.MetadataTransform/tests/project.json9
-rw-r--r--src/ILCompiler.MetadataWriter/src/project.json2
-rw-r--r--src/ILCompiler.TypeSystem/src/project.json8
-rw-r--r--src/ILCompiler.TypeSystem/tests/project.json11
-rw-r--r--src/ILCompiler/desktop/App.config35
-rw-r--r--src/ILCompiler/desktop/desktop.csproj1
-rw-r--r--src/ILCompiler/desktop/project.json12
-rw-r--r--src/ILCompiler/src/project.json15
-rw-r--r--src/System.Private.Reflection.Metadata/tests/project.json7
-rw-r--r--src/packaging/buildtools/test-runtime/project.json51
-rw-r--r--src/packaging/packages.targets31
-rw-r--r--tests/runtest.cmd2
-rwxr-xr-xtests/runtest.sh2
20 files changed, 166 insertions, 159 deletions
diff --git a/DotnetCLIVersion.txt b/DotnetCLIVersion.txt
index b60ffc677..7a77ed32a 100644
--- a/DotnetCLIVersion.txt
+++ b/DotnetCLIVersion.txt
@@ -1 +1 @@
-1.0.0-rc2-002416
+1.0.0-preview3-003223
diff --git a/init-tools.cmd b/init-tools.cmd
index 53c1b306b..dc54300b9 100644
--- a/init-tools.cmd
+++ b/init-tools.cmd
@@ -12,7 +12,7 @@ set BUILD_TOOLS_PATH=%PACKAGES_DIR%Microsoft.DotNet.BuildTools\%BUILDTOOLS_VERSI
set PROJECT_JSON_PATH=%TOOLRUNTIME_DIR%\%BUILDTOOLS_VERSION%
set PROJECT_JSON_FILE=%PROJECT_JSON_PATH%\project.json
set PROJECT_JSON_CONTENTS={ "dependencies": { "Microsoft.DotNet.BuildTools": "%BUILDTOOLS_VERSION%" }, "frameworks": { "dnxcore50": { } } }
-set BUILD_TOOLS_SEMAPHORE=%PROJECT_JSON_PATH%\init-tools-rev.completed
+set BUILD_TOOLS_SEMAPHORE=%PROJECT_JSON_PATH%\init-tools.completed
:: if force option is specified then clean the tool runtime and build tools package directory to force it to get recreated
if [%1]==[force] (
@@ -38,12 +38,12 @@ echo Installing dotnet cli...
if NOT exist "%DOTNET_PATH%" mkdir "%DOTNET_PATH%"
set /p DOTNET_VERSION=< "%~dp0DotnetCLIVersion.txt"
set DOTNET_ZIP_NAME=dotnet-dev-win-x64.%DOTNET_VERSION%.zip
-set DOTNET_REMOTE_PATH=https://dotnetcli.blob.core.windows.net/dotnet/beta/Binaries/%DOTNET_VERSION%/%DOTNET_ZIP_NAME%
+set DOTNET_REMOTE_PATH=https://dotnetcli.blob.core.windows.net/dotnet/Sdk/%DOTNET_VERSION%/%DOTNET_ZIP_NAME%
set DOTNET_LOCAL_PATH=%DOTNET_PATH%%DOTNET_ZIP_NAME%
echo Installing '%DOTNET_REMOTE_PATH%' to '%DOTNET_LOCAL_PATH%' >> "%INIT_TOOLS_LOG%"
powershell -NoProfile -ExecutionPolicy unrestricted -Command "$retryCount = 0; $success = $false; do { try { (New-Object Net.WebClient).DownloadFile('%DOTNET_REMOTE_PATH%', '%DOTNET_LOCAL_PATH%'); $success = $true; } catch { if ($retryCount -ge 6) { throw; } else { $retryCount++; Start-Sleep -Seconds (5 * $retryCount); } } } while ($success -eq $false); Add-Type -Assembly 'System.IO.Compression.FileSystem' -ErrorVariable AddTypeErrors; if ($AddTypeErrors.Count -eq 0) { [System.IO.Compression.ZipFile]::ExtractToDirectory('%DOTNET_LOCAL_PATH%', '%DOTNET_PATH%') } else { (New-Object -com shell.application).namespace('%DOTNET_PATH%').CopyHere((new-object -com shell.application).namespace('%DOTNET_LOCAL_PATH%').Items(),16) }" >> "%INIT_TOOLS_LOG%"
if NOT exist "%DOTNET_LOCAL_PATH%" (
- echo ERROR: Could not install dotnet cli correctly. See '%INIT_TOOLS_LOG%' for more details.
+ echo ERROR: Could not install dotnet cli correctly. See '%INIT_TOOLS_LOG%' for more details. 1>&2
exit /b 1
)
@@ -54,7 +54,7 @@ echo Restoring BuildTools version %BUILDTOOLS_VERSION%...
echo Running: "%DOTNET_CMD%" restore "%PROJECT_JSON_FILE%" --no-cache --packages %PACKAGES_DIR% --source "%BUILDTOOLS_SOURCE%" >> "%INIT_TOOLS_LOG%"
call "%DOTNET_CMD%" restore "%PROJECT_JSON_FILE%" --no-cache --packages %PACKAGES_DIR% --source "%BUILDTOOLS_SOURCE%" >> "%INIT_TOOLS_LOG%"
if NOT exist "%BUILD_TOOLS_PATH%init-tools.cmd" (
- echo ERROR: Could not restore build tools correctly. See '%INIT_TOOLS_LOG%' for more details.
+ echo ERROR: Could not restore build tools correctly. See '%INIT_TOOLS_LOG%' for more details. 1>&2
exit /b 1
)
diff --git a/init-tools.sh b/init-tools.sh
index 6dd1032a6..e23b7f3b3 100755
--- a/init-tools.sh
+++ b/init-tools.sh
@@ -15,40 +15,82 @@ __PROJECT_JSON_FILE=$__PROJECT_JSON_PATH/project.json
__PROJECT_JSON_CONTENTS="{ \"dependencies\": { \"Microsoft.DotNet.BuildTools\": \"$__BUILD_TOOLS_PACKAGE_VERSION\" }, \"frameworks\": { \"dnxcore50\": { } } }"
__INIT_TOOLS_DONE_MARKER=$__PROJECT_JSON_PATH/done
-OSName=$(uname -s)
-case $OSName in
- Darwin)
- OS=OSX
- __DOTNET_PKG=dotnet-dev-osx-x64
- ulimit -n 2048
- ;;
-
- Linux)
- OS=Linux
- source /etc/os-release
- if [ "$ID" == "centos" -o "$ID" == "rhel" ]; then
- __DOTNET_PKG=dotnet-dev-centos-x64
- elif [ "$ID" == "ubuntu" -o "$ID" == "debian" ]; then
- __DOTNET_PKG=dotnet-dev-ubuntu-x64
- else
- echo "Unsupported Linux distribution '$ID' detected. Downloading ubuntu-x64 tools."
- __DOTNET_PKG=dotnet-dev-ubuntu-x64
+# Extended version of platform detection logic from dotnet/cli/scripts/obtain/dotnet-install.sh 16692fc
+get_current_linux_name() {
+ # Detect Distro
+ if [ "$(cat /etc/*-release | grep -cim1 ubuntu)" -eq 1 ]; then
+ if [ "$(cat /etc/*-release | grep -cim1 16.04)" -eq 1 ]; then
+ echo "ubuntu.16.04"
+ return 0
+ fi
+ if [ "$(cat /etc/*-release | grep -cim1 16.10)" -eq 1 ]; then
+ echo "ubuntu.16.10"
+ return 0
fi
- ;;
- *)
- echo "Unsupported OS '$OSName' detected. Downloading ubuntu-x64 tools."
- OS=Linux
- __DOTNET_PKG=dotnet-dev-ubuntu-x64
- ;;
-esac
+ echo "ubuntu"
+ return 0
+ elif [ "$(cat /etc/*-release | grep -cim1 centos)" -eq 1 ]; then
+ echo "centos"
+ return 0
+ elif [ "$(cat /etc/*-release | grep -cim1 rhel)" -eq 1 ]; then
+ echo "rhel"
+ return 0
+ elif [ "$(cat /etc/*-release | grep -cim1 debian)" -eq 1 ]; then
+ echo "debian"
+ return 0
+ elif [ "$(cat /etc/*-release | grep -cim1 fedora)" -eq 1 ]; then
+ if [ "$(cat /etc/*-release | grep -cim1 23)" -eq 1 ]; then
+ echo "fedora.23"
+ return 0
+ fi
+ if [ "$(cat /etc/*-release | grep -cim1 24)" -eq 1 ]; then
+ echo "fedora.24"
+ return 0
+ fi
+ elif [ "$(cat /etc/*-release | grep -cim1 opensuse)" -eq 1 ]; then
+ if [ "$(cat /etc/*-release | grep -cim1 13.2)" -eq 1 ]; then
+ echo "opensuse.13.2"
+ return 0
+ fi
+ if [ "$(cat /etc/*-release | grep -cim1 42.1)" -eq 1 ]; then
+ echo "opensuse.42.1"
+ return 0
+ fi
+ fi
+ # Cannot determine Linux distribution, assuming Ubuntu 14.04.
+ echo "ubuntu"
+ return 0
+}
+
+if [ -z "$__DOTNET_PKG" ]; then
+OSName=$(uname -s)
+ case $OSName in
+ Darwin)
+ OS=OSX
+ __DOTNET_PKG=dotnet-dev-osx-x64
+ ulimit -n 2048
+ ;;
+
+ Linux)
+ __DOTNET_PKG="dotnet-dev-$(get_current_linux_name)-x64"
+ OS=Linux
+ ;;
+
+ *)
+ echo "Unsupported OS '$OSName' detected. Downloading ubuntu-x64 tools."
+ OS=Linux
+ __DOTNET_PKG=dotnet-dev-ubuntu-x64
+ ;;
+ esac
+fi
if [ ! -e $__INIT_TOOLS_DONE_MARKER ]; then
if [ -e $__TOOLRUNTIME_DIR ]; then rm -rf -- $__TOOLRUNTIME_DIR; fi
echo "Running: $__scriptpath/init-tools.sh" > $__init_tools_log
if [ ! -e $__DOTNET_PATH ]; then
echo "Installing dotnet cli..."
- __DOTNET_LOCATION="https://dotnetcli.blob.core.windows.net/dotnet/beta/Binaries/${__DOTNET_TOOLS_VERSION}/${__DOTNET_PKG}.${__DOTNET_TOOLS_VERSION}.tar.gz"
+ __DOTNET_LOCATION="https://dotnetcli.blob.core.windows.net/dotnet/Sdk/${__DOTNET_TOOLS_VERSION}/${__DOTNET_PKG}.${__DOTNET_TOOLS_VERSION}.tar.gz"
# curl has HTTPS CA trust-issues less often than wget, so lets try that first.
echo "Installing '${__DOTNET_LOCATION}' to '$__DOTNET_PATH/dotnet.tar'" >> $__init_tools_log
which curl > /dev/null 2> /dev/null
@@ -60,12 +102,6 @@ if [ ! -e $__INIT_TOOLS_DONE_MARKER ]; then
fi
cd $__DOTNET_PATH
tar -xf $__DOTNET_PATH/dotnet.tar
- if [ -n "$BUILDTOOLS_OVERRIDE_RUNTIME" ]; then
- find $__DOTNET_PATH -name *.ni.* | xargs rm 2>/dev/null
- cp -R $BUILDTOOLS_OVERRIDE_RUNTIME/* $__DOTNET_PATH/bin
- cp -R $BUILDTOOLS_OVERRIDE_RUNTIME/* $__DOTNET_PATH/bin/dnx
- cp -R $BUILDTOOLS_OVERRIDE_RUNTIME/* $__DOTNET_PATH/runtime/coreclr
- fi
cd $__scriptpath
fi
@@ -77,7 +113,7 @@ if [ ! -e $__INIT_TOOLS_DONE_MARKER ]; then
echo "Restoring BuildTools version $__BUILD_TOOLS_PACKAGE_VERSION..."
echo "Running: $__DOTNET_CMD restore \"$__PROJECT_JSON_FILE\" --no-cache --packages $__PACKAGES_DIR --source $__BUILDTOOLS_SOURCE" >> $__init_tools_log
$__DOTNET_CMD restore "$__PROJECT_JSON_FILE" --no-cache --packages $__PACKAGES_DIR --source $__BUILDTOOLS_SOURCE >> $__init_tools_log
- if [ ! -e "$__BUILD_TOOLS_PATH/init-tools.sh" ]; then echo "ERROR: Could not restore build tools correctly. See '$__init_tools_log' for more details."; fi
+ if [ ! -e "$__BUILD_TOOLS_PATH/init-tools.sh" ]; then echo "ERROR: Could not restore build tools correctly. See '$__init_tools_log' for more details."1>&2; fi
fi
echo "Initializing BuildTools..."
diff --git a/src/ILCompiler.Compiler/src/project.json b/src/ILCompiler.Compiler/src/project.json
index 0e57fbe18..7d127b2aa 100644
--- a/src/ILCompiler.Compiler/src/project.json
+++ b/src/ILCompiler.Compiler/src/project.json
@@ -1,10 +1,9 @@
{
"dependencies": {
- "NETStandard.Library": "1.5.0-rc2-23911",
- "System.IO.MemoryMappedFiles": "4.0.0-rc2-23911",
- "System.Reflection.Metadata": "1.3.0-rc3-24102-00",
- "System.Runtime.CompilerServices.Unsafe": "4.0.0-rc3-24102-00",
- "System.Runtime.InteropServices": "4.1.0-rc3-24102-00"
+ "NETStandard.Library": "1.6.0",
+ "System.IO.MemoryMappedFiles": "4.0.0",
+ "System.Reflection.Metadata": "1.4.1-beta-24227-04",
+ "System.Runtime.CompilerServices.Unsafe": "4.0.0"
},
"frameworks": {
"netstandard1.3": {}
diff --git a/src/ILCompiler.DependencyAnalysisFramework/src/project.json b/src/ILCompiler.DependencyAnalysisFramework/src/project.json
index ebb55ba63..2b8ab126a 100644
--- a/src/ILCompiler.DependencyAnalysisFramework/src/project.json
+++ b/src/ILCompiler.DependencyAnalysisFramework/src/project.json
@@ -1,7 +1,8 @@
{
"dependencies": {
- "NETStandard.Library": "1.5.0-rc2-23911",
- "System.Collections.Immutable": "1.2.0-rc2-23911"
+ "NETStandard.Library": "1.6.0",
+ "System.Xml.ReaderWriter": "4.0.11",
+ "System.Collections.Immutable": "1.2.0"
},
"frameworks": {
"netstandard1.3": {}
diff --git a/src/ILCompiler.DependencyAnalysisFramework/tests/project.json b/src/ILCompiler.DependencyAnalysisFramework/tests/project.json
index d6a59cc88..baa52a133 100644
--- a/src/ILCompiler.DependencyAnalysisFramework/tests/project.json
+++ b/src/ILCompiler.DependencyAnalysisFramework/tests/project.json
@@ -1,7 +1,7 @@
{
"dependencies": {
- "NETStandard.Library": "1.5.0-rc2-23911",
- "System.Collections.Immutable": "1.2.0-rc2-23911",
+ "NETStandard.Library": "1.6.0",
+ "System.Collections.Immutable": "1.2.0",
"xunit": "2.1.0",
"test-runtime": {
"target": "project",
@@ -10,7 +10,10 @@
},
"frameworks": {
"dnxcore50": {
- "imports": "portable-net451+win8"
+ "imports": [
+ "netstandard1.6",
+ "portable-net45+win8"
+ ]
}
},
"runtimes": {
diff --git a/src/ILCompiler.MetadataTransform/src/project.json b/src/ILCompiler.MetadataTransform/src/project.json
index 0cb1973fa..721bce5b4 100644
--- a/src/ILCompiler.MetadataTransform/src/project.json
+++ b/src/ILCompiler.MetadataTransform/src/project.json
@@ -1,7 +1,7 @@
{
"dependencies": {
- "NETStandard.Library": "1.5.0-rc2-23911",
- "System.Reflection.Metadata": "1.3.0-rc3-24102-00"
+ "NETStandard.Library": "1.6.0",
+ "System.Reflection.Metadata": "1.4.1-beta-24227-04"
},
"frameworks": {
"netstandard1.3": {}
diff --git a/src/ILCompiler.MetadataTransform/tests/project.json b/src/ILCompiler.MetadataTransform/tests/project.json
index b46e3b8c1..645afdaaf 100644
--- a/src/ILCompiler.MetadataTransform/tests/project.json
+++ b/src/ILCompiler.MetadataTransform/tests/project.json
@@ -1,7 +1,7 @@
{
"dependencies": {
- "NETStandard.Library": "1.5.0-rc2-23911",
- "System.Reflection.Metadata": "1.3.0-rc3-24102-00",
+ "NETStandard.Library": "1.6.0",
+ "System.Reflection.Metadata": "1.4.1-beta-24227-04",
"xunit": "2.1.0",
"test-runtime": {
"target": "project",
@@ -10,7 +10,10 @@
},
"frameworks": {
"dnxcore50": {
- "imports": "portable-net451+win8"
+ "imports": [
+ "netstandard1.6",
+ "portable-net45+win8"
+ ]
}
},
"runtimes": {
diff --git a/src/ILCompiler.MetadataWriter/src/project.json b/src/ILCompiler.MetadataWriter/src/project.json
index 6f3e8fc80..e8c7d8ff7 100644
--- a/src/ILCompiler.MetadataWriter/src/project.json
+++ b/src/ILCompiler.MetadataWriter/src/project.json
@@ -1,6 +1,6 @@
{
"dependencies": {
- "NETStandard.Library": "1.5.0-rc2-23911"
+ "NETStandard.Library": "1.6.0"
},
"frameworks": {
"netstandard1.3": {}
diff --git a/src/ILCompiler.TypeSystem/src/project.json b/src/ILCompiler.TypeSystem/src/project.json
index d9c26bcee..e7a4be069 100644
--- a/src/ILCompiler.TypeSystem/src/project.json
+++ b/src/ILCompiler.TypeSystem/src/project.json
@@ -1,9 +1,9 @@
{
"dependencies": {
- "NETStandard.Library": "1.5.0-rc2-23911",
- "System.IO.MemoryMappedFiles": "4.0.0-rc2-23911",
- "System.Reflection.Metadata": "1.3.0-rc3-24102-00",
- "Microsoft.DiaSymReader": "1.0.8-rc2-60325"
+ "NETStandard.Library": "1.6.0",
+ "System.IO.MemoryMappedFiles": "4.0.0",
+ "System.Reflection.Metadata": "1.4.1-beta-24227-04",
+ "Microsoft.DiaSymReader": "1.0.8"
},
"frameworks": {
"netstandard1.3": {}
diff --git a/src/ILCompiler.TypeSystem/tests/project.json b/src/ILCompiler.TypeSystem/tests/project.json
index d98647b09..34705dc8e 100644
--- a/src/ILCompiler.TypeSystem/tests/project.json
+++ b/src/ILCompiler.TypeSystem/tests/project.json
@@ -1,9 +1,9 @@
{
"dependencies": {
- "NETStandard.Library": "1.5.0-rc2-23911",
- "System.Reflection.Metadata": "1.3.0-rc3-24102-00",
+ "NETStandard.Library": "1.6.0",
+ "System.Reflection.Metadata": "1.4.1-beta-24227-04",
"xunit": "2.1.0",
- "xunit.netcore.extensions": "1.0.0-prerelease-00231-07",
+ "xunit.netcore.extensions": "1.0.0-prerelease-00312-04",
"test-runtime": {
"target": "project",
"exclude": "compile"
@@ -11,7 +11,10 @@
},
"frameworks": {
"dnxcore50": {
- "imports": "portable-net451+win8"
+ "imports": [
+ "netstandard1.6",
+ "portable-net45+win8"
+ ]
}
},
"runtimes": {
diff --git a/src/ILCompiler/desktop/App.config b/src/ILCompiler/desktop/App.config
deleted file mode 100644
index fbce4b6bc..000000000
--- a/src/ILCompiler/desktop/App.config
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
- <runtime>
- <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
- <dependentAssembly>
- <assemblyIdentity name="System.IO.UnmanagedMemoryStream" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
- <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
- </dependentAssembly>
- </assemblyBinding>
- <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
- <dependentAssembly>
- <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
- <bindingRedirect oldVersion="0.0.0.0-1.2.0.0" newVersion="1.2.0.0" />
- </dependentAssembly>
- </assemblyBinding>
- <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
- <dependentAssembly>
- <assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
- <bindingRedirect oldVersion="0.0.0.0-1.2.0.0" newVersion="1.2.0.0" />
- </dependentAssembly>
- </assemblyBinding>
- <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
- <dependentAssembly>
- <assemblyIdentity name="System.Reflection" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
- <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
- </dependentAssembly>
- </assemblyBinding>
- <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
- <dependentAssembly>
- <assemblyIdentity name="System.IO.FileSystem" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
- <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
- </dependentAssembly>
- </assemblyBinding>
- </runtime>
-</configuration> \ No newline at end of file
diff --git a/src/ILCompiler/desktop/desktop.csproj b/src/ILCompiler/desktop/desktop.csproj
index af78d3394..58cde28cd 100644
--- a/src/ILCompiler/desktop/desktop.csproj
+++ b/src/ILCompiler/desktop/desktop.csproj
@@ -52,7 +52,6 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
- <None Include="App.config" />
<None Include="project.json" />
</ItemGroup>
<ItemGroup>
diff --git a/src/ILCompiler/desktop/project.json b/src/ILCompiler/desktop/project.json
index 09cb009de..973eefdc7 100644
--- a/src/ILCompiler/desktop/project.json
+++ b/src/ILCompiler/desktop/project.json
@@ -1,11 +1,11 @@
{
"dependencies": {
- "NETStandard.Library": "1.5.0-rc2-23911",
- "System.IO.MemoryMappedFiles": "4.0.0-rc2-23911",
- "System.Reflection.Metadata": "1.3.0-rc3-24102-00",
- "System.Runtime.CompilerServices.Unsafe": "4.0.0-rc3-24102-00",
- "Microsoft.DiaSymReader": "1.0.8-rc2-60325",
- "System.CommandLine": "0.1.0-e160514-1"
+ "NETStandard.Library": "1.6.0",
+ "System.IO.MemoryMappedFiles": "4.0.0",
+ "System.Reflection.Metadata": "1.4.1-beta-24227-04",
+ "System.Runtime.CompilerServices.Unsafe": "4.0.0",
+ "Microsoft.DiaSymReader": "1.0.8",
+ "System.CommandLine": "0.1.0-e160909-1"
},
"frameworks": {
"net46": {}
diff --git a/src/ILCompiler/src/project.json b/src/ILCompiler/src/project.json
index 3e40b8e19..99a6f6ed5 100644
--- a/src/ILCompiler/src/project.json
+++ b/src/ILCompiler/src/project.json
@@ -1,20 +1,11 @@
{
"dependencies": {
- "NETStandard.Library": "1.5.0-rc2-23911",
- "System.CommandLine": "0.1.0-e160514-1",
+ "NETStandard.Library": "1.6.0",
+ "System.CommandLine": "0.1.0-e160909-1",
"Microsoft.NETCore.Jit": "1.1.0-preview1-24512-00",
"Microsoft.DotNet.ObjectWriter": "1.0.13-prerelease-00001"
},
"frameworks": {
- "netstandard1.3": {}
- },
- "runtimes": {
- "win7-x86": {},
- "win7-x64": {},
- "ubuntu.14.04-x64": {},
- "osx.10.10-x64": {},
- "centos.7-x64": {},
- "rhel.7-x64": {},
- "debian.8.2-x64": {}
+ "netstandard1.6": {}
}
}
diff --git a/src/System.Private.Reflection.Metadata/tests/project.json b/src/System.Private.Reflection.Metadata/tests/project.json
index 3c63115ec..f2301f514 100644
--- a/src/System.Private.Reflection.Metadata/tests/project.json
+++ b/src/System.Private.Reflection.Metadata/tests/project.json
@@ -1,6 +1,6 @@
{
"dependencies": {
- "NETStandard.Library": "1.5.0-rc2-23911",
+ "NETStandard.Library": "1.6.0",
"xunit": "2.1.0",
"test-runtime": {
"target": "project",
@@ -9,7 +9,10 @@
},
"frameworks": {
"dnxcore50": {
- "imports": "portable-net451+win8"
+ "imports": [
+ "netstandard1.6",
+ "portable-net45+win8"
+ ]
}
},
"runtimes": {
diff --git a/src/packaging/buildtools/test-runtime/project.json b/src/packaging/buildtools/test-runtime/project.json
index 4b0fe3c78..24474a8d7 100644
--- a/src/packaging/buildtools/test-runtime/project.json
+++ b/src/packaging/buildtools/test-runtime/project.json
@@ -1,29 +1,32 @@
{
- "dependencies": {
- "NETStandard.Library": "1.5.0-rc2-23911",
- "Microsoft.NETCore.TestHost": "1.0.0-rc2-23911",
- "Microsoft.NETCore.Console": "1.0.0-rc2-23911",
- "System.IO.Compression": "4.1.0-rc2-23911",
- "coveralls.io": "1.4",
- "OpenCover": "4.6.166",
- "ReportGenerator": "2.3.1",
+ "dependencies": {
+ "NETStandard.Library": "1.6.0",
+ "Microsoft.NETCore.Runtime.CoreCLR": "1.0.4",
+ "Microsoft.NETCore.TestHost": "1.0.0",
- "Microsoft.DotNet.xunit.performance.analysis": "1.0.0-alpha-build0023",
- "Microsoft.DotNet.xunit.performance.runner.Windows": "1.0.0-alpha-build0023",
+ "coveralls.io": "1.4",
+ "OpenCover": "4.6.519",
+ "ReportGenerator": "2.4.3",
- "xunit": "2.1.0",
- "xunit.console.netcore": "1.0.2-prerelease-00101",
- "xunit.runner.utility": "2.1.0"
- },
- "frameworks": {
- "dnxcore50": {
- "imports": "portable-net45+win8"
- }
- },
- "runtimes": {
- "win7-x64": { },
- "win7-x86": { },
- "ubuntu.14.04-x64": {},
- "osx.10.10-x64": {}
+ "Microsoft.DotNet.xunit.performance.analysis": "1.0.0-alpha-build0040",
+ "Microsoft.DotNet.xunit.performance.runner.Windows": "1.0.0-alpha-build0040",
+
+ "xunit": "2.1.0",
+ "xunit.console.netcore": "1.0.2-prerelease-00101",
+ "xunit.runner.utility": "2.1.0"
+ },
+ "frameworks": {
+ "dnxcore50": {
+ "imports": [
+ "netstandard1.6",
+ "portable-net45+win8"
+ ]
}
+ },
+ "runtimes": {
+ "win7-x64": { },
+ "win7-x86": { },
+ "ubuntu.14.04-x64": {},
+ "osx.10.10-x64": {}
+ }
}
diff --git a/src/packaging/packages.targets b/src/packaging/packages.targets
index 881873a9e..45197b42c 100644
--- a/src/packaging/packages.targets
+++ b/src/packaging/packages.targets
@@ -94,14 +94,14 @@
<Dependencies><![CDATA[
<dependency id="Microsoft.DotNet.ObjectWriter" version="1.0.13-prerelease-00001" />
<dependency id="Microsoft.NETCore.Jit" version="1.1.0-preview1-24512-00" />
- <dependency id="NETStandard.Library" version="1.5.0-rc2-23911" />
- <dependency id="System.Collections.Immutable" version="1.2.0-rc2-23911" />
- <dependency id="System.IO.MemoryMappedFiles" version="4.0.0-rc2-23911" />
- <dependency id="System.Reflection.Metadata" version="1.3.0-rc3-24102-00" />
- <dependency id="System.Runtime.CompilerServices.Unsafe" version="4.0.0-rc3-24102-00" />
- <dependency id="System.Xml.ReaderWriter" version="4.0.0" />
- <dependency id="Microsoft.DiaSymReader" version="1.0.8-rc2-60325" />
- <dependency id="System.CommandLine" version="0.1.0-e160514-1" />
+ <dependency id="NETStandard.Library" version="1.6.0" />
+ <dependency id="System.Collections.Immutable" version="1.2.0" />
+ <dependency id="System.IO.MemoryMappedFiles" version="4.0.0" />
+ <dependency id="System.Reflection.Metadata" version="1.4.1-beta-24227-04" />
+ <dependency id="System.Runtime.CompilerServices.Unsafe" version="4.0.0" />
+ <dependency id="System.Xml.ReaderWriter" version="4.0.11" />
+ <dependency id="Microsoft.DiaSymReader" version="1.0.8" />
+ <dependency id="System.CommandLine" version="0.1.0-e160909-1" />
]]></Dependencies>
</NuSpecFile>
@@ -220,19 +220,20 @@
<Stage1ProjectJsonLines><![CDATA[
{
"version": "1.0.0-*",
- "compilationOptions": {
- "emitEntryPoint": true,
- },
"dependencies": {
- "NETStandard.Library": "1.5.0-rc2-23911",
- "Microsoft.NETCore.TestHost": "1.0.0-beta-23504",
+ "NETStandard.Library": "1.6.0",
+ "Microsoft.NETCore.Runtime.CoreCLR": "1.0.4",
+ "Microsoft.NETCore.TestHost": "1.0.0",
"toolchain.$(NuPkgRid).$(RuntimeSdkPackageName)": "$(RuntimeSdkVersion)",
},
"frameworks": {
"dnxcore50": {
- "imports": "portable-net451+win8"
+ "imports": [
+ "netstandard1.6",
+ "portable-net45+win8"
+ ]
}
},
@@ -245,7 +246,7 @@
<MakeDir Directories="$(Stage1ProjectDir)" Condition="!Exists('$(Stage1ProjectDir)')" />
<WriteLinesToFile File="$(Stage1ProjectJsonFile)" Lines="$(Stage1ProjectJsonLines)" Overwrite="true" />
<WriteLinesToFile File="$(Stage1ProjectDir)/Program.cs" Lines="class Program { public static void Main() { } }" Overwrite="true" />
- <Exec Command="&quot;$(DnuToolPath)&quot; restore --quiet -s &quot;$(ProductPackageDir)&quot; $(DnuRestoreSource) &quot;$(Stage1ProjectDir)&quot;" />
+ <Exec Command="&quot;$(DnuToolPath)&quot; restore -s &quot;$(ProductPackageDir)&quot; $(DnuRestoreSource) &quot;$(Stage1ProjectDir)&quot;" />
<Exec Command="&quot;$(DnuToolPath)&quot; publish &quot;$(Stage1ProjectDir)&quot; --native-subdirectory -o &quot;$(Stage1PublishDir)&quot; -f &quot;dnxcore50&quot; --runtime &quot;$(NuPkgRid)&quot;" />
</Target>
diff --git a/tests/runtest.cmd b/tests/runtest.cmd
index 9e7ce9354..b7219d48f 100644
--- a/tests/runtest.cmd
+++ b/tests/runtest.cmd
@@ -69,7 +69,7 @@ for /f "delims=" %%a in ('dir /s /aD /b src\*') do (
set __SourceFileName=%%~na
set __RelativePath=!__SourceFolder:%CoreRT_TestRoot%=!
if exist "!__SourceFolder!\project.json" (
- %CoreRT_CliDir%\dotnet restore --quiet --source "https://dotnet.myget.org/F/dotnet-core" "!__SourceFolder!"
+ %CoreRT_CliDir%\dotnet restore --source "https://dotnet.myget.org/F/dotnet-core" "!__SourceFolder!"
set __Mode=Jit
call :CompileFile !__SourceFolder! !__SourceFileName! %__LogDir%\!__RelativePath!
diff --git a/tests/runtest.sh b/tests/runtest.sh
index 11c720264..5c7884dc5 100755
--- a/tests/runtest.sh
+++ b/tests/runtest.sh
@@ -22,7 +22,7 @@ runtest()
restore()
{
- ${CoreRT_CliBinDir}/dotnet restore --quiet $1 --source "https://dotnet.myget.org/F/dotnet-core"
+ ${CoreRT_CliBinDir}/dotnet restore $1 --source "https://dotnet.myget.org/F/dotnet-core"
}
compiletest()
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-06 12:07:35 +0300