Merge pull request #2332 from inforithmics/RepairMainBuild

Repair main build
Mapsui · Dec 11, 2023 · c7f4104 · c7f4104
2 parents 9ae2214 + cb28aae
commit c7f4104
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -181,13 +181,19 @@ jobs:
  key: ${{ runner.os }}-nuget15-${{ hashFiles('Directory.Packages.props') }}
  restore-keys: |
  ${{ runner.os }}-nuget15-
- # .Net 7 update 
+ # .Net 8 update 
  - name: Setup .NET 8 SDK
  uses: actions/setup-dotnet@v3
  with:
  dotnet-version: |
  8.0.x
  include-prerelease: true
+ # Java Sdk install 11
+ - name: Install Open JDK 11
+ uses: actions/setup-java@v4
+ with:
+ distribution: 'microsoft' # open jdk
+ java-version: '11'
  - name: Setup NuGet.exe for use with actions
  uses: NuGet/[email protected]
  with:

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -53,9 +53,9 @@
  <PackageVersion Include="Mapsui.WinUI" Version="4.0.0-beta.8" />
  <PackageVersion Include="Mapsui.Wpf" Version="4.0.0-beta.8" />
  <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="[7.0.0,8.0.0)" />
- <PackageVersion Include="Microsoft.CodeCoverage" Version="[16.11.0,17.0.0)" />
+ <PackageVersion Include="Microsoft.CodeCoverage" Version="[17.8.0,18.0.0)" />
  <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="[8.0.0,9.0.0)" />
- <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="[16.9.4,17.0.0)" />
+ <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="[17.8.0, 18.0.0)" />
  <PackageVersion Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="[6.2.14,7.0.0)" />
  <PackageVersion Include="Microsoft.UI.Xaml" Version="[2.6.2,3.0.0)" />
  <PackageVersion Include="Microsoft.VisualStudio.Threading.Analyzers" Version="[17.6.40,18.0.0)" />
@@ -65,8 +65,8 @@
  <PackageVersion Include="NetTopologySuite" Version="[2.5.0,3.0.0)" />
  <PackageVersion Include="NetTopologySuite.IO.GeoJSON4STJ" Version="[4.0.0,5.0.0)" />
  <PackageVersion Include="Newtonsoft.Json" Version="[13.0.2,14.0.0)" />
- <PackageVersion Include="NUnit" Version="[3.13.3,4.0.0)" />
- <PackageVersion Include="NUnit3TestAdapter" Version="[4.4.2,5.0.0)" />
+ <PackageVersion Include="NUnit" Version="[3.14.0,4.0.0)" />
+ <PackageVersion Include="NUnit3TestAdapter" Version="[4.5.0,5.0.0)" />
  <PackageVersion Include="OpenTK" Version="[3.1.0,4.0.0)" />
  <PackageVersion Include="OpenTK.GLControl" Version="[3.1.0,4.0.0)" />
  <PackageVersion Include="Plugin.CurrentActivity" Version="[2.1.0.4,3.0.0.0)" />