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

Commit4769a92

Browse files
authored
Merge pull request #3577 from brettfo/fssrgen
add build task to generate *.resx and *.fs from *.txt resources
2 parents9caa326 +d5ee817 commit4769a92

File tree

13 files changed

+575
-32
lines changed

13 files changed

+575
-32
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ obj
102102
extras
103103
ossreadme*.txt
104104
*.csproj.user
105+
*.fsproj.user
105106
*.sln.DotSettings.user
106107
*.ide
107108
*.log

‎src/FSharpSource.targets‎

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@
262262
<OutputTaskParameter="Include"ItemName="FileWrites"/>
263263
</CreateItem>
264264
</Target>
265-
<ImportProject="scripts\fssrgen.targets" />
265+
<ImportProject="$(FSharpSourcesRoot)\scripts\fssrgen.targets"Condition="'$(Configuration)' == 'Proto'" />
266266
<ImportProject="Microbuild.Settings.targets"Condition="'$(UseMicroBuild)' == 'true'"/>
267267

268268
<TargetName="dotnetrestore"BeforeTargets="Build"Condition=" '$(TargetDotnetProfile)' == 'coreclr'">
@@ -357,6 +357,30 @@
357357
<DeleteFiles="@(OldBuildVersionFiles)"TreatErrorsAsWarnings="true"/>
358358
</Target>
359359

360+
<UsingTaskTaskName="FSharpEmbedResourceText"
361+
AssemblyFile="$(FSharpSourcesRoot)\..\Proto\net40\bin\FSharp.Build-proto.dll"
362+
Condition="'$(Configuration)' != 'Proto'" />
363+
364+
<TargetName="GenerateFSharpTextResources"
365+
BeforeTargets="CoreResGen;PrepareForBuild"
366+
Condition="'$(Configuration)' != 'Proto'">
367+
368+
<MakeDirDirectories="$(IntermediateOutputPath)" />
369+
370+
<FSharpEmbedResourceTextEmbeddedText="@(EmbeddedText)"IntermediateOutputPath="$(IntermediateOutputPath)">
371+
<OutputTaskParameter="GeneratedSource"ItemName="_FsGeneratedSource" />
372+
<OutputTaskParameter="GeneratedResx"ItemName="_FsGeneratedResx" />
373+
</FSharpEmbedResourceText>
374+
375+
<ItemGroup>
376+
<CompileBeforeInclude="@(_FsGeneratedSource)" />
377+
<EmbeddedResourceInclude="@(_FsGeneratedResx)" />
378+
<FileWritesInclude="@(_FsGeneratedSource)" />
379+
<FileWritesInclude="@(_FsGeneratedResx)" />
380+
</ItemGroup>
381+
382+
</Target>
383+
360384
<UsingTaskTaskName="ReplaceFileText"TaskFactory="CodeTaskFactory"AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
361385
<ParameterGroup>
362386
<InputFilenameParameterType="System.String"Required="true" />

‎src/fsharp/FSharp.Build-proto/FSharp.Build-proto.fsproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@
3434
<CompileInclude="..\FSharp.Build\Fsc.fs">
3535
<Link>Fsc.fs</Link>
3636
</Compile>
37+
<CompileInclude="..\FSharp.Build\FSharpEmbedResourceText.fs">
38+
<Link>FSharpEmbedResourceText.fs</Link>
39+
</Compile>
3740
<CopyAndSubstituteTextInclude="..\FSharp.Build\Microsoft.FSharp.Targets">
3841
<Link>Microsoft.FSharp-proto.targets</Link>
3942
<TargetFilename>Microsoft.FSharp-proto.targets</TargetFilename>
@@ -63,6 +66,7 @@
6366
<ReferenceInclude="mscorlib" />
6467
<ReferenceInclude="System" />
6568
<ReferenceInclude="System.Numerics" />
69+
<ReferenceInclude="System.Xml" />
6670
</ItemGroup>
6771
<ItemGroupCondition=" '$(TargetDotnetProfile)' != 'coreclr' AND '$(MonoPackaging)' != 'true'">
6872
<ReferenceInclude="Microsoft.Build.Framework, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

‎src/fsharp/FSharp.Build/FSharp.Build.BuildFromSource.fsproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
<CompileInclude="..\..\utils\reshapedreflection.fs" />
2222
<CompileInclude="Fsc.fsi" />
2323
<CompileInclude="Fsc.fs" />
24+
<CompileInclude="FSharpEmbedResourceText.fs" />
2425
<CompileInclude="CreateFSharpManifestResourceName.fsi" />
2526
<CompileInclude="CreateFSharpManifestResourceName.fs" />
2627
<CopyAndSubstituteTextInclude="Microsoft.FSharp.Targets">

‎src/fsharp/FSharp.Build/FSharp.Build.fsproj‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,14 @@
2323
</ItemGroup>
2424

2525
<ItemGroup>
26-
<FsSrGenInclude="FSBuild.txt" />
26+
<EmbeddedTextInclude="FSBuild.txt" />
2727
<CompileInclude="InternalsVisibleTo.fs" />
2828
<CompileInclude="..\..\assemblyinfo\assemblyinfo.FSharp.Build.dll.fs" />
2929
<CompileInclude="..\..\utils\CompilerLocationUtils.fs" />
3030
<CompileInclude="..\..\utils\reshapedreflection.fs" />
3131
<CompileInclude="Fsc.fsi" />
3232
<CompileInclude="Fsc.fs" />
33+
<CompileInclude="FSharpEmbedResourceText.fs" />
3334
<CompileInclude="CreateFSharpManifestResourceName.fsi" />
3435
<CompileInclude="CreateFSharpManifestResourceName.fs" />
3536
<CopyAndSubstituteTextInclude="Microsoft.FSharp.Targets">
@@ -57,6 +58,7 @@
5758
<ItemGroupCondition=" '$(TargetDotnetProfile)' != 'coreclr'">
5859
<ReferenceInclude="mscorlib" />
5960
<ReferenceInclude="System" />
61+
<ReferenceInclude="System.Xml" />
6062
</ItemGroup>
6163
<ItemGroupCondition=" '$(TargetDotnetProfile)' != 'coreclr' AND '$(MonoPackaging)' != 'true'">
6264
<ReferenceInclude="Microsoft.Build.Framework, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

0 commit comments

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