File tree Expand file tree Collapse file tree 8 files changed +14
-134
lines changed
src/fsharp/FSharp.Compiler.LanguageServer
tests/FSharp.Compiler.LanguageServer.UnitTests Expand file tree Collapse file tree 8 files changed +14
-134
lines changed Original file line number Diff line number Diff line change 22
22
<add key =" vs-impl" value =" https://vside.myget.org/F/vs-impl/api/v3/index.json" />
23
23
<add key =" roslyn_concord" value =" https://myget.org/F/roslyn_concord/api/v3/index.json" />
24
24
<add key =" devcore" value =" https://vside.myget.org/F/devcore/api/v3/index.json" />
25
+
26
+ <!-- These keys can be removed once 16.3 has shipped, they are necessary to build with net16.3 previews -->
27
+ <add key =" dotnet-windowsdesktop" value =" https://dotnetfeed.blob.core.windows.net/dotnet-windowsdesktop/index.json" />
28
+ <add key =" aspnet-aspnetcore" value =" https://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore/index.json" />
29
+ <add key =" aspnet-aspnetcore-tooling" value =" https://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore-tooling/index.json" />
30
+ <add key =" aspnet-entityframeworkcore" value =" https://dotnetfeed.blob.core.windows.net/aspnet-entityframeworkcore/index.json" />
31
+ <add key =" aspnet-extensions" value =" https://dotnetfeed.blob.core.windows.net/aspnet-extensions/index.json" />
32
+ <add key =" gRPC repository" value =" https://grpc.jfrog.io/grpc/api/nuget/v3/grpc-nuget-dev" />
25
33
</packageSources >
26
34
<disabledPackageSources >
27
35
<clear />
Original file line number Diff line number Diff line change @@ -174,7 +174,7 @@ function BuildSolution() {
174
174
$officialBuildId = if ($official ) { $env: BUILD_BUILDNUMBER } else { " " }
175
175
$toolsetBuildProj = InitializeToolset
176
176
$quietRestore = ! $ci
177
- $testTargetFrameworks = if ($testCoreClr ) { " netcoreapp2.1 " } else { " " }
177
+ $testTargetFrameworks = if ($testCoreClr ) { " netcoreapp3.0 " } else { " " }
178
178
179
179
# Do not set the property to true explicitly, since that would override value projects might set.
180
180
$suppressExtensionDeployment = if (! $deployExtensions ) { " /p:DeployExtension=false" } else { " " }
@@ -309,7 +309,7 @@ try {
309
309
Prepare- TempDir
310
310
EnablePreviewSdks
311
311
312
- # enable us to build netcoreapp2.1 binaries
312
+ # enable us to build netcoreapp2.1 product binaries
313
313
$global :_DotNetInstallDir = Join-Path $RepoRoot " .dotnet"
314
314
InstallDotNetSdk $global :_DotNetInstallDir $GlobalJson.tools.dotnet
315
315
InstallDotNetSdk $global :_DotNetInstallDir " 2.1.503"
@@ -332,7 +332,7 @@ try {
332
332
}
333
333
334
334
$desktopTargetFramework = " net472"
335
- $coreclrTargetFramework = " netcoreapp2.1 "
335
+ $coreclrTargetFramework = " netcoreapp3.0 "
336
336
337
337
if ($testDesktop -and -not $noVisualStudio ) {
338
338
TestUsingNUnit - testProject " $RepoRoot \tests\FSharp.Compiler.UnitTests\FSharp.Compiler.UnitTests.fsproj" - targetFramework $desktopTargetFramework
Original file line number Diff line number Diff line change @@ -269,7 +269,7 @@ InstallDotNetSdk $_InitializeDotNetCli 2.1.503
269
269
BuildSolution
270
270
271
271
if [[ " $test_core_clr " == true ]]; then
272
- coreclrtestframework=netcoreapp2.1
272
+ coreclrtestframework=netcoreapp3.0
273
273
TestUsingNUnit --testproject " $repo_root /tests/FSharp.Compiler.UnitTests/FSharp.Compiler.UnitTests.fsproj" --targetframework $coreclrtestframework
274
274
TestUsingNUnit --testproject " $repo_root /tests/FSharp.Compiler.LanguageServer.UnitTests/FSharp.Compiler.LanguageServer.UnitTests.fsproj" --targetframework $coreclrtestframework
275
275
TestUsingNUnit --testproject " $repo_root /tests/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj" --targetframework $coreclrtestframework
Original file line number Diff line number Diff line change 4
4
<PropertyGroup >
5
5
<OutputType >Exe</OutputType >
6
6
<TargetExt >.exe</TargetExt >
7
- <TargetFrameworks >net472;netcoreapp2.1 </TargetFrameworks >
8
- <TargetFrameworks Condition =" '$(OS)' == 'Unix'" >netcoreapp2.1 </TargetFrameworks >
7
+ <TargetFrameworks >net472;netcoreapp3.0 </TargetFrameworks >
8
+ <TargetFrameworks Condition =" '$(OS)' == 'Unix'" >netcoreapp3.0 </TargetFrameworks >
9
9
<IsPackable >true</IsPackable >
10
10
<PackageDescription >Implements the Language Server Protocol (LSP) for F#.</PackageDescription >
11
11
<ExcludeFromSourceBuild >true</ExcludeFromSourceBuild >
Load Diff This file was deleted.
Load Diff This file was deleted.
Load Diff This file was deleted.
Load Diff This file was deleted.
You can’t perform that action at this time.
0 commit comments