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 2222 <add key =" vs-impl" value =" https://vside.myget.org/F/vs-impl/api/v3/index.json" />
2323 <add key =" roslyn_concord" value =" https://myget.org/F/roslyn_concord/api/v3/index.json" />
2424 <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" />
2533 </packageSources >
2634 <disabledPackageSources >
2735 <clear />
Original file line number Diff line number Diff line change @@ -174,7 +174,7 @@ function BuildSolution() {
174174 $officialBuildId = if ($official ) { $env: BUILD_BUILDNUMBER } else { " " }
175175 $toolsetBuildProj = InitializeToolset
176176 $quietRestore = ! $ci
177- $testTargetFrameworks = if ($testCoreClr ) { " netcoreapp2.1 " } else { " " }
177+ $testTargetFrameworks = if ($testCoreClr ) { " netcoreapp3.0 " } else { " " }
178178
179179 # Do not set the property to true explicitly, since that would override value projects might set.
180180 $suppressExtensionDeployment = if (! $deployExtensions ) { " /p:DeployExtension=false" } else { " " }
@@ -309,7 +309,7 @@ try {
309309 Prepare- TempDir
310310 EnablePreviewSdks
311311
312- # enable us to build netcoreapp2.1 binaries
312+ # enable us to build netcoreapp2.1 product binaries
313313 $global :_DotNetInstallDir = Join-Path $RepoRoot " .dotnet"
314314 InstallDotNetSdk $global :_DotNetInstallDir $GlobalJson.tools.dotnet
315315 InstallDotNetSdk $global :_DotNetInstallDir " 2.1.503"
@@ -332,7 +332,7 @@ try {
332332 }
333333
334334 $desktopTargetFramework = " net472"
335- $coreclrTargetFramework = " netcoreapp2.1 "
335+ $coreclrTargetFramework = " netcoreapp3.0 "
336336
337337 if ($testDesktop -and -not $noVisualStudio ) {
338338 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
269269BuildSolution
270270
271271if [[ " $test_core_clr " == true ]]; then
272- coreclrtestframework=netcoreapp2.1
272+ coreclrtestframework=netcoreapp3.0
273273 TestUsingNUnit --testproject " $repo_root /tests/FSharp.Compiler.UnitTests/FSharp.Compiler.UnitTests.fsproj" --targetframework $coreclrtestframework
274274 TestUsingNUnit --testproject " $repo_root /tests/FSharp.Compiler.LanguageServer.UnitTests/FSharp.Compiler.LanguageServer.UnitTests.fsproj" --targetframework $coreclrtestframework
275275 TestUsingNUnit --testproject " $repo_root /tests/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj" --targetframework $coreclrtestframework
Original file line number Diff line number Diff line change 44 <PropertyGroup >
55 <OutputType >Exe</OutputType >
66 <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 >
99 <IsPackable >true</IsPackable >
1010 <PackageDescription >Implements the Language Server Protocol (LSP) for F#.</PackageDescription >
1111 <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