Skip to content

Commit b2845af

Browse files
jjonesczRikkiGibson
jjonescz
and
RikkiGibson
authored
Add command 'dotnet project convert' (#47500)
Co-authored-by: Rikki Gibson <[email protected]>
1 parent 4e5b509 commit b2845af

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+1016
-143
lines changed

‎src/Cli/dotnet/Parser.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ public static class Parser
4242
PackCommandParser.GetCommand(),
4343
PackageCommandParser.GetCommand(),
4444
ParseCommandParser.GetCommand(),
45+
ProjectCommandParser.GetCommand(),
4546
PublishCommandParser.GetCommand(),
4647
ReferenceCommandParser.GetCommand(),
4748
RemoveCommandParser.GetCommand(),

‎src/Cli/dotnet/commands/dotnet-project/ProjectCommandParser.cs

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the MIT license.
3+
4+
#nullable enable
5+
6+
using System.CommandLine;
7+
using Microsoft.DotNet.Cli.Extensions;
8+
9+
namespace Microsoft.DotNet.Cli;
10+
11+
internal sealed class ProjectCommandParser
12+
{
13+
public static CliCommand GetCommand()
14+
{
15+
CliCommand command = new("project");
16+
command.SetAction((parseResult) => parseResult.HandleMissingCommand());
17+
command.Subcommands.Add(ProjectConvertCommandParser.GetCommand());
18+
19+
return command;
20+
}
21+
}

‎src/Cli/dotnet/commands/dotnet-project/convert/LocalizableStrings.resx

Lines changed: 133 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,133 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<root>
3+
<!--
4+
Microsoft ResX Schema
5+
6+
Version 2.0
7+
8+
The primary goals of this format is to allow a simple XML format
9+
that is mostly human readable. The generation and parsing of the
10+
various data types are done through the TypeConverter classes
11+
associated with the data types.
12+
13+
Example:
14+
15+
... ado.net/XML headers & schema ...
16+
<resheader name="resmimetype">text/microsoft-resx</resheader>
17+
<resheader name="version">2.0</resheader>
18+
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
19+
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
20+
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
21+
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
22+
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
23+
<value>[base64 mime encoded serialized .NET Framework object]</value>
24+
</data>
25+
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
26+
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
27+
<comment>This is a comment</comment>
28+
</data>
29+
30+
There are any number of "resheader" rows that contain simple
31+
name/value pairs.
32+
33+
Each data row contains a name, and value. The row also contains a
34+
type or mimetype. Type corresponds to a .NET class that support
35+
text/value conversion through the TypeConverter architecture.
36+
Classes that don't support this are serialized and stored with the
37+
mimetype set.
38+
39+
The mimetype is used for serialized objects, and tells the
40+
ResXResourceReader how to depersist the object. This is currently not
41+
extensible. For a given mimetype the value must be set accordingly:
42+
43+
Note - application/x-microsoft.net.object.binary.base64 is the format
44+
that the ResXResourceWriter will generate, however the reader can
45+
read any of the formats listed below.
46+
47+
mimetype: application/x-microsoft.net.object.binary.base64
48+
value : The object must be serialized with
49+
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
50+
: and then encoded with base64 encoding.
51+
52+
mimetype: application/x-microsoft.net.object.soap.base64
53+
value : The object must be serialized with
54+
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
55+
: and then encoded with base64 encoding.
56+
57+
mimetype: application/x-microsoft.net.object.bytearray.base64
58+
value : The object must be serialized into a byte array
59+
: using a System.ComponentModel.TypeConverter
60+
: and then encoded with base64 encoding.
61+
-->
62+
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
63+
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
64+
<xsd:element name="root" msdata:IsDataSet="true">
65+
<xsd:complexType>
66+
<xsd:choice maxOccurs="unbounded">
67+
<xsd:element name="metadata">
68+
<xsd:complexType>
69+
<xsd:sequence>
70+
<xsd:element name="value" type="xsd:string" minOccurs="0" />
71+
</xsd:sequence>
72+
<xsd:attribute name="name" use="required" type="xsd:string" />
73+
<xsd:attribute name="type" type="xsd:string" />
74+
<xsd:attribute name="mimetype" type="xsd:string" />
75+
<xsd:attribute ref="xml:space" />
76+
</xsd:complexType>
77+
</xsd:element>
78+
<xsd:element name="assembly">
79+
<xsd:complexType>
80+
<xsd:attribute name="alias" type="xsd:string" />
81+
<xsd:attribute name="name" type="xsd:string" />
82+
</xsd:complexType>
83+
</xsd:element>
84+
<xsd:element name="data">
85+
<xsd:complexType>
86+
<xsd:sequence>
87+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
88+
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
89+
</xsd:sequence>
90+
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
91+
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
92+
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
93+
<xsd:attribute ref="xml:space" />
94+
</xsd:complexType>
95+
</xsd:element>
96+
<xsd:element name="resheader">
97+
<xsd:complexType>
98+
<xsd:sequence>
99+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
100+
</xsd:sequence>
101+
<xsd:attribute name="name" type="xsd:string" use="required" />
102+
</xsd:complexType>
103+
</xsd:element>
104+
</xsd:choice>
105+
</xsd:complexType>
106+
</xsd:element>
107+
</xsd:schema>
108+
<resheader name="resmimetype">
109+
<value>text/microsoft-resx</value>
110+
</resheader>
111+
<resheader name="version">
112+
<value>2.0</value>
113+
</resheader>
114+
<resheader name="reader">
115+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116+
</resheader>
117+
<resheader name="writer">
118+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119+
</resheader>
120+
<data name="AppFullName" xml:space="preserve">
121+
<value>Convert a file-based program to a project-based program.</value>
122+
</data>
123+
<data name="CmdFileDescription" xml:space="preserve">
124+
<value>Path to the file-based program.</value>
125+
</data>
126+
<data name="InvalidFilePath" xml:space="preserve">
127+
<value>The specified file must exist and have '.cs' file extension: '{0}'</value>
128+
<comment>{Locked=".cs"}</comment>
129+
</data>
130+
<data name="DirectoryAlreadyExists" xml:space="preserve">
131+
<value>The target directory already exists: '{0}'</value>
132+
</data>
133+
</root>

‎src/Cli/dotnet/commands/dotnet-project/convert/ProjectConvertCommand.cs

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the MIT license.
3+
4+
#nullable enable
5+
6+
using System.CommandLine;
7+
using Microsoft.DotNet.Cli;
8+
using Microsoft.DotNet.Cli.Utils;
9+
using Microsoft.TemplateEngine.Cli.Commands;
10+
11+
namespace Microsoft.DotNet.Tools.Project.Convert;
12+
13+
internal sealed class ProjectConvertCommand : CommandBase
14+
{
15+
private readonly string _file;
16+
private readonly string? _outputDirectory;
17+
18+
public ProjectConvertCommand(ParseResult parseResult) : base(parseResult)
19+
{
20+
_file = parseResult.GetValue(ProjectConvertCommandParser.FileArgument) ?? string.Empty;
21+
_outputDirectory = parseResult.GetValue(SharedOptions.OutputOption)?.FullName;
22+
}
23+
24+
public override int Execute()
25+
{
26+
string file = Path.GetFullPath(_file);
27+
if (!VirtualProjectBuildingCommand.IsValidEntryPointPath(file))
28+
{
29+
throw new GracefulException(LocalizableStrings.InvalidFilePath, file);
30+
}
31+
32+
string targetDirectory = _outputDirectory ?? Path.ChangeExtension(file, null);
33+
if (Directory.Exists(targetDirectory))
34+
{
35+
throw new GracefulException(LocalizableStrings.DirectoryAlreadyExists, targetDirectory);
36+
}
37+
38+
Directory.CreateDirectory(targetDirectory);
39+
40+
string projectFile = Path.Join(targetDirectory, Path.GetFileNameWithoutExtension(file) + ".csproj");
41+
string projectFileText = VirtualProjectBuildingCommand.GetNonVirtualProjectFileText();
42+
File.WriteAllText(path: projectFile, contents: projectFileText);
43+
44+
File.Move(file, Path.Join(targetDirectory, Path.GetFileName(file)));
45+
46+
return 0;
47+
}
48+
}

‎src/Cli/dotnet/commands/dotnet-project/convert/ProjectConvertCommandParser.cs

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the MIT license.
3+
4+
#nullable enable
5+
6+
using System.CommandLine;
7+
using Microsoft.DotNet.Tools.Project.Convert;
8+
using Microsoft.TemplateEngine.Cli.Commands;
9+
using LocalizableStrings = Microsoft.DotNet.Tools.Project.Convert.LocalizableStrings;
10+
11+
namespace Microsoft.DotNet.Cli;
12+
13+
internal sealed class ProjectConvertCommandParser
14+
{
15+
public static readonly CliArgument<string> FileArgument = new("file")
16+
{
17+
Description = LocalizableStrings.CmdFileDescription,
18+
Arity = ArgumentArity.ExactlyOne,
19+
};
20+
21+
public static CliCommand GetCommand()
22+
{
23+
CliCommand command = new("convert", LocalizableStrings.AppFullName)
24+
{
25+
FileArgument,
26+
SharedOptions.OutputOption,
27+
};
28+
29+
command.SetAction((parseResult) => new ProjectConvertCommand(parseResult).Execute());
30+
return command;
31+
}
32+
}

‎src/Cli/dotnet/commands/dotnet-project/convert/xlf/LocalizableStrings.cs.xlf

Lines changed: 27 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Cli/dotnet/commands/dotnet-project/convert/xlf/LocalizableStrings.de.xlf

Lines changed: 27 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Cli/dotnet/commands/dotnet-project/convert/xlf/LocalizableStrings.es.xlf

Lines changed: 27 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Cli/dotnet/commands/dotnet-project/convert/xlf/LocalizableStrings.fr.xlf

Lines changed: 27 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Cli/dotnet/commands/dotnet-project/convert/xlf/LocalizableStrings.it.xlf

Lines changed: 27 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)