diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index ebc52549d..f70e36923 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.props
@@ -41,7 +41,7 @@
- 1.0.27-prerelease-01611-04
+ 1.0.27-prerelease-01723-01
2.0.0-preview2-25331-01
diff --git a/build/publish/FinishBuild.targets b/build/publish/FinishBuild.targets
index 709837429..69a9170ae 100644
--- a/build/publish/FinishBuild.targets
+++ b/build/publish/FinishBuild.targets
@@ -54,9 +54,8 @@
CommitHash="$(CommitHash)"
Coherent="$(Coherent)" />
-
-
+ GitHubPassword="$(GITHUB_PASSWORD)" />
diff --git a/build_projects/update-dependencies/Config.cs b/build_projects/update-dependencies/Config.cs
index 9938cce68..0bd5a0c6a 100644
--- a/build_projects/update-dependencies/Config.cs
+++ b/build_projects/update-dependencies/Config.cs
@@ -82,7 +82,8 @@ namespace Microsoft.DotNet.Scripts
private static string GetDefaultCoreSetupVersionFragment()
{
- string coreSetupChannel = GetRepoMSBuildPropValue("BundledRuntimes.props", "CoreSetupChannel") ?? "master";
+ // by default, the current core-setup branch should match the current cli branch name
+ string coreSetupChannel = Instance.GitHubUpstreamBranch;
return $"dotnet/core-setup/{coreSetupChannel}";
}
diff --git a/src/dotnet/Properties/AssemblyInfo.cs b/src/dotnet/Properties/AssemblyInfo.cs
index edc4c971f..d7ae131d6 100644
--- a/src/dotnet/Properties/AssemblyInfo.cs
+++ b/src/dotnet/Properties/AssemblyInfo.cs
@@ -16,3 +16,4 @@ using System.Runtime.CompilerServices;
[assembly: InternalsVisibleTo("dotnet-sln-list.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
[assembly: InternalsVisibleTo("dotnet-sln-remove.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
[assembly: InternalsVisibleTo("dotnet-msbuild.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("dotnet-run.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
diff --git a/src/dotnet/commands/dotnet-run/LocalizableStrings.resx b/src/dotnet/commands/dotnet-run/LocalizableStrings.resx
index 976312b28..8cab1941e 100644
--- a/src/dotnet/commands/dotnet-run/LocalizableStrings.resx
+++ b/src/dotnet/commands/dotnet-run/LocalizableStrings.resx
@@ -196,4 +196,7 @@ The current {1} is '{2}'.
An error was encountered when reading launchSettings.json.
{0}
+
+ '{0}' is not a valid project file.
+
\ No newline at end of file
diff --git a/src/dotnet/commands/dotnet-run/RunCommand.cs b/src/dotnet/commands/dotnet-run/RunCommand.cs
index d760a8690..e4af4a2a0 100644
--- a/src/dotnet/commands/dotnet-run/RunCommand.cs
+++ b/src/dotnet/commands/dotnet-run/RunCommand.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
using System.IO;
using System.Linq;
using Microsoft.Build.Evaluation;
+using Microsoft.Build.Exceptions;
using Microsoft.DotNet.Cli.Utils;
using Microsoft.DotNet.Tools;
using Microsoft.DotNet.Tools.MSBuild;
@@ -39,17 +40,26 @@ namespace Microsoft.DotNet.Tools.Run
EnsureProjectIsBuilt();
}
- ICommand runCommand = GetRunCommand();
- int launchSettingsApplicationResult = ApplyLaunchProfileSettingsIfNeeded(ref runCommand);
-
- if (launchSettingsApplicationResult != 0)
+ try
{
- return launchSettingsApplicationResult;
- }
+ ICommand runCommand = GetRunCommand();
+ int launchSettingsApplicationResult = ApplyLaunchProfileSettingsIfNeeded(ref runCommand);
- return runCommand
- .Execute()
- .ExitCode;
+ if (launchSettingsApplicationResult != 0)
+ {
+ return launchSettingsApplicationResult;
+ }
+
+ return runCommand
+ .Execute()
+ .ExitCode;
+ }
+ catch (InvalidProjectFileException e)
+ {
+ throw new GracefulException(
+ string.Format(LocalizableStrings.RunCommandSpecifiecFileIsNotAValidProject, Project),
+ e);
+ }
}
public RunCommand(string configuration,
diff --git a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.cs.xlf b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.cs.xlf
index 8577240b2..5563eace5 100644
--- a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.cs.xlf
+++ b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.cs.xlf
@@ -136,6 +136,11 @@ Aktuální {1} je {2}.
{0}
+
+ '{0}' is not a valid project file.
+ '{0}' is not a valid project file.
+
+