Merge pull request #22 from fsprojects/dotnet6

.NET 6 support
fsprojects · Sep 28, 2022 · 672a32d · 672a32d
2 parents c6ac29d + 2e7f092
commit 672a32d
Show file tree

Hide file tree

Showing 59 changed files with 779 additions and 3,043 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -15,7 +15,7 @@
       ]
     },
     "fsharp.formatting.commandtool": {
-      "version": "9.0.1",
+      "version": "11.4.3",
       "commands": [
         "fsdocs"
       ]

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,7 +11,7 @@ jobs:
     - uses: actions/checkout@v2
     - uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: '6.0.300'
+        dotnet-version: '6.0.400'
     - name: Restore
       run: |
         dotnet tool restore
@@ -29,7 +29,6 @@ jobs:
     - name: Test
       run: |
         dotnet fake build -t Test -- Release
-        dotnet fake build -t BuildTemplateProjects -- Release
 
   build-macos:
     name: CI (macOS)
@@ -39,18 +38,11 @@ jobs:
     - uses: actions/checkout@v2
     - uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: '6.0.300'
-    - name: setup-xamarin
-      uses: maxim-lobanov/setup-xamarin@v1
-      with:
-        mono-version: 6
-#         xamarin-mac-version: 7
-        xcode-version: 12.x
-    # temporary workaround for https://github.com/xamarin/xamarin-macios/issues/10652 until Xamarin.Mac 7.4.0.10 lands in GitHub Actions
-    - name: setup-xamarin-mac-patched
+        dotnet-version: '6.0.400'
+    - name: Install workloads
       run: |
-        curl -o xamarinmac.pkg 'https://bosstoragemirror.blob.core.windows.net/wrench/xcode12.4/a4c70e7d04e3904d17aa60f6d640eb048081c757/4477741/package/notarized/xamarin.mac-7.4.0.10.pkg'
-        sudo installer -pkg xamarinmac.pkg -target /
+        dotnet tool restore
+        sudo dotnet workload install macos
     - name: Restore
       run: |
         dotnet tool restore
@@ -67,4 +59,3 @@ jobs:
     - name: Test
       run: |
         dotnet fake build -t Test -- Release
-        dotnet fake build -t BuildTemplateProjects -- Release
diff --git a/.github/workflows/test-templates.yml b/.github/workflows/test-templates.yml
@@ -0,0 +1,42 @@
+name: Test Templates
+
+on: workflow_dispatch
+
+jobs:
+  build-windows:
+    name: Test Templates (Windows)
+    runs-on: windows-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: '6.0.300'
+    - name: Restore
+      run: |
+        dotnet tool restore
+        dotnet paket restore
+    - name: Test templates
+      run: |
+        dotnet fake build -t BuildTemplateProjects -- Release
+
+  build-macos:
+    name: Test Templates (macOS)
+    runs-on: macos-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: '6.0.300'
+    - name: Install workloads
+      run: |
+        dotnet tool restore
+        sudo dotnet workload install macos
+    - name: Restore
+      run: |
+        dotnet tool restore
+        dotnet paket restore
+    - name: Test templates
+      run: |
+        dotnet fake build -t BuildTemplateProjects -- Release
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -0,0 +1,5 @@
+<Project>
+  <PropertyGroup>
+    <EnableWindowsTargeting>True</EnableWindowsTargeting>
+  </PropertyGroup>
+</Project>
diff --git a/Examples/Examples.WinForms.Chromium/Examples.WinForms.Chromium.fsproj b/Examples/Examples.WinForms.Chromium/Examples.WinForms.Chromium.fsproj
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
+    <TargetFrameworks>net6.0-windows;net48</TargetFrameworks>
     <OutputType>WinExe</OutputType>
-    <TargetFrameworks>net5.0-Windows;net48</TargetFrameworks>
+    <CefSharpAnyCpuSupport>true</CefSharpAnyCpuSupport>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <UseWindowsForms>true</UseWindowsForms>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <ApplicationIcon />

diff --git a/Examples/Examples.Wpf.Chromium/Examples.Wpf.Chromium.fsproj b/Examples/Examples.Wpf.Chromium/Examples.Wpf.Chromium.fsproj
@@ -2,7 +2,9 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFrameworks>net5.0-Windows;net48</TargetFrameworks>
+    <TargetFrameworks>net6.0-windows;net48</TargetFrameworks>
+    <CefSharpAnyCpuSupport>true</CefSharpAnyCpuSupport>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <UseWPF>true</UseWPF>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <ApplicationIcon />