From b55f6cd61756e61fc19c4ee47cea6a8d84282c0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Denuzi=C3=A8re?= Date: Sat, 16 Dec 2023 09:50:58 +0100 Subject: [PATCH 1/4] fix: Re-enable ProduceReferenceAssembly --- src/Bolero.Build/Bolero.Build.targets | 1 - src/Bolero.Html/Bolero.Html.fsproj | 1 + src/Bolero/Bolero.fsproj | 2 +- src/Bolero/paket.template | 4 ++++ 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Bolero.Build/Bolero.Build.targets b/src/Bolero.Build/Bolero.Build.targets index 8a1f262e..2c109ee6 100644 --- a/src/Bolero.Build/Bolero.Build.targets +++ b/src/Bolero.Build/Bolero.Build.targets @@ -2,7 +2,6 @@ $(MSBuildThisFileDirectory)..\tools\Bolero.Build.dll - false <_BoleroScopedCssSourceFile>$(BaseIntermediateOutputPath)CssScopes.fs diff --git a/src/Bolero.Html/Bolero.Html.fsproj b/src/Bolero.Html/Bolero.Html.fsproj index 1ee34a73..580d53ff 100644 --- a/src/Bolero.Html/Bolero.Html.fsproj +++ b/src/Bolero.Html/Bolero.Html.fsproj @@ -6,6 +6,7 @@ Library Bolero true + true diff --git a/src/Bolero/Bolero.fsproj b/src/Bolero/Bolero.fsproj index 6bbcd024..306ca77b 100644 --- a/src/Bolero/Bolero.fsproj +++ b/src/Bolero/Bolero.fsproj @@ -3,7 +3,7 @@ net6.0;net8.0 true - false + true Library true diff --git a/src/Bolero/paket.template b/src/Bolero/paket.template index 0a836f1b..7070430c 100644 --- a/src/Bolero/paket.template +++ b/src/Bolero/paket.template @@ -16,6 +16,10 @@ files ../Bolero.Html/bin/Release/net6.0/Bolero.Html.xml ==> lib/net6.0 ../Bolero.Html/bin/Release/net8.0/Bolero.Html.dll ==> lib/net8.0 ../Bolero.Html/bin/Release/net8.0/Bolero.Html.xml ==> lib/net8.0 + obj/Release/net6.0/ref/Bolero.dll ==> ref/net6.0 + ../Bolero.Html/obj/Release/net6.0/ref/Bolero.Html.dll ==> ref/net6.0 + obj/Release/net8.0/ref/Bolero.dll ==> ref/net8.0 + ../Bolero.Html/obj/Release/net8.0/ref/Bolero.Html.dll ==> ref/net8.0 Bolero.targets ==> build roots.xml ==> build excludeddependencies From 047fda183be79f26f8fa1303bc0566b3e5cbf4ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Denuzi=C3=A8re?= Date: Sat, 16 Dec 2023 09:51:13 +0100 Subject: [PATCH 2/4] fix: don't include Bolero.Html.dll in the Server package --- src/Bolero.Server/paket.template | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Bolero.Server/paket.template b/src/Bolero.Server/paket.template index 1bba8e71..483ff4cf 100644 --- a/src/Bolero.Server/paket.template +++ b/src/Bolero.Server/paket.template @@ -7,7 +7,6 @@ description Server-side component of Bolero: a set of tools and libraries to run F# applications in WebAssembly using Blazor authors Loic Denuziere -include-referenced-projects true interproject-references fix excludeddependencies nerdbank.gitversioning From 14fff19ff6f41ca0001adbd4458635bac20a7cba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Denuzi=C3=A8re?= Date: Sat, 16 Dec 2023 10:25:24 +0100 Subject: [PATCH 3/4] fix: Output the templating TPDTC into the obj folder --- .../Bolero.Templating.Provider.fsproj | 2 +- src/Bolero/paket.template | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Bolero.Templating.Provider/Bolero.Templating.Provider.fsproj b/src/Bolero.Templating.Provider/Bolero.Templating.Provider.fsproj index cb94837a..2816ad90 100644 --- a/src/Bolero.Templating.Provider/Bolero.Templating.Provider.fsproj +++ b/src/Bolero.Templating.Provider/Bolero.Templating.Provider.fsproj @@ -3,7 +3,7 @@ netstandard2.0 Library - ..\Bolero\bin\$(Configuration)\typeproviders\fsharp41\netstandard2.0 + ..\Bolero\obj\$(Configuration)\typeproviders\fsharp41\netstandard2.0 true IS_DESIGNTIME false diff --git a/src/Bolero/paket.template b/src/Bolero/paket.template index 7070430c..d59e2fda 100644 --- a/src/Bolero/paket.template +++ b/src/Bolero/paket.template @@ -8,10 +8,10 @@ description authors Loic Denuziere files - bin/Release/typeproviders/fsharp41/netstandard2.0/Bolero.Templating.Provider.dll ==> typeproviders/fsharp41/netstandard2.0 - bin/Release/typeproviders/fsharp41/netstandard2.0/HtmlAgilityPack.dll ==> typeproviders/fsharp41/netstandard2.0 - bin/Release/typeproviders/fsharp41/netstandard2.0/Microsoft.AspNetCore.Components.dll ==> typeproviders/fsharp41/netstandard2.0 - bin/Release/typeproviders/fsharp41/netstandard2.0/Microsoft.AspNetCore.Components.Web.dll ==> typeproviders/fsharp41/netstandard2.0 + obj/Release/typeproviders/fsharp41/netstandard2.0/Bolero.Templating.Provider.dll ==> typeproviders/fsharp41/netstandard2.0 + obj/Release/typeproviders/fsharp41/netstandard2.0/HtmlAgilityPack.dll ==> typeproviders/fsharp41/netstandard2.0 + obj/Release/typeproviders/fsharp41/netstandard2.0/Microsoft.AspNetCore.Components.dll ==> typeproviders/fsharp41/netstandard2.0 + obj/Release/typeproviders/fsharp41/netstandard2.0/Microsoft.AspNetCore.Components.Web.dll ==> typeproviders/fsharp41/netstandard2.0 ../Bolero.Html/bin/Release/net6.0/Bolero.Html.dll ==> lib/net6.0 ../Bolero.Html/bin/Release/net6.0/Bolero.Html.xml ==> lib/net6.0 ../Bolero.Html/bin/Release/net8.0/Bolero.Html.dll ==> lib/net8.0 From 45ca059e74390a23eb72f4fe18124932c30651b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Denuzi=C3=A8re?= Date: Sat, 16 Dec 2023 11:00:59 +0100 Subject: [PATCH 4/4] fix: Add reference assemblies for Bolero.Server --- src/Bolero.Server/Bolero.Server.fsproj | 1 + src/Bolero.Server/paket.template | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/src/Bolero.Server/Bolero.Server.fsproj b/src/Bolero.Server/Bolero.Server.fsproj index 79c8a85e..234f9f92 100644 --- a/src/Bolero.Server/Bolero.Server.fsproj +++ b/src/Bolero.Server/Bolero.Server.fsproj @@ -3,6 +3,7 @@ net6.0;net7.0;net8.0 true + true Library diff --git a/src/Bolero.Server/paket.template b/src/Bolero.Server/paket.template index 483ff4cf..038d2c1d 100644 --- a/src/Bolero.Server/paket.template +++ b/src/Bolero.Server/paket.template @@ -11,6 +11,10 @@ interproject-references fix excludeddependencies nerdbank.gitversioning include-pdbs true +files + obj\Release\net6.0\ref\Bolero.Server.dll ==> ref/net6.0 + obj\Release\net7.0\ref\Bolero.Server.dll ==> ref/net7.0 + obj\Release\net8.0\ref\Bolero.Server.dll ==> ref/net8.0 dependencies framework: net6.0 framework: net7.0