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

Commit16c853f

Browse files
committed
Drop fsi.exe.config etc.
Fixfsharp#73
1 parentaea1b2a commit16c853f

File tree

8 files changed

+72
-5
lines changed

8 files changed

+72
-5
lines changed

‎.gitattributes‎

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,22 @@
1-
# Disable LF normalization for all files
2-
*-text
1+
# Auto detect text files and perform LF normalization
2+
*text=auto
3+
4+
# Custom for Visual Studio
5+
*.csdiff=csharp
6+
*.slnmerge=union
7+
*.csprojmerge=union
8+
*.vbprojmerge=union
9+
*.fsprojmerge=union
10+
*.dbprojmerge=union
11+
12+
# Standard to msysgit
13+
*.docdiff=astextplain
14+
*.DOCdiff=astextplain
15+
*.docxdiff=astextplain
16+
*.DOCXdiff=astextplain
17+
*.dotdiff=astextplain
18+
*.DOTdiff=astextplain
19+
*.pdfdiff=astextplain
20+
*.PDFdiff=astextplain
21+
*.rtfdiff=astextplain
22+
*.RTFdiff=astextplain

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@
4242
<CompileInclude="Fsc.fs" />
4343
<CompileInclude="CreateFSharpManifestResourceName.fsi" />
4444
<CompileInclude="CreateFSharpManifestResourceName.fs" />
45-
<CustomCopyLocalInclude="Microsoft.FSharp.targets">
46-
<TargetFilename>Microsoft.FSharp.targets</TargetFilename>
47-
</CustomCopyLocal>
45+
<NoneInclude="Microsoft.FSharp.targets">
46+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
47+
</None>
4848
</ItemGroup>
4949
<ItemGroup>
5050
<ReferenceInclude="mscorlib" />

‎src/fsharp/Fsc/Fsc.fsproj‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@
4242
<CompileInclude="..\fscmain.fs">
4343
<Link>fscmain.fs</Link>
4444
</Compile>
45+
<NoneInclude="fsc.exe.config">
46+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
47+
</None>
4548
</ItemGroup>
4649
<ItemGroup>
4750
<ReferenceInclude="mscorlib" />

‎src/fsharp/Fsc/fsc.exe.config‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<runtime>
4+
<legacyUnhandledExceptionPolicyenabled="true" />
5+
<assemblyBindingxmlns="urn:schemas-microsoft-com:asm.v1">
6+
<dependentAssembly>
7+
<assemblyIdentity
8+
name="FSharp.Core"
9+
publicKeyToken="b03f5f7f11d50a3a"
10+
culture="neutral"/>
11+
<bindingRedirect
12+
oldVersion="2.0.0.0"
13+
newVersion="4.3.0.0"/>
14+
<bindingRedirect
15+
oldVersion="2.3.0.0"
16+
newVersion="4.3.0.0"/>
17+
<bindingRedirect
18+
oldVersion="2.3.5.0"
19+
newVersion="4.3.0.0"/>
20+
<bindingRedirect
21+
oldVersion="4.0.0.0"
22+
newVersion="4.3.0.0"/>
23+
</dependentAssembly>
24+
</assemblyBinding>
25+
</runtime>
26+
</configuration>

‎src/fsharp/fsi/Fsi.fsproj‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,9 @@
5858
<CompileInclude="fsimain.fs">
5959
<Link>fsimain.fs</Link>
6060
</Compile>
61+
<NoneInclude="fsi.exe.config">
62+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
63+
</None>
6164
</ItemGroup>
6265
<ItemGroup>
6366
<ReferenceInclude="mscorlib" />

‎src/fsharp/fsi/fsi.exe.config‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@
1111
<bindingRedirect
1212
oldVersion="2.0.0.0"
1313
newVersion="4.3.0.0"/>
14+
<bindingRedirect
15+
oldVersion="2.3.0.0"
16+
newVersion="4.3.0.0"/>
17+
<bindingRedirect
18+
oldVersion="2.3.5.0"
19+
newVersion="4.3.0.0"/>
1420
<bindingRedirect
1521
oldVersion="4.0.0.0"
1622
newVersion="4.3.0.0"/>

‎src/fsharp/fsiAnyCpu/FsiAnyCPU.fsproj‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,9 @@
5858
<CompileInclude="..\fsi\fsimain.fs">
5959
<Link>fsimain.fs</Link>
6060
</Compile>
61+
<NoneInclude="fsiAnyCpu.exe.config">
62+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
63+
</None>
6164
</ItemGroup>
6265
<ItemGroup>
6366
<ReferenceInclude="mscorlib" />

‎src/fsharp/fsiAnyCpu/fsiAnyCPU.exe.config‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@
1111
<bindingRedirect
1212
oldVersion="2.0.0.0"
1313
newVersion="4.3.0.0"/>
14+
<bindingRedirect
15+
oldVersion="2.3.0.0"
16+
newVersion="4.3.0.0"/>
17+
<bindingRedirect
18+
oldVersion="2.3.5.0"
19+
newVersion="4.3.0.0"/>
1420
<bindingRedirect
1521
oldVersion="4.0.0.0"
1622
newVersion="4.3.0.0"/>

0 commit comments

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