Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
workflow-id: build.yml
- uses: actions/setup-dotnet@v4
with:
dotnet-version: "9.0.x"
dotnet-version: "10.0.x"
- name: Build
run: |
./build.sh --target Publish --build-type ${{ steps.info.outputs.build_type }} --build-id ${{ steps.info.outputs.build_id }} --last-build-commit \"${{ steps.setSHAs.outputs.base }}\" --nuget-api-key \"${{ secrets.NUGET_API_KEY }}\" --nuget-source https://nuget-modding.resonite.net/v3/index.json
Expand All @@ -46,7 +46,7 @@ jobs:
BEPISBUILDS_HOST: ${{ secrets.BEPISBUILDS_HOST }}
if: ${{ steps.info.outputs.build_type == 'BleedingEdge' && env.BEPISBUILDS_HOST != null }}
run: |
artifacts_list=$(find ./bin/dist -maxdepth 1 -type f | tr '\n' ','); artifacts_list=${artifacts_list::-1};
artifacts_list=$(find ${{ github.workspace }}/bin/dist -maxdepth 1 -type f | tr '\n' ','); artifacts_list=${artifacts_list::-1};
curl --upload-file "{${artifacts_list}}" --ftp-pasv --ftp-skip-pasv-ip --ftp-create-dirs --ftp-method singlecwd --disable-epsv "ftp://${{ secrets.BEPISBUILDS_AUTH }}@${{ secrets.BEPISBUILDS_HOST }}:${{ secrets.BEPISBUILDS_PORT }}/bepinex_be/artifacts/${{ steps.info.outputs.build_id }}/"
- name: Generate changelog
id: generate_changelog
Expand Down Expand Up @@ -77,6 +77,6 @@ jobs:
with:
name: "BepInEx_CI_${{ steps.info.outputs.build_type }}_${{ steps.info.outputs.sha_short }}_${{ steps.info.outputs.build_id || 0 }}"
path: |
"./bin/dist/*.zip"
"./bin/dist/thunderstore-package/*.zip"
${{ github.workspace }}/bin/dist/*.zip
${{ github.workspace }}/bin/dist/thunderstore-package/*.zip

6 changes: 3 additions & 3 deletions .github/workflows/build_pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
submodules: 'true'
- uses: actions/setup-dotnet@v4
with:
dotnet-version: "9.0.x"
dotnet-version: "10.0.x"
- name: Build
run: |
./build.sh --target Publish
Expand All @@ -23,5 +23,5 @@ jobs:
with:
name: "BepInEx_CI"
path: |
"./bin/dist/*.zip"
"./bin/dist/thunderstore-package/*.zip"
${{ github.workspace }}/bin/dist/*.zip
${{ github.workspace }}/bin/dist/thunderstore-package/*.zip
4 changes: 2 additions & 2 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@ jobs:
core.setOutput("build_id", context.runNumber);
- uses: actions/setup-dotnet@v4
with:
dotnet-version: "9.0.x"
dotnet-version: "10.0.x"
- name: Install dotnet Tools
run: dotnet tool restore
- name: Build with Cake
run: ./build.sh --target Publish --build-type ${{ steps.info.outputs.build_type }} --build-id ${{ steps.info.outputs.build_id }} --last-build-commit \"${{ steps.setSHAs.outputs.base }}\"
- name: Publish to Thunderstore
run: |
ZIP_FILE=$(ls ./bin/dist/thunderstore-package/*.zip | head -1)
ZIP_FILE=$(ls ${{ github.workspace }}/bin/dist/thunderstore-package/*.zip | head -1)
dotnet tcli publish --file "$ZIP_FILE" --config-path Runtimes/NET/BepisLoader/thunderstore.toml
env:
TCLI_AUTH_TOKEN: ${{ secrets.TCLI_AUTH_TOKEN }}
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
core.setOutput("build_id", context.runNumber);
- uses: actions/setup-dotnet@v4
with:
dotnet-version: "9.0.x"
dotnet-version: "10.0.x"
- name: Build
run: |
./build.sh --target Publish --build-type Release --build-id ${{ steps.info.outputs.build_id }} --nuget-api-key "${{ secrets.NUGET_API_KEY }}" --nuget-source https://nuget-modding.resonite.net/v3/index.json
Expand All @@ -39,5 +39,5 @@ jobs:
with:
name: "BepInEx_Release_${{ steps.info.outputs.sha_short }}_${{ steps.info.outputs.build_id || 0 }}"
path: |
"./bin/dist/*.zip"
"./bin/dist/thunderstore-package/*.zip"
${{ github.workspace }}/bin/dist/*.zip
${{ github.workspace }}/bin/dist/thunderstore-package/*.zip
6 changes: 3 additions & 3 deletions BepInEx.Core/BepInEx.Core.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Description>BepInEx Core library</Description>
<TargetFrameworks>net9.0</TargetFrameworks>
<TargetFrameworks>net10.0</TargetFrameworks>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<!-- Force nuget assembly output on netstandard2.0 -->
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
Expand All @@ -12,9 +12,9 @@
<ItemGroup>
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="All"/>
<PackageReference Include="SemanticVersioning" Version="2.0.2"/>
<PackageReference Include="MonoMod.Utils" Version="25.0.8"/>
<PackageReference Include="MonoMod.Utils" Version="25.0.11"/>
<PackageReference Include="Mono.Cecil" Version="0.11.6" />
<PackageReference Include="System.Drawing.Common" Version="9.0.8" />
<PackageReference Include="System.Drawing.Common" Version="10.0.0" />
</ItemGroup>
<ItemGroup>
<Compile Remove="Contract\IPlugin.cs"/>
Expand Down
4 changes: 2 additions & 2 deletions BepInEx.Preloader.Core/BepInEx.Preloader.Core.csproj
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Description>Core classes and utilities for BepInEx Preloader</Description>
<TargetFrameworks>net9.0</TargetFrameworks>
<TargetFrameworks>net10.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\BepInEx.Core\BepInEx.Core.csproj"/>
<ProjectReference Include="..\HarmonyX\Harmony\Harmony.csproj"/>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="All"/>
<PackageReference Include="MonoMod.Utils" Version="25.0.8"/>
<PackageReference Include="MonoMod.Utils" Version="25.0.11"/>
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion Runtimes/NET/BepInEx.NET.Common/BepInEx.NET.Common.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<Description>BepInEx common code for .NET-based games</Description>
<TargetFrameworks>net9.0</TargetFrameworks>
<TargetFrameworks>net10.0</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<Description>BepInEx support library for CoreCLR games</Description>
<TargetFrameworks>net9.0</TargetFrameworks>
<TargetFrameworks>net10.0</TargetFrameworks>
<OutputPath>$(BuildDir)/NET.CoreCLR</OutputPath>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
<AppendTargetFrameworkToOutputPath>true</AppendTargetFrameworkToOutputPath>
Expand Down
4 changes: 2 additions & 2 deletions Runtimes/NET/BepisLoader/BepisLoader.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

<PropertyGroup>
<Description>BepInEx support library for Resonite</Description>
<TargetFrameworks>net9.0</TargetFrameworks>
<TargetFrameworks>net10.0</TargetFrameworks>
<OutputPath>$(BuildDir)/BepisLoader</OutputPath>
<OutputType>Exe</OutputType>
<Version>1.5.0</Version>
<Version>1.5.1</Version>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
Expand Down
9 changes: 5 additions & 4 deletions Runtimes/NET/BepisLoader/LinuxBootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,9 @@ main()
chmod +x "$RENDERER_SCRIPT"


# Install .NET 9 into the current directory
# Install .NET 10 into the current directory

bash "$DOTNET_INSTALL_SCRIPT" --verbose --channel 9.0 --runtime dotnet --install-dir "$DOTNET_ROOT"
bash "$DOTNET_INSTALL_SCRIPT" --verbose --channel 10.0 --runtime dotnet --install-dir "$DOTNET_ROOT"


# Not technically required, but mark dotnet itself as executable just in case.
Expand All @@ -87,10 +87,10 @@ main()
cat > "./BepisLoader.runtimeconfig.json" <<-'EOF'
{
"runtimeOptions": {
"tfm": "net9.0",
"tfm": "net10.0",
"framework": {
"name": "Microsoft.NETCore.App",
"version": "9.0.0"
"version": "10.0.0"
},
"configProperties": {
"System.Reflection.Metadata.MetadataUpdater.IsSupported": false,
Expand Down Expand Up @@ -150,6 +150,7 @@ main()
echo "Entry point: $ENTRY_POINT"

# ~ Launch Resonite! :) ~

exec "$DOTNET_EXECUTABLE" "$ENTRY_POINT" "$@"
}

Expand Down
4 changes: 2 additions & 2 deletions build/Build.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<RunWorkingDirectory>$(MSBuildProjectDirectory)</RunWorkingDirectory>
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
</PropertyGroup>
Expand All @@ -10,7 +10,7 @@
<PackageReference Include="Cake.Frosting.Git" Version="5.0.1" />
<PackageReference Include="Cake.Incubator" Version="8.0.0" />
<PackageReference Include="Cake.Json" Version="7.0.1" />
<PackageReference Include="Microsoft.Build" Version="17.14.8" />
<PackageReference Include="Microsoft.Build" Version="17.14.28" />
</ItemGroup>
<ItemGroup>
<Content Include="$(SolutionDir)/.github/workflows/*.yml" LinkBase="ci" />
Expand Down
12 changes: 6 additions & 6 deletions build/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ public enum ProjectBuildType
//new("NET.Framework", "win-x86", "net452"),
//new("NET.CoreCLR", "win-x64", "netcoreapp3.1"),
//new("NET.CoreCLR", "win-x64", "net9.0"),
new("NET", "BepisLoader", "win-x64", "net9.0"),
// new("NET", "BepisLoader", "linux-x64", "net9.0")
new("NET", "BepisLoader", "win-x64", "net10.0"),
// new("NET", "BepisLoader", "linux-x64", "net10.0")
};


Expand Down Expand Up @@ -418,7 +418,7 @@ public override void Run(BuildContext ctx)
ctx.Log.Warning("LinuxBootstrap.sh not found at: " + linuxBootstrapPath);
}

var netCoreCLRSource = ctx.OutputDirectory.Combine("NET.CoreCLR").Combine("net9.0");
var netCoreCLRSource = ctx.OutputDirectory.Combine("NET.CoreCLR").Combine("net10.0");
if (ctx.DirectoryExists(netCoreCLRSource))
{
// Create BepInEx directories only if we have files to copy
Expand Down Expand Up @@ -474,15 +474,15 @@ public override void Run(BuildContext ctx)
var runtimeConfig = """
{
"runtimeOptions": {
"tfm": "net9.0",
"tfm": "net10.0",
"frameworks": [
{
"name": "Microsoft.NETCore.App",
"version": "9.0.0"
"version": "10.0.0"
},
{
"name": "Microsoft.WindowsDesktop.App",
"version": "9.0.0"
"version": "10.0.0"
}
],
"configProperties": {
Expand Down
Loading