diff --git a/BuildToolsVersion.txt b/BuildToolsVersion.txt
index 57adb361f015..b0667ae58b16 100644
--- a/BuildToolsVersion.txt
+++ b/BuildToolsVersion.txt
@@ -1 +1 @@
-1.0.25-prerelease-00156
+1.0.25-prerelease-00157
diff --git a/build.sh b/build.sh
index dd8f6ca4d5c0..d6fea0009926 100755
--- a/build.sh
+++ b/build.sh
@@ -133,7 +133,7 @@ build_managed_corefx()
__buildproj=$__scriptpath/build.proj
__buildlog=$__scriptpath/msbuild.log
- MONO29679=1 ReferenceAssemblyRoot=$__referenceassemblyroot mono $__msbuildpath "$__buildproj" /nologo /verbosity:minimal "/fileloggerparameters:Verbosity=normal;LogFile=$__buildlog" /t:Build /p:OSGroup=$__BuildOS /p:COMPUTERNAME=$(hostname) /p:USERNAME=$(id -un) /p:TestNugetRuntimeId=$__TestNugetRuntimeId /p:ToolNugetRuntimeId=$__TestNugetRuntimeId $__UnprocessedBuildArgs
+ ReferenceAssemblyRoot=$__referenceassemblyroot $__scriptpath/Tools/corerun $__scriptpath/Tools/MSBuild.exe "$__buildproj" /nologo /verbosity:minimal "/fileloggerparameters:Verbosity=normal;LogFile=$__buildlog" /t:Build /p:OSGroup=$__BuildOS /p:COMPUTERNAME=$(hostname) /p:USERNAME=$(id -un) /p:TestNugetRuntimeId=$__TestNugetRuntimeId /p:ToolNugetRuntimeId=$__TestNugetRuntimeId $__UnprocessedBuildArgs
BUILDERRORLEVEL=$?
echo
diff --git a/dir.props b/dir.props
index f5756958fd25..535db0a346c8 100644
--- a/dir.props
+++ b/dir.props
@@ -6,6 +6,8 @@
$(OS) is set to Unix/Windows_NT. This comes from an environment variable on Windows and MSBuild on Unix.
-->
+
+ Unix
$(OS)
@@ -35,7 +37,7 @@
$(MSBuildThisFileDirectory)
- $(ProjectDir)src\
+ $(ProjectDir)src/
$(ProjectDir)bin/
@@ -120,7 +122,6 @@
-
@@ -128,20 +129,20 @@
-
+
-
-
-
-
-
+
+
+
+
+
$(PackagesDir)/$(DnxPackageName)/
- $(DnxPackageDir)\bin\dnu.cmd
+ $(DnxPackageDir)/bin/dnu.cmd
$(DnxPackageDir)/bin/dnu
$(DotnetCliPath)dotnet.exe
$(DotnetCliPath)dotnet
@@ -158,7 +159,7 @@
-
+
@@ -186,6 +187,12 @@
-->
false
+
+ false
+
- $(SourceDir)Common\src
- $(SourceDir)Common\tests
+ $(SourceDir)Common/src
+ $(SourceDir)Common/tests
$(OSGroup).$(Platform).$(ConfigurationGroup)
- $(TargetGroup)\
+ $(TargetGroup)/
$(BinDir)
- $(BaseOutputPath)$(OSPlatformConfig)\$(MSBuildProjectName)\$(TargetOutputRelPath)
+ $(BaseOutputPath)$(OSPlatformConfig)/$(MSBuildProjectName)/$(TargetOutputRelPath)
$(ObjDir)
- $(BaseIntermediateOutputPath)$(OSPlatformConfig)\
- $(IntermediateOutputRootPath)$(MSBuildProjectName)\$(TargetOutputRelPath)
+ $(BaseIntermediateOutputPath)$(OSPlatformConfig)/
+ $(IntermediateOutputRootPath)$(MSBuildProjectName)/$(TargetOutputRelPath)
- $(TestWorkingDir)$(OSPlatformConfig)\$(MSBuildProjectName)\
+ $(TestWorkingDir)$(OSPlatformConfig)/$(MSBuildProjectName)/
$(BinDir)$(OSPlatformConfig)
diff --git a/init-tools.sh b/init-tools.sh
index 1601706309bf..79e1042f0597 100755
--- a/init-tools.sh
+++ b/init-tools.sh
@@ -64,4 +64,5 @@ if [ ! -e $__PROJECT_JSON_FILE ]; then
fi
sh $__BUILD_TOOLS_PATH/init-tools.sh $__scriptpath $__DOTNET_CMD $__TOOLRUNTIME_DIR
+ chmod a+x $__TOOLRUNTIME_DIR/corerun
fi
diff --git a/src/System.Buffers/src/System.Buffers.csproj b/src/System.Buffers/src/System.Buffers.csproj
index 8fc8d5eb7619..05b5813550db 100644
--- a/src/System.Buffers/src/System.Buffers.csproj
+++ b/src/System.Buffers/src/System.Buffers.csproj
@@ -6,7 +6,7 @@
{2ADDB484-6F57-4D71-A3FE-A57EC6329A2B}
dotnet5.2
true
- true
+ true
diff --git a/src/System.Diagnostics.Contracts/src/System.Diagnostics.Contracts.csproj b/src/System.Diagnostics.Contracts/src/System.Diagnostics.Contracts.csproj
index 8562511e4cb1..14c8a0441836 100644
--- a/src/System.Diagnostics.Contracts/src/System.Diagnostics.Contracts.csproj
+++ b/src/System.Diagnostics.Contracts/src/System.Diagnostics.Contracts.csproj
@@ -18,8 +18,8 @@
- netcore50aot\project.json
- netcore50aot\project.lock.json
+ netcore50aot/project.json
+ netcore50aot/project.lock.json
diff --git a/src/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj b/src/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj
index b498839d5f87..eb14bcba806f 100644
--- a/src/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj
+++ b/src/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj
@@ -7,7 +7,7 @@
4.0.0.0
$(OutputPath)$(AssemblyName).xml
dotnet5.2
- true
+ true
diff --git a/src/System.Dynamic.Runtime/src/System.Dynamic.Runtime.csproj b/src/System.Dynamic.Runtime/src/System.Dynamic.Runtime.csproj
index 728835a46845..d5717d446fff 100644
--- a/src/System.Dynamic.Runtime/src/System.Dynamic.Runtime.csproj
+++ b/src/System.Dynamic.Runtime/src/System.Dynamic.Runtime.csproj
@@ -22,8 +22,8 @@
- netcore50aot\project.json
- netcore50aot\project.lock.json
+ netcore50aot/project.json
+ netcore50aot/project.lock.json
$(DefineConstants);FEATURE_DYNAMIC_DELEGATE
diff --git a/src/System.Globalization.Calendars/src/System.Globalization.Calendars.csproj b/src/System.Globalization.Calendars/src/System.Globalization.Calendars.csproj
index 0059772d050d..804090420de0 100644
--- a/src/System.Globalization.Calendars/src/System.Globalization.Calendars.csproj
+++ b/src/System.Globalization.Calendars/src/System.Globalization.Calendars.csproj
@@ -19,8 +19,8 @@
- netcore50aot\project.json
- netcore50aot\project.lock.json
+ netcore50aot/project.json
+ netcore50aot/project.lock.json
diff --git a/src/System.Globalization/src/System.Globalization.csproj b/src/System.Globalization/src/System.Globalization.csproj
index 27d7a09ae794..13f2b0fa456b 100644
--- a/src/System.Globalization/src/System.Globalization.csproj
+++ b/src/System.Globalization/src/System.Globalization.csproj
@@ -19,8 +19,8 @@
- netcore50aot\project.json
- netcore50aot\project.lock.json
+ netcore50aot/project.json
+ netcore50aot/project.lock.json
diff --git a/src/System.Linq.Expressions/src/System.Linq.Expressions.csproj b/src/System.Linq.Expressions/src/System.Linq.Expressions.csproj
index ae8a209b36a3..4e03c88b6870 100644
--- a/src/System.Linq.Expressions/src/System.Linq.Expressions.csproj
+++ b/src/System.Linq.Expressions/src/System.Linq.Expressions.csproj
@@ -25,8 +25,8 @@
- netcore50aot\project.json
- netcore50aot\project.lock.json
+ netcore50aot/project.json
+ netcore50aot/project.lock.json
$(DefineConstants);FEATURE_DYNAMIC_DELEGATE
diff --git a/src/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.csproj b/src/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.csproj
index 46fcf0fed60e..0d63b1db9039 100644
--- a/src/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.csproj
+++ b/src/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.csproj
@@ -11,7 +11,7 @@
Library
System.Net.Http.WinHttpHandler.Unit.Tests
true
- ..\..\src\Resources\Strings.resx
+ ../../src/Resources/Strings.resx
Linux;OSX;FreeBSD
diff --git a/src/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj b/src/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj
index ea3df8ff5c9c..63792bf9d405 100644
--- a/src/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj
+++ b/src/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj
@@ -11,7 +11,7 @@
Library
System.Net.Http.Unit.Tests
System.Net.Http.Unit.Tests
- ..\..\src\Resources\Strings.resx
+ ../../src/Resources/Strings.resx
true
diff --git a/src/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj b/src/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj
index bd63c56e0bfa..b50c03e99047 100644
--- a/src/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj
+++ b/src/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj
@@ -9,7 +9,7 @@
Library
{F6D1C093-081D-46DE-B5A8-516533375FDD}
true
- ..\..\src\Resources\Strings.resx
+ ../../src/Resources/Strings.resx
FreeBSD
diff --git a/src/System.Net.NetworkInformation/tests/FunctionalTests/System.Net.NetworkInformation.Functional.Tests.csproj b/src/System.Net.NetworkInformation/tests/FunctionalTests/System.Net.NetworkInformation.Functional.Tests.csproj
index 84c6181c33f0..a4137d6b9f7b 100644
--- a/src/System.Net.NetworkInformation/tests/FunctionalTests/System.Net.NetworkInformation.Functional.Tests.csproj
+++ b/src/System.Net.NetworkInformation/tests/FunctionalTests/System.Net.NetworkInformation.Functional.Tests.csproj
@@ -10,7 +10,7 @@
{DCBB8805-4658-44BF-B5E8-B6714EC8936B}
Library
true
- ..\..\src\Resources\
+ ../../src/Resources/
diff --git a/src/System.Net.NetworkInformation/tests/UnitTests/System.Net.NetworkInformation.WinRT.Unit.Tests.csproj b/src/System.Net.NetworkInformation/tests/UnitTests/System.Net.NetworkInformation.WinRT.Unit.Tests.csproj
index bbc7831fc053..0b60181d0978 100644
--- a/src/System.Net.NetworkInformation/tests/UnitTests/System.Net.NetworkInformation.WinRT.Unit.Tests.csproj
+++ b/src/System.Net.NetworkInformation/tests/UnitTests/System.Net.NetworkInformation.WinRT.Unit.Tests.csproj
@@ -9,7 +9,7 @@
AnyCPU
{2194D6A2-1A35-46B5-8233-AEEBCBD31EF9}
Library
- ..\..\src\Resources\Strings.resx
+ ../../src/Resources/Strings.resx
diff --git a/src/System.Net.Primitives/tests/PalTests/System.Net.Primitives.Pal.Tests.csproj b/src/System.Net.Primitives/tests/PalTests/System.Net.Primitives.Pal.Tests.csproj
index b84c2cbb4ec0..a5722b0e2c66 100644
--- a/src/System.Net.Primitives/tests/PalTests/System.Net.Primitives.Pal.Tests.csproj
+++ b/src/System.Net.Primitives/tests/PalTests/System.Net.Primitives.Pal.Tests.csproj
@@ -11,7 +11,7 @@
Library
{7860A11A-1841-4416-8A30-28EEEB42C6BB}
true
- ..\..\src\Resources\Strings.resx
+ ../../src/Resources/Strings.resx
diff --git a/src/System.Net.Primitives/tests/UnitTests/System.Net.Primitives.UnitTests.Tests.csproj b/src/System.Net.Primitives/tests/UnitTests/System.Net.Primitives.UnitTests.Tests.csproj
index 18b59c894eb1..5390005e1a97 100644
--- a/src/System.Net.Primitives/tests/UnitTests/System.Net.Primitives.UnitTests.Tests.csproj
+++ b/src/System.Net.Primitives/tests/UnitTests/System.Net.Primitives.UnitTests.Tests.csproj
@@ -11,7 +11,7 @@
{FCFF9C63-CE7A-476E-8241-7B7236FFDBFB}
true
169,649
- ..\..\src\Resources\Strings.resx
+ ../../src/Resources/Strings.resx
diff --git a/src/System.Net.Requests/tests/System.Net.Requests.Tests.csproj b/src/System.Net.Requests/tests/System.Net.Requests.Tests.csproj
index 4809e4d7ab5d..2c1a01bcdd61 100644
--- a/src/System.Net.Requests/tests/System.Net.Requests.Tests.csproj
+++ b/src/System.Net.Requests/tests/System.Net.Requests.Tests.csproj
@@ -9,7 +9,7 @@
AnyCPU
{851A40FE-7F07-415D-8592-5FE2096E84D3}
Library
- ..\src\Resources\Strings.resx
+ ../src/Resources/Strings.resx
diff --git a/src/System.Net.Security/src/System.Net.Security.csproj b/src/System.Net.Security/src/System.Net.Security.csproj
index 812c8005b5aa..3c6b07a3c388 100644
--- a/src/System.Net.Security/src/System.Net.Security.csproj
+++ b/src/System.Net.Security/src/System.Net.Security.csproj
@@ -15,12 +15,12 @@
true
- win\project.json
- win\project.lock.json
+ win/project.json
+ win/project.lock.json
- unix\project.json
- unix\project.lock.json
+ unix/project.json
+ unix/project.lock.json
diff --git a/src/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj b/src/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj
index 2beb4135476c..9e3bfb78ded7 100644
--- a/src/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj
+++ b/src/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj
@@ -12,12 +12,12 @@
- win\project.json
- win\project.lock.json
+ win/project.json
+ win/project.lock.json
- unix\project.json
- unix\project.lock.json
+ unix/project.json
+ unix/project.lock.json
diff --git a/src/System.Net.Security/tests/UnitTests/System.Net.Security.Unit.Tests.csproj b/src/System.Net.Security/tests/UnitTests/System.Net.Security.Unit.Tests.csproj
index 0b4934414af8..0a40abe05365 100644
--- a/src/System.Net.Security/tests/UnitTests/System.Net.Security.Unit.Tests.csproj
+++ b/src/System.Net.Security/tests/UnitTests/System.Net.Security.Unit.Tests.csproj
@@ -9,7 +9,7 @@
AnyCPU
{0D174EA9-9E61-4519-8D31-7BD2331A1982}
Library
- ..\..\src\Resources\Strings.resx
+ ../../src/Resources/Strings.resx
diff --git a/src/System.Net.WebSockets.Client/tests/System.Net.WebSockets.Client.Tests.csproj b/src/System.Net.WebSockets.Client/tests/System.Net.WebSockets.Client.Tests.csproj
index 8091116df907..32aac3abf3c6 100644
--- a/src/System.Net.WebSockets.Client/tests/System.Net.WebSockets.Client.Tests.csproj
+++ b/src/System.Net.WebSockets.Client/tests/System.Net.WebSockets.Client.Tests.csproj
@@ -9,7 +9,7 @@
AnyCPU
{7C395A91-D955-444C-98BF-D3F809A56CE1}
Library
- ..\src\Resources\Strings.resx
+ ../src/Resources/Strings.resx
Linux;OSX
diff --git a/src/System.Reflection.TypeExtensions/src/System.Reflection.TypeExtensions.csproj b/src/System.Reflection.TypeExtensions/src/System.Reflection.TypeExtensions.csproj
index db933ba6b3a4..e8792836a037 100644
--- a/src/System.Reflection.TypeExtensions/src/System.Reflection.TypeExtensions.csproj
+++ b/src/System.Reflection.TypeExtensions/src/System.Reflection.TypeExtensions.csproj
@@ -17,7 +17,7 @@
- Resources\Strings.netcore50aot.resx
+ Resources/Strings.netcore50aot.resx
diff --git a/src/System.Reflection/src/System.Reflection.csproj b/src/System.Reflection/src/System.Reflection.csproj
index abdd0591f733..536da83136b4 100644
--- a/src/System.Reflection/src/System.Reflection.csproj
+++ b/src/System.Reflection/src/System.Reflection.csproj
@@ -19,8 +19,8 @@
- netcore50aot\project.json
- netcore50aot\project.lock.json
+ netcore50aot/project.json
+ netcore50aot/project.lock.json
diff --git a/src/System.Runtime.Serialization.Json/src/System.Runtime.Serialization.Json.csproj b/src/System.Runtime.Serialization.Json/src/System.Runtime.Serialization.Json.csproj
index e1d6f39fbefc..c88509934d4d 100644
--- a/src/System.Runtime.Serialization.Json/src/System.Runtime.Serialization.Json.csproj
+++ b/src/System.Runtime.Serialization.Json/src/System.Runtime.Serialization.Json.csproj
@@ -18,8 +18,8 @@
- netcore50aot\project.json
- netcore50aot\project.lock.json
+ netcore50aot/project.json
+ netcore50aot/project.lock.json
diff --git a/src/System.Runtime.Serialization.Primitives/src/System.Runtime.Serialization.Primitives.csproj b/src/System.Runtime.Serialization.Primitives/src/System.Runtime.Serialization.Primitives.csproj
index 8cf8bb58d7df..64735dac9b81 100644
--- a/src/System.Runtime.Serialization.Primitives/src/System.Runtime.Serialization.Primitives.csproj
+++ b/src/System.Runtime.Serialization.Primitives/src/System.Runtime.Serialization.Primitives.csproj
@@ -8,7 +8,6 @@
$(NoWarn);1634;1691;649
true
512
- true
AnyCPU
{CDF0ACB5-1361-4E48-8ECB-22E8022F5F01}
dotnet5.4
diff --git a/src/System.Runtime.Serialization.Xml/src/System.Runtime.Serialization.Xml.csproj b/src/System.Runtime.Serialization.Xml/src/System.Runtime.Serialization.Xml.csproj
index d2a4d972dae6..ef3d2b9b82b9 100644
--- a/src/System.Runtime.Serialization.Xml/src/System.Runtime.Serialization.Xml.csproj
+++ b/src/System.Runtime.Serialization.Xml/src/System.Runtime.Serialization.Xml.csproj
@@ -18,8 +18,8 @@
- netcore50aot\project.json
- netcore50aot\project.lock.json
+ netcore50aot/project.json
+ netcore50aot/project.lock.json
diff --git a/src/System.Security.Cryptography.X509Certificates/src/System.Security.Cryptography.X509Certificates.csproj b/src/System.Security.Cryptography.X509Certificates/src/System.Security.Cryptography.X509Certificates.csproj
index a3de60b7c2f6..9bdbe01a2563 100644
--- a/src/System.Security.Cryptography.X509Certificates/src/System.Security.Cryptography.X509Certificates.csproj
+++ b/src/System.Security.Cryptography.X509Certificates/src/System.Security.Cryptography.X509Certificates.csproj
@@ -18,20 +18,20 @@
true
- netcore50\project.json
- netcore50\project.lock.json
+ netcore50/project.json
+ netcore50/project.lock.json
net461\project.json
net461\project.lock.json
- win\project.json
- win\project.lock.json
+ win/project.json
+ win/project.lock.json
- unix\project.json
- unix\project.lock.json
+ unix/project.json
+ unix/project.lock.json
diff --git a/src/System.Text.Encoding.Extensions/src/System.Text.Encoding.Extensions.csproj b/src/System.Text.Encoding.Extensions/src/System.Text.Encoding.Extensions.csproj
index f0c9879167ce..9ef805509c65 100644
--- a/src/System.Text.Encoding.Extensions/src/System.Text.Encoding.Extensions.csproj
+++ b/src/System.Text.Encoding.Extensions/src/System.Text.Encoding.Extensions.csproj
@@ -19,8 +19,8 @@
- netcore50aot\project.json
- netcore50aot\project.lock.json
+ netcore50aot/project.json
+ netcore50aot/project.lock.json
diff --git a/src/System.Text.Encoding/src/System.Text.Encoding.csproj b/src/System.Text.Encoding/src/System.Text.Encoding.csproj
index b33070ca522b..4f72ac45530d 100644
--- a/src/System.Text.Encoding/src/System.Text.Encoding.csproj
+++ b/src/System.Text.Encoding/src/System.Text.Encoding.csproj
@@ -19,8 +19,8 @@
- netcore50aot\project.json
- netcore50aot\project.lock.json
+ netcore50aot/project.json
+ netcore50aot/project.lock.json
diff --git a/src/System.Text.Encodings.Web/src/System.Text.Encodings.Web.csproj b/src/System.Text.Encodings.Web/src/System.Text.Encodings.Web.csproj
index 4deb9724da99..c32ddc97adb4 100644
--- a/src/System.Text.Encodings.Web/src/System.Text.Encodings.Web.csproj
+++ b/src/System.Text.Encodings.Web/src/System.Text.Encodings.Web.csproj
@@ -8,7 +8,7 @@
4.0.0.0
true
dotnet5.1
- true
+ true
diff --git a/src/System.Threading.Tasks.Extensions/src/System.Threading.Tasks.Extensions.csproj b/src/System.Threading.Tasks.Extensions/src/System.Threading.Tasks.Extensions.csproj
index 70cbfbf64e20..d3d2d136b6bf 100644
--- a/src/System.Threading.Tasks.Extensions/src/System.Threading.Tasks.Extensions.csproj
+++ b/src/System.Threading.Tasks.Extensions/src/System.Threading.Tasks.Extensions.csproj
@@ -7,7 +7,7 @@
4.0.0.0
$(OutputPath)$(AssemblyName).xml
dotnet5.1
- true
+ true
diff --git a/src/System.Threading.Timer/src/System.Threading.Timer.csproj b/src/System.Threading.Timer/src/System.Threading.Timer.csproj
index c389d26623b7..82b9b7d5678f 100644
--- a/src/System.Threading.Timer/src/System.Threading.Timer.csproj
+++ b/src/System.Threading.Timer/src/System.Threading.Timer.csproj
@@ -19,8 +19,8 @@
- netcore50aot\project.json
- netcore50aot\project.lock.json
+ netcore50aot/project.json
+ netcore50aot/project.lock.json