Skip to content

Preview package #6761

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
KevinRansom merged 9 commits into from
May 20, 2019
Merged

Preview package #6761

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
36b6494
Allow targetting of preview FSharp.Core. Parameterize dsharp.core ve…
KevinRansom May 16, 2019
cc7e332
Parameterise app.config generation
KevinRansom May 16, 2019
11a5e67
parameterize banner text
KevinRansom May 17, 2019
92d75d8
Do app.config right
KevinRansom May 18, 2019
fc53a49
fcs
KevinRansom May 18, 2019
132595c
fcs tests
KevinRansom May 18, 2019
1aef952
add discriminator
KevinRansom May 18, 2019
608c0e9
Update FSharp.Compiler.Service.ProjectCrackerTool.fsproj
KevinRansom May 18, 2019
83ead13
remove dead file
KevinRansom May 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Parameterise app.config generation
  • Loading branch information
@KevinRansom
KevinRansom committed May 17, 2019
commit cc7e3322bc5e43c5ca7f92b039423d1e54a70a26
9 changes: 9 additions & 0 deletions FSharpBuild.Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,17 @@
<_ReplacementText>$([System.IO.File]::ReadAllText('%(CopyAndSubstituteText.FullPath)'))</_ReplacementText>
<_ReplacementText Condition="'%(CopyAndSubstituteText.Pattern1)' != ''">$(_ReplacementText.Replace('%(CopyAndSubstituteText.Pattern1)', '%(CopyAndSubstituteText.Replacement1)'))</_ReplacementText>
<_ReplacementText Condition="'%(CopyAndSubstituteText.Pattern2)' != ''">$(_ReplacementText.Replace('%(CopyAndSubstituteText.Pattern2)', '%(CopyAndSubstituteText.Replacement2)'))</_ReplacementText>
<_ReplacementText Condition="'%(CopyAndSubstituteText.Pattern3)' != ''">$(_ReplacementText.Replace('%(CopyAndSubstituteText.Pattern3)', '%(CopyAndSubstituteText.Replacement3)'))</_ReplacementText>
<_ReplacementText Condition="'%(CopyAndSubstituteText.Pattern4)' != ''">$(_ReplacementText.Replace('%(CopyAndSubstituteText.Pattern4)', '%(CopyAndSubstituteText.Replacement4)'))</_ReplacementText>
<_ReplacementText Condition="'%(CopyAndSubstituteText.Pattern5)' != ''">$(_ReplacementText.Replace('%(CopyAndSubstituteText.Pattern5)', '%(CopyAndSubstituteText.Replacement5)'))</_ReplacementText>
<_ReplacementText Condition="'%(CopyAndSubstituteText.Pattern6)' != ''">$(_ReplacementText.Replace('%(CopyAndSubstituteText.Pattern6)', '%(CopyAndSubstituteText.Replacement6)'))</_ReplacementText>
<_ReplacementText Condition="'%(CopyAndSubstituteText.Pattern7)' != ''">$(_ReplacementText.Replace('%(CopyAndSubstituteText.Pattern7)', '%(CopyAndSubstituteText.Replacement7)'))</_ReplacementText>
<_ReplacementText Condition="'%(CopyAndSubstituteText.Pattern8)' != ''">$(_ReplacementText.Replace('%(CopyAndSubstituteText.Pattern8)', '%(CopyAndSubstituteText.Replacement8)'))</_ReplacementText>
<_ReplacementText Condition="'%(CopyAndSubstituteText.Pattern9)' != ''">$(_ReplacementText.Replace('%(CopyAndSubstituteText.Pattern9)', '%(CopyAndSubstituteText.Replacement9)'))</_ReplacementText>
</PropertyGroup>

<WriteLinesToFile File="@(CopyAndSubstituteText->'$(OutDir)%(Filename)%(Extension)')" Lines="$(_ReplacementText)" Overwrite="true" />

<!-- Make sure it will get cleaned -->
<ItemGroup>
<None Include="@(CopyAndSubstituteText->'$(OutDir)%(Filename)%(Extension)')" CopyToOutputDirectory="PreserveNewest" />
Expand Down
1 change: 1 addition & 0 deletions src/fsharp/FSharp.Build/FSharp.Build.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
<None Include="Microsoft.Portable.FSharp.Targets" CopyToOutputDirectory="PreserveNewest" />
<None Include="Microsoft.FSharp.NetSdk.targets" CopyToOutputDirectory="PreserveNewest" />
<CopyAndSubstituteText Include="Microsoft.FSharp.NetSdk.props">
<TargetFileName>Microsoft.FSharp.NetSdk.props</TargetFileName>
<Pattern1>{{FSharpCoreShippedPackageVersion}}</Pattern1>
<Replacement1>$(FSharpCoreShippedPackageVersion)</Replacement1>
<Pattern2>{{FSharpCorePreviewPackageVersion}}</Pattern2>
Expand Down
2 changes: 1 addition & 1 deletion src/fsharp/fsc/app.config → src/fsharp/fsc/fsc.exe.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="2.0.0.0-4.6.0.0" newVersion="4.6.0.0"/>
<bindingRedirect oldVersion="2.0.0.0-{{FSCoreVersion}}" newVersion="{{FSCoreVersion}}"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
Expand Down
6 changes: 5 additions & 1 deletion src/fsharp/fsc/fsc.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<AllowCrossTargeting>true</AllowCrossTargeting>
<OtherFlags>$(OtherFlags) --maxerrors:20 --extraoptimizationloops:1</OtherFlags>
<NGenBinary>true</NGenBinary>
<GenerateSupportedRuntime>false</GenerateSupportedRuntime>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)' == 'net472'">
Expand All @@ -21,11 +22,14 @@
<Compile Include="..\fscmain.fs">
<Link>fscmain.fs</Link>
</Compile>
<None Include="app.config" />
<None Include="..\..\windows\default.win32manifest">
<Link>default.win32manifest</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<CopyAndSubstituteText Include="fsc.exe.config">
<Pattern1>{{FSCoreVersion}}</Pattern1>
<Replacement1>$(FSCoreVersion)</Replacement1>
</CopyAndSubstituteText>
</ItemGroup>

<ItemGroup>
Expand Down
5 changes: 4 additions & 1 deletion src/fsharp/fsi/app.config → src/fsharp/fsi/fsi.exe.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,15 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="2.0.0.0-4.6.0.0" newVersion="4.6.0.0"/>
<bindingRedirect oldVersion="2.0.0.0-{{FSCoreVersion}}" newVersion="{{FSCoreVersion}}"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.2.3.0" newVersion="1.2.3.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<startup>
<supportedRuntime version="v4.0" sku="{{TargetFrameworkMoniker}}" />
</startup>
</configuration>
6 changes: 5 additions & 1 deletion src/fsharp/fsi/fsi.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<OtherFlags>$(OtherFlags) --warnon:1182 --maxerrors:20 --extraoptimizationloops:1</OtherFlags>
<Win32Resource>fsi.res</Win32Resource>
<NGenBinary>true</NGenBinary>
<GenerateSupportedRuntime>false</GenerateSupportedRuntime>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)' == 'net472'">
Expand All @@ -22,7 +23,10 @@
<ItemGroup>
<Compile Include="console.fs" />
<Compile Include="fsimain.fs" />
<None Include="app.config" />
<CopyAndSubstituteText Include="fsi.exe.config">
<Pattern1>{{FSCoreVersion}}</Pattern1>
<Replacement1>$(FSCoreVersion)</Replacement1>
</CopyAndSubstituteText>
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/fsharp/fsiAnyCpu/app.config → src/fsharp/fsiAnyCpu/fsiAnyCpu.exe.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="2.0.0.0-4.6.0.0" newVersion="4.6.0.0"/>
<bindingRedirect oldVersion="2.0.0.0-{{FSCoreVersion}}" newVersion="{{FSCoreVersion}}"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
Expand Down
6 changes: 5 additions & 1 deletion src/fsharp/fsiAnyCpu/fsiAnyCpu.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<Win32Resource>..\fsi\fsi.res</Win32Resource>
<NGenBinary>true</NGenBinary>
<ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
<GenerateSupportedRuntime>false</GenerateSupportedRuntime>
</PropertyGroup>

<PropertyGroup>
Expand All @@ -22,7 +23,10 @@
<ItemGroup>
<Compile Include="..\fsi\console.fs" />
<Compile Include="..\fsi\fsimain.fs" />
<None Include="..\fsi\app.config" />
<CopyAndSubstituteText Include="fsiAnyCpu.exe.config">
<Pattern1>{{FSCoreVersion}}</Pattern1>
<Replacement1>$(FSCoreVersion)</Replacement1>
</CopyAndSubstituteText>
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion vsintegration/tests/UnitTests/App.config → ...itTests/VisualFSharp.UnitTests.dll.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="2.0.0.0-4.6.0.0" newVersion="4.6.0.0"/>
<bindingRedirect oldVersion="2.0.0.0-{{FSCoreVersion}}" newVersion="{{FSCoreVersion}}"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
Expand Down
11 changes: 5 additions & 6 deletions vsintegration/tests/UnitTests/VisualFSharp.UnitTests.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>
<IsTestProject>true</IsTestProject>
<GenerateSupportedRuntime>false</GenerateSupportedRuntime>
</PropertyGroup>

<ItemGroup>
Expand Down Expand Up @@ -165,12 +166,10 @@
<Compile Include="DocumentHighlightsServiceTests.fs">
<Link>Roslyn\DocumentHighlightsServiceTests.fs</Link>
</Compile>
<None Include="App.config" />
<None Include="app.runsettings">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<!-- <None Include="App.config" /> -->
<None Include="App.config" CopyToOutputDirectory="PreserveNewest" />
<CopyAndSubstituteText Include="VisualFSharp.UnitTests.dll.config">
<Pattern1>{{FSCoreVersion}}</Pattern1>
<Replacement1>$(FSCoreVersion)</Replacement1>
</CopyAndSubstituteText>
<None Include="app.runsettings" />
</ItemGroup>
<ItemGroup>
Expand Down