提交 7006df83 编写于 作者: A Andy Gocke

Revert "Revert "Update version of Microsft.Build.Mono.Debug""

This reverts commit 61a5ae49.
上级 23d4ed5e
......@@ -85,7 +85,7 @@
<CoreTestAssemblies Include="$(CoreClrTestDirectory)\$(IncludePattern)" />
</ItemGroup>
<Exec Command="$(CoreClrTestDirectory)\CoreRun.exe $(CoreClrTestDirectory)\xunit.console.netcore.exe @(CoreTestAssemblies, ' ') -xml $(CoreClrTestDirectory)\TestResults.xml" />
<Exec Command="$(CoreClrTestDirectory)\CoreRun.exe $(CoreClrTestDirectory)\xunit.console.netcore.exe @(CoreTestAssemblies, ' ') -parallel all -xml $(CoreClrTestDirectory)\TestResults.xml" />
<Exec Command="Binaries\$(Configuration)\RunTests.exe $(NuGetPackageRoot)\xunit.runner.console\$(XunitVersion)\tools $(RunTestArgs) @(TestAssemblies, ' ')" />
......
......@@ -33,11 +33,11 @@ MSBUILD_ADDITIONALARGS := $(MSBUILD_ADDITIONALARGS) /p:MonoToolsetPath=$(MONO_PA
TOOLSET_ARGS = $(MSBUILD_ADDITIONALARGS) /p:CscToolPath=$(ROSLYN_TOOLSET_PATH) /p:CscToolExe=csc /p:VbcToolPath=$(ROSLYN_TOOLSET_PATH) /p:VbcToolExe=vbc
all: toolset
$(MONO_PATH) ~/.nuget/packages/Microsoft.Build.Mono.Debug/14.1.0-prerelease/lib/MSBuild.exe $(TOOLSET_ARGS) CrossPlatform.sln
$(MONO_PATH) ~/.nuget/packages/Microsoft.Build.Mono.Debug/14.1.0/lib/MSBuild.exe $(TOOLSET_ARGS) CrossPlatform.sln
bootstrap: toolset
$(MONO_PATH) ~/.nuget/packages/Microsoft.Build.Mono.Debug/14.1.0-prerelease/lib/MSBuild.exe $(TOOLSET_ARGS) src/Compilers/CSharp/CscCore/CscCore.csproj ; \
$(MONO_PATH) ~/.nuget/packages/Microsoft.Build.Mono.Debug/14.1.0-prerelease/lib/MSBuild.exe $(TOOLSET_ARGS) src/Compilers/VisualBasic/VbcCore/VbcCore.csproj ; \
$(MONO_PATH) ~/.nuget/packages/Microsoft.Build.Mono.Debug/14.1.0/lib/MSBuild.exe $(TOOLSET_ARGS) src/Compilers/CSharp/CscCore/CscCore.csproj ; \
$(MONO_PATH) ~/.nuget/packages/Microsoft.Build.Mono.Debug/14.1.0/lib/MSBuild.exe $(TOOLSET_ARGS) src/Compilers/VisualBasic/VbcCore/VbcCore.csproj ; \
mkdir -p $(BOOTSTRAP_PATH) ; \
cp Binaries/$(BUILD_CONFIGURATION)/csccore/* $(BOOTSTRAP_PATH) ; \
cp Binaries/$(BUILD_CONFIGURATION)/vbccore/* $(BOOTSTRAP_PATH) ; \
......@@ -71,4 +71,4 @@ clean_toolset:
@pushd /tmp/ ; \
curl -O https://dotnetci.blob.core.windows.net/roslyn/$(NUGET_PACKAGE_NAME).zip ; \
unzip -uoq $(NUGET_PACKAGE_NAME).zip -d ~/ ; \
chmod +x ~/.nuget/packages/Microsoft.Build.Mono.Debug/14.1.0-prerelease/lib/MSBuild.exe
chmod +x ~/.nuget/packages/Microsoft.Build.Mono.Debug/14.1.0/lib/MSBuild.exe
{
"dependencies": {
"Microsoft.CodeAnalysis.Test.Resources.Proprietary": "1.2.0-beta1-20160105-04",
"Microsoft.Build.Mono.Debug": "14.1.0-prerelease",
"Microsoft.Build.Mono.Debug": "14.1.0",
"Microsoft.DiaSymReader.Native": "1.3.3",
"Microsoft.Net.Compilers": "1.2.0-beta1-20160202-02",
"Microsoft.Net.RoslynDiagnostics": "1.1.1-beta1-20150818-01",
......
......@@ -11,10 +11,10 @@ chmod +x ./corerun
mkdir -p ../xUnitResults/
./corerun ./xunit.console.netcore.exe *.UnitTests.dll -xml ../xUnitResults/CoreClrUnitTestResults.xml
./corerun ./xunit.console.netcore.exe *.UnitTests.dll -parallel all -xml ../xUnitResults/CoreClrUnitTestResults.xml
if [ $? -ne 0 ]; then
echo Unit test failed
exit 1
echo Unit test failed
exit 1
fi
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册