Skip to content
This repository has been archived by the owner on Apr 20, 2023. It is now read-only.

Removes *3 verbs, making msbuild the driver #4456

Merged
merged 83 commits into from
Oct 28, 2016

Conversation

TheRealPiotrP
Copy link

at this point builds are succeeding and am working through remainig test issues. Please take a look @brthor @eerhardt @livarcocc @jgoshi

Copy link
Member

@eerhardt eerhardt left a 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.

{
protected override string Command
{
get { return "restore3"; }
get { return "restore-projectjson"; }

This comment was marked as spam.

{
return _project
.AllEvaluatedProperties
.FirstOrDefault(p => p.Name.Equals("OutputPath"))

This comment was marked as spam.

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.

{
public class AnalyzerOptions : IEquatable<AnalyzerOptions>
internal class AnalyzerOptions : IEquatable<AnalyzerOptions>

This comment was marked as spam.

Piotr Puszkiewicz added 14 commits October 20, 2016 11:50
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
…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
@TheRealPiotrP
Copy link
Author

@dotnet-bot test Debian8.2 x64 Debug Build please.

@TheRealPiotrP TheRealPiotrP changed the title [WIP] Removes *3 verbs, making msbuild the driver Removes *3 verbs, making msbuild the driver Oct 28, 2016
@TheRealPiotrP TheRealPiotrP merged commit 6fcbefa into dotnet:rel/1.0.0 Oct 28, 2016
@TheRealPiotrP TheRealPiotrP deleted the piotrpMSFT/noPJ branch October 28, 2016 01:46
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants