Skip to content

Remove a few more build warnings #3647

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
merged 4 commits into from
Sep 26, 2017
Merged

Remove a few more build warnings #3647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
51a19b9
fix assembly reference
dsyme Sep 25, 2017
af82cbe
Merge branch 'master' of http://github.com/Microsoft/visualfsharp
dsyme Sep 25, 2017
0ca9da8
remove more build warnings
dsyme Sep 25, 2017
ef9321c
fix build
Sep 26, 2017
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
13 changes: 0 additions & 13 deletions FSharp.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,18 +205,6 @@ Global
{2E60864A-E3FF-4BCC-810F-DC7C34E6B236}.Release|Any CPU.Build.0 = Release|Any CPU
{2E60864A-E3FF-4BCC-810F-DC7C34E6B236}.Release|x86.ActiveCfg = Release|Any CPU
{2E60864A-E3FF-4BCC-810F-DC7C34E6B236}.Release|x86.Build.0 = Release|Any CPU
{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Debug|x86.ActiveCfg = Debug|Any CPU
{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Debug|x86.Build.0 = Debug|Any CPU
{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Proto|Any CPU.ActiveCfg = Proto|Any CPU
{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Proto|Any CPU.Build.0 = Proto|Any CPU
{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Proto|x86.ActiveCfg = Proto|Any CPU
{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Proto|x86.Build.0 = Proto|Any CPU
{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Release|Any CPU.Build.0 = Release|Any CPU
{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Release|x86.ActiveCfg = Release|Any CPU
{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -235,6 +223,5 @@ Global
{88E2D422-6852-46E3-A740-83E391DC7973} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
{4239EFEA-E746-446A-BF7A-51FCBAB13946} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
{2E60864A-E3FF-4BCC-810F-DC7C34E6B236} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
{A437A6EC-5323-47C2-8F86-E2CAC54FF152} = {3881429D-A97A-49EB-B7AE-A82BA5FE9C77}
EndGlobalSection
EndGlobal
5 changes: 1 addition & 4 deletions src/fsharp/Fsc-proto/Fsc-proto.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,10 +443,7 @@
<Compile Include="..\fscmain.fs">
<Link>fscmain.fs</Link>
</Compile>
<None Include="fsc-proto.exe.config">
<Link>fsc-proto.exe.config</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="app.config" />
</ItemGroup>
<ItemGroup>
<Reference Include="mscorlib" />
Expand Down
0 src/fsharp/Fsc-proto/fsc-proto.exe.config → src/fsharp/Fsc-proto/app.config
View file
Open in desktop
File renamed without changes.
5 changes: 1 addition & 4 deletions src/fsharp/Fsc/Fsc.BuildFromSource.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,7 @@
<Compile Include="..\fscmain.fs">
<Link>fscmain.fs</Link>
</Compile>
<None Include="fsc.exe.config">
<Link>fsc.exe.config</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="app.config" />
<None Include="..\..\windows\default.win32manifest">
<Link>default.win32manifest</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
Expand Down
5 changes: 1 addition & 4 deletions src/fsharp/Fsc/Fsc.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,7 @@
<Compile Include="..\fscmain.fs">
<Link>fscmain.fs</Link>
</Compile>
<None Include="fsc.exe.config">
<Link>fsc.exe.config</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="app.config" />
<None Include="..\..\windows\default.win32manifest">
<Link>default.win32manifest</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
Expand Down
0 src/fsharp/Fsc/fsc.exe.config → src/fsharp/Fsc/app.config
View file
Open in desktop
File renamed without changes.
5 changes: 1 addition & 4 deletions src/fsharp/fsi/Fsi.BuildFromSource.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,7 @@
<Compile Include="fsimain.fs">
<Link>fsimain.fs</Link>
</Compile>
<None Include="fsi.exe.config">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Link>fsi.exe.config</Link>
</None>
<None Include="app.config" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 1 addition & 3 deletions src/fsharp/fsi/Fsi.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,7 @@
<Compile Include="fsimain.fs">
<Link>fsimain.fs</Link>
</Compile>
<None Include="fsi.exe.config">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Link>fsi.exe.config</Link>
<None Include="app.config">
</None>
</ItemGroup>
<ItemGroup Condition="'$(TargetDotnetProfile)' == 'coreclr'">
Expand Down
0 src/fsharp/fsi/fsi.exe.config → src/fsharp/fsi/app.config
View file
Open in desktop
File renamed without changes.
5 changes: 1 addition & 4 deletions src/fsharp/fsiAnyCpu/FsiAnyCPU.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,7 @@
<Compile Include="..\fsi\fsimain.fs">
<Link>fsimain.fs</Link>
</Compile>
<None Include="..\fsi\fsiAnyCpu.exe.config">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Link>fsiAnyCpu.exe.config</Link>
</None>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(FSharpSourcesRoot)\FSharpSource.targets" />
<ItemGroup>
Expand Down
0 src/fsharp/fsi/fsiAnyCpu.exe.config → src/fsharp/fsiAnyCpu/app.config
View file
Open in desktop
File renamed without changes.
10 changes: 10 additions & 0 deletions tests/fsharpqa/testenv/src/HostedCompilerServer/App.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,15 @@
<runtime>
<gcServer enabled="true"/>
<gcConcurrent enabled="false"/>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="2.0.0.0-4.4.1.0" newVersion="4.4.1.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="1.0.0.0-1.2.0.0" newVersion="1.2.1.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>