Merge pull request #346 from fsbolero/enable-refasm

Re-enable ProduceReferenceAssembly
fsbolero · Dec 16, 2023 · 0ad0b1f · 0ad0b1f
2 parents faf7b05 + 45ca059
commit 0ad0b1f
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 8 deletions.
diff --git a/src/Bolero.Build/Bolero.Build.targets b/src/Bolero.Build/Bolero.Build.targets
@@ -2,7 +2,6 @@
 <Project>
   <PropertyGroup Condition="'$(BoleroTaskAssemblyPath)' == ''">
     <BoleroTaskAssemblyPath>$(MSBuildThisFileDirectory)..\tools\Bolero.Build.dll</BoleroTaskAssemblyPath>
-    <ProduceReferenceAssembly>false</ProduceReferenceAssembly><!-- See https://github.com/fsbolero/Bolero/issues/279 -->
   </PropertyGroup>
   <PropertyGroup>
     <_BoleroScopedCssSourceFile>$(BaseIntermediateOutputPath)CssScopes.fs</_BoleroScopedCssSourceFile>

diff --git a/src/Bolero.Html/Bolero.Html.fsproj b/src/Bolero.Html/Bolero.Html.fsproj
@@ -6,6 +6,7 @@
     <OutputType>Library</OutputType>
     <RootNamespace>Bolero</RootNamespace>
     <IsTrimmable>true</IsTrimmable>
+    <ProduceReferenceAssembly>true</ProduceReferenceAssembly>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="..\Trimmable.fs" Link="Trimmable.fs" />

diff --git a/src/Bolero.Server/Bolero.Server.fsproj b/src/Bolero.Server/Bolero.Server.fsproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <ProduceReferenceAssembly>true</ProduceReferenceAssembly>
     <OutputType>Library</OutputType>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/Bolero.Server/paket.template b/src/Bolero.Server/paket.template
@@ -7,11 +7,14 @@ 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
 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

diff --git a/src/Bolero.Templating.Provider/Bolero.Templating.Provider.fsproj b/src/Bolero.Templating.Provider/Bolero.Templating.Provider.fsproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <OutputType>Library</OutputType>
-    <OutputPath>..\Bolero\bin\$(Configuration)\typeproviders\fsharp41\netstandard2.0</OutputPath>
+    <OutputPath>..\Bolero\obj\$(Configuration)\typeproviders\fsharp41\netstandard2.0</OutputPath>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <DefineConstants>IS_DESIGNTIME</DefineConstants>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>

diff --git a/src/Bolero/Bolero.fsproj b/src/Bolero/Bolero.fsproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <ProduceReferenceAssembly>false</ProduceReferenceAssembly>
+    <ProduceReferenceAssembly>true</ProduceReferenceAssembly>
     <OutputType>Library</OutputType>
     <IsTrimmable>true</IsTrimmable>
     <!-- <DefineConstants>DEBUG_RENDERER;$(DefineConstants)</DefineConstants> -->

diff --git a/src/Bolero/paket.template b/src/Bolero/paket.template
@@ -8,14 +8,18 @@ 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
     ../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