Skip to content

Commit

Permalink
Update to 7.0.4xx FCS versions (#1151)
Browse files Browse the repository at this point in the history
Co-authored-by: Maxime Mangel <[email protected]>
Co-authored-by: github-actions <[email protected]>
Co-authored-by: Maxime Mangel <[email protected]>
Co-authored-by: Florian Verdonck <[email protected]>
Co-authored-by: dawe <[email protected]>
  • Loading branch information
6 people authored Aug 21, 2023
1 parent f5d82b2 commit 452411b
Show file tree
Hide file tree
Showing 27 changed files with 1,085 additions and 692 deletions.
34 changes: 34 additions & 0 deletions .github/workflows/build-and-pack-nightly.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: Build and pack nightly

on:
push:
branches:
- nightly

env:
BuildNet7: true

jobs:
pack-nightly:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3

- name: Get date for version
id: date
run: echo "::set-output name=date::$(date +'%Y%m%d%H%M')"
# setup .NET per the repo global.json
- name: Setup .NET
uses: actions/setup-dotnet@v2

- name: Restore tools
run: dotnet tool restore

- name: Run Build
run: dotnet run --project build -t Release
env:
VersionSuffix: "beta${{ steps.date.outputs.date }}"

- name: Push packages
run: dotnet nuget push bin/pkgs/fsautocomplete.*.nupkg --source https://nuget.pkg.github.com/fsharp/index.json --api-key ${{ secrets.GITHUB_TOKEN }}
44 changes: 22 additions & 22 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
{
"FSharp.excludeProjectDirectories": [
".git",
"paket-files",
"packages",
"test/FsAutoComplete.IntegrationTests"
],
//otherwise take a lot of time to load proj inside
//the test directories
"omnisharp.autoStart": false,
"FSharp.minimizeBackgroundParsing": true,
"FSharp.trace.server": "verbose",
"yaml.schemas": {
"https://raw.githubusercontent.com/SchemaStore/schemastore/master/src/schemas/json/github-workflow.json": ".github/workflows/*"
},
"editor.inlayHints.enabled": "offUnlessPressed",
"FSharp.enableAdaptiveLspServer": true,
"files.associations": {
"*.*proj": "msbuild",
"*.props": "msbuild",
"*.targets": "msbuild"
}
}
"FSharp.excludeProjectDirectories": [
".git",
"paket-files",
"packages",
"test/FsAutoComplete.IntegrationTests"
],
//otherwise take a lot of time to load proj inside
//the test directories
"omnisharp.autoStart": false,
"FSharp.minimizeBackgroundParsing": true,
"FSharp.trace.server": "off",
"yaml.schemas": {
"https://raw.githubusercontent.com/SchemaStore/schemastore/master/src/schemas/json/github-workflow.json": ".github/workflows/*"
},
"editor.inlayHints.enabled": "offUnlessPressed",
"FSharp.enableAdaptiveLspServer": true,
"files.associations": {
"*.*proj": "msbuild",
"*.props": "msbuild",
"*.targets": "msbuild"
}
}
12 changes: 12 additions & 0 deletions Directory.Build.targets
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<Project>

<Target Name="SupportPrereleaseVersion"
AfterTargets="SetVersionFromChangelog">
<PropertyGroup Condition="'$(VersionSuffix)' != ''">
<Version>$(Version)-$(VersionSuffix)</Version>
<PackageVersion>$(Version)</PackageVersion>
</PropertyGroup>
</Target>


</Project>
19 changes: 10 additions & 9 deletions build/Program.fs
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ let configuration = Environment.environVarOrDefault "configuration" "Release"
let buildDir = "src" </> project </> "bin" </> "Debug"
let buildReleaseDir = "src" </> project </> "bin" </> "Release"
let pkgsDir = "bin" </> "pkgs"
let toolsDir = "bin" </> "release_as_tool"
let releaseArchiveNetCore = pkgsDir </> "fsautocomplete.netcore.zip"

// Files to format
Expand Down Expand Up @@ -74,25 +75,24 @@ let init args =
failwithf "Errors while generating coverage report: %A" r.Errors)

Target.create "ReleaseArchive" (fun _ ->
Shell.cleanDirs [ "bin/pkgs" ]
Directory.ensure "bin/pkgs"
Directory.ensure pkgsDir

!!(sprintf "bin/release_as_tool/fsautocomplete.%s.nupkg" currentRelease.AssemblyVersion)
|> Shell.copy "bin/pkgs")
!!(toolsDir </> "fsautocomplete.*.nupkg")
|> Shell.copy pkgsDir)

Target.create "LocalRelease" (fun _ ->
Directory.ensure "bin/release_as_tool"
Shell.cleanDirs [ "bin/release_as_tool" ]
Directory.ensure toolsDir
Shell.cleanDirs [ toolsDir ]

DotNet.pack
(fun p ->
{ p with
OutputPath = Some(__SOURCE_DIRECTORY__ </> ".." </> "bin/release_as_tool")
OutputPath = Some(__SOURCE_DIRECTORY__ </> ".." </> toolsDir)
Configuration = DotNet.BuildConfiguration.fromString configuration
MSBuildParams = { MSBuild.CliArguments.Create() with Properties = [ packAsToolProp ] } })
"src/FsAutoComplete")

Target.create "Clean" (fun _ -> Shell.cleanDirs [ buildDir; buildReleaseDir; pkgsDir ])
Target.create "Clean" (fun _ -> Shell.cleanDirs [ buildDir; buildReleaseDir; pkgsDir; toolsDir ])

Target.create "Restore" (fun _ -> DotNet.restore id "")

Expand Down Expand Up @@ -178,7 +178,8 @@ let init args =
"Build" ==> "LspTest" ==> "Coverage" ==> "Test" ==> "All"
|> ignore<string>

"LocalRelease"
"Clean"
==> "LocalRelease"
==> "ReleaseArchive"
==> "Release"
|> ignore<string>
Expand Down
45 changes: 22 additions & 23 deletions paket.dependencies
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ framework: netstandard2.0, netstandard2.1, net6.0, net7.0

source https://api.nuget.org/v3/index.json
# this is the FCS nightly feed, re-enable at your own risk!
#source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
#source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json
#source: ./libs
storage: none
strategy: min
Expand All @@ -13,37 +13,37 @@ lowest_matching: true

nuget BenchmarkDotNet 0.13.5
nuget Fantomas.Client >= 0.9
nuget FSharp.Compiler.Service >= 43.7.300
nuget Ionide.ProjInfo >= 0.61.3
nuget Ionide.ProjInfo.FCS >= 0.61.3
nuget Ionide.ProjInfo.ProjectSystem >= 0.61.3
nuget Ionide.ProjInfo.Sln >= 0.61.3
nuget FSharp.Compiler.Service >= 43.7.400
nuget Ionide.ProjInfo >= 0.62.0
nuget Ionide.ProjInfo.FCS >= 0.62.0
nuget Ionide.ProjInfo.ProjectSystem >= 0.62.0
nuget Ionide.ProjInfo.Sln >= 0.62.0
nuget Microsoft.Build >= 17.2 copy_local:false
nuget Microsoft.Build.Framework >= 17.4 copy_local:false
nuget Microsoft.Build.Utilities.Core >= 17.4 copy_local:false
nuget Microsoft.Build.Tasks.Core >= 17.4 copy_local: false
nuget Nuget.Frameworks >= 6.3 copy_local: false
nuget Microsoft.CodeAnalysis 4.5.0
nuget Nuget.Frameworks copy_local: false
nuget FSharp.Analyzers.SDK
nuget ICSharpCode.Decompiler
nuget Mono.Cecil
nuget Mono.Cecil >= 0.11.4
nuget Newtonsoft.Json
nuget FSharpLint.Core
nuget System.Configuration.ConfigurationManager
nuget Serilog
nuget Serilog.Sinks.File
nuget Serilog.Sinks.Console
nuget Serilog.Sinks.Async
nuget Serilog >= 2.10.0
nuget Serilog.Sinks.File >= 5.0.0
nuget Serilog.Sinks.Console >= 4.0.0
nuget Serilog.Sinks.Async >= 1.5
nuget Destructurama.FSharp
nuget FSharp.UMX
nuget FSharp.Formatting
nuget FsToolkit.ErrorHandling.TaskResult framework: netstandard2.1 ,net6.0, net7.0
nuget IcedTasks
nuget FSharpx.Async
nuget CliWrap
nuget FSharp.UMX >= 1.1
nuget FSharp.Formatting >= 14.0
nuget FsToolkit.ErrorHandling.TaskResult >= 4.4 framework: netstandard2.1 ,net6.0, net7.0
nuget IcedTasks >= 0.5
nuget FSharpx.Async >= 1.14
nuget CliWrap >= 3.0
nuget System.CommandLine prerelease
nuget FSharp.Data.Adaptive
nuget Microsoft.NET.Test.Sdk
nuget FSharp.Data.Adaptive >= 1.2
nuget Microsoft.NET.Test.Sdk >= 17.4
nuget Dotnet.ReproducibleBuilds copy_local:true

nuget Microsoft.NETFramework.ReferenceAssemblies
Expand All @@ -55,12 +55,11 @@ nuget AltCover
nuget GitHubActionsTestLogger
nuget Ionide.LanguageServerProtocol >= 0.4.16
nuget Microsoft.Extensions.Caching.Memory
nuget OpenTelemetry.Exporter.OpenTelemetryProtocol >= 1.3.2
nuget OpenTelemetry.Api >= 1.3.2
nuget OpenTelemetry.Exporter.OpenTelemetryProtocol >= 1.3.2 # 1.4 bumps to 7.0 versions of System.Diagnostics libs, so can't use it
nuget LinkDotNet.StringBuilder 1.18.0
nuget CommunityToolkit.HighPerformance



group Build
source https://api.nuget.org/v3/index.json
storage: none
Expand Down
Loading

0 comments on commit 452411b

Please sign in to comment.