Merge branch 'master' of https://github.com/wokhan/Wokhan.UI

wokhan · Dec 31, 2022 · 6573f43 · 6573f43
2 parents a713516 + 18ccc96
commit 6573f43
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -9,6 +9,13 @@ jobs:
     runs-on: windows-latest
 
     steps:    
+    - name: Setup Java JDK
+      uses: actions/[email protected]
+      with:
+        # The Java version to set up. Takes a whole or semver Java version. See examples of supported syntax in README file
+        java-version: 11
+        distribution: microsoft
+
     - name: Setup msbuild
       uses: microsoft/setup-msbuild@v1
 
@@ -38,7 +45,7 @@ jobs:
         echo "PACKAGE_VERSION=$VERSION" >> $GITHUB_ENV
 
     - name: Build and pack
-      run: msbuild -t:pack /restore /p:Configuration=Release /p:Version=${{ env.PACKAGE_VERSION }}
+      run: msbuild -t:pack /restore /p:Configuration=Release /p:Version=${{ env.PACKAGE_VERSION }} /p:JavaSdkDirectory=C:\hostedtoolcache\windows\Java_Microsoft_jdk\11.0.15\x64
 
     #- name: Generate documentation (retrieve global tool)
     #  run: dotnet tool install xmldocmd -g