Add Java 11

reactivemarbles · Dec 14, 2023 · 4ad58dc · 4ad58dc
1 parent f26f27d
commit 4ad58dc
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 2 deletions.
diff --git a/.github/workflows/BuildDeploy.yml b/.github/workflows/BuildDeploy.yml
@@ -37,6 +37,12 @@ jobs:
         with:
           setAllVars: true
       - run: echo 'SemVer2=${{ steps.nbgv.outputs.SemVer2 }}'
+
+      - name: 'Setup Java JDK 11'
+        uses: actions/[email protected]
+        with:
+          distribution: 'microsoft'
+          java-version: '11'
 
       - name: 'Install DotNet workloads'
         shell: bash

diff --git a/.github/workflows/BuildOnly.yml b/.github/workflows/BuildOnly.yml
@@ -29,6 +29,12 @@ jobs:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0
+
+      - name: 'Setup Java JDK 11'
+        uses: actions/[email protected]
+        with:
+          distribution: 'microsoft'
+          java-version: '11'
 
       - name: 'Install DotNet workloads'
         shell: bash

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -33,6 +33,7 @@
     <ReactiveUIVersion>19.5.1</ReactiveUIVersion>
     <CrissCrossCoreTargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0</CrissCrossCoreTargetFrameworks>
     <CrissCrossWinTargetFrameworks>net462;net472;net48;net6.0-windows10.0.17763.0;net7.0-windows10.0.17763.0;net8.0-windows10.0.17763.0</CrissCrossWinTargetFrameworks>
+    <CrissCrossWebviewTargetFrameworks>net462;net472;net48;net6.0-windows;net7.0-windows;net8.0-windows</CrissCrossWebviewTargetFrameworks>
   </PropertyGroup>
   <PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
     <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>

diff --git a/Version.json b/Version.json
@@ -1,6 +1,6 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "1.0.3",
+    "version": "1.0.4",
     "publicReleaseRefSpec": [
         "^refs/heads/master$",
         "^refs/heads/main$"

diff --git a/src/CrissCross.WPF.WebView2/CrissCross.WPF.WebView2.csproj b/src/CrissCross.WPF.WebView2/CrissCross.WPF.WebView2.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-		<TargetFrameworks>$(CrissCrossWinTargetFrameworks)</TargetFrameworks>
+		<TargetFrameworks>$(CrissCrossWebviewTargetFrameworks)</TargetFrameworks>
 		<UseWpf>true</UseWpf>
 		<Nullable>enable</Nullable>
 		<ProduceReferenceAssembly>True</ProduceReferenceAssembly>