diff options
| -rw-r--r-- | dir.props | 6 | ||||
| -rw-r--r-- | src/.nuget/packages.Unix.config | 4 | ||||
| -rw-r--r-- | src/.nuget/packages.Windows_NT.config | 4 | ||||
| -rw-r--r-- | tests/dir.props | 8 | ||||
| -rw-r--r-- | tests/runtest.proj | 12 | ||||
| -rw-r--r-- | tests/src/.nuget/packages.Unix.config | 2 | ||||
| -rw-r--r-- | tests/src/.nuget/packages.Windows_NT.config | 4 | ||||
| -rw-r--r-- | tests/tests.targets | 4 |
8 files changed, 21 insertions, 23 deletions
@@ -9,10 +9,10 @@ <!-- Build Tools Versions --> <PropertyGroup> - <BuildToolsVersion>1.0.25-prerelease-00105</BuildToolsVersion> + <BuildToolsVersion>1.0.25-prerelease-00121</BuildToolsVersion> <BuildToolsCoreCLRVersion>1.0.3-prerelease</BuildToolsCoreCLRVersion> - <DnxVersion Condition="'$(OsEnvironment)'!='Unix'">1.0.0-beta5-12101</DnxVersion> - <DnxVersion Condition="'$(OsEnvironment)'=='Unix'">1.0.0-beta5-12101</DnxVersion> + <DnxVersion Condition="'$(OsEnvironment)'!='Unix'">1.0.0-rc2-16128</DnxVersion> + <DnxVersion Condition="'$(OsEnvironment)'=='Unix'">1.0.0-rc2-16128</DnxVersion> <DnxPackageName Condition="'$(DnxPackageName)' == '' and '$(OsEnvironment)'!='Unix'">dnx-coreclr-win-x86.$(DnxVersion)</DnxPackageName> <DnxPackageName Condition="'$(DnxPackageName)' == '' and '$(OsEnvironment)'=='Unix'">dnx-mono.$(DnxVersion)</DnxPackageName> <RoslynVersion>1.0.0-rc3-20150510-01</RoslynVersion> diff --git a/src/.nuget/packages.Unix.config b/src/.nuget/packages.Unix.config index eba577c778..34039f8283 100644 --- a/src/.nuget/packages.Unix.config +++ b/src/.nuget/packages.Unix.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="Microsoft.DotNet.BuildTools" version="1.0.25-prerelease-00105" /> - <package id="dnx-mono" version="1.0.0-beta5-12101" /> + <package id="Microsoft.DotNet.BuildTools" version="1.0.25-prerelease-00121" /> + <package id="dnx-mono" version="1.0.0-rc2-16128" /> <package id="Microsoft.Net.ToolsetCompilers" version="1.0.0-rc3-20150510-01" /> </packages> diff --git a/src/.nuget/packages.Windows_NT.config b/src/.nuget/packages.Windows_NT.config index 1c9236e18e..8e4b319638 100644 --- a/src/.nuget/packages.Windows_NT.config +++ b/src/.nuget/packages.Windows_NT.config @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="Microsoft.DotNet.BuildTools" version="1.0.25-prerelease-00105" /> - <package id="dnx-coreclr-win-x86" version="1.0.0-beta5-12101" /> + <package id="Microsoft.DotNet.BuildTools" version="1.0.25-prerelease-00121" /> + <package id="dnx-coreclr-win-x86" version="1.0.0-rc2-16128" /> </packages> diff --git a/tests/dir.props b/tests/dir.props index 1956cbfe59..a47b3d2aa5 100644 --- a/tests/dir.props +++ b/tests/dir.props @@ -9,10 +9,10 @@ <!-- Build Tools Versions --> <PropertyGroup> - <BuildToolsVersion>1.0.25-prerelease-00105</BuildToolsVersion> - <BuildToolsCoreCLRVersion>1.0.2-prerelease</BuildToolsCoreCLRVersion> - <DnxVersion Condition="'$(OsEnvironment)'!='Unix'">1.0.0-beta5-12101</DnxVersion> - <DnxVersion Condition="'$(OsEnvironment)'=='Unix'">1.0.0-beta5-12101</DnxVersion> + <BuildToolsVersion>1.0.25-prerelease-00121</BuildToolsVersion> + <BuildToolsCoreCLRVersion>1.0.3-prerelease</BuildToolsCoreCLRVersion> + <DnxVersion Condition="'$(OsEnvironment)'!='Unix'">1.0.0-rc2-16128</DnxVersion> + <DnxVersion Condition="'$(OsEnvironment)'=='Unix'">1.0.0-rc2-16128</DnxVersion> <DnxPackageName Condition="'$(DnxPackageName)' == '' and '$(OsEnvironment)'!='Unix'">dnx-coreclr-win-x86.$(DnxVersion)</DnxPackageName> <DnxPackageName Condition="'$(DnxPackageName)' == '' and '$(OsEnvironment)'=='Unix'">dnx-mono.$(DnxVersion)</DnxPackageName> <RoslynVersion>1.0.0-rc3-20150510-01</RoslynVersion> diff --git a/tests/runtest.proj b/tests/runtest.proj index a667bb102f..76d96a353a 100644 --- a/tests/runtest.proj +++ b/tests/runtest.proj @@ -56,7 +56,7 @@ $(_XunitEpilog) ]]> </_XunitWrapperGen> - <XunitVersionCompiled>2.0.0-beta5-build2785</XunitVersionCompiled> + <XunitVersionCompiled>2.1.0</XunitVersionCompiled> <XunitWrapperGenCsProj> <![CDATA[ <?xml version="1.0" encoding="utf-8"?> @@ -118,12 +118,10 @@ $(_XunitEpilog) <![CDATA[ { "dependencies": { - "xunit" : "2.0.0-beta5-build2785", - "xunit.abstractions" : "2.0.0-beta5-build2785", - "xunit.assert" : "2.0.0-beta5-build2785", - "xunit.core" : "2.0.0-beta5-build2785", - "xunit.execution" : "2.0.0-beta5-build2785", - "xunit.runners" : "2.0.0-beta5-build2785" + "xunit" : "2.1.0", + "xunit.assert" : "2.1.0", + "xunit.core" : "2.1.0", + "xunit.runner.msbuild": "2.1.0" }, "frameworks": { "net45": {} diff --git a/tests/src/.nuget/packages.Unix.config b/tests/src/.nuget/packages.Unix.config index ef024415d4..6af954ce8a 100644 --- a/tests/src/.nuget/packages.Unix.config +++ b/tests/src/.nuget/packages.Unix.config @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="Microsoft.DotNet.BuildTools" version="1.0.0-beta5-12101" /> + <package id="Microsoft.DotNet.BuildTools" version="1.0.25-prerelease-00121" /> </packages> diff --git a/tests/src/.nuget/packages.Windows_NT.config b/tests/src/.nuget/packages.Windows_NT.config index c93a751145..8405234d2a 100644 --- a/tests/src/.nuget/packages.Windows_NT.config +++ b/tests/src/.nuget/packages.Windows_NT.config @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="Microsoft.DotNet.BuildTools" version="1.0.25-prerelease-00105" /> - <package id="dnx-coreclr-win-x86" version="1.0.0-beta5-12101" /> + <package id="Microsoft.DotNet.BuildTools" version="1.0.25-prerelease-00121" /> + <package id="dnx-coreclr-win-x86" version="1.0.0-rc2-16128" /> </packages> diff --git a/tests/tests.targets b/tests/tests.targets index 87b7f00c2c..3b7d78b71f 100644 --- a/tests/tests.targets +++ b/tests/tests.targets @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <UsingTask AssemblyFile="$(PackagesDir)xunit.runners\2.0.0-beta5-build2785\tools\xunit.runner.msbuild.dll" TaskName="Xunit.Runner.MSBuild.xunit" /> + <UsingTask AssemblyFile="$(PackagesDir)xunit.runner.msbuild\2.1.0\build\portable-net45+win8+wp8+wpa81\xunit.runner.msbuild.dll" TaskName="Xunit.Runner.MSBuild.xunit" /> <ItemGroup> <_SkipTestAssemblies Include="$(SkipTestAssemblies)" /> @@ -30,7 +30,7 @@ </PropertyGroup> <UsingTask - AssemblyFile="$(SourceDir)\packages\xunit.abstractions\$(XunitVersionCompiled)\lib\portable-net45+aspnetcore50+win+wpa81+wp80+monotouch+monoandroid\xunit.runner.msbuild.dll" + AssemblyFile="$(SourceDir)\packages\xunit.runner.msbuild\2.1.0\build\portable-net45+win8+wp8+wpa81\xunit.runner.msbuild.dll" TaskName="Xunit.Runner.MSBuild.xunit" /> <Target Name="RunTests" |