summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--init-tools.cmd10
-rwxr-xr-xinit-tools.sh2
-rw-r--r--src/mscorlib/facade/mscorlib.csproj18
-rw-r--r--src/mscorlib/model.xml181
-rw-r--r--src/mscorlib/mscorlib.shared.sources.props4
-rw-r--r--tests/publishdependency.targets4
-rw-r--r--tests/src/Common/test_dependencies/project.json2
-rw-r--r--tests/src/Common/test_dependencies/test_dependencies.csproj3
-rw-r--r--tests/src/Common/test_runtime/project.json2
-rw-r--r--tests/src/Common/test_runtime/test_runtime.csproj3
10 files changed, 21 insertions, 208 deletions
diff --git a/init-tools.cmd b/init-tools.cmd
index 85c136ce34..f1e9f1fa82 100644
--- a/init-tools.cmd
+++ b/init-tools.cmd
@@ -39,11 +39,11 @@ if NOT exist "%PROJECT_JSON_PATH%" mkdir "%PROJECT_JSON_PATH%"
echo %PROJECT_JSON_CONTENTS% > "%PROJECT_JSON_FILE%"
echo Running %0 > "%INIT_TOOLS_LOG%"
+set /p DOTNET_VERSION=< "%~dp0DotnetCLIVersion.txt"
if exist "%DOTNET_CMD%" goto :afterdotnetrestore
echo Installing dotnet cli...
if NOT exist "%DOTNET_PATH%" mkdir "%DOTNET_PATH%"
-set /p DOTNET_VERSION=< "%~dp0DotnetCLIVersion.txt"
if [%PROCESSOR_ARCHITECTURE%]==[x86] (set DOTNET_ZIP_NAME=dotnet-dev-win-x86.%DOTNET_VERSION%.zip) else (set DOTNET_ZIP_NAME=dotnet-dev-win-x64.%DOTNET_VERSION%.zip)
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%
@@ -73,6 +73,14 @@ echo Initializing BuildTools ...
echo Running: "%BUILD_TOOLS_PATH%init-tools.cmd" "%~dp0" "%DOTNET_CMD%" "%TOOLRUNTIME_DIR%" >> "%INIT_TOOLS_LOG%"
call "%BUILD_TOOLS_PATH%init-tools.cmd" "%~dp0" "%DOTNET_CMD%" "%TOOLRUNTIME_DIR%" >> "%INIT_TOOLS_LOG%"
+echo Updating CLI NuGet Frameworks map...
+robocopy "%TOOLRUNTIME_DIR%" "%TOOLRUNTIME_DIR%\dotnetcli\sdk\%DOTNET_VERSION%" NuGet.Frameworks.dll /XO >> "%INIT_TOOLS_LOG%"
+set UPDATE_CLI_ERRORLEVEL=%ERRORLEVEL%
+if %UPDATE_CLI_ERRORLEVEL% GTR 1 (
+ echo ERROR: Failed to update Nuget for CLI {Error level %UPDATE_CLI_ERRORLEVEL%}. Please check '%INIT_TOOLS_LOG%' for more details. 1>&2
+ exit /b %UPDATE_CLI_ERRORLEVEL%
+)
+
:: Create sempahore file
echo Done initializing tools.
echo Init-Tools.cmd completed for BuildTools Version: %BUILDTOOLS_VERSION% > "%BUILD_TOOLS_SEMAPHORE%"
diff --git a/init-tools.sh b/init-tools.sh
index 7a799af973..e842c9d431 100755
--- a/init-tools.sh
+++ b/init-tools.sh
@@ -136,6 +136,8 @@ if [ ! -e $__PROJECT_JSON_FILE ]; then
# On ubuntu 14.04, /bin/sh (symbolic link) calls /bin/dash by default.
$__BUILD_TOOLS_PATH/init-tools.sh $__scriptpath $__DOTNET_CMD $__TOOLRUNTIME_DIR
+ cp $__TOOLRUNTIME_DIR/NuGet.Frameworks.dll $__TOOLRUNTIME_DIR/dotnetcli/sdk/$__DOTNET_TOOLS_VERSION
+
else
echo "$__PROJECT_JSON_FILE found. Skipping .NET CLI installation."
fi
diff --git a/src/mscorlib/facade/mscorlib.csproj b/src/mscorlib/facade/mscorlib.csproj
index 622e2db80a..40d9717383 100644
--- a/src/mscorlib/facade/mscorlib.csproj
+++ b/src/mscorlib/facade/mscorlib.csproj
@@ -103,24 +103,6 @@
<SeedTypePreference Include="System.IO.SeekOrigin">
<Assembly>System.IO</Assembly>
</SeedTypePreference>
- <SeedTypePreference Include="System.IO.TextReader">
- <Assembly>System.IO</Assembly>
- </SeedTypePreference>
- <SeedTypePreference Include="System.IO.TextWriter">
- <Assembly>System.IO</Assembly>
- </SeedTypePreference>
- <SeedTypePreference Include="System.IO.StreamReader">
- <Assembly>System.IO</Assembly>
- </SeedTypePreference>
- <SeedTypePreference Include="System.IO.StreamWriter">
- <Assembly>System.IO</Assembly>
- </SeedTypePreference>
- <SeedTypePreference Include="System.IO.StringReader">
- <Assembly>System.IO</Assembly>
- </SeedTypePreference>
- <SeedTypePreference Include="System.IO.StringWriter">
- <Assembly>System.IO</Assembly>
- </SeedTypePreference>
<SeedTypePreference Include="System.IO.Stream">
<Assembly>System.IO</Assembly>
</SeedTypePreference>
diff --git a/src/mscorlib/model.xml b/src/mscorlib/model.xml
index 54915fea75..ecd9b92a66 100644
--- a/src/mscorlib/model.xml
+++ b/src/mscorlib/model.xml
@@ -9236,187 +9236,6 @@
<Member MemberType="Property" Name="ReadTimeout" />
<Member MemberType="Property" Name="WriteTimeout" />
</Type>
- <Type Name="System.IO.StreamReader">
- <Member MemberType="Field" Name="Null" />
- <Member Name="#ctor(System.IO.Stream)" />
- <Member Name="#ctor(System.IO.Stream,System.Boolean)" />
- <Member Name="#ctor(System.IO.Stream,System.Text.Encoding)" />
- <Member Name="#ctor(System.IO.Stream,System.Text.Encoding,System.Boolean)" />
- <Member Name="#ctor(System.IO.Stream,System.Text.Encoding,System.Boolean,System.Int32)" />
- <Member Name="#ctor(System.IO.Stream,System.Text.Encoding,System.Boolean,System.Int32,System.Boolean)" />
- <Member Name="#ctor(System.String)" />
- <Member Name="#ctor(System.String,System.Boolean)" />
- <Member Name="#ctor(System.String,System.Text.Encoding)" />
- <Member Name="#ctor(System.String,System.Text.Encoding,System.Boolean)" />
- <Member Name="#ctor(System.String,System.Text.Encoding,System.Boolean,System.Int32)" />
- <Member Name="Close" />
- <Member Name="DiscardBufferedData" />
- <Member Name="Dispose(System.Boolean)" />
- <Member Name="get_BaseStream" />
- <Member Name="get_CurrentEncoding" />
- <Member Name="get_EndOfStream" />
- <Member Name="Peek" />
- <Member Name="Read" />
- <Member Name="Read(System.Char[],System.Int32,System.Int32)" />
- <Member Name="ReadAsync(System.Char[],System.Int32,System.Int32)" />
- <Member Name="ReadBlock(System.Char[],System.Int32,System.Int32)" />
- <Member Name="ReadBlockAsync(System.Char[],System.Int32,System.Int32)" />
- <Member Name="ReadLine" />
- <Member Name="ReadLineAsync" />
- <Member Name="ReadToEnd" />
- <Member Name="ReadToEndAsync" />
- <Member MemberType="Property" Name="BaseStream" />
- <Member MemberType="Property" Name="CurrentEncoding" />
- <Member MemberType="Property" Name="EndOfStream" />
- </Type>
- <Type Name="System.IO.StreamWriter">
- <Member MemberType="Field" Name="Null" />
- <Member Name="#ctor(System.IO.Stream)" />
- <Member Name="#ctor(System.IO.Stream,System.Text.Encoding)" />
- <Member Name="#ctor(System.IO.Stream,System.Text.Encoding,System.Int32)" />
- <Member Name="#ctor(System.IO.Stream,System.Text.Encoding,System.Int32,System.Boolean)" />
- <Member Name="#ctor(System.String)" />
- <Member Name="#ctor(System.String,System.Boolean)" />
- <Member Name="#ctor(System.String,System.Boolean,System.Text.Encoding)" />
- <Member Name="#ctor(System.String,System.Boolean,System.Text.Encoding,System.Int32)" />
- <Member Name="Close" />
- <Member Name="Dispose(System.Boolean)" />
- <Member Name="Flush" />
- <Member Name="FlushAsync" />
- <Member Name="get_AutoFlush" />
- <Member Name="get_BaseStream" />
- <Member Name="get_Encoding" />
- <Member Name="set_AutoFlush(System.Boolean)" />
- <Member Name="Write(System.Char)" />
- <Member Name="Write(System.Char[])" />
- <Member Name="Write(System.Char[],System.Int32,System.Int32)" />
- <Member Name="Write(System.String)" />
- <Member Name="WriteAsync(System.Char)" />
- <Member Name="WriteAsync(System.Char[],System.Int32,System.Int32)" />
- <Member Name="WriteAsync(System.String)" />
- <Member Name="WriteLineAsync" />
- <Member Name="WriteLineAsync(System.Char)" />
- <Member Name="WriteLineAsync(System.Char[],System.Int32,System.Int32)" />
- <Member Name="WriteLineAsync(System.String)" />
- <Member MemberType="Property" Name="AutoFlush" />
- <Member MemberType="Property" Name="BaseStream" />
- <Member MemberType="Property" Name="Encoding" />
- </Type>
- <Type Name="System.IO.StringReader">
- <Member Name="#ctor(System.String)" />
- <Member Name="Close" />
- <Member Name="Dispose(System.Boolean)" />
- <Member Name="Peek" />
- <Member Name="Read" />
- <Member Name="Read(System.Char[],System.Int32,System.Int32)" />
- <Member Name="ReadAsync(System.Char[],System.Int32,System.Int32)" />
- <Member Name="ReadBlockAsync(System.Char[],System.Int32,System.Int32)" />
- <Member Name="ReadLine" />
- <Member Name="ReadLineAsync" />
- <Member Name="ReadToEnd" />
- <Member Name="ReadToEndAsync" />
- </Type>
- <Type Name="System.IO.StringWriter">
- <Member Name="#ctor" />
- <Member Name="#ctor(System.IFormatProvider)" />
- <Member Name="#ctor(System.Text.StringBuilder)" />
- <Member Name="#ctor(System.Text.StringBuilder,System.IFormatProvider)" />
- <Member Name="Close" />
- <Member Name="Dispose(System.Boolean)" />
- <Member Name="FlushAsync" />
- <Member Name="get_Encoding" />
- <Member Name="GetStringBuilder" />
- <Member Name="ToString" />
- <Member Name="Write(System.Char)" />
- <Member Name="Write(System.Char[],System.Int32,System.Int32)" />
- <Member Name="Write(System.String)" />
- <Member Name="WriteAsync(System.Char)" />
- <Member Name="WriteAsync(System.Char[],System.Int32,System.Int32)" />
- <Member Name="WriteAsync(System.String)" />
- <Member Name="WriteLineAsync(System.Char)" />
- <Member Name="WriteLineAsync(System.Char[],System.Int32,System.Int32)" />
- <Member Name="WriteLineAsync(System.String)" />
- <Member MemberType="Property" Name="Encoding" />
- </Type>
- <Type Name="System.IO.TextReader">
- <Member MemberType="Field" Name="Null" />
- <Member Name="#ctor" />
- <Member Name="Close" />
- <Member Name="Dispose(System.Boolean)" />
- <Member Name="Peek" />
- <Member Name="Read" />
- <Member Name="Read(System.Char[],System.Int32,System.Int32)" />
- <Member Name="ReadAsync(System.Char[],System.Int32,System.Int32)" />
- <Member Name="ReadBlock(System.Char[],System.Int32,System.Int32)" />
- <Member Name="ReadBlockAsync(System.Char[],System.Int32,System.Int32)" />
- <Member Name="ReadLine" />
- <Member Name="ReadLineAsync" />
- <Member Name="ReadToEnd" />
- <Member Name="ReadToEndAsync" />
- <Member Name="Synchronized(System.IO.TextReader)" />
- </Type>
- <Type Name="System.IO.TextWriter">
- <Member MemberType="Field" Name="CoreNewLine" />
- <Member MemberType="Field" Name="Null" />
- <Member Name="#ctor" />
- <Member Name="#ctor(System.IFormatProvider)" />
- <Member Name="Close" />
- <Member Name="Dispose(System.Boolean)" />
- <Member Name="Flush" />
- <Member Name="FlushAsync" />
- <Member Name="get_Encoding" />
- <Member Name="get_FormatProvider" />
- <Member Name="get_NewLine" />
- <Member Name="set_NewLine(System.String)" />
- <Member Name="Synchronized(System.IO.TextWriter)" />
- <Member Name="Write(System.Boolean)" />
- <Member Name="Write(System.Char)" />
- <Member Name="Write(System.Char[])" />
- <Member Name="Write(System.Char[],System.Int32,System.Int32)" />
- <Member Name="Write(System.Decimal)" />
- <Member Name="Write(System.Double)" />
- <Member Name="Write(System.Int32)" />
- <Member Name="Write(System.Int64)" />
- <Member Name="Write(System.Object)" />
- <Member Name="Write(System.Single)" />
- <Member Name="Write(System.String)" />
- <Member Name="Write(System.String,System.Object)" />
- <Member Name="Write(System.String,System.Object,System.Object)" />
- <Member Name="Write(System.String,System.Object,System.Object,System.Object)" />
- <Member Name="Write(System.String,System.Object[])" />
- <Member Name="Write(System.UInt32)" />
- <Member Name="Write(System.UInt64)" />
- <Member Name="WriteAsync(System.Char)" />
- <Member Name="WriteAsync(System.Char[])" />
- <Member Name="WriteAsync(System.Char[],System.Int32,System.Int32)" />
- <Member Name="WriteAsync(System.String)" />
- <Member Name="WriteLine" />
- <Member Name="WriteLine(System.Boolean)" />
- <Member Name="WriteLine(System.Char)" />
- <Member Name="WriteLine(System.Char[])" />
- <Member Name="WriteLine(System.Char[],System.Int32,System.Int32)" />
- <Member Name="WriteLine(System.Decimal)" />
- <Member Name="WriteLine(System.Double)" />
- <Member Name="WriteLine(System.Int32)" />
- <Member Name="WriteLine(System.Int64)" />
- <Member Name="WriteLine(System.Object)" />
- <Member Name="WriteLine(System.Single)" />
- <Member Name="WriteLine(System.String)" />
- <Member Name="WriteLine(System.String,System.Object)" />
- <Member Name="WriteLine(System.String,System.Object,System.Object)" />
- <Member Name="WriteLine(System.String,System.Object,System.Object,System.Object)" />
- <Member Name="WriteLine(System.String,System.Object[])" />
- <Member Name="WriteLine(System.UInt32)" />
- <Member Name="WriteLine(System.UInt64)" />
- <Member Name="WriteLineAsync" />
- <Member Name="WriteLineAsync(System.Char)" />
- <Member Name="WriteLineAsync(System.Char[])" />
- <Member Name="WriteLineAsync(System.Char[],System.Int32,System.Int32)" />
- <Member Name="WriteLineAsync(System.String)" />
- <Member MemberType="Property" Name="Encoding" />
- <Member MemberType="Property" Name="FormatProvider" />
- <Member MemberType="Property" Name="NewLine" />
- </Type>
<Type Name="System.IO.UnmanagedMemoryAccessor">
<Member Name="#ctor" />
<Member Name="#ctor(System.Runtime.InteropServices.SafeBuffer,System.Int64,System.Int64)" />
diff --git a/src/mscorlib/mscorlib.shared.sources.props b/src/mscorlib/mscorlib.shared.sources.props
index 17e255457a..85f3c5a690 100644
--- a/src/mscorlib/mscorlib.shared.sources.props
+++ b/src/mscorlib/mscorlib.shared.sources.props
@@ -810,8 +810,8 @@
<IoSources Include="$(BclSourcesRoot)\System\IO\StreamHelpers.CopyValidation.cs" />
<IoSources Include="$(BclSourcesRoot)\System\IO\StreamReader.cs" />
<IoSources Include="$(BclSourcesRoot)\System\IO\StreamWriter.cs" />
- <IoSources Include="$(BclSourcesRoot)\System\IO\StringReader.cs" />
- <IoSources Include="$(BclSourcesRoot)\System\IO\StringWriter.cs" />
+ <IoSources Condition="'$(FeatureCoreClr)'!='true'" Include="$(BclSourcesRoot)\System\IO\StringReader.cs" />
+ <IoSources Condition="'$(FeatureCoreClr)'!='true'" Include="$(BclSourcesRoot)\System\IO\StringWriter.cs" />
<IoSources Include="$(BclSourcesRoot)\System\IO\TextReader.cs" />
<IoSources Include="$(BclSourcesRoot)\System\IO\TextWriter.cs" />
<IoSources Include="$(BclSourcesRoot)\System\IO\UnmanagedMemoryAccessor.cs" />
diff --git a/tests/publishdependency.targets b/tests/publishdependency.targets
index 554b1eee78..c5a006c255 100644
--- a/tests/publishdependency.targets
+++ b/tests/publishdependency.targets
@@ -3,8 +3,8 @@
<UsingTask TaskName="PrereleaseResolveNuGetPackageAssets" AssemblyFile="$(BuildToolsTaskDir)Microsoft.DotNet.Build.Tasks.dll"/>
<ItemGroup>
- <TestTargetFramework Include=".NETCoreApp,Version=v1.0">
- <Folder>netcoreapp1.0</Folder>
+ <TestTargetFramework Include=".NETCoreApp,Version=v1.1">
+ <Folder>netcoreapp1.1</Folder>
</TestTargetFramework>
</ItemGroup>
diff --git a/tests/src/Common/test_dependencies/project.json b/tests/src/Common/test_dependencies/project.json
index 22f9985515..97e9cc367c 100644
--- a/tests/src/Common/test_dependencies/project.json
+++ b/tests/src/Common/test_dependencies/project.json
@@ -70,7 +70,7 @@
"System.Numerics.Vectors": "4.4.0-beta-24612-04"
},
"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 1676021480..0649d2b1e7 100644
--- a/tests/src/Common/test_dependencies/test_dependencies.csproj
+++ b/tests/src/Common/test_dependencies/test_dependencies.csproj
@@ -5,9 +5,10 @@
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<CLRTestKind>BuildOnly</CLRTestKind>
+ <NugetTargetMoniker>.NETCoreApp,Version=v1.1</NugetTargetMoniker>
</PropertyGroup>
<ItemGroup>
- <DnuSourceList Include="$(CORE_ROOT)\.nuget\pkg" />
+ <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..0e718d9f4b 100644
--- a/tests/src/Common/test_runtime/project.json
+++ b/tests/src/Common/test_runtime/project.json
@@ -3,7 +3,7 @@
"Microsoft.DotNet.CoreCLR.TestDependencies": "1.0.0-prerelease",
},
"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 71fefbe80b..ad0093adfc 100644
--- a/tests/src/Common/test_runtime/test_runtime.csproj
+++ b/tests/src/Common/test_runtime/test_runtime.csproj
@@ -8,9 +8,10 @@
<!-- Reset the Default project.json-->
<ProjectJson></ProjectJson>
<ProjectLockJson></ProjectLockJson>
+ <NugetTargetMoniker>.NETCoreApp,Version=v1.1</NugetTargetMoniker>
</PropertyGroup>
<ItemGroup>
- <DnuSourceList Include="$(CORE_ROOT)\.nuget\pkg" />
+ <DnuSourceList Include="$(CORE_ROOT)\.nuget\pkg" />
</ItemGroup>
<ItemGroup>
<None Include="project.json" />
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-23 18:40:24 +0000