#1320 Add RollForward=LatestMajor for WebSharper compiler

dotnet-websharper · Mar 14, 2023 · 5f5646d · 5f5646d
1 parent 9e756af
commit 5f5646d
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 2 deletions.
diff --git a/WebSharper.sln b/WebSharper.sln
@@ -31,6 +31,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_", "_", "{068ABD81-368A-49
 		build.sh = build.sh
 		chutzpah.json = chutzpah.json
 		CONTRIBUTING.md = CONTRIBUTING.md
+		global.json = global.json
 		LICENSE.md = LICENSE.md
 		paket.dependencies = paket.dependencies
 		paket.lock = paket.lock

diff --git a/src/compiler/WebSharper.CSharp/WebSharper.CSharp.fsproj b/src/compiler/WebSharper.CSharp/WebSharper.CSharp.fsproj
@@ -8,6 +8,7 @@
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <CSharpTool>True</CSharpTool>
     <RuntimeIdentifiers>win-x64;linux-x64;linux-musl-x64;osx-x64</RuntimeIdentifiers>
+    <RollForward>LatestMajor</RollForward>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Program.fs" />

diff --git a/src/compiler/WebSharper.DllBrowser/MainWindow.xaml b/src/compiler/WebSharper.DllBrowser/MainWindow.xaml
@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:WebSharper.DllBrowser"
         mc:Ignorable="d"
-        Title="WebSharper Dll Browser" Height="450" Width="800" 
+        Title="{Binding TitleText}" Height="450" Width="800" 
         DataContext="{Binding Mode=OneWay, RelativeSource={RelativeSource Self}}">
     <Grid>
         <Grid.ColumnDefinitions>

diff --git a/src/compiler/WebSharper.DllBrowser/MainWindow.xaml.cs b/src/compiler/WebSharper.DllBrowser/MainWindow.xaml.cs
@@ -14,6 +14,7 @@
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 using WebSharper.Compiler;
+using WebSharper.Core;
 
 namespace WebSharper.DllBrowser
 {
@@ -23,6 +24,7 @@ namespace WebSharper.DllBrowser
     public partial class MainWindow : Window
     {
         public ObservableCollection<DllModel> DllModels { get; } = new();
+        public string TitleText => $"WebSharper {Metadata.IO.CurrentVersion} Dll Browser";
 
         public MainWindow()
         {
@@ -50,4 +52,4 @@ private void TreeView_Drop(object sender, DragEventArgs e)
         }
 
     }
-}
+}
diff --git a/src/compiler/WebSharper.DllBrowser/WebSharper.DllBrowser.csproj b/src/compiler/WebSharper.DllBrowser/WebSharper.DllBrowser.csproj
@@ -5,6 +5,7 @@
     <TargetFramework>net6.0-windows</TargetFramework>
     <Nullable>enable</Nullable>
     <UseWPF>true</UseWPF>
+    <RollForward>LatestMajor</RollForward>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/compiler/WebSharper.FSharp.Service/WebSharper.FSharp.Service.fsproj b/src/compiler/WebSharper.FSharp.Service/WebSharper.FSharp.Service.fsproj
@@ -12,6 +12,7 @@
     <AssemblyName>wsfscservice</AssemblyName>
     <EnableUnsafeBinaryFormatterSerialization>true</EnableUnsafeBinaryFormatterSerialization>
     <RuntimeIdentifiers>win-x64;linux-x64;linux-musl-x64;osx-x64</RuntimeIdentifiers>
+    <RollForward>LatestMajor</RollForward>
   </PropertyGroup>
   <ItemGroup>
     <None Include="NLog.config">

diff --git a/src/compiler/WebSharper.FSharp/WebSharper.FSharp.fsproj b/src/compiler/WebSharper.FSharp/WebSharper.FSharp.fsproj
@@ -9,6 +9,7 @@
     <FSharpTool>True</FSharpTool>
     <EnableUnsafeBinaryFormatterSerialization>true</EnableUnsafeBinaryFormatterSerialization>
     <RuntimeIdentifiers>win-x64;linux-x64;linux-musl-x64;osx-x64</RuntimeIdentifiers>
+    <RollForward>LatestMajor</RollForward>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="NamedPipeClient.fs" />