Merge in develop.

ikvmnet · Feb 4, 2025 · 58d39c6 · 58d39c6
2 parents 94c6065 + 3f80de3
commit 58d39c6
Show file tree

Hide file tree

Showing 11 changed files with 47 additions and 77 deletions.
diff --git a/.github/workflows/IKVM.Maven.yml b/.github/workflows/IKVM.Maven.yml
@@ -17,29 +17,12 @@ on:
 jobs:
   build:
     name: Build
-    runs-on: windows-2022
+    runs-on: ubuntu-22.04
     steps:
-    - name: Set Paths (Windows)
-      shell: pwsh
-      run: |
-        $WORKPATH="C:\w"
-        mkdir $WORKPATH
-        mkdir $WORKPATH\temp
-        mkdir $WORKPATH\dotnet
-        mkdir $WORKPATH\nuget
-        mkdir $WORKPATH\nuget\packages
-        mkdir $WORKPATH\ikvm-maven
-        Add-Content $env:GITHUB_ENV "`nWORKPATH=$WORKPATH"
-        Add-Content $env:GITHUB_ENV "`nTMP=$WORKPATH\temp`nTEMP=$WORKPATH\temp`nTMPDIR=$WORKPATH\temp"
-        Add-Content $env:GITHUB_ENV "`nDOTNET_INSTALL_DIR=$WORKPATH\dotnet"
-        Add-Content $env:GITHUB_ENV "`nNUGET_PACKAGES=$WORKPATH\nuget\packages"
-        New-Item -Path "$env:GITHUB_WORKSPACE\work" -ItemType SymbolicLink -Value "$WORKPATH\ikvm-maven"
     - name: Checkout Source
       uses: actions/checkout@v4
       with:
-        path: work
         fetch-depth: 0
-        submodules: recursive
     - name: Setup .NET 6.0
       uses: actions/setup-dotnet@v4
       with:
@@ -52,38 +35,26 @@ jobs:
       uses: actions/setup-dotnet@v4
       with:
         dotnet-version: 8.0.x
+    - name: Install Mono
+      run: |
+        sudo apt-get update && \
+        sudo apt-get install -y mono-runtime mono-devel
     - name: Install GitVersion
-      uses: gittools/actions/gitversion/setup@v1
+      uses: gittools/actions/gitversion/setup@v3
       with:
         versionSpec: 5.x
     - name: Execute GitVersion
-      uses: gittools/actions/gitversion/execute@v1
-      with:
-        targetPath: ${{ env.WORKPATH }}/ikvm-maven
-        useConfigFile: true
-        configFilePath: ${{ env.WORKPATH }}/ikvm-maven/GitVersion.yml
+      uses: gittools/actions/gitversion/execute@v3
     - name: Add NuGet Source (GitHub)
       shell: pwsh
       run: dotnet nuget add source --username USERNAME --password $env:GITHUB_TOKEN --store-password-in-clear-text --name ikvm $env:GITHUB_REPOS
       env:
         GITHUB_REPOS: https://nuget.pkg.github.com/${{ github.repository_owner }}/index.json
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    - name: Cache NuGet
-      uses: actions/cache@v4
-      with:
-        path: ${{ env.NUGET_PACKAGES }}
-        key: ${{ runner.os }}-nuget-${{ hashFiles('IKVM.Maven.sln', 'src/**/*.csproj', 'src/**/*.msbuildproj') }}
-        restore-keys: ${{ runner.os }}-nuget-
-    - name: Cache Maven
-      uses: actions/cache@v4
-      with:
-        path: ~\.m2\repository
-        key: ${{ runner.os }}-maven-${{ hashFiles('IKVM.Maven.sln', 'src/**/*.csproj', 'src/**/*.msbuildproj') }}
-        restore-keys: ${{ runner.os }}-maven-
     - name: NuGet Restore
       run: dotnet restore IKVM.Maven.sln
-      working-directory: ${{ env.WORKPATH }}/ikvm-maven
     - name: Build
+      shell: pwsh
       run: |
         dotnet msbuild /m /bl `
           /p:Configuration="Release" `
@@ -103,35 +74,33 @@ jobs:
           /p:CreateHardLinksForPublishFilesIfPossible=true `
           /p:ContinuousIntegrationBuild=true `
           IKVM.Maven.dist.msbuildproj
-      working-directory: ${{ env.WORKPATH }}/ikvm-maven
     - name: Upload MSBuild Log
       if: ${{ always() }}
       uses: actions/upload-artifact@v4
       with:
         name: msbuild.binlog
-        path: ${{ env.WORKPATH }}/ikvm-maven/msbuild.binlog
+        path: msbuild.binlog
     - name: Upload NuGet Packages
       uses: actions/upload-artifact@v4
       with:
         name: nuget
-        path: ${{ env.WORKPATH }}/ikvm-maven/dist/nuget
+        path: dist/nuget
     - name: Package Tests
-      run: tar czvf C:\tests.tar.gz tests
-      working-directory: ${{ env.WORKPATH }}/ikvm-maven/dist
+      run: tar czvf /tmp/tests.tar.gz tests
+      working-directory: dist
     - name: Upload Tests
       uses: actions/upload-artifact@v4
       with:
         name: tests
-        path: C:\tests.tar.gz
+        path: /tmp/tests.tar.gz
     - name: Package Documentation
       shell: pwsh
-      run: Compress-Archive -Path doc\* -DestinationPath C:\doc.zip
-      working-directory: ${{ env.WORKPATH }}/ikvm-maven
+      run: Compress-Archive -Path doc/* -DestinationPath /tmp/doc.zip
     - name: Upload Documentation
       uses: actions/upload-artifact@v4
       with:
         name: doc
-        path: C:\doc.zip
+        path: /tmp/doc.zip
   test:
     strategy:
       matrix:
@@ -162,7 +131,7 @@ jobs:
     timeout-minutes: 240
     needs:
     - build
-    runs-on: ${{ fromJSON('{"win-x64":["windows-2022"],"linux-x64":["ubuntu-22.04"],"osx-x64":["macos-12"],"osx-arm64":["macos-14"]}')[matrix.sys] }}
+    runs-on: ${{ fromJSON('{"win-x64":["windows-2022"],"linux-x64":["ubuntu-22.04"],"osx-x64":["macos-13"],"osx-arm64":["macos-14"]}')[matrix.sys] }}
     steps:
     - name: Free Disk Space (Linux)
       if: runner.os == 'Linux'
@@ -311,14 +280,12 @@ jobs:
       with:
         dotnet-version: 7.0.x
     - name: Install GitVersion
-      uses: gittools/actions/gitversion/setup@v1
+      uses: gittools/actions/gitversion/setup@v3
       with:
         versionSpec: 5.x
     - name: Execute GitVersion
       id: GitVersion
-      uses: gittools/actions/gitversion/execute@v1
-      with:
-        useConfigFile: true
+      uses: gittools/actions/gitversion/execute@v3
     - name: Download NuGet Packages
       uses: actions/download-artifact@v4
       with:

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -5,7 +5,6 @@
 
     <ItemGroup>
         <Authors Include="Jerome Haltom" />
-        <Authors Include="Shad Storhaug" />
     </ItemGroup>
 
     <PropertyGroup Label="Copyright Info">
@@ -31,7 +30,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="IKVM.Core.MSBuild" Version="0.1.103">
+        <PackageReference Include="IKVM.Core.MSBuild" Version="0.1.106">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

diff --git a/global.json b/global.json
@@ -4,6 +4,7 @@
         "rollForward": "latestFeature"
     },
     "msbuild-sdks": {
-        "IKVM.NET.Sdk": "8.10.3"
+        "Microsoft.Build.NoTargets": "3.7.56",
+        "IKVM.NET.Sdk": "8.11.0"
     }
 }
diff --git a/src/IKVM.Maven.Sdk.Tasks.Java/IKVM.Maven.Sdk.Tasks.Java.csproj b/src/IKVM.Maven.Sdk.Tasks.Java/IKVM.Maven.Sdk.Tasks.Java.csproj
@@ -8,7 +8,7 @@
     </ItemGroup>
 
     <Target Name="DownloadMavenArtifacts">
-        <Exec Command="mvn org.apache.maven.plugins:maven-dependency-plugin:3.3.0:copy-dependencies -f ikvm-maven-sdk-tasks-java.pom -DoutputDirectory=$(IntermediateOutputPath)maven" />
+        <Exec Command="mvn org.apache.maven.plugins:maven-dependency-plugin:3.8.0:copy-dependencies -f ikvm-maven-sdk-tasks-java.pom -DoutputDirectory=$(IntermediateOutputPath)maven" />
     </Target>
 
     <Target Name="AddJavaReferences" DependsOnTargets="DownloadMavenArtifacts" BeforeTargets="GetIkvmReferenceItemsFromIkvmReferences">

diff --git a/src/IKVM.Maven.Sdk.Tasks.Java/ikvm-maven-sdk-tasks-java.pom b/src/IKVM.Maven.Sdk.Tasks.Java/ikvm-maven-sdk-tasks-java.pom
@@ -10,52 +10,52 @@
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-model</artifactId>
-            <version>3.9.8</version>
+            <version>3.9.9</version>
         </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-core</artifactId>
-            <version>3.9.8</version>
+            <version>3.9.9</version>
         </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-resolver-provider</artifactId>
-            <version>3.9.8</version>
+            <version>3.9.9</version>
         </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-settings-builder</artifactId>
-            <version>3.9.8</version>
+            <version>3.9.9</version>
         </dependency>
         <dependency>
             <groupId>org.apache.maven.resolver</groupId>
             <artifactId>maven-resolver-api</artifactId>
-            <version>1.9.20</version>
+            <version>1.9.22</version>
         </dependency>
         <dependency>
             <groupId>org.apache.maven.resolver</groupId>
             <artifactId>maven-resolver-spi</artifactId>
-            <version>1.9.20</version>
+            <version>1.9.22</version>
         </dependency>
         <dependency>
             <groupId>org.apache.maven.resolver</groupId>
             <artifactId>maven-resolver-impl</artifactId>
-            <version>1.9.20</version>
+            <version>1.9.22</version>
         </dependency>
         <dependency>
             <groupId>org.apache.maven.resolver</groupId>
             <artifactId>maven-resolver-connector-basic</artifactId>
-            <version>1.9.20</version>
+            <version>1.9.22</version>
         </dependency>
         <dependency>
             <groupId>org.apache.maven.resolver</groupId>
             <artifactId>maven-resolver-transport-file</artifactId>
-            <version>1.9.20</version>
+            <version>1.9.22</version>
         </dependency>
         <dependency>
             <groupId>org.apache.maven.resolver</groupId>
             <artifactId>maven-resolver-transport-http</artifactId>
-            <version>1.9.20</version>
+            <version>1.9.22</version>
         </dependency>
     </dependencies>
-</project>
+</project>
diff --git a/src/IKVM.Maven.Sdk.Tasks.Tests/IKVM.Maven.Sdk.Tasks.Tests.csproj b/src/IKVM.Maven.Sdk.Tasks.Tests/IKVM.Maven.Sdk.Tasks.Tests.csproj
@@ -5,11 +5,11 @@
 
     <ItemGroup>
         <PackageReference Include="FluentAssertions" Version="6.12.0" />
-        <PackageReference Include="Microsoft.CodeCoverage" Version="17.7.2" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+        <PackageReference Include="Microsoft.CodeCoverage" Version="17.11.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
         <PackageReference Include="Moq" Version="4.20.70" />
-        <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
-        <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
+        <PackageReference Include="MSTest.TestAdapter" Version="3.5.2" />
+        <PackageReference Include="MSTest.TestFramework" Version="3.5.2" />
         <PackageReference Include="Microsoft.Build" Version="16.9.0" />
         <PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.9.0" />
     </ItemGroup>

diff --git a/src/IKVM.Maven.Sdk.Tasks/IKVM.Maven.Sdk.Tasks.csproj b/src/IKVM.Maven.Sdk.Tasks/IKVM.Maven.Sdk.Tasks.csproj
@@ -9,6 +9,7 @@
 
     <ItemGroup>
         <PackageReference Include="IKVM" Version="8.10.3" />
+        <PackageReference Include="IKVM" Version="8.11.0" />
         <PackageReference Include="Microsoft.Bcl.HashCode" Version="1.1.1" />
         <PackageReference Include="Microsoft.Build" Version="16.9.0" PrivateAssets="All" />
         <PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.9.0" PrivateAssets="All" />

diff --git a/src/IKVM.Maven.Sdk.Tests/IKVM.Maven.Sdk.Tests.csproj b/src/IKVM.Maven.Sdk.Tests/IKVM.Maven.Sdk.Tests.csproj
@@ -15,11 +15,11 @@
     <ItemGroup>
         <PackageReference Include="FluentAssertions" Version="6.12.0" />
         <PackageReference Include="Buildalyzer" Version="6.0.4" />
-        <PackageReference Include="Microsoft.CodeCoverage" Version="17.7.2" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+        <PackageReference Include="Microsoft.CodeCoverage" Version="17.11.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
         <PackageReference Include="Moq" Version="4.20.70" />
-        <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
-        <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
+        <PackageReference Include="MSTest.TestAdapter" Version="3.5.2" />
+        <PackageReference Include="MSTest.TestFramework" Version="3.5.2" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/IKVM.Maven.Sdk/IKVM.Maven.Sdk.csproj b/src/IKVM.Maven.Sdk/IKVM.Maven.Sdk.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.Build.NoTargets/3.5.6">
+<Project Sdk="Microsoft.Build.NoTargets">
 
     <PropertyGroup>
         <TargetFrameworks>net472;net6.0;net8.0</TargetFrameworks>
@@ -21,6 +21,8 @@
     <ItemGroup>
         <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="all" />
         <PackageReference Include="IKVM" Version="8.10.3" />
+        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="all" />
+        <PackageReference Include="IKVM" Version="8.11.0" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/dist-nuget/dist-nuget.csproj b/src/dist-nuget/dist-nuget.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.Build.NoTargets/3.5.6">
+<Project Sdk="Microsoft.Build.NoTargets">
     <PropertyGroup>
         <TargetFramework>netstandard2.0</TargetFramework>
         <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>

diff --git a/src/dist-tests/dist-tests.csproj b/src/dist-tests/dist-tests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.Build.NoTargets/3.5.6">
+<Project Sdk="Microsoft.Build.NoTargets">
     <PropertyGroup>
         <TargetFramework>netstandard2.0</TargetFramework>
         <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>