Bump Microsoft.Bcl.AsyncInterfaces from 8.0.0 to 9.0.0 in /src/net (#571

) * Bump Microsoft.Bcl.AsyncInterfaces from 8.0.0 to 9.0.0 in /src/net Bumps [Microsoft.Bcl.AsyncInterfaces](https://github.com/dotnet/runtime) from 8.0.0 to 9.0.0. - [Release notes](https://github.com/dotnet/runtime/releases) - [Commits](dotnet/runtime@v8.0.0...v9.0.0) --- updated-dependencies: - dependency-name: Microsoft.Bcl.AsyncInterfaces dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> * Added .NET 9 and removed .NET 6 * Bump MASES.JCOBridge from 2.5.17 to 2.5.18 in /src/net Bumps MASES.JCOBridge from 2.5.17 to 2.5.18. --- updated-dependencies: - dependency-name: MASES.JCOBridge dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * Update templates * Added .NET 9 and removed .NET 6 * Update to JCOBridge 2.5.19 * Update workflows to support .NET 9 while new runner images are deployed * Update target JCOBridge license --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: masesdevelopers <[email protected]>
masesgroup · Dec 1, 2024 · 5af2aed · 5af2aed
1 parent 781a50b
commit 5af2aed
Show file tree

Hide file tree

Showing 11 changed files with 41 additions and 19 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -79,6 +79,12 @@ jobs:
           fetch-depth: '1'
           submodules: 'true'
 
+      - uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: |
+            6.x
+            9.x
+
       - name: Pre compile
         run: dotnet build --no-incremental --configuration Release /p:Platform="Any CPU" /p:NoWarn="0108%3B1030%3B0618" src/net/JNet/JNet.csproj
         env:
@@ -257,7 +263,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ 'ubuntu-latest', 'windows-latest', 'macos-latest', 'macos-13' ]
-        framework: [ 'net462', 'net6.0', 'net8.0' ]
+        framework: [ 'net462', 'net8.0', 'net9.0' ]
         jdk_vendor: [ 'temurin', 'zulu', 'microsoft', 'corretto', 'oracle']
         jdk_version: [ '11', '17', '21' ] # only LTS versions
         exclude:
@@ -269,8 +275,6 @@ jobs:
             framework: net6.0
           - os: macos-13
             framework: net462
-          - os: macos-13
-            framework: net6.0
           - jdk_vendor: oracle
             jdk_version: 11
 
@@ -283,7 +287,13 @@ jobs:
           enableCrossOsArchive: true
           path: ./bin/
           key: JNet_${{ github.run_number }}_${{ github.run_attempt }}_bin_${{ github.sha }}
-
+
+      - uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: |
+            6.x
+            9.x
+
       - name: Set up JDK distribution
         uses: actions/setup-java@v4
         with: # running setup-java again overwrites the settings.xml
@@ -296,15 +306,15 @@ jobs:
           dotnet ./bin/${{ matrix.framework }}/JNetTest.dll
           dotnet ./bin/${{ matrix.framework }}/JNetByteBufferTest.dll
         env:
-          JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ENCODED_2_5_17 }}
+          JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ENCODED_2_5_19 }}
 
       - name: WINDOWS ONLY - Execute tests on ${{ matrix.os }} with ${{ matrix.jdk_vendor }} ${{ matrix.jdk_version }}
         if: ${{ matrix.os == 'windows-latest' }}
         run: |
           .\bin\${{ matrix.framework }}\JNetTest.exe
           .\bin\${{ matrix.framework }}\JNetByteBufferTest.exe
         env:
-          JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ENCODED_2_5_17 }}
+          JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ENCODED_2_5_19 }}
 
       - uses: actions/upload-artifact@v4
         if: failure()
@@ -350,7 +360,7 @@ jobs:
           Install-Module MASES.JNetPS -Repository Local_Nuget_Feed
           ${{ github.workspace }}/bin/JNetPSTest.ps1
         env:
-          JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ENCODED_2_5_17 }}
+          JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ENCODED_2_5_19 }}
 
       - name: Execute PowerShell test on ${{ matrix.os }} with ${{ matrix.jdk_vendor }} ${{ matrix.jdk_version }}
         if: ${{ matrix.os == 'windows-latest' }}
@@ -361,7 +371,7 @@ jobs:
           Install-Module MASES.JNetPS -Repository Local_Nuget_Feed
           ${{ github.workspace }}\bin\JNetPSTest.ps1
         env:
-          JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ENCODED_2_5_17 }}
+          JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ENCODED_2_5_19 }}
 
       - name: Execute PowerShell 5.1 test on ${{ matrix.os }} with ${{ matrix.jdk_vendor }} ${{ matrix.jdk_version }}
         if: ${{ matrix.os == 'windows-latest' }}
@@ -371,7 +381,7 @@ jobs:
           Install-Module MASES.JNetPS -Repository Local_Nuget_Feed
           ${{ github.workspace }}\bin\JNetPSTest.ps1
         env:
-          JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ENCODED_2_5_17 }}
+          JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ENCODED_2_5_19 }}
 
       - uses: actions/upload-artifact@v4
         if: failure()

diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
@@ -26,6 +26,12 @@ jobs:
           fetch-depth: '1'
           submodules: 'true'
 
+      - uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: |
+            6.x
+            9.x
+
       - name: Pre compile
         run: dotnet build --no-incremental --configuration Release /p:Platform="Any CPU" /p:NoWarn="0108%3B1030%3B0618" src/net/JNet/JNet.csproj
         env:

diff --git a/.github/workflows/pullrequest.yaml b/.github/workflows/pullrequest.yaml
@@ -73,6 +73,12 @@ jobs:
           fetch-depth: '1'
           submodules: 'true'
 
+      - uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: |
+            6.x
+            9.x
+
       - name: Pre compile
         run: dotnet build --no-incremental --configuration Release /p:Platform="Any CPU" /p:NoWarn="0108%3B1030%3B0618" src/net/JNet/JNet.csproj
         env:

diff --git a/src/net/Common/Common.props b/src/net/Common/Common.props
@@ -22,7 +22,7 @@
 	</PropertyGroup>
 	<PropertyGroup Condition="'$(JNET_DOCKER_BUILD_ACTIONS)' != 'true'">
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-		<TargetFrameworks>net462;net6.0;net8.0</TargetFrameworks>
+		<TargetFrameworks>net462;net8.0;net9.0</TargetFrameworks>
 	</PropertyGroup>
 	<PropertyGroup Condition="'$(JNET_DOCKER_BUILD_ACTIONS)' == 'true'">
 		<DefineConstants>$(DefineConstants);JNET_DOCKER_BUILD_ACTIONS</DefineConstants>
@@ -37,7 +37,7 @@
 		<None Include="..\Common\JNet.snk" Link="JNet.snk" />
 	</ItemGroup>
 	<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
-		<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0"/>
+		<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.0"/>
 		<Reference Include="Microsoft.CSharp" />
 	</ItemGroup>
 	<!-- Fix start https://github.com/dotnet/sourcelink/issues/572 -->

diff --git a/src/net/JNet/JNet.csproj b/src/net/JNet/JNet.csproj
@@ -52,7 +52,7 @@
 	</ItemGroup>
 	<ItemGroup>
 		<PackageReference Include="MASES.CLIParser" Version="3.2.1" />
-		<PackageReference Include="MASES.JCOBridge" Version="2.5.17">
+		<PackageReference Include="MASES.JCOBridge" Version="2.5.19">
 			<IncludeAssets>All</IncludeAssets>
 			<PrivateAssets>None</PrivateAssets>
 		</PackageReference>

diff --git a/src/net/JNetReflector/JNetReflector.csproj b/src/net/JNetReflector/JNetReflector.csproj
@@ -116,7 +116,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="MASES.CLIParser" Version="3.2.1" />
-	<PackageReference Include="MASES.JCOBridge" Version="2.5.17">
+	<PackageReference Include="MASES.JCOBridge" Version="2.5.19">
 		<IncludeAssets>All</IncludeAssets>
 		<PrivateAssets>None</PrivateAssets>
 	</PackageReference>

diff --git a/src/net/templates/templates/jcobridgeConsoleApp/jcobridgeConsoleApp.csproj b/src/net/templates/templates/jcobridgeConsoleApp/jcobridgeConsoleApp.csproj
@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net462;net6.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net462;net8.0;net9.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'net462'">
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="MASES.JCOBridge" Version="2.5.17" IncludeAssets="All" PrivateAssets="None" />
+    <PackageReference Include="MASES.JCOBridge" Version="2.5.19" IncludeAssets="All" PrivateAssets="None" />
   </ItemGroup>
 </Project>
diff --git a/src/net/templates/templates/jnetAWTApp/jnetAWTApp.csproj b/src/net/templates/templates/jnetAWTApp/jnetAWTApp.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
-		<TargetFrameworks>net462;net6.0;net8.0</TargetFrameworks>
+		<TargetFrameworks>net462;net8.0;net9.0</TargetFrameworks>
 	</PropertyGroup>
 	<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
 		<Reference Include="Microsoft.CSharp" />

diff --git a/src/net/templates/templates/jnetApp/jnetApp.csproj b/src/net/templates/templates/jnetApp/jnetApp.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net462;net6.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net462;net8.0;net9.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'net462'">
     <Reference Include="Microsoft.CSharp" />

diff --git a/tests/net/JNetWPFTest/JNetWPFTest.csproj b/tests/net/JNetWPFTest/JNetWPFTest.csproj
@@ -7,7 +7,7 @@
 		<RootNamespace>MASES.JNetWPFTest</RootNamespace>
 		<Title>JNetWPFTest - a test tool for JNet</Title>
 		<Description>JNetWPFTest - a test tool for JNet</Description>
-		<TargetFrameworks>net462;net6.0-windows;net8.0-windows</TargetFrameworks>
+		<TargetFrameworks>net462;net8.0-windows;net9.0-windows</TargetFrameworks>
 	</PropertyGroup>
 	<ItemGroup>
 		<None Include="..\Common\app.manifest">

diff --git a/tests/net/JNetWinFormsTest/JNetWinFormsTest.csproj b/tests/net/JNetWinFormsTest/JNetWinFormsTest.csproj
@@ -8,7 +8,7 @@
 		<RootNamespace>MASES.JNetWinFormsTest</RootNamespace>
 		<Title>JNetWinFormsTest - a test tool for JNet</Title>
 		<Description>JNetWinFormsTest - a test tool for JNet</Description>
-		<TargetFrameworks>net462;net6.0-windows;net8.0-windows</TargetFrameworks>
+		<TargetFrameworks>net462;net8.0-windows;net9.0-windows</TargetFrameworks>
 		<DefineConstants>$(DefineConstants);WINFORMS</DefineConstants>
 	</PropertyGroup>
 	<ItemGroup>