Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitb8ef88b

Browse files
committed
Adjust fix to targets to treat resources correctly for both msbuild and xbuild
1 parentb123d9a commitb8ef88b

File tree

1 file changed

+36
-27
lines changed

1 file changed

+36
-27
lines changed

‎src/fsharp/FSharp.Build/Microsoft.FSharp.targets‎

Lines changed: 36 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -72,77 +72,86 @@ Copyright (C) Microsoft Corporation. Apache 2.0 License.
7272
<CreateManifestResourceNamesDependsOn></CreateManifestResourceNamesDependsOn>
7373
</PropertyGroup>
7474

75-
<!-- This is the implementation of CreateManifestResourceNames which is compatible with the way-->
76-
<!-- xbuild processes resource names-->
75+
<PropertyGroup>
76+
<UsingXBuild>false</UsingXBuild>
77+
<UsingXBuildCondition="Exists('$(MSBuildExtensionsPath32)\..\4.0\Mono.Posix.dll')">true</UsingXBuild>
78+
</PropertyGroup>
79+
80+
7781
<Target
7882
Name="CreateManifestResourceNames"
79-
Condition="'@(EmbeddedResource)' != '' AND Exists('$(MSBuildToolsPath)\..\4.0\Mono.Posix.dll')"
83+
Condition="'@(EmbeddedResource)' != ''"
8084
DependsOnTargets="$(CreateManifestResourceNamesDependsOn)"
8185
>
82-
<CreateFSharpManifestResourceNameCondition="'@(ResxWithNoCulture)' != ''"
83-
ResourceFiles="@(ResxWithNoCulture)"RootNamespace="$(RootNamespace)">
86+
<ItemGroup>
87+
<_TemporaryRemove="@(_Temporary)" />
88+
</ItemGroup>
89+
90+
<!-- START XBUILD-->
91+
92+
<!-- This is the implementation of CreateManifestResourceNames which is compatible with the way-->
93+
<!-- xbuild processes resource names-->
94+
95+
<CreateFSharpManifestResourceName
96+
Condition="'@(ResxWithNoCulture)' != '' AND '$(UsingXBuild)' == 'true'"
97+
ResourceFiles="@(ResxWithNoCulture)"RootNamespace="$(RootNamespace)">
8498
<Output TaskParameter ="ManifestResourceNames" ItemName ="ManifestResourceWithNoCultureName" />
8599
</CreateFSharpManifestResourceName>
86100

87-
<CreateFSharpManifestResourceNameCondition="'@(NonResxWithNoCulture)' != ''"
88-
ResourceFiles="@(NonResxWithNoCulture)"RootNamespace="$(RootNamespace)">
101+
<CreateFSharpManifestResourceName
102+
Condition="'@(NonResxWithNoCulture)' != '' AND '$(UsingXBuild)' == 'true'"
103+
ResourceFiles="@(NonResxWithNoCulture)"RootNamespace="$(RootNamespace)">
89104
<Output TaskParameter ="ManifestResourceNames" ItemName ="ManifestNonResxWithNoCulture" />
90105
</CreateFSharpManifestResourceName>
91106

92-
<CreateFSharpManifestResourceNameCondition="'@(ResxWithCulture)' != ''"
93-
ResourceFiles="@(ResxWithCulture)"RootNamespace="$(RootNamespace)">
107+
<CreateFSharpManifestResourceName
108+
Condition="'@(ResxWithCulture)' != '' AND '$(UsingXBuild)' == 'true'"
109+
ResourceFiles="@(ResxWithCulture)"RootNamespace="$(RootNamespace)">
94110
<Output TaskParameter ="ManifestResourceNames" ItemName ="ManifestResourceWithCultureName" />
95111
</CreateFSharpManifestResourceName>
96112

97-
<CreateFSharpManifestResourceNameCondition="'@(NonResxWithCulture)' != ''"
98-
ResourceFiles="@(NonResxWithCulture)"RootNamespace="$(RootNamespace)">
113+
<CreateFSharpManifestResourceName
114+
Condition="'@(NonResxWithCulture)' != '' AND '$(UsingXBuild)' == 'true'"
115+
ResourceFiles="@(NonResxWithCulture)"RootNamespace="$(RootNamespace)">
99116
<Output TaskParameter ="ManifestResourceNames" ItemName ="ManifestNonResxWithCulture" />
100117
</CreateFSharpManifestResourceName>
101118

119+
<!-- END XBUILD-->
102120

103-
<ItemGroup>
104-
<EmbeddedResourceRemove="@(EmbeddedResource)"Condition="'%(EmbeddedResource.ManifestResourceName)' == ''"/>
105-
</ItemGroup>
106121

107-
</Target>
122+
<!-- START MSBUILD-->
108123

109124
<!-- This is the implementation of CreateManifestResourceNames which is compatible with the way-->
110125
<!-- msbuild processes resource names-->
111-
<Target
112-
Name="CreateManifestResourceNames"
113-
Condition="'@(EmbeddedResource)' != '' AND !Exists('$(MSBuildToolsPath)\..\4.0\Mono.Posix.dll')"
114-
DependsOnTargets="$(CreateManifestResourceNamesDependsOn)">
115-
116-
<ItemGroup>
117-
<_TemporaryRemove="@(_Temporary)" />
118-
</ItemGroup>
119126

120-
<!-- Create manifest names for culture and non-culture Resx files, and for non-culture Non-Resx resources-->
121127
<CreateFSharpManifestResourceName
122128
ResourceFiles="@(EmbeddedResource)"
123129
RootNamespace="$(RootNamespace)"
124-
Condition="'%(EmbeddedResource.ManifestResourceName)' == '' and ('%(EmbeddedResource.WithCulture)' == 'false' or '%(EmbeddedResource.Type)' == 'Resx')">
130+
Condition="'%(EmbeddedResource.ManifestResourceName)' == '' and ('%(EmbeddedResource.WithCulture)' == 'false' or '%(EmbeddedResource.Type)' == 'Resx') AND '$(UsingXBuild)' == 'false'">
125131

126132
<OutputTaskParameter="ResourceFilesWithManifestResourceNames"ItemName="_Temporary" />
127133

128134
</CreateFSharpManifestResourceName>
129135

130-
<!-- Create manifest names for all culture non-resx resources-->
131136
<CreateFSharpManifestResourceName
132137
ResourceFiles="@(EmbeddedResource)"
133138
RootNamespace="$(RootNamespace)"
134139
PrependCultureAsDirectory="false"
135-
Condition="'%(EmbeddedResource.ManifestResourceName)' == '' and '%(EmbeddedResource.WithCulture)' == 'true' and '%(EmbeddedResource.Type)' == 'Non-Resx'">
140+
Condition="'%(EmbeddedResource.ManifestResourceName)' == '' and '%(EmbeddedResource.WithCulture)' == 'true' and '%(EmbeddedResource.Type)' == 'Non-Resx' AND '$(UsingXBuild)' == 'false'">
136141

137142
<OutputTaskParameter="ResourceFilesWithManifestResourceNames"ItemName="_Temporary" />
138143

139144
</CreateFSharpManifestResourceName>
140145

146+
<!-- END MSBUILD-->
147+
148+
141149
<ItemGroup>
142150
<EmbeddedResourceRemove="@(EmbeddedResource)"Condition="'%(EmbeddedResource.ManifestResourceName)' == ''"/>
143151
<EmbeddedResourceInclude="@(_Temporary)" />
144152
<_TemporaryRemove="@(_Temporary)" />
145153
</ItemGroup>
154+
146155
</Target>
147156

148157
<ItemGroup>

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp