diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 911ef99bcb96..b9bd99c6c270 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -26,53 +26,53 @@
https://github.com/dotnet/coreclr
b9e88989458e24fa9764e045917b141e3338eae7
-
+
https://github.com/dotnet/arcade
- 044fa99d22e576fcfaf63f09ee9bba821855dddb
+ 673cb1c9358575a722b8d9b43ccfd4222c89c0a0
-
+
https://github.com/dotnet/arcade
- 044fa99d22e576fcfaf63f09ee9bba821855dddb
+ 673cb1c9358575a722b8d9b43ccfd4222c89c0a0
-
+
https://github.com/dotnet/arcade
- 044fa99d22e576fcfaf63f09ee9bba821855dddb
+ 673cb1c9358575a722b8d9b43ccfd4222c89c0a0
-
+
https://github.com/dotnet/arcade
- 044fa99d22e576fcfaf63f09ee9bba821855dddb
+ 673cb1c9358575a722b8d9b43ccfd4222c89c0a0
-
+
https://github.com/dotnet/arcade
- 044fa99d22e576fcfaf63f09ee9bba821855dddb
+ 673cb1c9358575a722b8d9b43ccfd4222c89c0a0
-
+
https://github.com/dotnet/arcade
- 044fa99d22e576fcfaf63f09ee9bba821855dddb
+ 673cb1c9358575a722b8d9b43ccfd4222c89c0a0
-
+
https://github.com/dotnet/arcade
- 044fa99d22e576fcfaf63f09ee9bba821855dddb
+ 673cb1c9358575a722b8d9b43ccfd4222c89c0a0
-
+
https://github.com/dotnet/arcade
- 044fa99d22e576fcfaf63f09ee9bba821855dddb
+ 673cb1c9358575a722b8d9b43ccfd4222c89c0a0
-
+
https://github.com/dotnet/arcade
- 044fa99d22e576fcfaf63f09ee9bba821855dddb
+ 673cb1c9358575a722b8d9b43ccfd4222c89c0a0
-
+
https://github.com/dotnet/arcade
- 044fa99d22e576fcfaf63f09ee9bba821855dddb
+ 673cb1c9358575a722b8d9b43ccfd4222c89c0a0
-
+
https://github.com/dotnet/arcade
- 044fa99d22e576fcfaf63f09ee9bba821855dddb
+ 673cb1c9358575a722b8d9b43ccfd4222c89c0a0
-
+
https://github.com/dotnet/arcade
- 044fa99d22e576fcfaf63f09ee9bba821855dddb
+ 673cb1c9358575a722b8d9b43ccfd4222c89c0a0
diff --git a/eng/Versions.props b/eng/Versions.props
index 92b6c739996e..930653eb6e65 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -16,16 +16,16 @@
- 1.0.0-beta.19072.5
- 1.0.0-beta.19072.5
- 1.0.0-beta.19072.5
- 1.0.0-beta.19072.5
- 1.0.0-beta.19072.5
- 2.4.0-beta.19072.5
- 1.0.0-beta.19072.5
- 1.0.0-beta.19072.5
- 1.0.0-beta.19072.5
- 2.2.0-beta.19072.5
+ 1.0.0-beta.19074.1
+ 1.0.0-beta.19074.1
+ 1.0.0-beta.19074.1
+ 1.0.0-beta.19074.1
+ 1.0.0-beta.19074.1
+ 2.4.0-beta.19074.1
+ 1.0.0-beta.19074.1
+ 1.0.0-beta.19074.1
+ 1.0.0-beta.19074.1
+ 2.2.0-beta.19074.1
3.0.0-preview-27321-5
3.0.0-preview-27321-5
diff --git a/eng/dependencies.props b/eng/dependencies.props
index cbe89015a55e..07b4d8d2e452 100644
--- a/eng/dependencies.props
+++ b/eng/dependencies.props
@@ -43,7 +43,7 @@
2.4.1-pre.build.4059
1.0.0-beta-build0020
2.0.5
- 1.0.25
+ 1.0.30
1.4.0
diff --git a/external/test-runtime/XUnit.Runtime.depproj b/external/test-runtime/XUnit.Runtime.depproj
index c79e5fe8fda6..6abed19a4172 100644
--- a/external/test-runtime/XUnit.Runtime.depproj
+++ b/external/test-runtime/XUnit.Runtime.depproj
@@ -19,6 +19,7 @@
xunit.runner.visualstudio.dotnetcore.testadapter
xunit.runner.visualstudio.uwp.testadapter
xunit.runner.visualstudio.testadapter
+ microsoft.dotnet.uap.testtools
microsoft.net.test.sdk
microsoft.testplatform.testhost
Microsoft.Diagnostics.Tracing.TraceEvent
@@ -34,7 +35,7 @@
-
+
@@ -136,9 +137,8 @@
AfterTargets="AfterResolveReferences">
- microsoft.dotnet.uap.testtools
- $(PackagesDir)$(UAPToolsPackageName)\$(UAPToolsPackageVersion)\Tools\$(ArchGroup)
+ $(PackagesDir)$(MicrosoftDotNetUapTestToolsPackageName)\$(MicrosoftDotNetUapTestToolsPackageVersion)\Tools\$(ArchGroup)
$(UAPToolsFolder.Replace('/', '\'))
@@ -252,8 +252,8 @@
Condition="'$(TargetGroup)' == 'uap' OR '$(TargetGroup)' == 'uapaot'"
BeforeTargets="ResolveReferences">
-
-
+
false
- $(XUnitRunnerConsolePackageName)
+ $(MicrosoftDotNetUapTestToolsPackageName)
+ $(MicrosoftDotNetUapTestToolsPackageVersion)
+
+
+ false
+ xunit.runner.utility
$(XUnitPackageVersion)
diff --git a/global.json b/global.json
index a95e4bd849e3..10f4d26e0926 100644
--- a/global.json
+++ b/global.json
@@ -3,8 +3,8 @@
"dotnet": "2.1.401"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19072.5",
- "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19072.5",
+ "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19074.1",
+ "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19074.1",
"Microsoft.NET.Sdk.IL": "3.0.0-preview-27322-72"
}
}
diff --git a/src/CoreFx.Private.TestUtilities/src/System/Diagnostics/RemoteExecutorTestBase.aot.cs b/src/CoreFx.Private.TestUtilities/src/System/Diagnostics/RemoteExecutorTestBase.aot.cs
index 7faa3ce470c3..4ee1e316fec6 100644
--- a/src/CoreFx.Private.TestUtilities/src/System/Diagnostics/RemoteExecutorTestBase.aot.cs
+++ b/src/CoreFx.Private.TestUtilities/src/System/Diagnostics/RemoteExecutorTestBase.aot.cs
@@ -10,9 +10,9 @@ namespace System.Diagnostics
/// Base class used for all tests that need to spawn a remote process.
public abstract partial class RemoteExecutorTestBase : FileCleanupTestBase
{
- protected static readonly string HostRunnerName = PlatformDetection.IsWindows ? "dotnet.exe" : "dotnet";
+ protected static readonly string HostRunnerName = "xunit.console.exe";
protected static readonly string HostRunner = Process.GetCurrentProcess().MainModule.FileName;
- private static readonly string ExtraParameter = TestConsoleApp;
+ private static readonly string ExtraParameter = "remote";
}
}