Skip to content

Commit 43cb01f

Browse files
brettfobaronfel
brettfo
authored and
baronfel
committed
ensure Microsoft.FSharp.NetSdk.props makes it into VisualFSharpFull.vsix (#6942)
* ensure Microsoft.FSharp.NetSdk.props makes it into VisualFSharpFull.vsix During a build/deploy in VS the target `BeforeBuild` wasn't getting called on FSharp.Build.fsproj if up-to-date checks passed which meant the .props file wasn't getting added to the @(None) item group. The fix is to make that target depend on `AssignTargetPaths` which is run in both the VS build as well as the command line build. * annotate ambiguous function
1 parent 3cb7cbc commit 43cb01f

File tree

5 files changed

+36
-34
lines changed

5 files changed

+36
-34
lines changed

‎FSharpBuild.Directory.Build.targets‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,29 +5,30 @@
55
<Import Project="eng\targets\NGenBinaries.targets" />
66
<Import Project="FSharp.Profiles.props" />
77

8-
<Target Name="CopyAndSubstituteTextFiles"
9-
Inputs="@(CopyAndSubstituteText)"
10-
Outputs="@(CopyAndSubstituteText->'$(IntermediateOutputPath)%(Filename)%(Extension)')"
11-
BeforeTargets="BeforeBuild">
8+
<Target Name="NoneSubstituteTextFiles"
9+
Inputs="@(NoneSubstituteText)"
10+
Outputs="@(NoneSubstituteText->'$(IntermediateOutputPath)%(Filename)%(Extension)')"
11+
BeforeTargets="AssignTargetPaths;BeforeBuild">
1212

1313
<PropertyGroup>
14-
<__TargetFilePath>@(CopyAndSubstituteText->'$(IntermediateOutputPath)%(Filename)%(Extension)')</__TargetFilePath>
15-
<__TargetFileName>@(CopyAndSubstituteText->'%(Filename)%(Extension)')</__TargetFileName>
14+
<__TargetFilePath>@(NoneSubstituteText->'$(IntermediateOutputPath)%(Filename)%(Extension)')</__TargetFilePath>
15+
<__TargetFileName>@(NoneSubstituteText->'%(Filename)%(Extension)')</__TargetFileName>
1616

17-
<_ReplacementText>$([System.IO.File]::ReadAllText('%(CopyAndSubstituteText.FullPath)'))</_ReplacementText>
18-
<_ReplacementText Condition="'%(CopyAndSubstituteText.Pattern1)' != ''">$(_ReplacementText.Replace('%(CopyAndSubstituteText.Pattern1)', '%(CopyAndSubstituteText.Replacement1)'))</_ReplacementText>
19-
<_ReplacementText Condition="'%(CopyAndSubstituteText.Pattern2)' != ''">$(_ReplacementText.Replace('%(CopyAndSubstituteText.Pattern2)', '%(CopyAndSubstituteText.Replacement2)'))</_ReplacementText>
17+
<_ReplacementText>$([System.IO.File]::ReadAllText('%(NoneSubstituteText.FullPath)'))</_ReplacementText>
18+
<_ReplacementText Condition="'%(NoneSubstituteText.Pattern1)' != ''">$(_ReplacementText.Replace('%(NoneSubstituteText.Pattern1)', '%(NoneSubstituteText.Replacement1)'))</_ReplacementText>
19+
<_ReplacementText Condition="'%(NoneSubstituteText.Pattern2)' != ''">$(_ReplacementText.Replace('%(NoneSubstituteText.Pattern2)', '%(NoneSubstituteText.Replacement2)'))</_ReplacementText>
20+
21+
<_CopyToOutputDirectory Condition="'%(NoneSubstituteText.CopyToOutputDirectory)' != ''">%(NoneSubstituteText.CopyToOutputDirectory)</_CopyToOutputDirectory>
22+
<_CopyToOutputDirectory Condition="'%(NoneSubstituteText.CopyToOutputDirectory)' == ''">Never</_CopyToOutputDirectory>
2023
</PropertyGroup>
2124

22-
<MakeDir
23-
Directories="$(IntermediateOutputPath)"
24-
Condition="!Exists('$(IntermediateOutputPath)')" />
25+
<MakeDir Directories="$(IntermediateOutputPath)"
26+
Condition="!Exists('$(IntermediateOutputPath)')" />
2527
<WriteLinesToFile File="$(__TargetFilePath)" Lines="$(_ReplacementText)" Overwrite="true" WriteOnlyWhenDifferent="true" />
2628

2729
<!-- Make sure it will get cleaned -->
2830
<ItemGroup >
29-
<None Include="$(__TargetFilePath)" Condition="'$(__TargetFileName)' == 'App.config'" CopyToOutputDirectory="Never" />
30-
<None Include="$(__TargetFilePath)" Condition="'$(__TargetFileName)' != 'App.config'" CopyToOutputDirectory="PreserveNewest" />
31+
<None Include="$(__TargetFilePath)" CopyToOutputDirectory="$(_CopyToOutputDirectory)" />
3132
<FileWrites Include="$(__TargetFilePath)" Condition="'$(__TargetFileName)' != 'App.config'" />
3233
</ItemGroup>
3334
</Target>

‎fcs/Directory.Build.targets‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,29 @@
11
<Project>
22

3-
<Target Name="CopyAndSubstituteTextFiles"
4-
Inputs="@(CopyAndSubstituteText)"
5-
Outputs="@(CopyAndSubstituteText->'$(IntermediateOutputPath)%(Filename)%(Extension)')"
6-
BeforeTargets="BeforeBuild">
3+
<Target Name="NoneSubstituteTextFiles"
4+
Inputs="@(NoneSubstituteText)"
5+
Outputs="@(NoneSubstituteText->'$(IntermediateOutputPath)%(Filename)%(Extension)')"
6+
BeforeTargets="AssignTargetPaths;BeforeBuild">
77

88
<PropertyGroup>
9-
<__TargetFilePath>@(CopyAndSubstituteText->'$(IntermediateOutputPath)%(Filename)%(Extension)')</__TargetFilePath>
10-
<__TargetFileName>@(CopyAndSubstituteText->'%(Filename)%(Extension)')</__TargetFileName>
9+
<__TargetFilePath>@(NoneSubstituteText->'$(IntermediateOutputPath)%(Filename)%(Extension)')</__TargetFilePath>
10+
<__TargetFileName>@(NoneSubstituteText->'%(Filename)%(Extension)')</__TargetFileName>
1111

12-
<_ReplacementText>$([System.IO.File]::ReadAllText('%(CopyAndSubstituteText.FullPath)'))</_ReplacementText>
13-
<_ReplacementText Condition="'%(CopyAndSubstituteText.Pattern1)' != ''">$(_ReplacementText.Replace('%(CopyAndSubstituteText.Pattern1)', '%(CopyAndSubstituteText.Replacement1)'))</_ReplacementText>
14-
<_ReplacementText Condition="'%(CopyAndSubstituteText.Pattern2)' != ''">$(_ReplacementText.Replace('%(CopyAndSubstituteText.Pattern2)', '%(CopyAndSubstituteText.Replacement2)'))</_ReplacementText>
12+
<_ReplacementText>$([System.IO.File]::ReadAllText('%(NoneSubstituteText.FullPath)'))</_ReplacementText>
13+
<_ReplacementText Condition="'%(NoneSubstituteText.Pattern1)' != ''">$(_ReplacementText.Replace('%(NoneSubstituteText.Pattern1)', '%(NoneSubstituteText.Replacement1)'))</_ReplacementText>
14+
<_ReplacementText Condition="'%(NoneSubstituteText.Pattern2)' != ''">$(_ReplacementText.Replace('%(NoneSubstituteText.Pattern2)', '%(NoneSubstituteText.Replacement2)'))</_ReplacementText>
15+
16+
<_CopyToOutputDirectory Condition="'%(NoneSubstituteText.CopyToOutputDirectory)' != ''">%(NoneSubstituteText.CopyToOutputDirectory)</_CopyToOutputDirectory>
17+
<_CopyToOutputDirectory Condition="'%(NoneSubstituteText.CopyToOutputDirectory)' == ''">Never</_CopyToOutputDirectory>
1518
</PropertyGroup>
1619

17-
<MakeDir
18-
Directories="$(IntermediateOutputPath)"
19-
Condition="!Exists('$(IntermediateOutputPath)')" />
20+
<MakeDir Directories="$(IntermediateOutputPath)"
21+
Condition="!Exists('$(IntermediateOutputPath)')" />
2022
<WriteLinesToFile File="$(__TargetFilePath)" Lines="$(_ReplacementText)" Overwrite="true" WriteOnlyWhenDifferent="true" />
2123

2224
<!-- Make sure it will get cleaned -->
2325
<ItemGroup >
24-
<None Include="$(__TargetFilePath)" Condition="'$(__TargetFileName)' == 'App.config'" CopyToOutputDirectory="Never" />
25-
<None Include="$(__TargetFilePath)" Condition="'$(__TargetFileName)' != 'App.config'" CopyToOutputDirectory="PreserveNewest" />
26+
<None Include="$(__TargetFilePath)" CopyToOutputDirectory="$(_CopyToOutputDirectory)" />
2627
<FileWrites Include="$(__TargetFilePath)" Condition="'$(__TargetFileName)' != 'App.config'" />
2728
</ItemGroup>
2829
</Target>

‎fcs/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,10 @@
7676
<Compile Include="$(FSharpSourcesRoot)\..\tests\service\Program.fs" Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
7777
<Link>Program.fs</Link>
7878
</Compile>
79-
<CopyAndSubstituteText Include="App.config">
79+
<NoneSubstituteText Include="App.config">
8080
<Pattern1>{{FSCoreVersion}}</Pattern1>
8181
<Replacement1>$(FSCoreVersion)</Replacement1>
82-
</CopyAndSubstituteText>
82+
</NoneSubstituteText>
8383
</ItemGroup>
8484
<ItemGroup>
8585
<PackageReference Include="FSharp.Core" Version="$(FcsFSharpCorePkgVersion)" />

‎src/fsharp/fsi/fsi.fsproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@
2828
<ItemGroup>
2929
<Compile Include="console.fs" />
3030
<Compile Include="fsimain.fs" />
31-
<CopyAndSubstituteText Include="App.config">
31+
<NoneSubstituteText Include="App.config">
3232
<Pattern1>{{FSCoreVersion}}</Pattern1>
3333
<Replacement1>$(FSCoreVersion)</Replacement1>
34-
</CopyAndSubstituteText>
34+
</NoneSubstituteText>
3535
</ItemGroup>
3636

3737
<ItemGroup>

‎src/fsharp/fsiAnyCpu/fsiAnyCpu.fsproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525
<ItemGroup>
2626
<Compile Include="..\fsi\console.fs" />
2727
<Compile Include="..\fsi\fsimain.fs" />
28-
<CopyAndSubstituteText Include="App.config">
28+
<NoneSubstituteText Include="App.config">
2929
<Pattern1>{{FSCoreVersion}}</Pattern1>
3030
<Replacement1>$(FSCoreVersion)</Replacement1>
31-
</CopyAndSubstituteText>
31+
</NoneSubstituteText>
3232
</ItemGroup>
3333

3434
<ItemGroup>

0 commit comments

Comments
 (0)