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

Commite4cd160

Browse files
authored
Merge pull request #4885 from brettfo/remove-copy-and-sub
remove old CopyAndSubstituteText build task and targets
2 parents0b06a7a +ecbe4f3 commite4cd160

File tree

2 files changed

+5
-40
lines changed

2 files changed

+5
-40
lines changed

‎src/buildfromsource/BuildFromSource.targets‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -37,21 +37,6 @@
3737
<ImportProject="..\FSharpSource.Profiles.targets" />
3838
<ImportProject="$(BuildVersionFilePath)"Condition="Exists('$(BuildVersionFilePath)')" />
3939

40-
<TargetName="CopyAndSubstituteTextFiles"
41-
BeforeTargets="Compile"
42-
Inputs="@(CopyAndSubstituteText)"
43-
Outputs="@(CopyAndSubstituteText->'$(OutDir)%(TargetFilename)')"
44-
Condition="'$(DesignTimeBuild)' != 'true'">
45-
46-
<ItemGroup>
47-
<FileTextMapInclude="%(CopyAndSubstituteText.TargetFilename)">
48-
<FileText>$([System.Text.RegularExpressions.Regex]::Replace($([System.IO.File]::ReadAllText("%(CopyAndSubstituteText.FullPath)")), "%(CopyAndSubstituteText.Pattern1)", "%(CopyAndSubstituteText.Replacement1)"))</FileText>
49-
<FileText Condition ="'$(CurrentPattern2)' != ''">$([System.Text.RegularExpressions.Regex]::Replace($(FileText), "%(CopyAndSubstituteText.Pattern2)", "%(CopyAndSubstituteText.Replacement2)"))</FileText>
50-
</FileTextMap>
51-
</ItemGroup>
52-
<WriteLinesToFileFile="$(OutDir)%(FileTextMap.Identity)"Lines="%(FileTextMap.FileText)"Overwrite="true" />
53-
</Target>
54-
5540
<ItemGroup>
5641
<AvailableItemNameInclude="FsLex">
5742
<Visible>false</Visible>

‎src/buildfromsource/FSharp.Build/FSharp.Build.fsproj‎

Lines changed: 5 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -26,31 +26,11 @@
2626
<CompileInclude="$(FSharpSourcesRoot)\fsharp\FSharp.Build\FSharpEmbedResXSource.fs" />
2727
<CompileInclude="$(FSharpSourcesRoot)\fsharp\FSharp.Build\WriteCodeFragment.fs" />
2828
<CompileInclude="$(FSharpSourcesRoot)\fsharp\FSharp.Build\CreateFSharpManifestResourceName.fs" />
29-
<CopyAndSubstituteTextInclude="$(FSharpSourcesRoot)\fsharp\FSharp.Build\Microsoft.FSharp.Targets">
30-
<TargetFilename>Microsoft.FSharp.Targets</TargetFilename>
31-
<Pattern1>{BuildSuffix}</Pattern1>
32-
<Replacement1></Replacement1>
33-
</CopyAndSubstituteText>
34-
<CopyAndSubstituteTextInclude="$(FSharpSourcesRoot)\fsharp\FSharp.Build\Microsoft.Portable.FSharp.Targets">
35-
<TargetFilename>Microsoft.Portable.FSharp.Targets</TargetFilename>
36-
<Pattern1>{BuildSuffix}</Pattern1>
37-
<Replacement1></Replacement1>
38-
</CopyAndSubstituteText>
39-
<CopyAndSubstituteTextInclude="$(FSharpSourcesRoot)\fsharp\FSharp.Build\Microsoft.FSharp.NetSdk.props">
40-
<TargetFilename>Microsoft.FSharp.NetSdk.props</TargetFilename>
41-
<Pattern1>{BuildSuffix}</Pattern1>
42-
<Replacement1></Replacement1>
43-
</CopyAndSubstituteText>
44-
<CopyAndSubstituteTextInclude="$(FSharpSourcesRoot)\fsharp\FSharp.Build\Microsoft.FSharp.NetSdk.targets">
45-
<TargetFilename>Microsoft.FSharp.NetSdk.targets</TargetFilename>
46-
<Pattern1>{BuildSuffix}</Pattern1>
47-
<Replacement1></Replacement1>
48-
</CopyAndSubstituteText>
49-
<CopyAndSubstituteTextInclude="$(FSharpSourcesRoot)\fsharp\FSharp.Build\Microsoft.FSharp.Overrides.NetSdk.targets">
50-
<TargetFilename>Microsoft.FSharp.Overrides.NetSdk.targets</TargetFilename>
51-
<Pattern1>{BuildSuffix}</Pattern1>
52-
<Replacement1></Replacement1>
53-
</CopyAndSubstituteText>
29+
<NoneInclude="$(FSharpSourcesRoot)\fsharp\FSharp.Build\Microsoft.FSharp.Targets"CopyToOutputDirectory="PreserveNewest" />
30+
<NoneInclude="$(FSharpSourcesRoot)\fsharp\FSharp.Build\Microsoft.Portable.FSharp.Targets"CopyToOutputDirectory="PreserveNewest" />
31+
<NoneInclude="$(FSharpSourcesRoot)\fsharp\FSharp.Build\Microsoft.FSharp.NetSdk.props"CopyToOutputDirectory="PreserveNewest" />
32+
<NoneInclude="$(FSharpSourcesRoot)\fsharp\FSharp.Build\Microsoft.FSharp.NetSdk.targets"CopyToOutputDirectory="PreserveNewest" />
33+
<NoneInclude="$(FSharpSourcesRoot)\fsharp\FSharp.Build\Microsoft.FSharp.Overrides.NetSdk.targets"CopyToOutputDirectory="PreserveNewest" />
5434
</ItemGroup>
5535

5636
<ItemGroup>

0 commit comments

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