Skip to content

Commit 2935f1c

Browse files
yfakariyayfakariya
committed
Fix leaf directory of specified output directory path is ignored in mpu.exe.
1 parent feba007 commit 2935f1c

4 files changed

Lines changed: 35 additions & 3 deletions

File tree

‎src/mpu/AssetFileImporter.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public void AssembleAssetTree( string sourceProjectPath, string outputDirectoryP
9595

9696
foreach ( var sourceFileRelativePath in this.ParseProjectFile( sourceProjectPath ) )
9797
{
98-
var destinationFilePath = Path.Combine( outputDirectoryPath, sourceFileRelativePath );
98+
var destinationFilePath = Path.Combine( outputDirectoryPath, sourceFileRelativePath.StartsWith( "..\\" ) ? sourceFileRelativePath.Substring( 3 ) : sourceFileRelativePath );
9999
// ReSharper disable once AssignNullToNotNullAttribute
100100
Directory.CreateDirectory( Path.GetDirectoryName( destinationFilePath ) );
101101

@@ -130,7 +130,7 @@ internal IEnumerable<string> ParseProjectFile( string filePath )
130130
projectXml.Root.Elements( "{http://schemas.microsoft.com/developer/msbuild/2003}ItemGroup" )
131131
.Elements( "{http://schemas.microsoft.com/developer/msbuild/2003}Compile" )
132132
.Attributes( "Include" )
133-
.Where( include =>
133+
.Where( include =>
134134
include.Value.EndsWith( ".cs", StringComparison.OrdinalIgnoreCase )
135135
&& !include.Value.EndsWith( "AssemblyInfo.cs", StringComparison.OrdinalIgnoreCase )
136136
&& !include.Value.EndsWith( "CommonAssemblyInfo.cs", StringComparison.OrdinalIgnoreCase )

‎tools/mpu/bin/MsgPack.dll‎

1 KB
Binary file not shown.

‎tools/mpu/bin/MsgPack.xml‎

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1257,71 +1257,103 @@
12571257
<summary>
12581258
Initializes a new instance of the <see cref="T:MsgPack.MessagePackObject"/> type which wraps <see cref="T:System.Boolean"/> instance.
12591259
</summary>
1260+
<param name="value">A <see cref="T:MsgPack.MessagePackObject"/> value to be wrapped.</param>
12601261
</member>
12611262
<member name="M:MsgPack.MessagePackObject.#ctor(System.Byte)">
12621263
<summary>
12631264
Initializes a new instance of the <see cref="T:MsgPack.MessagePackObject"/> type which wraps <see cref="T:System.Byte"/> instance.
12641265
</summary>
1266+
<param name="value">A <see cref="T:MsgPack.MessagePackObject"/> value to be wrapped.</param>
12651267
</member>
12661268
<member name="M:MsgPack.MessagePackObject.#ctor(System.SByte)">
12671269
<summary>
12681270
Initializes a new instance of the <see cref="T:MsgPack.MessagePackObject"/> type which wraps <see cref="T:System.SByte"/> instance.
12691271
</summary>
1272+
<param name="value">A <see cref="T:MsgPack.MessagePackObject"/> value to be wrapped.</param>
12701273
</member>
12711274
<member name="M:MsgPack.MessagePackObject.#ctor(System.Int16)">
12721275
<summary>
12731276
Initializes a new instance of the <see cref="T:MsgPack.MessagePackObject"/> type which wraps <see cref="T:System.Int16"/> instance.
12741277
</summary>
1278+
<param name="value">A <see cref="T:MsgPack.MessagePackObject"/> value to be wrapped.</param>
12751279
</member>
12761280
<member name="M:MsgPack.MessagePackObject.#ctor(System.UInt16)">
12771281
<summary>
12781282
Initializes a new instance of the <see cref="T:MsgPack.MessagePackObject"/> type which wraps <see cref="T:System.UInt16"/> instance.
12791283
</summary>
1284+
<param name="value">A <see cref="T:MsgPack.MessagePackObject"/> value to be wrapped.</param>
12801285
</member>
12811286
<member name="M:MsgPack.MessagePackObject.#ctor(System.Int32)">
12821287
<summary>
12831288
Initializes a new instance of the <see cref="T:MsgPack.MessagePackObject"/> type which wraps <see cref="T:System.Int32"/> instance.
12841289
</summary>
1290+
<param name="value">A <see cref="T:MsgPack.MessagePackObject"/> value to be wrapped.</param>
12851291
</member>
12861292
<member name="M:MsgPack.MessagePackObject.#ctor(System.UInt32)">
12871293
<summary>
12881294
Initializes a new instance of the <see cref="T:MsgPack.MessagePackObject"/> type which wraps <see cref="T:System.UInt32"/> instance.
12891295
</summary>
1296+
<param name="value">A <see cref="T:MsgPack.MessagePackObject"/> value to be wrapped.</param>
12901297
</member>
12911298
<member name="M:MsgPack.MessagePackObject.#ctor(System.Int64)">
12921299
<summary>
12931300
Initializes a new instance of the <see cref="T:MsgPack.MessagePackObject"/> type which wraps <see cref="T:System.Int64"/> instance.
12941301
</summary>
1302+
<param name="value">A <see cref="T:MsgPack.MessagePackObject"/> value to be wrapped.</param>
12951303
</member>
12961304
<member name="M:MsgPack.MessagePackObject.#ctor(System.UInt64)">
12971305
<summary>
12981306
Initializes a new instance of the <see cref="T:MsgPack.MessagePackObject"/> type which wraps <see cref="T:System.UInt64"/> instance.
12991307
</summary>
1308+
<param name="value">A <see cref="T:MsgPack.MessagePackObject"/> value to be wrapped.</param>
13001309
</member>
13011310
<member name="M:MsgPack.MessagePackObject.#ctor(System.Single)">
13021311
<summary>
13031312
Initializes a new instance of the <see cref="T:MsgPack.MessagePackObject"/> type which wraps <see cref="T:System.Single"/> instance.
13041313
</summary>
1314+
<param name="value">A <see cref="T:MsgPack.MessagePackObject"/> value to be wrapped.</param>
13051315
</member>
13061316
<member name="M:MsgPack.MessagePackObject.#ctor(System.Double)">
13071317
<summary>
13081318
Initializes a new instance of the <see cref="T:MsgPack.MessagePackObject"/> type which wraps <see cref="T:System.Double"/> instance.
13091319
</summary>
1320+
<param name="value">A <see cref="T:MsgPack.MessagePackObject"/> value to be wrapped.</param>
13101321
</member>
13111322
<member name="M:MsgPack.MessagePackObject.#ctor(System.String)">
13121323
<summary>
13131324
Initializes a new instance of the <see cref="T:MsgPack.MessagePackObject"/> type which wraps <see cref="T:System.String"/> instance.
13141325
</summary>
1326+
<param name="value">A <see cref="T:MsgPack.MessagePackObject"/> value to be wrapped.</param>
13151327
</member>
13161328
<member name="M:MsgPack.MessagePackObject.#ctor(System.Byte[])">
13171329
<summary>
1318-
Initializes a new instance of the <see cref="T:MsgPack.MessagePackObject"/> type which wraps <see cref="T:System.Byte"/>[] instance.
1330+
Initializes a new instance of the <see cref="T:System.Byte"/>[] type which wraps <see cref="T:System.Byte"/>[] instance with specified manner.
13191331
</summary>
1332+
<param name="value">A bytes array to be wrapped.</param>
1333+
<remarks>
1334+
This constructor invokes <see cref="M:MsgPack.MessagePackObject.#ctor(System.Byte[],System.Boolean)"/> with <c>false</c>, that means if you pass tha bytes array which is valid utf-8, resulting object can be <see cref="T:System.String"/>,
1335+
and its <see cref="P:MsgPack.MessagePackObject.UnderlyingType"/> should be <see cref="T:System.String"/>.
1336+
</remarks>
1337+
</member>
1338+
<member name="M:MsgPack.MessagePackObject.#ctor(System.Byte[],System.Boolean)">
1339+
<summary>
1340+
Initializes a new instance of the <see cref="T:System.Byte"/>[] type which wraps <see cref="T:System.Byte"/>[] instance with specified manner.
1341+
</summary>
1342+
<param name="value">A bytes array to be wrapped.</param>
1343+
<param name="isBinary"><c>true</c> if <paramref name="value"/> always should be binary; <c>false</c>, otherwise.</param>
1344+
<remarks>
1345+
When the <paramref name="isBinary"/> is <c>true</c>, then resulting object represents binary even if the <paramref name="value"/> is valid utf-8 sequence,
1346+
that is, its <see cref="P:MsgPack.MessagePackObject.UnderlyingType"/> should be <see cref="T:System.Byte"/>[].
1347+
On the other hand, when contrast, the <paramref name="isBinary"/> is <c>false</c>, and if the <paramref name="value"/> is valid utf-8,
1348+
then the resulting object can be <see cref="T:System.String"/>,
1349+
and its <see cref="P:MsgPack.MessagePackObject.UnderlyingType"/> should be <see cref="T:System.String"/>.
1350+
</remarks>
13201351
</member>
13211352
<member name="M:MsgPack.MessagePackObject.#ctor(MsgPack.MessagePackExtendedTypeObject)">
13221353
<summary>
13231354
Initializes a new instance of the <see cref="T:MsgPack.MessagePackObject"/> type which wraps <see cref="T:MsgPack.MessagePackExtendedTypeObject"/> instance.
13241355
</summary>
1356+
<param name="value">A <see cref="T:MsgPack.MessagePackObject"/> value to be wrapped.</param>
13251357
</member>
13261358
<member name="M:MsgPack.MessagePackObject.AsBoolean">
13271359
<summary>

‎tools/mpu/bin/mpu.exe‎

0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)