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

escape semicolons when forwarding RestoreSources to MSBuild #5539

Merged
merged 3 commits into from
Feb 1, 2017
Merged

escape semicolons when forwarding RestoreSources to MSBuild #5539

merged 3 commits into from
Feb 1, 2017

Conversation

jonsequitur
Copy link

This change adds a workaround for dotnet/msbuild#1622 into MSBuildForwardingApp.

@jonsequitur
Copy link
Author

@cdmihai @piotrpMSFT @livarcocc

livarcocc
livarcocc reviewed Feb 1, 2017
View reviewed changes
src/dotnet/commands/dotnet-msbuild/MSBuildForwardingApp.cs
@@ -77,6 +79,11 @@ internal static CommandOption AddVerbosityOption(CommandLineApplication app)
return app.Option("-v|--verbosity", LocalizableStrings.VerbosityOptionDescription, CommandOptionType.SingleValue);
}

private static string Escape(string arg) =>

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

livarcocc
livarcocc reviewed Feb 1, 2017
View reviewed changes
src/dotnet/commands/dotnet-msbuild/MSBuildForwardingApp.cs Outdated
@@ -77,6 +79,11 @@ internal static CommandOption AddVerbosityOption(CommandLineApplication app)
return app.Option("-v|--verbosity", LocalizableStrings.VerbosityOptionDescription, CommandOptionType.SingleValue);
}

private static string Escape(string arg) =>
(arg.StartsWith("/p:RestoreSources=", StringComparison.OrdinalIgnoreCase)) ?
arg.Replace(";", "%3B") : // <-- this is a workaround for https://github.com/Microsoft/msbuild/issues/1622

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

@jonsequitur jonsequitur force-pushed the msbuild-RestoreSources-escaping branch from 7d040fb to 6f6d6c5 Compare February 1, 2017 18:10
@jonsequitur jonsequitur force-pushed the msbuild-RestoreSources-escaping branch from 6f6d6c5 to 905db12 Compare February 1, 2017 22:13
livarcocc
livarcocc reviewed Feb 1, 2017
View reviewed changes
test/dotnet-msbuild.Tests/GivenDotnetMSBuildBuildsProjects.cs
@@ -77,6 +86,37 @@ public void When_help_is_invoked_Then_MSBuild_extra_options_text_is_included_in_
}

[Fact]
public void WhenRestoreSourcesStartsWithUnixPathThenHttpsSourceIsParsedCorrectly()
{
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

@TheRealPiotrP
Copy link

@dotnet-bot test Fedora23 x64 Debug Build please.

@livarcocc livarcocc merged commit 35547e6 into dotnet:rel/1.0.0 Feb 1, 2017
@rainersigwald rainersigwald mentioned this pull request Feb 2, 2017
Open
@TheRealPiotrP TheRealPiotrP mentioned this pull request Jan 31, 2020
Closed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@cdmihai cdmihai cdmihai left review comments

@livarcocc livarcocc livarcocc approved these changes

Assignees
No one assigned
Labels
Approved to merge Pending Shiproom Approval
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@jonsequitur @TheRealPiotrP @livarcocc @cdmihai @dnfclas