diff --git a/.paket/Paket.Restore.targets b/.paket/Paket.Restore.targets index e230bb21..c66062b2 100644 --- a/.paket/Paket.Restore.targets +++ b/.paket/Paket.Restore.targets @@ -1,322 +1,325 @@ - - - - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - - $(MSBuildVersion) - 15.0.0 - false - true - - true - $(MSBuildThisFileDirectory) - $(MSBuildThisFileDirectory)..\ - $(PaketRootPath)paket-files\paket.restore.cached - $(PaketRootPath)paket.lock - classic - proj - assembly - native - /Library/Frameworks/Mono.framework/Commands/mono - mono - - - $(PaketRootPath)paket.bootstrapper.exe - $(PaketToolsPath)paket.bootstrapper.exe - $([System.IO.Path]::GetDirectoryName("$(PaketBootStrapperExePath)"))\ - - "$(PaketBootStrapperExePath)" - $(MonoPath) --runtime=v4.0.30319 "$(PaketBootStrapperExePath)" - - - - - true - true - - - True - - - False - - $(BaseIntermediateOutputPath.TrimEnd('\').TrimEnd('\/')) - - - - - - - - - $(PaketRootPath)paket - $(PaketToolsPath)paket - - - - - - $(PaketRootPath)paket.exe - $(PaketToolsPath)paket.exe - - - - - - <_DotnetToolsJson Condition="Exists('$(PaketRootPath)/.config/dotnet-tools.json')">$([System.IO.File]::ReadAllText("$(PaketRootPath)/.config/dotnet-tools.json")) - <_ConfigContainsPaket Condition=" '$(_DotnetToolsJson)' != ''">$(_DotnetToolsJson.Contains('"paket"')) - <_ConfigContainsPaket Condition=" '$(_ConfigContainsPaket)' == ''">false - - - - - - - - - - - <_PaketCommand>dotnet paket - - - - - - $(PaketToolsPath)paket - $(PaketBootStrapperExeDir)paket - - - paket - - - - - <_PaketExeExtension>$([System.IO.Path]::GetExtension("$(PaketExePath)")) - <_PaketCommand Condition=" '$(_PaketCommand)' == '' AND '$(_PaketExeExtension)' == '.dll' ">dotnet "$(PaketExePath)" - <_PaketCommand Condition=" '$(_PaketCommand)' == '' AND '$(OS)' != 'Windows_NT' AND '$(_PaketExeExtension)' == '.exe' ">$(MonoPath) --runtime=v4.0.30319 "$(PaketExePath)" - <_PaketCommand Condition=" '$(_PaketCommand)' == '' ">"$(PaketExePath)" - - - - - - - - - - - - - - - - - - - - - true - $(NoWarn);NU1603;NU1604;NU1605;NU1608 - false - true - - - - - - - - - $([System.IO.File]::ReadAllText('$(PaketRestoreCacheFile)')) - - - - - - - $([System.Text.RegularExpressions.Regex]::Split(`%(Identity)`, `": "`)[0].Replace(`"`, ``).Replace(` `, ``)) - $([System.Text.RegularExpressions.Regex]::Split(`%(Identity)`, `": "`)[1].Replace(`"`, ``).Replace(` `, ``)) - - - - - %(PaketRestoreCachedKeyValue.Value) - %(PaketRestoreCachedKeyValue.Value) - - - - - true - false - true - - - + + + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + + $(MSBuildVersion) + 15.0.0 + false + true + + true + $(MSBuildThisFileDirectory) + $(MSBuildThisFileDirectory)..\ + $(PaketRootPath)paket-files\paket.restore.cached + $(PaketRootPath)paket.lock + classic + proj + assembly + native + /Library/Frameworks/Mono.framework/Commands/mono + mono + + + $(PaketRootPath)paket.bootstrapper.exe + $(PaketToolsPath)paket.bootstrapper.exe + $([System.IO.Path]::GetDirectoryName("$(PaketBootStrapperExePath)"))\ + + "$(PaketBootStrapperExePath)" + $(MonoPath) --runtime=v4.0.30319 "$(PaketBootStrapperExePath)" + + + + + true + true + + + True + + + False + + $(BaseIntermediateOutputPath.TrimEnd('\').TrimEnd('\/')) + + + + + + + + + $(PaketRootPath)paket + $(PaketToolsPath)paket + + + + + + $(PaketRootPath)paket.exe + $(PaketToolsPath)paket.exe + + + + + + <_DotnetToolsJson Condition="Exists('$(PaketRootPath)/.config/dotnet-tools.json')">$([System.IO.File]::ReadAllText("$(PaketRootPath)/.config/dotnet-tools.json")) + <_ConfigContainsPaket Condition=" '$(_DotnetToolsJson)' != ''">$(_DotnetToolsJson.Contains('"paket"')) + <_ConfigContainsPaket Condition=" '$(_ConfigContainsPaket)' == ''">false + + + + + + + + + + + <_PaketCommand>dotnet paket + + + + + + $(PaketToolsPath)paket + $(PaketBootStrapperExeDir)paket + + + paket + + + + + <_PaketExeExtension>$([System.IO.Path]::GetExtension("$(PaketExePath)")) + <_PaketCommand Condition=" '$(_PaketCommand)' == '' AND '$(_PaketExeExtension)' == '.dll' ">dotnet "$(PaketExePath)" + <_PaketCommand Condition=" '$(_PaketCommand)' == '' AND '$(OS)' != 'Windows_NT' AND '$(_PaketExeExtension)' == '.exe' ">$(MonoPath) --runtime=v4.0.30319 "$(PaketExePath)" + <_PaketCommand Condition=" '$(_PaketCommand)' == '' ">"$(PaketExePath)" + + + + + + + + + + + + + + + + + + + + + true + $(NoWarn);NU1603;NU1604;NU1605;NU1608 + false + true + + + + + + + + + $([System.IO.File]::ReadAllText('$(PaketRestoreCacheFile)')) + + + + + + + $([System.Text.RegularExpressions.Regex]::Split(`%(Identity)`, `": "`)[0].Replace(`"`, ``).Replace(` `, ``)) + $([System.Text.RegularExpressions.Regex]::Split(`%(Identity)`, `": "`)[1].Replace(`"`, ``).Replace(` `, ``)) + + + + + %(PaketRestoreCachedKeyValue.Value) + %(PaketRestoreCachedKeyValue.Value) + + + + + true + false + true + + + - - true - - - - - - - - - - - - - - - - - - - $(PaketIntermediateOutputPath)\$(MSBuildProjectFile).paket.references.cached - - $(MSBuildProjectFullPath).paket.references - - $(MSBuildProjectDirectory)\$(MSBuildProjectName).paket.references - - $(MSBuildProjectDirectory)\paket.references - - false - true - true - references-file-or-cache-not-found - - - - - $([System.IO.File]::ReadAllText('$(PaketReferencesCachedFilePath)')) - $([System.IO.File]::ReadAllText('$(PaketOriginalReferencesFilePath)')) - references-file - false - - - - - false - - - - - true - target-framework '$(TargetFramework)' or '$(TargetFrameworks)' files @(PaketResolvedFilePaths) - - - - - - - - - - - false - true - - - - - - - - - - - $([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',').Length) - $([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[0]) - $([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[1]) - $([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[4]) - $([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[5]) - $([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[6]) - $([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[7]) - - - %(PaketReferencesFileLinesInfo.PackageVersion) - All - runtime - $(ExcludeAssets);contentFiles - $(ExcludeAssets);build;buildMultitargeting;buildTransitive - true - true - - - - - $(PaketIntermediateOutputPath)/$(MSBuildProjectFile).paket.clitools - - - - - - - - - $([System.String]::Copy('%(PaketCliToolFileLines.Identity)').Split(',')[0]) - $([System.String]::Copy('%(PaketCliToolFileLines.Identity)').Split(',')[1]) - - - %(PaketCliToolFileLinesInfo.PackageVersion) - - - - + + + + + + + + + + + + + + + + $(PaketIntermediateOutputPath)\$(MSBuildProjectFile).paket.references.cached + + $(MSBuildProjectFullPath).paket.references + + $(MSBuildProjectDirectory)\$(MSBuildProjectName).paket.references + + $(MSBuildProjectDirectory)\paket.references + + false + true + true + references-file-or-cache-not-found + + + + + $([System.IO.File]::ReadAllText('$(PaketReferencesCachedFilePath)')) + $([System.IO.File]::ReadAllText('$(PaketOriginalReferencesFilePath)')) + references-file + false + + + + + false + + + + + true + target-framework '$(TargetFramework)' or '$(TargetFrameworks)' files @(PaketResolvedFilePaths) + + + + + + + + + + + false + true + + + + + + + + + + + $([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',').Length) + $([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[0]) + $([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[1]) + $([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[4]) + $([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[5]) + $([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[6]) + $([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[7]) + $([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[8]) + + + %(PaketReferencesFileLinesInfo.PackageVersion) + All + runtime + $(ExcludeAssets);contentFiles + $(ExcludeAssets);build;buildMultitargeting;buildTransitive + %(PaketReferencesFileLinesInfo.Aliases) + true + true + + + + + + $(PaketIntermediateOutputPath)/$(MSBuildProjectFile).paket.clitools + + + + + + + + + $([System.String]::Copy('%(PaketCliToolFileLines.Identity)').Split(',')[0]) + $([System.String]::Copy('%(PaketCliToolFileLines.Identity)').Split(',')[1]) + + + %(PaketCliToolFileLinesInfo.PackageVersion) + + + + - - - - - false - - - - - - <_NuspecFilesNewLocation Include="$(PaketIntermediateOutputPath)\$(Configuration)\*.nuspec"/> - - - - - - $(MSBuildProjectDirectory)/$(MSBuildProjectFile) - true - false - true - false - true - false - true - false - true - false - true - $(PaketIntermediateOutputPath)\$(Configuration) - $(PaketIntermediateOutputPath) - - - - <_NuspecFiles Include="$(AdjustedNuspecOutputPath)\*.$(PackageVersion.Split(`+`)[0]).nuspec"/> - - - - - - - - - + + + + + false + + + + + + <_NuspecFilesNewLocation Include="$(PaketIntermediateOutputPath)\$(Configuration)\*.nuspec"/> + + + + + + $(MSBuildProjectDirectory)/$(MSBuildProjectFile) + true + false + true + false + true + false + true + false + true + false + true + $(PaketIntermediateOutputPath)\$(Configuration) + $(PaketIntermediateOutputPath) + + + + <_NuspecFiles Include="$(AdjustedNuspecOutputPath)\*.$(PackageVersion.Split(`+`)[0]).nuspec"/> + + + + + + + + + - - - - - - - - - + + + + + + + + + diff --git a/Build.fs b/Build.fs index 7eac3dbe..b12e1c5c 100644 --- a/Build.fs +++ b/Build.fs @@ -5,7 +5,7 @@ open Fake.DotNet open Fake.IO open Fake.Tools -let execContext = Context.FakeExecutionContext.Create false "build.fsx" [ ] +let execContext = Context.FakeExecutionContext.Create false "build.fsx" [] Context.setExecutionContext (Context.RuntimeContext.Fake execContext) let skipTests = Environment.hasEnvironVar "yolo" @@ -19,54 +19,59 @@ let version = Environment.environVarOrDefault "VERSION" "" let nupkgDir = Path.getFullName "./nupkg" let nupkgPath = System.IO.Path.Combine(nupkgDir, $"SAFE.Template.%s{version}.nupkg") -let result = DotNet.exec (fun x -> { x with DotNetCliPath = "dotnet" }) "tool" "restore" +let result = + DotNet.exec (fun x -> { x with DotNetCliPath = "dotnet" }) "tool" "restore" -if not result.OK then failwithf "`dotnet %s %s` failed" "tool" "restore" +if not result.OK then + failwithf "`dotnet %s %s` failed" "tool" "restore" let formattedRN = release.Notes |> List.map (sprintf "* %s") |> String.concat "\n" -Target.create "Clean" (fun _ -> - Shell.cleanDirs [ nupkgDir ] -) +Target.create "Clean" (fun _ -> Shell.cleanDirs [ nupkgDir ]) -let msBuildParams msBuildParameter: MSBuild.CliArguments = { msBuildParameter with DisableInternalBinLog = true } +let msBuildParams msBuildParameter : MSBuild.CliArguments = + { msBuildParameter with DisableInternalBinLog = true } Target.create "Pack" (fun _ -> Shell.regexReplaceInFileWithEncoding " \"name\": .+," - (" \"name\": \"" + templateName + " v" + version + "\",") + (" \"name\": \"" + + templateName + + " v" + + version + + "\",") Text.Encoding.UTF8 templatePath + let releaseNotesUrl = Environment.environVarOrDefault "RELEASE_NOTES_URL" "" DotNet.pack (fun args -> { args with - Configuration = DotNet.BuildConfiguration.Release - OutputPath = Some nupkgDir - MSBuildParams = msBuildParams args.MSBuildParams - Common = - { args.Common with - CustomParams = - Some (sprintf "/p:PackageVersion=%s /p:PackageReleaseNotes=\"%s\"" - version - releaseNotesUrl) } - }) - templateProj -) + Configuration = DotNet.BuildConfiguration.Release + OutputPath = Some nupkgDir + MSBuildParams = msBuildParams args.MSBuildParams + Common = + { args.Common with + CustomParams = + Some(sprintf "/p:PackageVersion=%s /p:PackageReleaseNotes=\"%s\"" version releaseNotesUrl) } }) + templateProj) Target.create "Install" (fun _ -> let unInstallArgs = $"uninstall SAFE.Template" + DotNet.exec (fun x -> { x with DotNetCliPath = "dotnet" }) "new" unInstallArgs |> ignore // Allow this to fail as the template might not be installed let installArgs = $"install \"%s{nupkgPath}\"" + DotNet.exec (fun x -> { x with DotNetCliPath = "dotnet" }) "new" installArgs - |> fun result -> if not result.OK then failwith $"`dotnet new %s{installArgs}` failed with %O{result}" -) + |> fun result -> + if not result.OK then + failwith $"`dotnet new %s{installArgs}` failed with %O{result}") let psi exe arg dir (x: ProcStartInfo) : ProcStartInfo = { x with @@ -75,37 +80,66 @@ let psi exe arg dir (x: ProcStartInfo) : ProcStartInfo = WorkingDirectory = dir } let run exe arg dir = - let result = Process.execWithResult (psi exe arg dir) TimeSpan.MaxValue - if not result.OK then (failwithf "`%s %s` failed: %A" exe arg result.Errors) + let result = + CreateProcess.fromRawCommandLine exe arg + |> CreateProcess.withWorkingDirectory dir + |> CreateProcess.withTimeout System.TimeSpan.MaxValue + |> Proc.run + + if result.ExitCode <> 0 then + (failwithf "`%s %s` failed: %A" exe arg result.ExitCode) + Target.create "TemplateExecutionTests" (fun _ -> let cmd = "run" let args = "--project tests/Tests.fsproj" let result = DotNet.exec (fun x -> { x with DotNetCliPath = "dotnet" }) cmd args - if not result.OK then failwithf "`dotnet %s %s` failed" cmd args -) + + if not result.OK then + failwithf "`dotnet %s %s` failed" cmd args) Target.create "DefaultTemplateTests" (fun _ -> let cmd = "run" let args = "RunTestsHeadless --project Build.fsproj" - let result = DotNet.exec (fun x -> { x with DotNetCliPath = "dotnet"; WorkingDirectory = defaultTemplatePath}) cmd args - if not result.OK then failwithf "`dotnet %s %s` failed" cmd args -) + + let result = + DotNet.exec + (fun x -> + { x with + DotNetCliPath = "dotnet" + WorkingDirectory = defaultTemplatePath }) + cmd + args + + if not result.OK then + failwithf "`dotnet %s %s` failed" cmd args) Target.create "Release" (fun _ -> let nugetApiKey = Environment.environVarOrFail "NUGET_API_KEY" - let nugetArgs = $"""push "*.nupkg" --api-key {nugetApiKey} --source https://api.nuget.org/v3/index.json""" - let result = DotNet.exec (fun x -> { x with DotNetCliPath = "dotnet"; WorkingDirectory = nupkgDir }) "nuget" nugetArgs - if not result.OK then failwithf "`dotnet %s` failed" "nuget push") + + let nugetArgs = + $"""push "*.nupkg" --api-key {nugetApiKey} --source https://api.nuget.org/v3/index.json""" + + let result = + DotNet.exec + (fun x -> + { x with + DotNetCliPath = "dotnet" + WorkingDirectory = nupkgDir }) + "nuget" + nugetArgs + + if not result.OK then + failwithf "`dotnet %s` failed" "nuget push") open Fake.Core.TargetOperators "Clean" - =?> ("TemplateExecutionTests", not skipTests) - =?> ("DefaultTemplateTests", not skipTests) - ==> "Pack" - ==> "Install" - ==> "Release" +=?> ("TemplateExecutionTests", not skipTests) +=?> ("DefaultTemplateTests", not skipTests) +==> "Pack" +==> "Install" +==> "Release" |> ignore [] @@ -114,7 +148,9 @@ let main args = match args with | [| target |] -> Target.runOrDefault target | _ -> Target.runOrDefault "Install" + 0 - with e -> + with + | e -> printfn "%A" e 1 diff --git a/Build.fsproj b/Build.fsproj index 9c19ff44..b7ae51cf 100644 --- a/Build.fsproj +++ b/Build.fsproj @@ -1,18 +1,16 @@ - - + + Exe net8.0 - - - + + - - - + + \ No newline at end of file diff --git a/Content/default/Build.fsproj b/Content/default/Build.fsproj index fb57c7a7..bd26ebd9 100644 --- a/Content/default/Build.fsproj +++ b/Content/default/Build.fsproj @@ -11,8 +11,8 @@ - + \ No newline at end of file diff --git a/Content/default/paket.lock b/Content/default/paket.lock index 2a34d298..75b172d0 100644 --- a/Content/default/paket.lock +++ b/Content/default/paket.lock @@ -9,13 +9,13 @@ NUGET Fable.Browser.Blob (1.4) Fable.Core (>= 3.2.8) FSharp.Core (>= 4.7.2) - Fable.Browser.Dom (2.17) + Fable.Browser.Dom (2.18) Fable.Browser.Blob (>= 1.4) - Fable.Browser.Event (>= 1.6) + Fable.Browser.Event (>= 1.7) Fable.Browser.WebStorage (>= 1.3) Fable.Core (>= 3.2.8) FSharp.Core (>= 4.7.2) - Fable.Browser.Event (1.6) + Fable.Browser.Event (1.7) Fable.Browser.Gamepad (>= 1.3) Fable.Core (>= 3.2.8) FSharp.Core (>= 4.7.2) @@ -81,16 +81,16 @@ NUGET Fable.Core (>= 3.1.5) Fable.Parsimmon (>= 4.0) FSharp.Core (>= 4.7) - Fake.Core.CommandLineParsing (6.0) + Fake.Core.CommandLineParsing (6.1.3) FParsec (>= 1.1.1) - FSharp.Core (>= 6.0.3) - Fake.Core.Context (6.0) - FSharp.Core (>= 6.0.3) - Fake.Core.Environment (6.0) - FSharp.Core (>= 6.0.3) - Fake.Core.FakeVar (6.0) - Fake.Core.Context (>= 6.0) - FSharp.Core (>= 6.0.3) + FSharp.Core (>= 8.0.301) + Fake.Core.Context (6.1.3) + FSharp.Core (>= 8.0.301) + Fake.Core.Environment (6.1.3) + FSharp.Core (>= 8.0.301) + Fake.Core.FakeVar (6.1.3) + Fake.Core.Context (>= 6.1.3) + FSharp.Core (>= 8.0.301) Fake.Core.Process (5.23.1) Fake.Core.Environment (>= 5.23.1) Fake.Core.FakeVar (>= 5.23.1) @@ -99,8 +99,8 @@ NUGET Fake.IO.FileSystem (>= 5.23.1) FSharp.Core (>= 6.0) System.Collections.Immutable (>= 5.0) - Fake.Core.String (6.0) - FSharp.Core (>= 6.0.3) + Fake.Core.String (6.1.3) + FSharp.Core (>= 8.0.301) Fake.Core.Target (5.23.1) Fake.Core.CommandLineParsing (>= 5.23.1) Fake.Core.Context (>= 5.23.1) @@ -111,17 +111,17 @@ NUGET Fake.Core.Trace (>= 5.23.1) FSharp.Control.Reactive (>= 5.0.2) FSharp.Core (>= 6.0) - Fake.Core.Trace (6.0) - Fake.Core.Environment (>= 6.0) - Fake.Core.FakeVar (>= 6.0) - FSharp.Core (>= 6.0.3) + Fake.Core.Trace (6.1.3) + Fake.Core.Environment (>= 6.1.3) + Fake.Core.FakeVar (>= 6.1.3) + FSharp.Core (>= 8.0.301) Fake.IO.FileSystem (5.23.1) Fake.Core.String (>= 5.23.1) FSharp.Core (>= 6.0) - Farmer (1.8.13) + Farmer (1.9.2) FSharp.Core (>= 5.0) System.Text.Json (>= 5.0) - Feliz (2.8) + Feliz (2.9) Fable.ReactDom.Types (>= 18.2) Feliz.CompilerPlugins (>= 2.2) FSharp.Core (>= 4.7.2) @@ -137,30 +137,36 @@ NUGET FSharp.Core (>= 6.0) Microsoft.IO.RecyclableMemoryStream (>= 3.0) FSharp.Core (8.0.401) - Giraffe (6.4) + FSharp.SystemTextJson (1.3.13) + FSharp.Core (>= 4.7) + System.Text.Json (>= 6.0) + Giraffe (7.0.2) FSharp.Core (>= 6.0) + FSharp.SystemTextJson (>= 1.3.13) Giraffe.ViewEngine (>= 1.4) - Microsoft.IO.RecyclableMemoryStream (>= 3.0) - Newtonsoft.Json (>= 13.0.3) - System.Text.Json (>= 8.0.3) + Microsoft.IO.RecyclableMemoryStream (>= 3.0.1) + System.Text.Json (>= 8.0.5) Giraffe.ViewEngine (1.4) FSharp.Core (>= 5.0) - Microsoft.AspNetCore.Authentication.JwtBearer (8.0.6) + Microsoft.AspNetCore.Authentication.JwtBearer (8.0.10) Microsoft.IdentityModel.Protocols.OpenIdConnect (>= 7.1.2) - Microsoft.IdentityModel.Abstractions (7.6.2) - Microsoft.IdentityModel.JsonWebTokens (7.6.2) - Microsoft.IdentityModel.Tokens (>= 7.6.2) - Microsoft.IdentityModel.Logging (7.6.2) - Microsoft.IdentityModel.Abstractions (>= 7.6.2) - Microsoft.IdentityModel.Protocols (7.6.2) - Microsoft.IdentityModel.Tokens (>= 7.6.2) - Microsoft.IdentityModel.Protocols.OpenIdConnect (7.6.2) - Microsoft.IdentityModel.Protocols (>= 7.6.2) - System.IdentityModel.Tokens.Jwt (>= 7.6.2) - Microsoft.IdentityModel.Tokens (7.6.2) - Microsoft.IdentityModel.Logging (>= 7.6.2) + Microsoft.Bcl.TimeProvider (8.0.1) + Microsoft.IdentityModel.Abstractions (8.1.2) + Microsoft.IdentityModel.JsonWebTokens (8.1.2) + Microsoft.Bcl.TimeProvider (>= 8.0.1) + Microsoft.IdentityModel.Tokens (>= 8.1.2) + Microsoft.IdentityModel.Logging (8.1.2) + Microsoft.IdentityModel.Abstractions (>= 8.1.2) + Microsoft.IdentityModel.Protocols (8.1.2) + Microsoft.IdentityModel.Tokens (>= 8.1.2) + Microsoft.IdentityModel.Protocols.OpenIdConnect (8.1.2) + Microsoft.IdentityModel.Protocols (>= 8.1.2) + System.IdentityModel.Tokens.Jwt (>= 8.1.2) + Microsoft.IdentityModel.Tokens (8.1.2) + Microsoft.Bcl.TimeProvider (>= 8.0.1) + Microsoft.IdentityModel.Logging (>= 8.1.2) Microsoft.IO.RecyclableMemoryStream (3.0.1) - Mono.Cecil (0.11.5) + Mono.Cecil (0.11.6) Newtonsoft.Json (13.0.3) SAFE.Client (5.1) Fable.Core (>= 4.3 < 5.0) @@ -181,10 +187,8 @@ NUGET Giraffe (>= 6.4) Microsoft.AspNetCore.Authentication.JwtBearer (>= 6.0.3) System.Collections.Immutable (8.0) - System.IdentityModel.Tokens.Jwt (7.6.2) - Microsoft.IdentityModel.JsonWebTokens (>= 7.6.2) - Microsoft.IdentityModel.Tokens (>= 7.6.2) + System.IdentityModel.Tokens.Jwt (8.1.2) + Microsoft.IdentityModel.JsonWebTokens (>= 8.1.2) + Microsoft.IdentityModel.Tokens (>= 8.1.2) System.Reactive (5.0) - System.Text.Encodings.Web (8.0) - System.Text.Json (8.0.3) - System.Text.Encodings.Web (>= 8.0) + System.Text.Json (8.0.5) diff --git a/paket.lock b/paket.lock index 2da3f72b..0726d5a6 100644 --- a/paket.lock +++ b/paket.lock @@ -5,115 +5,116 @@ NUGET BlackFox.VsWhere (1.1) FSharp.Core (>= 4.2.3) Microsoft.Win32.Registry (>= 4.7) - Expecto (9.0.4) - FSharp.Core (>= 4.6) - Mono.Cecil (>= 0.11.3) - Expecto.FsCheck (9.0.4) - Expecto (>= 9.0.4) - FsCheck (>= 2.14.3) + Expecto (10.2.1) + FSharp.Core (>= 7.0.200) + Mono.Cecil (>= 0.11.4 < 1.0) + Expecto.FsCheck (10.2.1) + Expecto (>= 10.2.1) + FsCheck (>= 2.16.5 < 3.0) Expecto.TestResults (8.13.2) Expecto (>= 8.13.2) FSharp.Core (>= 4.6) - Fake.Core.CommandLineParsing (5.23.1) + Fake.Core.CommandLineParsing (6.1.3) FParsec (>= 1.1.1) - FSharp.Core (>= 6.0) - Fake.Core.Context (5.23.1) - FSharp.Core (>= 6.0) - Fake.Core.Environment (5.23.1) - FSharp.Core (>= 6.0) - Fake.Core.FakeVar (5.23.1) - Fake.Core.Context (>= 5.23.1) - FSharp.Core (>= 6.0) - Fake.Core.Process (5.23.1) - Fake.Core.Environment (>= 5.23.1) - Fake.Core.FakeVar (>= 5.23.1) - Fake.Core.String (>= 5.23.1) - Fake.Core.Trace (>= 5.23.1) - Fake.IO.FileSystem (>= 5.23.1) - FSharp.Core (>= 6.0) - System.Collections.Immutable (>= 5.0) - Fake.Core.ReleaseNotes (5.23.1) - Fake.Core.SemVer (>= 5.23.1) - Fake.Core.String (>= 5.23.1) - FSharp.Core (>= 6.0) - Fake.Core.SemVer (5.23.1) - FSharp.Core (>= 6.0) - Fake.Core.String (5.23.1) - FSharp.Core (>= 6.0) - Fake.Core.Target (5.23.1) - Fake.Core.CommandLineParsing (>= 5.23.1) - Fake.Core.Context (>= 5.23.1) - Fake.Core.Environment (>= 5.23.1) - Fake.Core.FakeVar (>= 5.23.1) - Fake.Core.Process (>= 5.23.1) - Fake.Core.String (>= 5.23.1) - Fake.Core.Trace (>= 5.23.1) + FSharp.Core (>= 8.0.301) + Fake.Core.Context (6.1.3) + FSharp.Core (>= 8.0.301) + Fake.Core.Environment (6.1.3) + FSharp.Core (>= 8.0.301) + Fake.Core.FakeVar (6.1.3) + Fake.Core.Context (>= 6.1.3) + FSharp.Core (>= 8.0.301) + Fake.Core.Process (6.1.3) + Fake.Core.Environment (>= 6.1.3) + Fake.Core.FakeVar (>= 6.1.3) + Fake.Core.String (>= 6.1.3) + Fake.Core.Trace (>= 6.1.3) + Fake.IO.FileSystem (>= 6.1.3) + FSharp.Core (>= 8.0.301) + System.Collections.Immutable (>= 8.0) + Fake.Core.ReleaseNotes (6.1.3) + Fake.Core.SemVer (>= 6.1.3) + Fake.Core.String (>= 6.1.3) + FSharp.Core (>= 8.0.301) + Fake.Core.SemVer (6.1.3) + FSharp.Core (>= 8.0.301) + Fake.Core.String (6.1.3) + FSharp.Core (>= 8.0.301) + Fake.Core.Target (6.1.3) + Fake.Core.CommandLineParsing (>= 6.1.3) + Fake.Core.Context (>= 6.1.3) + Fake.Core.Environment (>= 6.1.3) + Fake.Core.FakeVar (>= 6.1.3) + Fake.Core.Process (>= 6.1.3) + Fake.Core.String (>= 6.1.3) + Fake.Core.Trace (>= 6.1.3) FSharp.Control.Reactive (>= 5.0.2) - FSharp.Core (>= 6.0) - Fake.Core.Tasks (5.23.1) - Fake.Core.Trace (>= 5.23.1) - FSharp.Core (>= 6.0) - Fake.Core.Trace (5.23.1) - Fake.Core.Environment (>= 5.23.1) - Fake.Core.FakeVar (>= 5.23.1) - FSharp.Core (>= 6.0) - Fake.Core.Xml (5.23.1) - Fake.Core.String (>= 5.23.1) - FSharp.Core (>= 6.0) - Fake.DotNet.Cli (5.23.1) - Fake.Core.Environment (>= 5.23.1) - Fake.Core.Process (>= 5.23.1) - Fake.Core.String (>= 5.23.1) - Fake.Core.Trace (>= 5.23.1) - Fake.DotNet.MSBuild (>= 5.23.1) - Fake.DotNet.NuGet (>= 5.23.1) - Fake.IO.FileSystem (>= 5.23.1) - FSharp.Core (>= 6.0) + FSharp.Core (>= 8.0.301) + Fake.Core.Tasks (6.1.3) + Fake.Core.Trace (>= 6.1.3) + FSharp.Core (>= 8.0.301) + Fake.Core.Trace (6.1.3) + Fake.Core.Environment (>= 6.1.3) + Fake.Core.FakeVar (>= 6.1.3) + FSharp.Core (>= 8.0.301) + Fake.Core.Xml (6.1.3) + Fake.Core.String (>= 6.1.3) + FSharp.Core (>= 8.0.301) + Fake.DotNet.Cli (6.1.3) + Fake.Core.Environment (>= 6.1.3) + Fake.Core.Process (>= 6.1.3) + Fake.Core.String (>= 6.1.3) + Fake.Core.Trace (>= 6.1.3) + Fake.DotNet.MSBuild (>= 6.1.3) + Fake.DotNet.NuGet (>= 6.1.3) + Fake.IO.FileSystem (>= 6.1.3) + FSharp.Core (>= 8.0.301) Mono.Posix.NETStandard (>= 1.0) - Newtonsoft.Json (>= 13.0.1) - Fake.DotNet.MSBuild (5.23.1) + Newtonsoft.Json (>= 13.0.3) + Fake.DotNet.MSBuild (6.1.3) BlackFox.VsWhere (>= 1.1) - Fake.Core.Environment (>= 5.23.1) - Fake.Core.Process (>= 5.23.1) - Fake.Core.String (>= 5.23.1) - Fake.Core.Trace (>= 5.23.1) - Fake.IO.FileSystem (>= 5.23.1) - FSharp.Core (>= 6.0) - MSBuild.StructuredLogger (>= 2.1.545) - Fake.DotNet.NuGet (5.23.1) - Fake.Core.Environment (>= 5.23.1) - Fake.Core.Process (>= 5.23.1) - Fake.Core.SemVer (>= 5.23.1) - Fake.Core.String (>= 5.23.1) - Fake.Core.Tasks (>= 5.23.1) - Fake.Core.Trace (>= 5.23.1) - Fake.Core.Xml (>= 5.23.1) - Fake.IO.FileSystem (>= 5.23.1) - Fake.Net.Http (>= 5.23.1) - FSharp.Core (>= 6.0) - Newtonsoft.Json (>= 13.0.1) - NuGet.Protocol (>= 5.11) - Fake.DotNet.Paket (5.23.1) - Fake.Core.Process (>= 5.23.1) - Fake.Core.String (>= 5.23.1) - Fake.Core.Trace (>= 5.23.1) - Fake.DotNet.Cli (>= 5.23.1) - Fake.IO.FileSystem (>= 5.23.1) - FSharp.Core (>= 6.0) - Fake.IO.FileSystem (5.23.1) - Fake.Core.String (>= 5.23.1) - FSharp.Core (>= 6.0) - Fake.Net.Http (5.23.1) - Fake.Core.Trace (>= 5.23.1) - FSharp.Core (>= 6.0) - Fake.Tools.Git (5.23.1) - Fake.Core.Environment (>= 5.23.1) - Fake.Core.Process (>= 5.23.1) - Fake.Core.SemVer (>= 5.23.1) - Fake.Core.String (>= 5.23.1) - Fake.Core.Trace (>= 5.23.1) - Fake.IO.FileSystem (>= 5.23.1) - FSharp.Core (>= 6.0) + Fake.Core.Environment (>= 6.1.3) + Fake.Core.Process (>= 6.1.3) + Fake.Core.String (>= 6.1.3) + Fake.Core.Trace (>= 6.1.3) + Fake.IO.FileSystem (>= 6.1.3) + FSharp.Core (>= 8.0.301) + MSBuild.StructuredLogger (>= 2.1.815) + Fake.DotNet.NuGet (6.1.3) + Fake.Core.Environment (>= 6.1.3) + Fake.Core.Process (>= 6.1.3) + Fake.Core.SemVer (>= 6.1.3) + Fake.Core.String (>= 6.1.3) + Fake.Core.Tasks (>= 6.1.3) + Fake.Core.Trace (>= 6.1.3) + Fake.Core.Xml (>= 6.1.3) + Fake.IO.FileSystem (>= 6.1.3) + Fake.Net.Http (>= 6.1.3) + FSharp.Core (>= 8.0.301) + Newtonsoft.Json (>= 13.0.3) + NuGet.Protocol (>= 6.10.1) + Fake.DotNet.Paket (6.1.3) + Fake.Core.Process (>= 6.1.3) + Fake.Core.String (>= 6.1.3) + Fake.Core.Trace (>= 6.1.3) + Fake.DotNet.Cli (>= 6.1.3) + Fake.IO.FileSystem (>= 6.1.3) + FSharp.Core (>= 8.0.301) + Fake.IO.FileSystem (6.1.3) + Fake.Core.String (>= 6.1.3) + Fake.Core.Trace (>= 6.1.3) + FSharp.Core (>= 8.0.301) + Fake.Net.Http (6.1.3) + Fake.Core.Trace (>= 6.1.3) + FSharp.Core (>= 8.0.301) + Fake.Tools.Git (6.1.3) + Fake.Core.Environment (>= 6.1.3) + Fake.Core.Process (>= 6.1.3) + Fake.Core.SemVer (>= 6.1.3) + Fake.Core.String (>= 6.1.3) + Fake.Core.Trace (>= 6.1.3) + Fake.IO.FileSystem (>= 6.1.3) + FSharp.Core (>= 8.0.301) FParsec (1.1.1) FSharp.Core (>= 4.3.4) FsCheck (2.16.6) @@ -121,70 +122,43 @@ NUGET FSharp.Control.Reactive (5.0.5) FSharp.Core (>= 4.7.2) System.Reactive (>= 5.0 < 6.0) - FSharp.Core (6.0.7) - Microsoft.Build (17.2.2) - Microsoft.Build.Framework (>= 17.2.2) - Microsoft.NET.StringTools (>= 1.0) - Microsoft.Win32.Registry (>= 4.3) - System.Collections.Immutable (>= 5.0) - System.Configuration.ConfigurationManager (>= 4.7) - System.Reflection.Metadata (>= 1.6) - System.Security.Principal.Windows (>= 4.7) - System.Text.Encoding.CodePages (>= 4.0.1) - System.Text.Json (>= 6.0) - System.Threading.Tasks.Dataflow (>= 6.0) - Microsoft.Build.Framework (17.8.3) - Microsoft.Build.Tasks.Core (17.2.2) - Microsoft.Build.Framework (>= 17.2.2) - Microsoft.Build.Utilities.Core (>= 17.2.2) - Microsoft.NET.StringTools (>= 1.0) - Microsoft.Win32.Registry (>= 4.3) - System.CodeDom (>= 4.4) - System.Collections.Immutable (>= 5.0) - System.Reflection.Metadata (>= 1.6) - System.Resources.Extensions (>= 4.6) - System.Security.Cryptography.Pkcs (>= 4.7) - System.Security.Cryptography.Xml (>= 4.7) - System.Security.Permissions (>= 4.7) - System.Threading.Tasks.Dataflow (>= 6.0) - Microsoft.Build.Utilities.Core (17.2.2) - Microsoft.Build.Framework (>= 17.2.2) - Microsoft.NET.StringTools (>= 1.0) - Microsoft.Win32.Registry (>= 4.3) - System.Collections.Immutable (>= 5.0) - System.Configuration.ConfigurationManager (>= 4.7) - Microsoft.NET.StringTools (1.0) - System.Memory (>= 4.5.4) - System.Runtime.CompilerServices.Unsafe (>= 5.0) - Microsoft.NETCore.Platforms (6.0.11) + FSharp.Core (8.0.401) + Microsoft.Build.Framework (17.11.4) + Microsoft.Build.Utilities.Core (17.11.4) + Microsoft.Build.Framework (>= 17.11.4) + Microsoft.NET.StringTools (>= 17.11.4) + System.Collections.Immutable (>= 8.0) + System.Configuration.ConfigurationManager (>= 8.0) + Microsoft.NET.StringTools (17.11.4) + Microsoft.NETCore.Platforms (7.0.4) Microsoft.NETCore.Targets (5.0) Microsoft.Win32.Registry (5.0) System.Security.AccessControl (>= 5.0) System.Security.Principal.Windows (>= 5.0) - Microsoft.Win32.SystemEvents (6.0.1) - Mono.Cecil (0.11.5) + Mono.Cecil (0.11.6) Mono.Posix.NETStandard (1.0) - MSBuild.StructuredLogger (2.1.815) - Microsoft.Build.Framework (>= 16.10) - Microsoft.Build.Utilities.Core (>= 16.10) + MSBuild.StructuredLogger (2.2.374) + Microsoft.Build.Framework (>= 17.5) + Microsoft.Build.Utilities.Core (>= 17.5) + System.Collections.Immutable (>= 8.0) Newtonsoft.Json (13.0.3) - NuGet.Common (6.7) - NuGet.Frameworks (>= 6.7) - NuGet.Configuration (6.7) - NuGet.Common (>= 6.7) + NuGet.Common (6.11.1) + NuGet.Frameworks (>= 6.11.1) + NuGet.Configuration (6.11.1) + NuGet.Common (>= 6.11.1) System.Security.Cryptography.ProtectedData (>= 4.4) - NuGet.Frameworks (6.7) - NuGet.Packaging (6.7) - Newtonsoft.Json (>= 13.0.1) - NuGet.Configuration (>= 6.7) - NuGet.Versioning (>= 6.7) + NuGet.Frameworks (6.11.1) + NuGet.Packaging (6.11.1) + Newtonsoft.Json (>= 13.0.3) + NuGet.Configuration (>= 6.11.1) + NuGet.Versioning (>= 6.11.1) System.Security.Cryptography.Pkcs (>= 6.0.4) - NuGet.Protocol (6.7) - NuGet.Packaging (>= 6.7) - NuGet.Versioning (6.7) - Polly (8.2) - Polly.Core (>= 8.2) - Polly.Core (8.2) + NuGet.Protocol (6.11.1) + NuGet.Packaging (>= 6.11.1) + NuGet.Versioning (6.11.1) + Polly (8.4.2) + Polly.Core (>= 8.4.2) + Polly.Core (8.4.2) runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) runtime.debian.9-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) @@ -225,7 +199,6 @@ NUGET runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) runtime.ubuntu.18.04-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) - System.CodeDom (6.0) System.Collections (4.3) Microsoft.NETCore.Platforms (>= 1.1) Microsoft.NETCore.Targets (>= 1.1) @@ -241,24 +214,21 @@ NUGET System.Runtime.Extensions (>= 4.3) System.Threading (>= 4.3) System.Threading.Tasks (>= 4.3) - System.Collections.Immutable (6.0) - System.Runtime.CompilerServices.Unsafe (>= 6.0) - System.Configuration.ConfigurationManager (6.0.1) - System.Security.Cryptography.ProtectedData (>= 6.0) - System.Security.Permissions (>= 6.0) + System.Collections.Immutable (8.0) + System.Configuration.ConfigurationManager (8.0.1) + System.Diagnostics.EventLog (>= 8.0.1) + System.Security.Cryptography.ProtectedData (>= 8.0) System.Diagnostics.Debug (4.3) Microsoft.NETCore.Platforms (>= 1.1) Microsoft.NETCore.Targets (>= 1.1) System.Runtime (>= 4.3) - System.Diagnostics.DiagnosticSource (6.0.1) - System.Runtime.CompilerServices.Unsafe (>= 6.0) + System.Diagnostics.DiagnosticSource (8.0.1) + System.Diagnostics.EventLog (8.0.1) System.Diagnostics.Tracing (4.3) Microsoft.NETCore.Platforms (>= 1.1) Microsoft.NETCore.Targets (>= 1.1) System.Runtime (>= 4.3) - System.Drawing.Common (6.0) - Microsoft.Win32.SystemEvents (>= 6.0) - System.Formats.Asn1 (6.0) + System.Formats.Asn1 (8.0.1) System.Globalization (4.3) Microsoft.NETCore.Platforms (>= 1.1) Microsoft.NETCore.Targets (>= 1.1) @@ -298,7 +268,6 @@ NUGET System.Resources.ResourceManager (>= 4.3) System.Runtime (>= 4.3) System.Runtime.Extensions (>= 4.3) - System.Memory (4.5.5) System.Net.Http (4.3.4) Microsoft.NETCore.Platforms (>= 1.1.1) runtime.native.System (>= 4.3) @@ -338,13 +307,10 @@ NUGET System.IO (>= 4.3) System.Reflection.Primitives (>= 4.3) System.Runtime (>= 4.3) - System.Reflection.Metadata (6.0.1) - System.Collections.Immutable (>= 6.0) System.Reflection.Primitives (4.3) Microsoft.NETCore.Platforms (>= 1.1) Microsoft.NETCore.Targets (>= 1.1) System.Runtime (>= 4.3) - System.Resources.Extensions (6.0) System.Resources.ResourceManager (4.3) Microsoft.NETCore.Platforms (>= 1.1) Microsoft.NETCore.Targets (>= 1.1) @@ -354,7 +320,6 @@ NUGET System.Runtime (4.3.1) Microsoft.NETCore.Platforms (>= 1.1.1) Microsoft.NETCore.Targets (>= 1.1.3) - System.Runtime.CompilerServices.Unsafe (6.0) System.Runtime.Extensions (4.3.1) Microsoft.NETCore.Platforms (>= 1.1.1) Microsoft.NETCore.Targets (>= 1.1.3) @@ -375,7 +340,7 @@ NUGET System.Resources.ResourceManager (>= 4.3) System.Runtime (>= 4.3) System.Runtime.Extensions (>= 4.3) - System.Security.AccessControl (6.0) + System.Security.AccessControl (6.0.1) System.Security.Cryptography.Algorithms (4.3.1) Microsoft.NETCore.Platforms (>= 1.1) runtime.native.System.Security.Cryptography.Apple (>= 4.3.1) @@ -422,8 +387,7 @@ NUGET System.Text.Encoding (>= 4.3) System.Security.Cryptography.OpenSsl (5.0) System.Formats.Asn1 (>= 5.0) - System.Security.Cryptography.Pkcs (6.0.4) - System.Formats.Asn1 (>= 6.0) + System.Security.Cryptography.Pkcs (8.0.1) System.Security.Cryptography.Primitives (4.3) System.Diagnostics.Debug (>= 4.3) System.Globalization (>= 4.3) @@ -432,7 +396,7 @@ NUGET System.Runtime (>= 4.3) System.Threading (>= 4.3) System.Threading.Tasks (>= 4.3) - System.Security.Cryptography.ProtectedData (6.0) + System.Security.Cryptography.ProtectedData (8.0) System.Security.Cryptography.X509Certificates (4.3.2) Microsoft.NETCore.Platforms (>= 1.1) runtime.native.System (>= 4.3) @@ -459,24 +423,11 @@ NUGET System.Security.Cryptography.Primitives (>= 4.3) System.Text.Encoding (>= 4.3) System.Threading (>= 4.3) - System.Security.Cryptography.Xml (6.0.1) - System.Security.AccessControl (>= 6.0) - System.Security.Cryptography.Pkcs (>= 6.0.1) - System.Security.Permissions (6.0) - System.Security.AccessControl (>= 6.0) - System.Windows.Extensions (>= 6.0) System.Security.Principal.Windows (5.0) System.Text.Encoding (4.3) Microsoft.NETCore.Platforms (>= 1.1) Microsoft.NETCore.Targets (>= 1.1) System.Runtime (>= 4.3) - System.Text.Encoding.CodePages (6.0) - System.Runtime.CompilerServices.Unsafe (>= 6.0) - System.Text.Encodings.Web (6.0) - System.Runtime.CompilerServices.Unsafe (>= 6.0) - System.Text.Json (6.0.9) - System.Runtime.CompilerServices.Unsafe (>= 6.0) - System.Text.Encodings.Web (>= 6.0) System.Threading (4.3) System.Runtime (>= 4.3) System.Threading.Tasks (>= 4.3) @@ -484,9 +435,6 @@ NUGET Microsoft.NETCore.Platforms (>= 1.1) Microsoft.NETCore.Targets (>= 1.1) System.Runtime (>= 4.3) - System.Threading.Tasks.Dataflow (6.0) - System.Windows.Extensions (6.0) - System.Drawing.Common (>= 6.0) GITHUB remote: fable-compiler/webpack-config-template webpack.config.js (7c7653b8ab09546481a74b48a55192a9803fbaa1) \ No newline at end of file