Skip to content

F
fsharp

dotNET Platform / fsharp
10 个月 前同步成功

通知 0
Star 1
Fork 0
F
fsharp

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

未验证 提交 ae024e92 编写于 作者: B Brett V. Forsgren 提交者： GitHub
浏览文件
操作

migrate to netcoreapp3.1 (#9448) 

* migrate to netcoreapp3.1

* update comments

* update tool versions
上级 4dd07412
隐藏空白更改
内联 并排
Showing with 117 addition and 119 deletion
FSharpTests.Directory.Build.props
浏览文件 @ ae024e92
...@@ -22,18 +22,18 @@ ...@@ -22,18 +22,18 @@
<FscToolPath>$([System.IO.Path]::GetDirectoryName('$(DOTNET_HOST_PATH)'))</FscToolPath> <FscToolPath>$([System.IO.Path]::GetDirectoryName('$(DOTNET_HOST_PATH)'))</FscToolPath>
<FscToolExe Condition="'$(OS)' != 'Unix'">dotnet.exe</FscToolExe> <FscToolExe Condition="'$(OS)' != 'Unix'">dotnet.exe</FscToolExe>
<FscToolExe Condition="'$(OS)' == 'Unix'">dotnet</FscToolExe> <FscToolExe Condition="'$(OS)' == 'Unix'">dotnet</FscToolExe>
<DotnetFscCompilerPath>$(MSBuildThisFileDirectory)artifacts\bin\fsc\$(Configuration)\netcoreapp3.0\fsc.exe</DotnetFscCompilerPath> <DotnetFscCompilerPath>$(MSBuildThisFileDirectory)artifacts\bin\fsc\$(Configuration)\netcoreapp3.1\fsc.exe</DotnetFscCompilerPath>
<FsiToolPath>$([System.IO.Path]::GetDirectoryName('$(DOTNET_HOST_PATH)'))</FsiToolPath> <FsiToolPath>$([System.IO.Path]::GetDirectoryName('$(DOTNET_HOST_PATH)'))</FsiToolPath>
<FsiToolExe Condition="'$(OS)' != 'Unix'">dotnet.exe</FsiToolExe> <FsiToolExe Condition="'$(OS)' != 'Unix'">dotnet.exe</FsiToolExe>
<FsiToolExe Condition="'$(OS)' == 'Unix'">dotnet</FsiToolExe> <FsiToolExe Condition="'$(OS)' == 'Unix'">dotnet</FsiToolExe>
<DotnetFsiCompilerPath>$(MSBuildThisFileDirectory)artifacts\bin\fsi\$(Configuration)\netcoreapp3.0\fsi.exe</DotnetFsiCompilerPath> <DotnetFsiCompilerPath>$(MSBuildThisFileDirectory)artifacts\bin\fsi\$(Configuration)\netcoreapp3.1\fsi.exe</DotnetFsiCompilerPath>
</PropertyGroup> </PropertyGroup>
<!-- SDK targets override --> <!-- SDK targets override -->
<PropertyGroup> <PropertyGroup>
<_FSharpBuildTargetFramework Condition="'$(MSBuildRuntimeType)'!='Core'">net472</_FSharpBuildTargetFramework> <_FSharpBuildTargetFramework Condition="'$(MSBuildRuntimeType)'!='Core'">net472</_FSharpBuildTargetFramework>
<_FSharpBuildTargetFramework Condition="'$(MSBuildRuntimeType)'=='Core'">netcoreapp3.0</_FSharpBuildTargetFramework> <_FSharpBuildTargetFramework Condition="'$(MSBuildRuntimeType)'=='Core'">netcoreapp3.1</_FSharpBuildTargetFramework>
<_FSharpBuildBinPath>$(MSBuildThisFileDirectory)artifacts\bin\fsc\$(Configuration)\$(_FSharpBuildTargetFramework)</_FSharpBuildBinPath> <_FSharpBuildBinPath>$(MSBuildThisFileDirectory)artifacts\bin\fsc\$(Configuration)\$(_FSharpBuildTargetFramework)</_FSharpBuildBinPath>
<FSharpBuildAssemblyFile>$(_FSharpBuildBinPath)\FSharp.Build.dll</FSharpBuildAssemblyFile> <FSharpBuildAssemblyFile>$(_FSharpBuildBinPath)\FSharp.Build.dll</FSharpBuildAssemblyFile>
......
Makefile
浏览文件 @ ae024e92
...@@ -15,7 +15,7 @@ proto: tools ...@@ -15,7 +15,7 @@ proto: tools
$(DotNetExe) restore src/fsharp/fsc/fsc.fsproj $(DotNetExe) restore src/fsharp/fsc/fsc.fsproj
$(DotNetExe) build src/buildtools/buildtools.proj -c Proto $(DotNetExe) build src/buildtools/buildtools.proj -c Proto
$(DotNetExe) build src/fsharp/FSharp.Build/FSharp.Build.fsproj -f netstandard2.0 -c Proto $(DotNetExe) build src/fsharp/FSharp.Build/FSharp.Build.fsproj -f netstandard2.0 -c Proto
$(DotNetExe) build src/fsharp/fsc/fsc.fsproj -f netcoreapp3.0 -c Proto $(DotNetExe) build src/fsharp/fsc/fsc.fsproj -f netcoreapp3.1 -c Proto
restore: restore:
$(DotNetExe) restore src/fsharp/FSharp.Core/FSharp.Core.fsproj $(DotNetExe) restore src/fsharp/FSharp.Core/FSharp.Core.fsproj
...@@ -32,15 +32,15 @@ build: proto restore ...@@ -32,15 +32,15 @@ build: proto restore
$(DotNetExe) build -c $(Configuration) -f netstandard2.0 src/fsharp/FSharp.Core/FSharp.Core.fsproj $(DotNetExe) build -c $(Configuration) -f netstandard2.0 src/fsharp/FSharp.Core/FSharp.Core.fsproj
$(DotNetExe) build -c $(Configuration) -f netstandard2.0 src/fsharp/FSharp.Build/FSharp.Build.fsproj $(DotNetExe) build -c $(Configuration) -f netstandard2.0 src/fsharp/FSharp.Build/FSharp.Build.fsproj
$(DotNetExe) build -c $(Configuration) -f netstandard2.0 src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj $(DotNetExe) build -c $(Configuration) -f netstandard2.0 src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj
$(DotNetExe) build -c $(Configuration) -f netcoreapp3.0 src/fsharp/fsc/fsc.fsproj $(DotNetExe) build -c $(Configuration) -f netcoreapp3.1 src/fsharp/fsc/fsc.fsproj
$(DotNetExe) build -c $(Configuration) -f netstandard2.0 src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj $(DotNetExe) build -c $(Configuration) -f netstandard2.0 src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj
$(DotNetExe) build -c $(Configuration) -f netcoreapp3.0 src/fsharp/fsi/fsi.fsproj $(DotNetExe) build -c $(Configuration) -f netcoreapp3.1 src/fsharp/fsi/fsi.fsproj
$(DotNetExe) build -c $(Configuration) -f netcoreapp3.0 tests/FSharp.Core.UnitTests/FSharp.Core.UnitTests.fsproj $(DotNetExe) build -c $(Configuration) -f netcoreapp3.1 tests/FSharp.Core.UnitTests/FSharp.Core.UnitTests.fsproj
$(DotNetExe) build -c $(Configuration) -f netcoreapp3.0 tests/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj $(DotNetExe) build -c $(Configuration) -f netcoreapp3.1 tests/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj
test: build test: build
$(DotNetExe) test -f netcoreapp3.0 -c $(Configuration) --no-restore --no-build tests/FSharp.Core.UnitTests/FSharp.Core.UnitTests.fsproj -l "trx;LogFileName=$(CURDIR)/tests/TestResults/FSharp.Core.UnitTests.coreclr.trx" $(DotNetExe) test -f netcoreapp3.1 -c $(Configuration) --no-restore --no-build tests/FSharp.Core.UnitTests/FSharp.Core.UnitTests.fsproj -l "trx;LogFileName=$(CURDIR)/tests/TestResults/FSharp.Core.UnitTests.coreclr.trx"
$(DotNetExe) test -f netcoreapp3.0 -c $(Configuration) --no-restore --no-build tests/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj -l "trx;LogFileName=$(CURDIR)/tests/TestResults/FSharp.Build.UnitTests.coreclr.trx" $(DotNetExe) test -f netcoreapp3.1 -c $(Configuration) --no-restore --no-build tests/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj -l "trx;LogFileName=$(CURDIR)/tests/TestResults/FSharp.Build.UnitTests.coreclr.trx"
clean: clean:
rm -rf $(CURDIR)/artifacts rm -rf $(CURDIR)/artifacts
eng/Build.ps1
浏览文件 @ ae024e92
...@@ -152,11 +152,11 @@ function Process-Arguments() { ...@@ -152,11 +152,11 @@ function Process-Arguments() {
function Update-Arguments() { function Update-Arguments() {
if ($script:noVisualStudio) { if ($script:noVisualStudio) {
$script:bootstrapTfm = "netcoreapp3.0" $script:bootstrapTfm = "netcoreapp3.1"
$script:msbuildEngine = "dotnet" $script:msbuildEngine = "dotnet"
} }
if ($bootstrapTfm -eq "netcoreapp3.0") { if ($bootstrapTfm -eq "netcoreapp3.1") {
if (-Not (Test-Path "$ArtifactsDir\Bootstrap\fsc\fsc.runtimeconfig.json")) { if (-Not (Test-Path "$ArtifactsDir\Bootstrap\fsc\fsc.runtimeconfig.json")) {
$script:bootstrap = $True $script:bootstrap = $True
} }
...@@ -178,7 +178,7 @@ function BuildSolution() { ...@@ -178,7 +178,7 @@ function BuildSolution() {
$officialBuildId = if ($official) { $env:BUILD_BUILDNUMBER } else { "" } $officialBuildId = if ($official) { $env:BUILD_BUILDNUMBER } else { "" }
$toolsetBuildProj = InitializeToolset $toolsetBuildProj = InitializeToolset
$quietRestore = !$ci $quietRestore = !$ci
$testTargetFrameworks = if ($testCoreClr) { "netcoreapp3.0" } else { "" } $testTargetFrameworks = if ($testCoreClr) { "netcoreapp3.1" } else { "" }
# Do not set the property to true explicitly, since that would override value projects might set. # Do not set the property to true explicitly, since that would override value projects might set.
$suppressExtensionDeployment = if (!$deployExtensions) { "/p:DeployExtension=false" } else { "" } $suppressExtensionDeployment = if (!$deployExtensions) { "/p:DeployExtension=false" } else { "" }
...@@ -264,7 +264,7 @@ function TestUsingNUnit([string] $testProject, [string] $targetFramework) { ...@@ -264,7 +264,7 @@ function TestUsingNUnit([string] $testProject, [string] $targetFramework) {
} }
function BuildCompiler() { function BuildCompiler() {
if ($bootstrapTfm -eq "netcoreapp3.0") { if ($bootstrapTfm -eq "netcoreapp3.1") {
$dotnetPath = InitializeDotNetCli $dotnetPath = InitializeDotNetCli
$dotnetExe = Join-Path $dotnetPath "dotnet.exe" $dotnetExe = Join-Path $dotnetPath "dotnet.exe"
$fscProject = "$RepoRoot\src\fsharp\fsc\fsc.fsproj" $fscProject = "$RepoRoot\src\fsharp\fsc\fsc.fsproj"
...@@ -277,14 +277,14 @@ function BuildCompiler() { ...@@ -277,14 +277,14 @@ function BuildCompiler() {
$logFilePath = Join-Path $LogDir "fscBootstrapLog.binlog" $logFilePath = Join-Path $LogDir "fscBootstrapLog.binlog"
$args += " /bl:$logFilePath" $args += " /bl:$logFilePath"
} }
$args = "build $fscProject -c $configuration -v $verbosity -f netcoreapp3.0" + $argNoRestore + $argNoIncremental $args = "build $fscProject -c $configuration -v $verbosity -f netcoreapp3.1" + $argNoRestore + $argNoIncremental
Exec-Console $dotnetExe $args Exec-Console $dotnetExe $args
if ($binaryLog) { if ($binaryLog) {
$logFilePath = Join-Path $LogDir "fsiBootstrapLog.binlog" $logFilePath = Join-Path $LogDir "fsiBootstrapLog.binlog"
$args += " /bl:$logFilePath" $args += " /bl:$logFilePath"
} }
$args = "build $fsiProject -c $configuration -v $verbosity -f netcoreapp3.0" + $argNoRestore + $argNoIncremental $args = "build $fsiProject -c $configuration -v $verbosity -f netcoreapp3.1" + $argNoRestore + $argNoIncremental
Exec-Console $dotnetExe $args Exec-Console $dotnetExe $args
} }
} }
...@@ -448,7 +448,7 @@ try { ...@@ -448,7 +448,7 @@ try {
$script:BuildCategory = "Test" $script:BuildCategory = "Test"
$script:BuildMessage = "Failure running tests" $script:BuildMessage = "Failure running tests"
$desktopTargetFramework = "net472" $desktopTargetFramework = "net472"
$coreclrTargetFramework = "netcoreapp3.0" $coreclrTargetFramework = "netcoreapp3.1"
if ($testDesktop -and -not $noVisualStudio) { if ($testDesktop -and -not $noVisualStudio) {
TestUsingNUnit -testProject "$RepoRoot\tests\FSharp.Compiler.UnitTests\FSharp.Compiler.UnitTests.fsproj" -targetFramework $desktopTargetFramework TestUsingNUnit -testProject "$RepoRoot\tests\FSharp.Compiler.UnitTests\FSharp.Compiler.UnitTests.fsproj" -targetFramework $desktopTargetFramework
......
eng/build-utils.ps1
浏览文件 @ ae024e92
...@@ -244,16 +244,16 @@ function Make-BootstrapBuild() { ...@@ -244,16 +244,16 @@ function Make-BootstrapBuild() {
$argNoRestore = if ($norestore) { " --no-restore" } else { "" } $argNoRestore = if ($norestore) { " --no-restore" } else { "" }
$argNoIncremental = if ($rebuild) { " --no-incremental" } else { "" } $argNoIncremental = if ($rebuild) { " --no-incremental" } else { "" }
$args = "build $buildToolsProject -c $bootstrapConfiguration -v $verbosity -f netcoreapp3.0" + $argNoRestore + $argNoIncremental $args = "build $buildToolsProject -c $bootstrapConfiguration -v $verbosity -f netcoreapp3.1" + $argNoRestore + $argNoIncremental
if ($binaryLog) { if ($binaryLog) {
$logFilePath = Join-Path $LogDir "toolsBootstrapLog.binlog" $logFilePath = Join-Path $LogDir "toolsBootstrapLog.binlog"
$args += " /bl:$logFilePath" $args += " /bl:$logFilePath"
} }
Exec-Console $dotnetExe $args Exec-Console $dotnetExe $args
Copy-Item "$ArtifactsDir\bin\fslex\$bootstrapConfiguration\netcoreapp3.0" -Destination "$dir\fslex" -Force -Recurse Copy-Item "$ArtifactsDir\bin\fslex\$bootstrapConfiguration\netcoreapp3.1" -Destination "$dir\fslex" -Force -Recurse
Copy-Item "$ArtifactsDir\bin\fsyacc\$bootstrapConfiguration\netcoreapp3.0" -Destination "$dir\fsyacc" -Force -Recurse Copy-Item "$ArtifactsDir\bin\fsyacc\$bootstrapConfiguration\netcoreapp3.1" -Destination "$dir\fsyacc" -Force -Recurse
Copy-Item "$ArtifactsDir\bin\AssemblyCheck\$bootstrapConfiguration\netcoreapp3.0" -Destination "$dir\AssemblyCheck" -Force -Recurse Copy-Item "$ArtifactsDir\bin\AssemblyCheck\$bootstrapConfiguration\netcoreapp3.1" -Destination "$dir\AssemblyCheck" -Force -Recurse
# prepare compiler # prepare compiler
$protoProject = "$RepoRoot\proto.proj" $protoProject = "$RepoRoot\proto.proj"
......
eng/build.sh
浏览文件 @ ae024e92
...@@ -244,8 +244,8 @@ function BuildSolution { ...@@ -244,8 +244,8 @@ function BuildSolution {
/t:Publish /t:Publish
mkdir -p "$bootstrap_dir" mkdir -p "$bootstrap_dir"
cp -pr $artifacts_dir/bin/fslex/$bootstrap_config/netcoreapp3.0/publish $bootstrap_dir/fslex cp -pr $artifacts_dir/bin/fslex/$bootstrap_config/netcoreapp3.1/publish $bootstrap_dir/fslex
cp -pr $artifacts_dir/bin/fsyacc/$bootstrap_config/netcoreapp3.0/publish $bootstrap_dir/fsyacc cp -pr $artifacts_dir/bin/fsyacc/$bootstrap_config/netcoreapp3.1/publish $bootstrap_dir/fsyacc
fi fi
if [ ! -f "$bootstrap_dir/fsc.exe" ]; then if [ ! -f "$bootstrap_dir/fsc.exe" ]; then
BuildMessage="Error building bootstrap" BuildMessage="Error building bootstrap"
...@@ -254,7 +254,7 @@ function BuildSolution { ...@@ -254,7 +254,7 @@ function BuildSolution {
/p:Configuration=$bootstrap_config \ /p:Configuration=$bootstrap_config \
/t:Publish /t:Publish
cp -pr $artifacts_dir/bin/fsc/$bootstrap_config/netcoreapp3.0/publish $bootstrap_dir/fsc cp -pr $artifacts_dir/bin/fsc/$bootstrap_config/netcoreapp3.1/publish $bootstrap_dir/fsc
fi fi
# do real build # do real build
...@@ -293,7 +293,7 @@ InitializeDotNetCli $restore ...@@ -293,7 +293,7 @@ InitializeDotNetCli $restore
BuildSolution BuildSolution
if [[ "$test_core_clr" == true ]]; then if [[ "$test_core_clr" == true ]]; then
coreclrtestframework=netcoreapp3.0 coreclrtestframework=netcoreapp3.1
TestUsingNUnit --testproject "$repo_root/tests/FSharp.Compiler.UnitTests/FSharp.Compiler.UnitTests.fsproj" --targetframework $coreclrtestframework TestUsingNUnit --testproject "$repo_root/tests/FSharp.Compiler.UnitTests/FSharp.Compiler.UnitTests.fsproj" --targetframework $coreclrtestframework
TestUsingNUnit --testproject "$repo_root/tests/FSharp.Compiler.Private.Scripting.UnitTests/FSharp.Compiler.Private.Scripting.UnitTests.fsproj" --targetframework $coreclrtestframework TestUsingNUnit --testproject "$repo_root/tests/FSharp.Compiler.Private.Scripting.UnitTests/FSharp.Compiler.Private.Scripting.UnitTests.fsproj" --targetframework $coreclrtestframework
TestUsingNUnit --testproject "$repo_root/tests/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj" --targetframework $coreclrtestframework TestUsingNUnit --testproject "$repo_root/tests/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj" --targetframework $coreclrtestframework
......
fcs/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj
浏览文件 @ ae024e92
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<Import Project="..\netfx.props" /> <Import Project="..\netfx.props" />
<Import Project="..\..\eng\Versions.props"/> <!-- keep our test deps in line with the overall compiler --> <Import Project="..\..\eng\Versions.props"/> <!-- keep our test deps in line with the overall compiler -->
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>$(FcsTargetNetFxFramework);netcoreapp3.0</TargetFrameworks> <TargetFrameworks>$(FcsTargetNetFxFramework);netcoreapp3.1</TargetFrameworks>
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference> <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
<DefaultFSharpPackageVersion>4.1.19</DefaultFSharpPackageVersion> <DefaultFSharpPackageVersion>4.1.19</DefaultFSharpPackageVersion>
<NoWarn>$(NoWarn);44;75;</NoWarn> <NoWarn>$(NoWarn);44;75;</NoWarn>
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
<Compile Include="$(FSharpSourcesRoot)\..\tests\service\ScriptOptionsTests.fs"> <Compile Include="$(FSharpSourcesRoot)\..\tests\service\ScriptOptionsTests.fs">
<Link>ScriptOptionsTests.fs</Link> <Link>ScriptOptionsTests.fs</Link>
</Compile> </Compile>
<Compile Include="$(FSharpSourcesRoot)\..\tests\service\Program.fs" Condition="'$(TargetFramework)' == 'netcoreapp3.0'"> <Compile Include="$(FSharpSourcesRoot)\..\tests\service\Program.fs" Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
<Link>Program.fs</Link> <Link>Program.fs</Link>
</Compile> </Compile>
<NoneSubstituteText Include="App.config"> <NoneSubstituteText Include="App.config">
......
fcs/build.fsx
浏览文件 @ ae024e92
...@@ -64,8 +64,8 @@ Target.create "BuildVersion" (fun _ -> ...@@ -64,8 +64,8 @@ Target.create "BuildVersion" (fun _ ->
Target.create "Build" (fun _ -> Target.create "Build" (fun _ ->
runDotnet __SOURCE_DIRECTORY__ "build" "../src/buildtools/buildtools.proj -v n -c Proto" runDotnet __SOURCE_DIRECTORY__ "build" "../src/buildtools/buildtools.proj -v n -c Proto"
let fslexPath = __SOURCE_DIRECTORY__ + "/../artifacts/bin/fslex/Proto/netcoreapp3.0/fslex.dll" let fslexPath = __SOURCE_DIRECTORY__ + "/../artifacts/bin/fslex/Proto/netcoreapp3.1/fslex.dll"
let fsyaccPath = __SOURCE_DIRECTORY__ + "/../artifacts/bin/fsyacc/Proto/netcoreapp3.0/fsyacc.dll" let fsyaccPath = __SOURCE_DIRECTORY__ + "/../artifacts/bin/fsyacc/Proto/netcoreapp3.1/fsyacc.dll"
runDotnet __SOURCE_DIRECTORY__ "build" (sprintf "FSharp.Compiler.Service.sln -nodereuse:false -v n -c Release /p:DisableCompilerRedirection=true /p:FsLexPath=%s /p:FsYaccPath=%s" fslexPath fsyaccPath) runDotnet __SOURCE_DIRECTORY__ "build" (sprintf "FSharp.Compiler.Service.sln -nodereuse:false -v n -c Release /p:DisableCompilerRedirection=true /p:FsLexPath=%s /p:FsYaccPath=%s" fslexPath fsyaccPath)
) )
......
fcs/samples/EditorService/EditorService.fsproj
浏览文件 @ ae024e92
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\netfx.props" /> <Import Project="..\..\netfx.props" />
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>$(FcsTargetNetFxFramework);netcoreapp3.0</TargetFrameworks> <TargetFrameworks>$(FcsTargetNetFxFramework);netcoreapp3.1</TargetFrameworks>
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference> <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<IsPackable>false</IsPackable> <IsPackable>false</IsPackable>
......
global.json
浏览文件 @ ae024e92
{ {
"tools": { "tools": {
"dotnet": "3.1.200", "dotnet": "3.1.301",
"vs": { "vs": {
"version": "16.4", "version": "16.6",
"components": [ "components": [
"Microsoft.VisualStudio.Component.FSharp" "Microsoft.VisualStudio.Component.FSharp"
] ]
......
proto.proj
浏览文件 @ ae024e92
...@@ -7,13 +7,13 @@ ...@@ -7,13 +7,13 @@
<ItemGroup> <ItemGroup>
<Projects Include="src\fsharp\FSharp.Build\FSharp.Build.fsproj"> <Projects Include="src\fsharp\FSharp.Build\FSharp.Build.fsproj">
<AdditionalProperties Condition="'$(OS)' == 'Unix'">TargetFramework=netcoreapp3.0</AdditionalProperties> <AdditionalProperties Condition="'$(OS)' == 'Unix'">TargetFramework=netcoreapp3.1</AdditionalProperties>
</Projects> </Projects>
<Projects Include="src\fsharp\fsc\fsc.fsproj"> <Projects Include="src\fsharp\fsc\fsc.fsproj">
<AdditionalProperties Condition="'$(OS)' == 'Unix'">TargetFramework=netcoreapp3.0</AdditionalProperties> <AdditionalProperties Condition="'$(OS)' == 'Unix'">TargetFramework=netcoreapp3.1</AdditionalProperties>
</Projects> </Projects>
<Projects Include="src\fsharp\fsi\fsi.fsproj"> <Projects Include="src\fsharp\fsi\fsi.fsproj">
<AdditionalProperties Condition="'$(OS)' == 'Unix'">TargetFramework=netcoreapp3.0</AdditionalProperties> <AdditionalProperties Condition="'$(OS)' == 'Unix'">TargetFramework=netcoreapp3.1</AdditionalProperties>
</Projects> </Projects>
</ItemGroup> </ItemGroup>
......
src/absil/ilreflect.fs
浏览文件 @ ae024e92
...@@ -1481,14 +1481,13 @@ let emitParameter cenv emEnv (defineParameter: int * ParameterAttributes * strin ...@@ -1481,14 +1481,13 @@ let emitParameter cenv emEnv (defineParameter: int * ParameterAttributes * strin
// buildMethodPass2 // buildMethodPass2
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
#if !FX_RESHAPED_REFEMIT || NETCOREAPP3_0 #if !FX_RESHAPED_REFEMIT || NETCOREAPP3_1
let enablePInvoke = true let enablePInvoke = true
#else #else
// We currently build targeting netcoreapp2_1, and will continue to do so through this VS cycle // Use reflection to invoke the api when we are executing on a platform that doesn't directly have this API.
// but we can run on Netcoreapp3.0 so ... use reflection to invoke the api, when we are executing on netcoreapp3.0
let definePInvokeMethod = let definePInvokeMethod =
typeof<TypeBuilder>.GetMethod("DefinePInvokeMethod", [| typeof<TypeBuilder>.GetMethod("DefinePInvokeMethod", [|
typeof<string> typeof<string>
...@@ -1541,13 +1540,12 @@ let rec buildMethodPass2 cenv tref (typB: TypeBuilder) emEnv (mdef: ILMethodDef) ...@@ -1541,13 +1540,12 @@ let rec buildMethodPass2 cenv tref (typB: TypeBuilder) emEnv (mdef: ILMethodDef)
(* p.CharBestFit *) (* p.CharBestFit *)
(* p.NoMangle *) (* p.NoMangle *)
#if !FX_RESHAPED_REFEMIT || NETCOREAPP3_0 #if !FX_RESHAPED_REFEMIT || NETCOREAPP3_1
// DefinePInvokeMethod was removed in early versions of coreclr, it was added back in NETCORE_APP3_0. // DefinePInvokeMethod was removed in early versions of coreclr, it was added back in NETCOREAPP3.
// It has always been available in the desktop framework // It has always been available in the desktop framework
let methB = typB.DefinePInvokeMethod(mdef.Name, p.Where.Name, p.Name, attrs, cconv, rty, null, null, argtys, null, null, pcc, pcs) let methB = typB.DefinePInvokeMethod(mdef.Name, p.Where.Name, p.Name, attrs, cconv, rty, null, null, argtys, null, null, pcc, pcs)
#else #else
// We currently build targeting netcoreapp2_1, and will continue to do so through this VS cycle // Use reflection to invoke the api when we are executing on a platform that doesn't directly have this API.
// but we can run on Netcoreapp3.0 so ... use reflection to invoke the api, when we are executing on netcoreapp3.0
let methB = let methB =
System.Diagnostics.Debug.Assert(definePInvokeMethod <> null, "Runtime does not have DefinePInvokeMethod") // Absolutely can't happen System.Diagnostics.Debug.Assert(definePInvokeMethod <> null, "Runtime does not have DefinePInvokeMethod") // Absolutely can't happen
definePInvokeMethod.Invoke(typB, [| mdef.Name; p.Where.Name; p.Name; attrs; cconv; rty; null; null; argtys; null; null; pcc; pcs |]) :?> MethodBuilder definePInvokeMethod.Invoke(typB, [| mdef.Name; p.Where.Name; p.Name; attrs; cconv; rty; null; null; argtys; null; null; pcc; pcs |]) :?> MethodBuilder
......
src/buildtools/AssemblyCheck/AssemblyCheck.fsproj
浏览文件 @ ae024e92
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFramework>netcoreapp3.0</TargetFramework> <TargetFramework>netcoreapp3.1</TargetFramework>
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference> <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
</PropertyGroup> </PropertyGroup>
......
src/buildtools/fslex/fslex.fsproj
浏览文件 @ ae024e92
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFramework>netcoreapp3.0</TargetFramework> <TargetFramework>netcoreapp3.1</TargetFramework>
<DefineConstants>INTERNALIZED_FSLEXYACC_RUNTIME;$(DefineConstant)</DefineConstants> <DefineConstants>INTERNALIZED_FSLEXYACC_RUNTIME;$(DefineConstant)</DefineConstants>
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference> <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
</PropertyGroup> </PropertyGroup>
......
src/buildtools/fsyacc/fsyacc.fsproj
浏览文件 @ ae024e92
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFramework>netcoreapp3.0</TargetFramework> <TargetFramework>netcoreapp3.1</TargetFramework>
<DefineConstants>INTERNALIZED_FSLEXYACC_RUNTIME;$(DefineConstant)</DefineConstants> <DefineConstants>INTERNALIZED_FSLEXYACC_RUNTIME;$(DefineConstant)</DefineConstants>
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference> <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
</PropertyGroup> </PropertyGroup>
......
src/fsharp/FSharp.Build/FSharp.Build.fsproj
浏览文件 @ ae024e92
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
<PropertyGroup> <PropertyGroup>
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
<TargetFrameworks Condition="'$(ProtoTargetFramework)' != ''">$(ProtoTargetFramework)</TargetFrameworks> <TargetFrameworks Condition="'$(ProtoTargetFramework)' != ''">$(ProtoTargetFramework)</TargetFrameworks>
<TargetFrameworks Condition="'$(ProtoTargetFramework)' == ''">net472;netcoreapp3.0</TargetFrameworks> <TargetFrameworks Condition="'$(ProtoTargetFramework)' == ''">net472;netcoreapp3.1</TargetFrameworks>
<TargetFrameworks Condition="'$(OS)' == 'Unix'">netcoreapp3.0</TargetFrameworks> <TargetFrameworks Condition="'$(OS)' == 'Unix'">netcoreapp3.1</TargetFrameworks>
<AssemblyName>FSharp.Build</AssemblyName> <AssemblyName>FSharp.Build</AssemblyName>
<NoWarn>$(NoWarn);45;55;62;75;1204</NoWarn> <NoWarn>$(NoWarn);45;55;62;75;1204</NoWarn>
<AllowCrossTargeting>true</AllowCrossTargeting> <AllowCrossTargeting>true</AllowCrossTargeting>
......
src/fsharp/FSharp.Compiler.nuget/Microsoft.FSharp.Compiler.csproj
浏览文件 @ ae024e92
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<PreRelease>true</PreRelease> <PreRelease>true</PreRelease>
<TargetFramework>netcoreapp3.0</TargetFramework> <TargetFramework>netcoreapp3.1</TargetFramework>
<NuspecFile>Microsoft.FSharp.Compiler.nuspec</NuspecFile> <NuspecFile>Microsoft.FSharp.Compiler.nuspec</NuspecFile>
<IsPackable>true</IsPackable> <IsPackable>true</IsPackable>
<PackageDescription>.NET Core compatible version of the F# compiler fsc.exe.</PackageDescription> <PackageDescription>.NET Core compatible version of the F# compiler fsc.exe.</PackageDescription>
...@@ -10,13 +10,13 @@ ...@@ -10,13 +10,13 @@
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\fsc\fsc.fsproj"> <ProjectReference Include="..\fsc\fsc.fsproj">
<AdditionalProperties>TargetFramework=netcoreapp3.0</AdditionalProperties> <AdditionalProperties>TargetFramework=netcoreapp3.1</AdditionalProperties>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\fsi\fsi.fsproj"> <ProjectReference Include="..\fsi\fsi.fsproj">
<AdditionalProperties>TargetFramework=netcoreapp3.0</AdditionalProperties> <AdditionalProperties>TargetFramework=netcoreapp3.1</AdditionalProperties>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\FSharp.Build\FSharp.Build.fsproj"> <ProjectReference Include="..\FSharp.Build\FSharp.Build.fsproj">
<AdditionalProperties>TargetFramework=netcoreapp3.0</AdditionalProperties> <AdditionalProperties>TargetFramework=netcoreapp3.1</AdditionalProperties>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\FSharp.Compiler.Interactive.Settings\FSharp.Compiler.Interactive.Settings.fsproj"> <ProjectReference Include="..\FSharp.Compiler.Interactive.Settings\FSharp.Compiler.Interactive.Settings.fsproj">
<AdditionalProperties>TargetFramework=netstandard2.0</AdditionalProperties> <AdditionalProperties>TargetFramework=netstandard2.0</AdditionalProperties>
......
src/fsharp/FSharp.Compiler.nuget/Microsoft.FSharp.Compiler.nuspec
浏览文件 @ ae024e92
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
$CommonMetadataElements$ $CommonMetadataElements$
<language>en-US</language> <language>en-US</language>
<dependencies> <dependencies>
<group targetFramework=".NETCoreApp3.0"> <group targetFramework=".NETCoreApp3.1">
<dependency id="Microsoft.NETCore.Platforms" version="2.0.0" /> <dependency id="Microsoft.NETCore.Platforms" version="2.0.0" />
<dependency id="NETStandard.Library" version="2.0.0" /> <dependency id="NETStandard.Library" version="2.0.0" />
<dependency id="System.Collections.Immutable" version="1.5.0" /> <dependency id="System.Collections.Immutable" version="1.5.0" />
...@@ -46,37 +46,37 @@ ...@@ -46,37 +46,37 @@
this approach gives a very small deployment. Which is kind of necessary. this approach gives a very small deployment. Which is kind of necessary.
--> -->
<!-- assemblies --> <!-- assemblies -->
<file src="fsc\$Configuration$\netcoreapp3.0\fsc.exe" target="lib\netcoreapp3.0" /> <file src="fsc\$Configuration$\netcoreapp3.1\fsc.exe" target="lib\netcoreapp3.1" />
<file src="fsi\$Configuration$\netcoreapp3.0\fsi.exe" target="lib\netcoreapp3.0" /> <file src="fsi\$Configuration$\netcoreapp3.1\fsi.exe" target="lib\netcoreapp3.1" />
<file src="FSharp.Core\$Configuration$\netstandard2.0\FSharp.Core.dll" target="lib\netcoreapp3.0" /> <file src="FSharp.Core\$Configuration$\netstandard2.0\FSharp.Core.dll" target="lib\netcoreapp3.1" />
<file src="FSharp.Core\$Configuration$\netstandard2.0\FSharp.Core.xml" target="lib\netcoreapp3.0" /> <file src="FSharp.Core\$Configuration$\netstandard2.0\FSharp.Core.xml" target="lib\netcoreapp3.1" />
<file src="FSharp.Compiler.Private\$Configuration$\netstandard2.0\FSharp.Compiler.Private.dll" target="lib\netcoreapp3.0" /> <file src="FSharp.Compiler.Private\$Configuration$\netstandard2.0\FSharp.Compiler.Private.dll" target="lib\netcoreapp3.1" />
<file src="FSharp.Build\$Configuration$\netcoreapp3.0\FSharp.Build.dll" target="lib\netcoreapp3.0" /> <file src="FSharp.Build\$Configuration$\netcoreapp3.1\FSharp.Build.dll" target="lib\netcoreapp3.1" />
<file src="FSharp.DependencyManager.Nuget\$configuration$\netstandard2.0\FSharp.DependencyManager.Nuget.dll" <file src="FSharp.DependencyManager.Nuget\$configuration$\netstandard2.0\FSharp.DependencyManager.Nuget.dll"
target="lib\netcoreapp3.0" /> target="lib\netcoreapp3.1" />
<file src="Microsoft.DotNet.DependencyManager\$configuration$\netstandard2.0\Microsoft.DotNet.DependencyManager.dll" <file src="Microsoft.DotNet.DependencyManager\$configuration$\netstandard2.0\Microsoft.DotNet.DependencyManager.dll"
target="lib\netcoreapp3.0" /> target="lib\netcoreapp3.1" />
<file src="FSharp.Compiler.Interactive.Settings\$Configuration$\netstandard2.0\FSharp.Compiler.Interactive.Settings.dll" <file src="FSharp.Compiler.Interactive.Settings\$Configuration$\netstandard2.0\FSharp.Compiler.Interactive.Settings.dll"
target="lib\netcoreapp3.0" /> target="lib\netcoreapp3.1" />
<!-- additional files --> <!-- additional files -->
<file src="fsc\$Configuration$\netcoreapp3.0\default.win32manifest" target="contentFiles\any\any" /> <file src="fsc\$Configuration$\netcoreapp3.1\default.win32manifest" target="contentFiles\any\any" />
<file src="FSharp.Build\$Configuration$\netcoreapp3.0\Microsoft.FSharp.Targets" target="contentFiles\any\any" /> <file src="FSharp.Build\$Configuration$\netcoreapp3.1\Microsoft.FSharp.Targets" target="contentFiles\any\any" />
<file src="FSharp.Build\$Configuration$\netcoreapp3.0\Microsoft.Portable.FSharp.Targets" target="contentFiles\any\any" /> <file src="FSharp.Build\$Configuration$\netcoreapp3.1\Microsoft.Portable.FSharp.Targets" target="contentFiles\any\any" />
<file src="FSharp.Build\$Configuration$\netcoreapp3.0\Microsoft.FSharp.NetSdk.props" target="contentFiles\any\any" /> <file src="FSharp.Build\$Configuration$\netcoreapp3.1\Microsoft.FSharp.NetSdk.props" target="contentFiles\any\any" />
<file src="FSharp.Build\$Configuration$\netcoreapp3.0\Microsoft.FSharp.NetSdk.targets" target="contentFiles\any\any" /> <file src="FSharp.Build\$Configuration$\netcoreapp3.1\Microsoft.FSharp.NetSdk.targets" target="contentFiles\any\any" />
<file src="FSharp.Build\$Configuration$\netcoreapp3.0\Microsoft.FSharp.Overrides.NetSdk.targets" target="contentFiles\any\any" /> <file src="FSharp.Build\$Configuration$\netcoreapp3.1\Microsoft.FSharp.Overrides.NetSdk.targets" target="contentFiles\any\any" />
<!-- resources --> <!-- resources -->
<file src="FSharp.Core\$Configuration$\netstandard2.0\**\FSharp.Core.resources.dll" target="lib\netcoreapp3.0" /> <file src="FSharp.Core\$Configuration$\netstandard2.0\**\FSharp.Core.resources.dll" target="lib\netcoreapp3.1" />
<file src="FSharp.Compiler.Private\$Configuration$\netstandard2.0\**\FSharp.Compiler.Private.resources.dll" <file src="FSharp.Compiler.Private\$Configuration$\netstandard2.0\**\FSharp.Compiler.Private.resources.dll"
target="lib\netcoreapp3.0" /> target="lib\netcoreapp3.1" />
<file src="FSharp.Compiler.Interactive.Settings\$Configuration$\netstandard2.0\**\FSharp.Compiler.Interactive.Settings.resources.dll" <file src="FSharp.Compiler.Interactive.Settings\$Configuration$\netstandard2.0\**\FSharp.Compiler.Interactive.Settings.resources.dll"
target="lib\netcoreapp3.0" /> target="lib\netcoreapp3.1" />
<file src="FSharp.Build\$Configuration$\netcoreapp3.0\**\FSharp.Build.resources.dll" target="lib\netcoreapp3.0" /> <file src="FSharp.Build\$Configuration$\netcoreapp3.1\**\FSharp.Build.resources.dll" target="lib\netcoreapp3.1" />
<file src="FSharp.DependencyManager.Nuget\$configuration$\netstandard2.0\**\FSharp.DependencyManager.Nuget.resources.dll" <file src="FSharp.DependencyManager.Nuget\$configuration$\netstandard2.0\**\FSharp.DependencyManager.Nuget.resources.dll"
target="lib\netcoreapp3.0" /> target="lib\netcoreapp3.1" />
<file src="Microsoft.DotNet.DependencyManager\$Configuration$\netstandard2.0\**\Microsoft.DotNet.DependencyManager.resources.dll" <file src="Microsoft.DotNet.DependencyManager\$Configuration$\netstandard2.0\**\Microsoft.DotNet.DependencyManager.resources.dll"
target="lib\netcoreapp3.0" /> target="lib\netcoreapp3.1" />
</files> </files>
</package> </package>
src/fsharp/FSharp.DependencyManager.Nuget/FSharp.DependencyManager.Utilities.fs
浏览文件 @ ae024e92
...@@ -118,7 +118,7 @@ module internal Utilities = ...@@ -118,7 +118,7 @@ module internal Utilities =
// In an sdk install we are always installed in: sdk\3.0.100-rc2-014234\FSharp // In an sdk install we are always installed in: sdk\3.0.100-rc2-014234\FSharp
// dotnet or dotnet.exe will be found in the directory that contains the sdk directory // dotnet or dotnet.exe will be found in the directory that contains the sdk directory
// 3. We are loaded in-process to some other application ... Eg. try .net // 3. We are loaded in-process to some other application ... Eg. try .net
// See if the host is dotnet.exe ... from netcoreapp3.0 on this is fairly unlikely // See if the host is dotnet.exe ... from netcoreapp3.1 on this is fairly unlikely
// 4. If it's none of the above we are going to have to rely on the path containing the way to find dotnet.exe // 4. If it's none of the above we are going to have to rely on the path containing the way to find dotnet.exe
// //
if isRunningOnCoreClr then if isRunningOnCoreClr then
......
src/fsharp/fsc/fsc.fsproj
浏览文件 @ ae024e92
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFrameworks Condition="'$(ProtoTargetFramework)' != ''">$(ProtoTargetFramework)</TargetFrameworks> <TargetFrameworks Condition="'$(ProtoTargetFramework)' != ''">$(ProtoTargetFramework)</TargetFrameworks>
<TargetFrameworks Condition="'$(ProtoTargetFramework)' == ''">net472;netcoreapp3.0</TargetFrameworks> <TargetFrameworks Condition="'$(ProtoTargetFramework)' == ''">net472;netcoreapp3.1</TargetFrameworks>
<TargetFrameworks Condition="'$(OS)' == 'Unix'">netcoreapp3.0</TargetFrameworks> <TargetFrameworks Condition="'$(OS)' == 'Unix'">netcoreapp3.1</TargetFrameworks>
<TargetExt>.exe</TargetExt> <TargetExt>.exe</TargetExt>
<NoWarn>$(NoWarn);45;55;62;75;1204</NoWarn> <NoWarn>$(NoWarn);45;55;62;75;1204</NoWarn>
<AllowCrossTargeting>true</AllowCrossTargeting> <AllowCrossTargeting>true</AllowCrossTargeting>
......
src/fsharp/fsi/fsi.fsproj
浏览文件 @ ae024e92
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFrameworks Condition="'$(ProtoTargetFramework)' != ''">$(ProtoTargetFramework)</TargetFrameworks> <TargetFrameworks Condition="'$(ProtoTargetFramework)' != ''">$(ProtoTargetFramework)</TargetFrameworks>
<TargetFrameworks Condition="'$(ProtoTargetFramework)' == ''">net472;netcoreapp3.0</TargetFrameworks> <TargetFrameworks Condition="'$(ProtoTargetFramework)' == ''">net472;netcoreapp3.1</TargetFrameworks>
<TargetFrameworks Condition="'$(OS)' == 'Unix'">netcoreapp3.0</TargetFrameworks> <TargetFrameworks Condition="'$(OS)' == 'Unix'">netcoreapp3.1</TargetFrameworks>
<TargetExt>.exe</TargetExt> <TargetExt>.exe</TargetExt>
<NoWarn>$(NoWarn);45;55;62;75;1204</NoWarn> <NoWarn>$(NoWarn);45;55;62;75;1204</NoWarn>
<AllowCrossTargeting>true</AllowCrossTargeting> <AllowCrossTargeting>true</AllowCrossTargeting>
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
<Reference Include="WindowsBase" /> <Reference Include="WindowsBase" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'"> <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
<PackageReference Include="System.Diagnostics.Process" Version="$(SystemDiagnosticsProcessVersion)" /> <PackageReference Include="System.Diagnostics.Process" Version="$(SystemDiagnosticsProcessVersion)" />
<PackageReference Include="System.Linq.Expressions" Version="$(SystemLinqExpressionsVersion)" /> <PackageReference Include="System.Linq.Expressions" Version="$(SystemLinqExpressionsVersion)" />
<PackageReference Include="System.Reflection.Emit" Version="$(SystemReflectionEmitVersion)" /> <PackageReference Include="System.Reflection.Emit" Version="$(SystemReflectionEmitVersion)" />
......
tests/EndToEndBuildTests/BasicProvider/BasicProvider.DesignTime/BasicProvider.DesignTime.fsproj
浏览文件 @ ae024e92
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
<TargetFrameworks>netcoreapp3.0;net461</TargetFrameworks> <TargetFrameworks>netcoreapp3.1;net461</TargetFrameworks>
<FSharpToolsDirectory>typeproviders</FSharpToolsDirectory> <FSharpToolsDirectory>typeproviders</FSharpToolsDirectory>
<DefineConstants>NO_GENERATIVE</DefineConstants> <DefineConstants>NO_GENERATIVE</DefineConstants>
<DefineConstants>IS_DESIGNTIME</DefineConstants> <DefineConstants>IS_DESIGNTIME</DefineConstants>
......
tests/EndToEndBuildTests/BasicProvider/BasicProvider.Tests/BasicProvider.Tests.fsproj
浏览文件 @ ae024e92
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
<TargetFramework Condition=" '$(TestTargetFramework)' == '' ">netcoreapp3.0</TargetFramework> <TargetFramework Condition=" '$(TestTargetFramework)' == '' ">netcoreapp3.1</TargetFramework>
<TargetFramework Condition=" '$(TestTargetFramework)' != '' ">$(TestTargetFramework)</TargetFramework> <TargetFramework Condition=" '$(TestTargetFramework)' != '' ">$(TestTargetFramework)</TargetFramework>
<IsPackable>false</IsPackable> <IsPackable>false</IsPackable>
<DefineConstants>NO_GENERATIVE</DefineConstants> <DefineConstants>NO_GENERATIVE</DefineConstants>
......
tests/EndToEndBuildTests/BasicProvider/BasicProvider/BasicProvider.fsproj
浏览文件 @ ae024e92
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
<TargetFrameworks>netcoreapp3.0;net461</TargetFrameworks> <TargetFrameworks>netcoreapp3.1;net461</TargetFrameworks>
<FSharpToolsDirectory>typeproviders</FSharpToolsDirectory> <FSharpToolsDirectory>typeproviders</FSharpToolsDirectory>
<PackagePath>typeproviders</PackagePath> <PackagePath>typeproviders</PackagePath>
</PropertyGroup> </PropertyGroup>
......
tests/EndToEndBuildTests/BasicProvider/TestBasicProvider.cmd
浏览文件 @ ae024e92
...@@ -42,8 +42,8 @@ echo dotnet test BasicProvider.Tests\BasicProvider.Tests.fsproj -c %configuratio ...@@ -42,8 +42,8 @@ echo dotnet test BasicProvider.Tests\BasicProvider.Tests.fsproj -c %configuratio
dotnet test BasicProvider.Tests\BasicProvider.Tests.fsproj -c %configuration% -v minimal -p:TestTargetFramework=net461 -p:FSharpTestCompilerVersion=net40 dotnet test BasicProvider.Tests\BasicProvider.Tests.fsproj -c %configuration% -v minimal -p:TestTargetFramework=net461 -p:FSharpTestCompilerVersion=net40
if ERRORLEVEL 1 echo Error: TestBasicProvider failed && goto :failure if ERRORLEVEL 1 echo Error: TestBasicProvider failed && goto :failure
echo dotnet test BasicProvider.Tests\BasicProvider.Tests.fsproj -c %configuration% -v minimal -p:TestTargetFramework=netcoreapp3.0 -p:FSharpTestCompilerVersion=coreclr echo dotnet test BasicProvider.Tests\BasicProvider.Tests.fsproj -c %configuration% -v minimal -p:TestTargetFramework=netcoreapp3.1 -p:FSharpTestCompilerVersion=coreclr
dotnet test BasicProvider.Tests\BasicProvider.Tests.fsproj -c %configuration% -v minimal -p:TestTargetFramework=netcoreapp3.0 -p:FSharpTestCompilerVersion=coreclr dotnet test BasicProvider.Tests\BasicProvider.Tests.fsproj -c %configuration% -v minimal -p:TestTargetFramework=netcoreapp3.1 -p:FSharpTestCompilerVersion=coreclr
if ERRORLEVEL 1 echo Error: TestBasicProvider failed && goto :failure if ERRORLEVEL 1 echo Error: TestBasicProvider failed && goto :failure
rem rem
...@@ -60,8 +60,8 @@ echo dotnet test BasicProvider.Tests\BasicProvider.Tests.fsproj -c %configuratio ...@@ -60,8 +60,8 @@ echo dotnet test BasicProvider.Tests\BasicProvider.Tests.fsproj -c %configuratio
dotnet test BasicProvider.Tests\BasicProvider.Tests.fsproj -c %configuration% -v minimal -p:TestTargetFramework=net461 -p:FSharpTestCompilerVersion=net40 dotnet test BasicProvider.Tests\BasicProvider.Tests.fsproj -c %configuration% -v minimal -p:TestTargetFramework=net461 -p:FSharpTestCompilerVersion=net40
if ERRORLEVEL 1 echo Error: TestBasicProvider failed && goto :failure if ERRORLEVEL 1 echo Error: TestBasicProvider failed && goto :failure
echo dotnet test BasicProvider.Tests\BasicProvider.Tests.fsproj -c %configuration% -v minimal -p:TestTargetFramework=netcoreapp3.0 -p:FSharpTestCompilerVersion=coreclr echo dotnet test BasicProvider.Tests\BasicProvider.Tests.fsproj -c %configuration% -v minimal -p:TestTargetFramework=netcoreapp3.1 -p:FSharpTestCompilerVersion=coreclr
dotnet test BasicProvider.Tests\BasicProvider.Tests.fsproj -c %configuration% -v minimal -p:TestTargetFramework=netcoreapp3.0 -p:FSharpTestCompilerVersion=coreclr dotnet test BasicProvider.Tests\BasicProvider.Tests.fsproj -c %configuration% -v minimal -p:TestTargetFramework=netcoreapp3.1 -p:FSharpTestCompilerVersion=coreclr
if ERRORLEVEL 1 echo Error: TestBasicProvider failed && goto :failure if ERRORLEVEL 1 echo Error: TestBasicProvider failed && goto :failure
:success :success
......
tests/EndToEndBuildTests/ComboProvider/ComboProvider.Tests/ComboProvider.Tests.fsproj
浏览文件 @ ae024e92
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
<TargetFramework Condition=" '$(TestTargetFramework)' == '' ">netcoreapp3.0</TargetFramework> <TargetFramework Condition=" '$(TestTargetFramework)' == '' ">netcoreapp3.1</TargetFramework>
<TargetFramework Condition=" '$(TestTargetFramework)' != '' ">$(TestTargetFramework)</TargetFramework> <TargetFramework Condition=" '$(TestTargetFramework)' != '' ">$(TestTargetFramework)</TargetFramework>
<IsPackable>false</IsPackable> <IsPackable>false</IsPackable>
<DefineConstants>NO_GENERATIVE</DefineConstants> <DefineConstants>NO_GENERATIVE</DefineConstants>
......
tests/EndToEndBuildTests/ComboProvider/ComboProvider/ComboProvider.fsproj
浏览文件 @ ae024e92
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
<TargetFrameworks>netcoreapp3.0;net461</TargetFrameworks> <TargetFrameworks>netcoreapp3.1;net461</TargetFrameworks>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
......
tests/EndToEndBuildTests/ComboProvider/TestComboProvider.cmd
浏览文件 @ ae024e92
...@@ -42,8 +42,8 @@ echo dotnet test ComboProvider.Tests\ComboProvider.Tests.fsproj -c %configuratio ...@@ -42,8 +42,8 @@ echo dotnet test ComboProvider.Tests\ComboProvider.Tests.fsproj -c %configuratio
dotnet test ComboProvider.Tests\ComboProvider.Tests.fsproj -c %configuration% -v minimal -p:TestTargetFramework=net461 -p:FSharpTestCompilerVersion=net40 dotnet test ComboProvider.Tests\ComboProvider.Tests.fsproj -c %configuration% -v minimal -p:TestTargetFramework=net461 -p:FSharpTestCompilerVersion=net40
if ERRORLEVEL 1 echo Error: TestComboProvider failed && goto :failure if ERRORLEVEL 1 echo Error: TestComboProvider failed && goto :failure
echo dotnet test ComboProvider.Tests\ComboProvider.Tests.fsproj -c %configuration% -v minimal -p:TestTargetFramework=netcoreapp3.0 -p:FSharpTestCompilerVersion=coreclr echo dotnet test ComboProvider.Tests\ComboProvider.Tests.fsproj -c %configuration% -v minimal -p:TestTargetFramework=netcoreapp3.1 -p:FSharpTestCompilerVersion=coreclr
dotnet test ComboProvider.Tests\ComboProvider.Tests.fsproj -c %configuration% -v minimal -p:TestTargetFramework=netcoreapp3.0 -p:FSharpTestCompilerVersion=coreclr dotnet test ComboProvider.Tests\ComboProvider.Tests.fsproj -c %configuration% -v minimal -p:TestTargetFramework=netcoreapp3.1 -p:FSharpTestCompilerVersion=coreclr
if ERRORLEVEL 1 echo Error: TestComboProvider failed && goto :failure if ERRORLEVEL 1 echo Error: TestComboProvider failed && goto :failure
rem rem
...@@ -60,8 +60,8 @@ echo dotnet test ComboProvider.Tests\ComboProvider.Tests.fsproj -c %configuratio ...@@ -60,8 +60,8 @@ echo dotnet test ComboProvider.Tests\ComboProvider.Tests.fsproj -c %configuratio
dotnet test ComboProvider.Tests\ComboProvider.Tests.fsproj -c %configuration% -v minimal -p:TestTargetFramework=net461 -p:FSharpTestCompilerVersion=net40 dotnet test ComboProvider.Tests\ComboProvider.Tests.fsproj -c %configuration% -v minimal -p:TestTargetFramework=net461 -p:FSharpTestCompilerVersion=net40
if ERRORLEVEL 1 echo Error: TestComboProvider failed && goto :failure if ERRORLEVEL 1 echo Error: TestComboProvider failed && goto :failure
echo dotnet test ComboProvider.Tests\ComboProvider.Tests.fsproj -v %configuration% -p:TestTargetFramework=netcoreapp3.0 -p:FSharpTestCompilerVersion=coreclr echo dotnet test ComboProvider.Tests\ComboProvider.Tests.fsproj -v %configuration% -p:TestTargetFramework=netcoreapp3.1 -p:FSharpTestCompilerVersion=coreclr
dotnet test ComboProvider.Tests\ComboProvider.Tests.fsproj -c %configuration% -v minimal -p:TestTargetFramework=netcoreapp3.0 -p:FSharpTestCompilerVersion=coreclr dotnet test ComboProvider.Tests\ComboProvider.Tests.fsproj -c %configuration% -v minimal -p:TestTargetFramework=netcoreapp3.1 -p:FSharpTestCompilerVersion=coreclr
if ERRORLEVEL 1 echo Error: TestComboProvider failed && goto :failure if ERRORLEVEL 1 echo Error: TestComboProvider failed && goto :failure
:success :success
......
tests/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj
浏览文件 @ ae024e92
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>net472;netcoreapp3.0</TargetFrameworks> <TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
<TargetFrameworks Condition="'$(OS)' == 'Unix'">netcoreapp3.0</TargetFrameworks> <TargetFrameworks Condition="'$(OS)' == 'Unix'">netcoreapp3.1</TargetFrameworks>
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference> <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
<UnitTestType>nunit</UnitTestType> <UnitTestType>nunit</UnitTestType>
......
tests/FSharp.Compiler.Private.Scripting.UnitTests/DependencyManagerInteractiveTests.fs
浏览文件 @ ae024e92
...@@ -266,7 +266,7 @@ TorchSharp.Tensor.LongTensor.From([| 0L .. 100L |]).Device ...@@ -266,7 +266,7 @@ TorchSharp.Tensor.LongTensor.From([| 0L .. 100L |]).Device
let result = let result =
use dp = new DependencyProvider(AssemblyResolutionProbe(assemblyProbingPaths), NativeResolutionProbe(nativeProbingRoots)) use dp = new DependencyProvider(AssemblyResolutionProbe(assemblyProbingPaths), NativeResolutionProbe(nativeProbingRoots))
let idm = dp.TryFindDependencyManagerByKey(Seq.empty, "", reportError, "nuget") let idm = dp.TryFindDependencyManagerByKey(Seq.empty, "", reportError, "nuget")
dp.Resolve(idm, ".fsx", packagemanagerlines, reportError, "netcoreapp3.0") dp.Resolve(idm, ".fsx", packagemanagerlines, reportError, "netcoreapp3.1")
Assert.IsTrue(result.Success, "resolve failed") Assert.IsTrue(result.Success, "resolve failed")
...@@ -363,7 +363,7 @@ printfn ""%A"" result ...@@ -363,7 +363,7 @@ printfn ""%A"" result
let result = let result =
use dp = new DependencyProvider(NativeResolutionProbe(nativeProbingRoots)) use dp = new DependencyProvider(NativeResolutionProbe(nativeProbingRoots))
let idm = dp.TryFindDependencyManagerByKey(Seq.empty, "", reportError, "nuget") let idm = dp.TryFindDependencyManagerByKey(Seq.empty, "", reportError, "nuget")
dp.Resolve(idm, ".fsx", packagemanagerlines, reportError, "netcoreapp3.0") dp.Resolve(idm, ".fsx", packagemanagerlines, reportError, "netcoreapp3.1")
Assert.IsTrue(result.Success, "resolve failed") Assert.IsTrue(result.Success, "resolve failed")
...@@ -445,7 +445,7 @@ printfn ""%A"" result ...@@ -445,7 +445,7 @@ printfn ""%A"" result
let result = let result =
use dp = new DependencyProvider(NativeResolutionProbe(nativeProbingRoots)) use dp = new DependencyProvider(NativeResolutionProbe(nativeProbingRoots))
let idm = dp.TryFindDependencyManagerByKey(Seq.empty, "", reportError, "nuget") let idm = dp.TryFindDependencyManagerByKey(Seq.empty, "", reportError, "nuget")
dp.Resolve(idm, ".fsx", packagemanagerlines, reportError, "netcoreapp3.0") dp.Resolve(idm, ".fsx", packagemanagerlines, reportError, "netcoreapp3.1")
Assert.IsTrue(result.Success, "resolve failed") Assert.IsTrue(result.Success, "resolve failed")
...@@ -502,7 +502,7 @@ x |> Seq.iter(fun r -> ...@@ -502,7 +502,7 @@ x |> Seq.iter(fun r ->
let result = let result =
use dp = new DependencyProvider(NativeResolutionProbe(nativeProbingRoots)) use dp = new DependencyProvider(NativeResolutionProbe(nativeProbingRoots))
let idm = dp.TryFindDependencyManagerByKey(Seq.empty, "", reportError, "nuget") let idm = dp.TryFindDependencyManagerByKey(Seq.empty, "", reportError, "nuget")
dp.Resolve(idm, ".fsx", packagemanagerlines, reportError, "netcoreapp3.0") dp.Resolve(idm, ".fsx", packagemanagerlines, reportError, "netcoreapp3.1")
// Expected: error FS3217: PackageManager can not reference the System Package 'FSharp.Core' // Expected: error FS3217: PackageManager can not reference the System Package 'FSharp.Core'
Assert.IsFalse(result.Success, "resolve succeeded but should have failed") Assert.IsFalse(result.Success, "resolve succeeded but should have failed")
...@@ -528,7 +528,7 @@ x |> Seq.iter(fun r -> ...@@ -528,7 +528,7 @@ x |> Seq.iter(fun r ->
let result = let result =
use dp = new DependencyProvider(NativeResolutionProbe(nativeProbingRoots)) use dp = new DependencyProvider(NativeResolutionProbe(nativeProbingRoots))
let idm = dp.TryFindDependencyManagerByKey(Seq.empty, "", reportError, "nuget") let idm = dp.TryFindDependencyManagerByKey(Seq.empty, "", reportError, "nuget")
dp.Resolve(idm, ".csx", packagemanagerlines, reportError, "netcoreapp3.0") dp.Resolve(idm, ".csx", packagemanagerlines, reportError, "netcoreapp3.1")
Assert.IsTrue(result.Success, "resolve failed but should have succeeded") Assert.IsTrue(result.Success, "resolve failed but should have succeeded")
......
tests/FSharp.Compiler.Private.Scripting.UnitTests/FSharp.Compiler.Private.Scripting.UnitTests.fsproj
浏览文件 @ ae024e92
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>net472;netcoreapp3.0</TargetFrameworks> <TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
<TargetFrameworks Condition="'$(OS)' == 'Unix'">netcoreapp3.0</TargetFrameworks> <TargetFrameworks Condition="'$(OS)' == 'Unix'">netcoreapp3.1</TargetFrameworks>
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference> <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
<UnitTestType>nunit</UnitTestType> <UnitTestType>nunit</UnitTestType>
......
tests/FSharp.Compiler.UnitTests/FSharp.Compiler.UnitTests.fsproj
浏览文件 @ ae024e92
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>net472;netcoreapp3.0</TargetFrameworks> <TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
<TargetFrameworks Condition="'$(OS)' == 'Unix'">netcoreapp3.0</TargetFrameworks> <TargetFrameworks Condition="'$(OS)' == 'Unix'">netcoreapp3.1</TargetFrameworks>
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference> <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
<UnitTestType>nunit</UnitTestType> <UnitTestType>nunit</UnitTestType>
......
tests/FSharp.Core.UnitTests/FSharp.Core.UnitTests.fsproj
浏览文件 @ ae024e92
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>net472;netcoreapp3.0</TargetFrameworks> <TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
<TargetFrameworks Condition="'$(OS)' == 'Unix'">netcoreapp3.0</TargetFrameworks> <TargetFrameworks Condition="'$(OS)' == 'Unix'">netcoreapp3.1</TargetFrameworks>
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
<AssemblyName>FSharp.Core.UnitTests</AssemblyName> <AssemblyName>FSharp.Core.UnitTests</AssemblyName>
......
tests/FSharp.TestHelpers/FSharp.TestHelpers.fsproj
浏览文件 @ ae024e92
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>net472;netcoreapp3.0</TargetFrameworks> <TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
<TargetFrameworks Condition="'$(OS)' == 'Unix'">netcoreapp3.0</TargetFrameworks> <TargetFrameworks Condition="'$(OS)' == 'Unix'">netcoreapp3.1</TargetFrameworks>
<RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers> <RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers>
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81</AssetTargetFallback> <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81</AssetTargetFallback>
<ReferenceVsAssemblies>true</ReferenceVsAssemblies> <ReferenceVsAssemblies>true</ReferenceVsAssemblies>
......
tests/FSharp.TestHelpers/TestFramework.fs
浏览文件 @ ae024e92
...@@ -172,10 +172,10 @@ let config configurationName envVars = ...@@ -172,10 +172,10 @@ let config configurationName envVars =
let fsharpBuildArchitecture = "net472" let fsharpBuildArchitecture = "net472"
let fsharpCompilerInteractiveSettingsArchitecture = "net472" let fsharpCompilerInteractiveSettingsArchitecture = "net472"
#else #else
let fscArchitecture = "netcoreapp3.0" let fscArchitecture = "netcoreapp3.1"
let fsiArchitecture = "netcoreapp3.0" let fsiArchitecture = "netcoreapp3.1"
let fsharpCoreArchitecture = "netstandard2.0" let fsharpCoreArchitecture = "netstandard2.0"
let fsharpBuildArchitecture = "netcoreapp3.0" let fsharpBuildArchitecture = "netcoreapp3.1"
let fsharpCompilerInteractiveSettingsArchitecture = "netstandard2.0" let fsharpCompilerInteractiveSettingsArchitecture = "netstandard2.0"
#endif #endif
let repoRoot = SCRIPT_ROOT ++ ".." ++ ".." let repoRoot = SCRIPT_ROOT ++ ".." ++ ".."
......
tests/fsharp/FSharpSuite.Tests.fsproj
浏览文件 @ ae024e92
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>net472;netcoreapp3.0</TargetFrameworks> <TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
<TargetFrameworks Condition="'$(OS)' == 'Unix'">netcoreapp3.0</TargetFrameworks> <TargetFrameworks Condition="'$(OS)' == 'Unix'">netcoreapp3.1</TargetFrameworks>
<RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers> <RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers>
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81</AssetTargetFallback> <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81</AssetTargetFallback>
<ReferenceVsAssemblies>true</ReferenceVsAssemblies> <ReferenceVsAssemblies>true</ReferenceVsAssemblies>
......
tests/fsharp/core/pinvoke/test.fsx
浏览文件 @ ae024e92
...@@ -16,7 +16,7 @@ let report_failure (s : string) = ...@@ -16,7 +16,7 @@ let report_failure (s : string) =
stderr.WriteLine s stderr.WriteLine s
failures := !failures @ [s] failures := !failures @ [s]
// We currently build targeting netcoreapp2_1, and will continue to do so through this VS cycle // We currently build targeting netcoreapp3_1, and will continue to do so through this VS cycle
// We will use this api to see if we are running on a netcore which supports pinvoke / refemit // We will use this api to see if we are running on a netcore which supports pinvoke / refemit
let definePInvokeMethod = let definePInvokeMethod =
typeof<System.Reflection.Emit.TypeBuilder>.GetMethod("DefinePInvokeMethod", [| typeof<System.Reflection.Emit.TypeBuilder>.GetMethod("DefinePInvokeMethod", [|
......
tests/fsharp/single-test.fs
浏览文件 @ ae024e92
...@@ -94,7 +94,7 @@ let generateOverrides = ...@@ -94,7 +94,7 @@ let generateOverrides =
// Arguments: // Arguments:
// pc = ProjectConfiguration // pc = ProjectConfiguration
// outputType = OutputType.Exe, OutputType.Library or OutputType.Script // outputType = OutputType.Exe, OutputType.Library or OutputType.Script
// targetFramework optimize = "net472" OR NETCOREAPP3.0 etc ... // targetFramework optimize = "net472" OR NETCOREAPP3.1 etc ...
// optimize = true or false // optimize = true or false
// configuration = "Release" or "Debug" // configuration = "Release" or "Debug"
// //
...@@ -214,12 +214,12 @@ let singleTestBuildAndRunCore cfg copyFiles p languageVersion = ...@@ -214,12 +214,12 @@ let singleTestBuildAndRunCore cfg copyFiles p languageVersion =
let extraSources = ["testlib.fsi";"testlib.fs";"test.mli";"test.ml";"test.fsi";"test.fs";"test2.fsi";"test2.fs";"test.fsx";"test2.fsx"] let extraSources = ["testlib.fsi";"testlib.fs";"test.mli";"test.ml";"test.fsi";"test.fs";"test2.fsi";"test2.fs";"test.fsx";"test2.fsx"]
let utilitySources = [__SOURCE_DIRECTORY__ ++ "coreclr_utilities.fs"] let utilitySources = [__SOURCE_DIRECTORY__ ++ "coreclr_utilities.fs"]
let referenceItems = if String.IsNullOrEmpty(copyFiles) then [] else [copyFiles] let referenceItems = if String.IsNullOrEmpty(copyFiles) then [] else [copyFiles]
let framework = "netcoreapp3.0" let framework = "netcoreapp3.1"
// Arguments: // Arguments:
// outputType = OutputType.Exe, OutputType.Library or OutputType.Script // outputType = OutputType.Exe, OutputType.Library or OutputType.Script
// compilerType = "coreclr" or "net40" // compilerType = "coreclr" or "net40"
// targetFramework optimize = "net472" OR NETCOREAPP3.0 etc ... // targetFramework optimize = "net472" OR NETCOREAPP3.1 etc ...
// optimize = true or false // optimize = true or false
let executeSingleTestBuildAndRun outputType compilerType targetFramework optimize buildOnly = let executeSingleTestBuildAndRun outputType compilerType targetFramework optimize buildOnly =
let mutable result = false let mutable result = false
...@@ -305,9 +305,9 @@ let singleTestBuildAndRunCore cfg copyFiles p languageVersion = ...@@ -305,9 +305,9 @@ let singleTestBuildAndRunCore cfg copyFiles p languageVersion =
printfn "Filename: %s" projectFileName printfn "Filename: %s" projectFileName
match p with match p with
| FSC_CORECLR -> executeSingleTestBuildAndRun OutputType.Exe "coreclr" "netcoreapp3.0" true false | FSC_CORECLR -> executeSingleTestBuildAndRun OutputType.Exe "coreclr" "netcoreapp3.1" true false
| FSC_CORECLR_BUILDONLY -> executeSingleTestBuildAndRun OutputType.Exe "coreclr" "netcoreapp3.0" true true | FSC_CORECLR_BUILDONLY -> executeSingleTestBuildAndRun OutputType.Exe "coreclr" "netcoreapp3.1" true true
| FSI_CORECLR -> executeSingleTestBuildAndRun OutputType.Script "coreclr" "netcoreapp3.0" true false | FSI_CORECLR -> executeSingleTestBuildAndRun OutputType.Script "coreclr" "netcoreapp3.1" true false
#if !NETCOREAPP #if !NETCOREAPP
| FSC_BUILDONLY -> executeSingleTestBuildAndRun OutputType.Exe "net40" "net472" false true | FSC_BUILDONLY -> executeSingleTestBuildAndRun OutputType.Exe "net40" "net472" false true
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或