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

Commitc87da60

Browse files
0x53Abrettfo
authored andcommitted
Use C# code instead of manually modified DLL. (#4514)
* Use C# code instead of manually modified DLL.* set /langversion:latest* pre-fill CSC_PIPE with Microsoft.Net.Compilers* upgrade Microsoft.Net.Compilers 2.4 => 2.7
1 parent4dce3d1 commitc87da60

File tree

6 files changed

+10
-11
lines changed

6 files changed

+10
-11
lines changed

‎build.cmd‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -938,6 +938,7 @@ set HOSTED_COMPILER=1
938938

939939
if"%TEST_NET40_FSHARPQA_SUITE%"=="1" (
940940

941+
setCSC_PIPE=%~dp0packages\Microsoft.Net.Compilers.2.7.0\tools\csc.exe
941942
setFSC=!FSCBINPATH!\fsc.exe
942943
setFSCOREDLLPATH=!FSCBinPath!\FSharp.Core.dll
943944
setPATH=!FSCBINPATH!;!PATH!

‎tests/fsharp/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<packageid="Microsoft.Net.Compilers"version="2.4.0" />
3+
<packageid="Microsoft.Net.Compilers"version="2.7.0" />
44
<packageid="NUnit3TestAdapter"version="3.7.0"targetFramework="net45" />
55
<packageid="runtime.win-x64.Microsoft.NETCore.ILDAsm"version="2.0.3" />
66
<packageid="runtime.win-x86.Microsoft.NETCore.ILDAsm"version="2.0.3" />

‎tests/fsharp/test-framework.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ let config configurationName envVars =
155155
letfsi_flags="-r:System.Core.dll --nowarn:20 --define:INTERACTIVE --maxerrors:1 --abortonerror"
156156
letIs64BitOperatingSystem= WindowsPlatform.Is64BitOperatingSystem envVars
157157
letarchitectureMoniker=if Is64BitOperatingSystemthen"x64"else"x86"
158-
letCSC= requireFile(packagesDir++"Microsoft.Net.Compilers.2.4.0"++"tools"++"csc.exe")
158+
letCSC= requireFile(packagesDir++"Microsoft.Net.Compilers.2.7.0"++"tools"++"csc.exe")
159159
letILDASM= requireFile(packagesDir++("runtime.win-"+ architectureMoniker+".Microsoft.NETCore.ILDAsm.2.0.3")++"runtimes"++("win-"+ architectureMoniker)++"native"++"ildasm.exe")
160160
letcoreclrdll= requireFile(packagesDir++("runtime.win-"+ architectureMoniker+".Microsoft.NETCore.Runtime.CoreCLR.2.0.3")++"runtimes"++("win-"+ architectureMoniker)++"native"++"coreclr.dll")
161161
letPEVERIFY= requireFile(SCRIPT_ROOT++".."++"fsharpqa"++"testenv"++"src"++"PEVerify"++"bin"++ configurationName++"net46"++"PEVerify.exe")

‎tests/fsharpqa/Source/Import/AccessibilityTests.cs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@ public class Accessibility
1010
privateintPrivate{get;set;}
1111
protectedintProtected{get;set;}
1212
internalintInternal{get;set;}
13-
// Note: accessibility was modified using dnspy
14-
publicintFamOrAssembly{get;set;}
15-
// Note: accessibility was modified using dnspy
16-
publicintFamAndAssembly{get;set;}
13+
protectedinternalintFamOrAssembly{get;set;}
14+
privateprotectedintFamAndAssembly{get;set;}
1715
}
1816

-4.5 KB
Binary file not shown.

‎tests/fsharpqa/Source/Import/env.lst‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,11 @@ NOMONOSOURCE=reference2.fsx SCFLAGS="--nologo -r:reference1.dll" PRECMD="\$FSC_
8383
###
8484
### F# can consume FamOrAssembly and FamAndAssembly in combination with IVT
8585
###
86-
SOURCE=FamAndAssembly.fs SCFLAGS="-a -r:AccessibilityTests.dll" # FamAndAssembly.fs
86+
SOURCE=FamAndAssembly.fs SCFLAGS="-a -r:AccessibilityTests.dll"PRECMD="\$CSC_PIPE /debug /target:library /langversion:latest AccessibilityTests.cs" # FamAndAssembly.fs
8787
### See issue https://github.com/Microsoft/visualfsharp/issues/2496
88-
### SOURCE=FamOrAssembly.fs SCFLAGS="-a -r:AccessibilityTests.dll" # FamOrAssembly.fs
89-
SOURCE=FamAndAssembly_NoIVT.fs SCFLAGS="-a -r:AccessibilityTests.dll" # FamAndAssembly_NoIVT.fs
90-
### SOURCE=FamOrAssembly_NoIVT.fs SCFLAGS="-a -r:AccessibilityTests.dll" # FamOrAssembly_NoIVT.fs
88+
### SOURCE=FamOrAssembly.fs SCFLAGS="-a -r:AccessibilityTests.dll"PRECMD="\$CSC_PIPE /debug /target:library /langversion:latest AccessibilityTests.cs" # FamOrAssembly.fs
89+
SOURCE=FamAndAssembly_NoIVT.fs SCFLAGS="-a -r:AccessibilityTests.dll"PRECMD="\$CSC_PIPE /debug /target:library /langversion:latest AccessibilityTests.cs" # FamAndAssembly_NoIVT.fs
90+
### SOURCE=FamOrAssembly_NoIVT.fs SCFLAGS="-a -r:AccessibilityTests.dll"PRECMD="\$CSC_PIPE /debug /target:library /langversion:latest AccessibilityTests.cs" # FamOrAssembly_NoIVT.fs
9191

9292
###
9393
### Iterate over BCL collections
@@ -100,4 +100,4 @@ NOMONOSOURCE=reference2.fsx SCFLAGS="--nologo -r:reference1.dll" PRECMD="\$FSC_
100100

101101

102102
SOURCE=ReferenceExe01.fsx PRECMD="\$FSC_PIPE ReferenceExe.fs"# ReferenceExe01.fsx
103-
SOURCE=LineDirectiveFromCSharp.fs PRECMD="\$CSC_PIPE /t:library LineDirectiveLib.cs" SCFLAGS="-r:LineDirectiveLib.dll"# LineDirectiveFromCSharp.fs
103+
SOURCE=LineDirectiveFromCSharp.fs PRECMD="\$CSC_PIPE /t:library LineDirectiveLib.cs" SCFLAGS="-r:LineDirectiveLib.dll"# LineDirectiveFromCSharp.fs

0 commit comments

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