Skip to content

Commit 82b6410

Browse files
committed
Include resources in command line arguments produced by csc in design-time build
1 parent 4ad4624 commit 82b6410

File tree

1 file changed

+15
-3
lines changed

1 file changed

+15
-3
lines changed

src/Tasks/Microsoft.Common.CurrentVersion.targets

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3203,7 +3203,8 @@ Copyright (C) Microsoft Corporation. All rights reserved.
32033203
AssignTargetPaths;
32043204
SplitResourcesByCulture;
32053205
CreateManifestResourceNames;
3206-
CreateCustomManifestResourceNames
3206+
CreateCustomManifestResourceNames;
3207+
AssignEmbeddedResourceOutputPaths;
32073208
</PrepareResourceNamesDependsOn>
32083209
</PropertyGroup>
32093210

@@ -3261,6 +3262,17 @@ Copyright (C) Microsoft Corporation. All rights reserved.
32613262

32623263
</Target>
32633264

3265+
<!--
3266+
Sets OutputResource metadata on EmbeddedResource items. This metadata is used in design time build without running ResGen target.
3267+
-->
3268+
<Target Name="AssignEmbeddedResourceOutputPaths">
3269+
<ItemGroup>
3270+
<EmbeddedResource Update="@(EmbeddedResource)">
3271+
<OutputResource>$(IntermediateOutputPath)%(EmbeddedResource.ManifestResourceName).resources</OutputResource>
3272+
</EmbeddedResource>
3273+
</ItemGroup>
3274+
</Target>
3275+
32643276
<!--
32653277
============================================================
32663278
GetItemTargetPaths
@@ -3467,7 +3479,7 @@ Copyright (C) Microsoft Corporation. All rights reserved.
34673479
StronglyTypedNamespace="%(EmbeddedResource.StronglyTypedNamespace)"
34683480
StronglyTypedManifestPrefix="%(EmbeddedResource.StronglyTypedManifestPrefix)"
34693481
PublicClass="%(EmbeddedResource.PublicClass)"
3470-
OutputResources="@(EmbeddedResource->'$(IntermediateOutputPath)%(ManifestResourceName).resources')"
3482+
OutputResources="@(EmbeddedResource->'%(OutputResource)')"
34713483
Condition="'%(EmbeddedResource.Type)' == 'Resx' and '%(EmbeddedResource.GenerateResource)' != 'false' and '$(GenerateResourceMSBuildRuntime)' != 'CLR2'"
34723484
SdkToolsPath="$(ResgenToolPath)"
34733485
ExecuteAsTool="$(ResGenExecuteAsTool)"
@@ -3677,7 +3689,7 @@ Copyright (C) Microsoft Corporation. All rights reserved.
36773689
Create the _CoreCompileResourceInputs list of inputs to the CoreCompile target.
36783690
============================================================
36793691
-->
3680-
<Target Name="_GenerateCompileInputs">
3692+
<Target Name="_GenerateCompileInputs" DependsOnTargets="PrepareResourceNames">
36813693

36823694
<MSBuildInternalMessage
36833695
Condition="'@(ManifestResourceWithNoCulture)'!='' and '%(ManifestResourceWithNoCulture.EmittedForCompatibilityOnly)'==''"

0 commit comments

Comments
 (0)