This repository has been archived by the owner on Apr 20, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Removes *3 verbs, making msbuild the driver #4456
Merged
TheRealPiotrP
merged 83 commits into
dotnet:rel/1.0.0
from
TheRealPiotrP:piotrpMSFT/noPJ
Oct 28, 2016
Merged
Removes *3 verbs, making msbuild the driver #4456
TheRealPiotrP
merged 83 commits into
dotnet:rel/1.0.0
from
TheRealPiotrP:piotrpMSFT/noPJ
Oct 28, 2016
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
eerhardt
reviewed
Oct 20, 2016
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looking good.
@@ -41,7 +41,7 @@ | |||
<Inputs>@(CompileStageInputs)</Inputs> | |||
<StageDirectory>$(Stage2Directory)</StageDirectory> | |||
<StageSymbolsDirectory>$(Stage2SymbolsDirectory)</StageSymbolsDirectory> | |||
<DotnetDir>$(Stage1Directory)</DotnetDir> | |||
<DotnetDir>$(Stage0Directory)</DotnetDir> |
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
{ | ||
protected override string Command | ||
{ | ||
get { return "restore3"; } | ||
get { return "restore-projectjson"; } |
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
{ | ||
return _project | ||
.AllEvaluatedProperties | ||
.FirstOrDefault(p => p.Name.Equals("OutputPath")) |
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
public static class RuntimeEnvironmentRidExtensions | ||
{ | ||
// Gets the identfier that is used for restore by default (this is different from the actual RID, but only on Windows) | ||
public static string GetLegacyRestoreRuntimeIdentifier() |
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
{ | ||
public class AnalyzerOptions : IEquatable<AnalyzerOptions> | ||
internal class AnalyzerOptions : IEquatable<AnalyzerOptions> |
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
Conflicts: src/Microsoft.DotNet.ProjectJsonMigration/project.json src/dotnet/commands/dotnet-restore3/Program.cs src/dotnet/commands/dotnet-run3/Program.cs src/dotnet/commands/dotnet-run3/Run3Command.cs src/dotnet/project.json test/dotnet-run3.Tests/GivenDotnetRun3RunsCsProj.cs
…ReferencesFailAsExpected
…NameIsDifferentFromDllName
…pendenciesIfPackageNameDifferentFromToolName
Conflicts: src/Microsoft.DotNet.Cli.Utils/CommandResolution/MSBuildProject.cs src/Microsoft.DotNet.Cli.Utils/CommandResolution/OutputPathCommandResolver.cs src/Microsoft.DotNet.Cli.Utils/CommandResolution/ProjectJsonProject.cs src/Microsoft.DotNet.ProjectJsonMigration/Rules/MigratePackOptionsRule.cs src/dotnet/commands/dotnet-restore3/Program.cs
@dotnet-bot test Debian8.2 x64 Debug Build please. |
TheRealPiotrP
changed the title
[WIP] Removes *3 verbs, making msbuild the driver
Removes *3 verbs, making msbuild the driver
Oct 28, 2016
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
at this point builds are succeeding and am working through remainig test issues. Please take a look @brthor @eerhardt @livarcocc @jgoshi