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
2 changes: 1 addition & 1 deletion .github/actions/test-setup-dotnet/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ runs:
- name: Setup .NET Sdk
uses: actions/setup-dotnet@v4
with:
dotnet-version: '9.0.101'
dotnet-version: '10.0.x'

- name: Get .NET Channels
uses: ./.github/actions/get-dotnet-channel
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: '9.0.101'
dotnet-version: '10.0.x'

- name: Build
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-unix-mono.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ jobs:
- name: Setup .NET SDK
uses: actions/setup-dotnet@v4
with:
dotnet-version: '9.0.101'
dotnet-version: '10.0.x'
env:
DOTNET_INSTALL_DIR: ${{ runner.temp }}/.dotnet

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-windows-framework.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
- name: Setup .NET Sdk
uses: actions/setup-dotnet@v4
with:
dotnet-version: '9.0.101'
dotnet-version: '10.0.x'

- name: Get Installed .NET Sdk Information
run: dotnet --info
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-windows-mono.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
- name: Setup .NET Sdk
uses: actions/setup-dotnet@v4
with:
dotnet-version: '9.0.101'
dotnet-version: '10.0.x'

- name: Get Installed .NET Sdk Information
run: dotnet --info
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ env:
# You are interested in changing these values
BUILD_CONFIGURATIONS: "['Debug', 'Release']"
BUILD_CONFIGURATIONS_WITH_REF: "['Debug', 'Release']"
DOTNET_TARGET_FRAMEWORKS: "['netcoreapp3.0', 'netcoreapp3.1', 'net5.0', 'net6.0', 'net7.0', 'net8.0', 'net9.0']"
DOTNET_TARGET_FRAMEWORKS_MACOS_ARM64: "['net6.0', 'net7.0', 'net8.0', 'net9.0']"
DOTNET_TARGET_FRAMEWORKS: "['netcoreapp3.0', 'netcoreapp3.1', 'net5.0', 'net6.0', 'net7.0', 'net8.0', 'net9.0', 'net10.0']"
DOTNET_TARGET_FRAMEWORKS_MACOS_ARM64: "['net6.0', 'net7.0', 'net8.0', 'net9.0', 'net10.0']"
FRAMEWORK_TARGET_FRAMEWORKS: "['net35', 'net452', 'net472', 'net48']"

jobs:
Expand Down
5 changes: 3 additions & 2 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
</PropertyGroup>

<PropertyGroup Label="Build Configuration">
<TargetFrameworks>net35;net452;net472;net48;netcoreapp3.0;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
<TargetFrameworks>net35;net452;net472;net48;netcoreapp3.0;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<LangVersion>preview</LangVersion>
<CheckEolTargetFramework>false</CheckEolTargetFramework>
Expand All @@ -32,7 +32,7 @@
<IncludeBuildOutput Condition="$(TargetFramework)=='netstandard2.0'">false</IncludeBuildOutput>

<IsNET5OrGreater>false</IsNET5OrGreater>
<IsNET5OrGreater Condition="'$(TargetFramework)'=='net5.0' Or '$(TargetFramework)'=='net6.0' Or '$(TargetFramework)'=='net7.0' Or '$(TargetFramework)'=='net8.0' Or '$(TargetFramework)'=='net9.0'">true</IsNET5OrGreater>
<IsNET5OrGreater Condition="'$(TargetFramework)'=='net5.0' Or '$(TargetFramework)'=='net6.0' Or '$(TargetFramework)'=='net7.0' Or '$(TargetFramework)'=='net8.0' Or '$(TargetFramework)'=='net9.0' Or '$(TargetFramework)'=='net10.0'">true</IsNET5OrGreater>
</PropertyGroup>

<PropertyGroup Label="Package Configuration" Condition="$(IsLibHarmonyProject)">
Expand Down Expand Up @@ -79,6 +79,7 @@
<PackageReference Condition="'$(TargetFramework)'=='net7.0'" Include="System.Text.Json" Version="8.0.5" />
<PackageReference Condition="'$(TargetFramework)'=='net8.0'" Include="System.Text.Json" Version="8.0.5" />
<PackageReference Condition="'$(TargetFramework)'=='net9.0'" Include="System.Text.Json" Version="9.0.1" />
<PackageReference Condition="'$(TargetFramework)'=='net10.0'" Include="System.Text.Json" Version="10.0.0" />
</ItemGroup>

<ItemGroup Condition="$(IsLibHarmonyProject)">
Expand Down
1 change: 1 addition & 0 deletions Lib.Harmony/Lib.Harmony.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
<PackageReference Condition="$(TargetFramework) == 'net7.0'" Include="Microsoft.NetCore.App.Ref" Version="7.0.20" ExcludeAssets="all" PrivateAssets="all" GeneratePathProperty="true" />
<PackageReference Condition="$(TargetFramework) == 'net8.0'" Include="Microsoft.NetCore.App.Ref" Version="8.0.12" ExcludeAssets="all" PrivateAssets="all" GeneratePathProperty="true" />
<PackageReference Condition="$(TargetFramework) == 'net9.0'" Include="Microsoft.NetCore.App.Ref" Version="9.0.1" ExcludeAssets="all" PrivateAssets="all" GeneratePathProperty="true" />
<PackageReference Condition="$(TargetFramework) == 'net10.0'" Include="Microsoft.NetCore.App.Ref" Version="10.0.0" ExcludeAssets="all" PrivateAssets="all" GeneratePathProperty="true" />
</ItemGroup>

<!-- Replace Code with reference to Lib.Harmony.Ref for netstandard2.0 -->
Expand Down
4 changes: 2 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "9.0.101",
"rollForward": "latestFeature"
"version": "10.0.100",
"rollForward": "latestPatch"
}
}
Loading