Skip to content

Commit

Permalink
Merge pull request #36 from xodial/xodial/net8-downgrade
Browse files Browse the repository at this point in the history
Downgrade to latest net8 to stay synced with GodotSharp
  • Loading branch information
jolexxa authored Jan 10, 2025
2 parents 45ec5e6 + 1b363f4 commit ecee9c8
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 19 deletions.
8 changes: 3 additions & 5 deletions .github/workflows/auto_release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# You can disable this action by setting the DISABLE_AUTO_RELEASE repository
# variable to true.

name: '🦾 Auto-Release'
name: "🦾 Auto-Release"
on:
workflow_run:
workflows: ["🚥 Tests"]
Expand All @@ -33,10 +33,8 @@ jobs:
- name: 🧾 Checkout
uses: actions/checkout@v4
with:
# Use your GitHub Personal Access Token variable here.
token: ${{ secrets.GH_BASIC }}
lfs: true
submodules: 'recursive'
submodules: "recursive"

- name: 🧑‍🔬 Check Test Results
id: tests
Expand Down Expand Up @@ -71,7 +69,7 @@ jobs:
fi
trigger_release:
uses: './.github/workflows/release.yaml'
uses: "./.github/workflows/release.yaml"
needs: auto_release
if: needs.auto_release.outputs.should_release == 'true'
secrets:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ jobs:
- name: 🧾 Checkout
uses: actions/checkout@v4
with:
token: ${{ secrets.GH_BASIC }}
lfs: true
submodules: "recursive"
fetch-depth: 0 # So we can get all tags.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Godot.NET.Sdk/4.3.0">
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>disable</ImplicitUsings>
<Nullable>enable</Nullable>
<EnableDynamicLoading>true</EnableDynamicLoading>
Expand Down
8 changes: 0 additions & 8 deletions Chickensoft.Serialization.Godot.Tests/nuget.config

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<EnableDynamicLoading>true</EnableDynamicLoading>
<LangVersion>preview</LangVersion>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
Expand Down Expand Up @@ -47,7 +47,8 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="System.Text.Json" Version="9.0.0" />
<PackageReference Include="GodotSharp" Version="4.3.0" />
<PackageReference Include="Chickensoft.Serialization" Version="2.1.0" />
<PackageReference Include="Chickensoft.Serialization" Version="2.2.0" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"sdk": {
"version": "9.0.101",
"rollForward": "latestMajor"
"version": "8.0.404",
"rollForward": "latestMinor"
},
"msbuild-sdks": {
"Godot.NET.Sdk": "4.3.0"
Expand Down

0 comments on commit ecee9c8

Please sign in to comment.