Skip to content

Commit

Permalink
Merge branch 'rc' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
Doxoh committed Oct 15, 2024
2 parents 969a35f + be2759c commit 31da6ee
Show file tree
Hide file tree
Showing 37 changed files with 89 additions and 89 deletions.
72 changes: 36 additions & 36 deletions .github/workflows/dotnetcore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,28 +16,28 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v3
with:
dotnet-version: 6.0.x
dotnet-version: 8.0.x
- name: Build with dotnet
working-directory: ./api
run: |
dotnet build AltV.Net.Host -c Release -f net6.0
dotnet build AltV.Net.Host -c Release -f net6.0
dotnet build AltV.Net.Shared -c Release -f net6.0
dotnet build AltV.Net.CApi -c Release -f net6.0
dotnet build AltV.Net -c Release -f net6.0
dotnet build AltV.Net -c Debug -f net6.0
dotnet build AltV.Net.Async -c Release -f net6.0
dotnet build AltV.Net.Async -c Debug -f net6.0
dotnet build AltV.Net.Interactions -c Release -f net6.0
dotnet build AltV.Net.Host -c Release -f net8.0
dotnet build AltV.Net.Host -c Release -f net8.0
dotnet build AltV.Net.Shared -c Release -f net8.0
dotnet build AltV.Net.CApi -c Release -f net8.0
dotnet build AltV.Net -c Release -f net8.0
dotnet build AltV.Net -c Debug -f net8.0
dotnet build AltV.Net.Async -c Release -f net8.0
dotnet build AltV.Net.Async -c Debug -f net8.0
dotnet build AltV.Net.Interactions -c Release -f net8.0
dotnet build AltV.Net.Async.CodeGen -c Release -f netstandard2.0
dotnet build AltV.Net.Resources.Chat.Api -c Release -f net6.0
dotnet build AltV.Net.EntitySync.ServerEvent -c Release -f net6.0
dotnet build AltV.Net.Client -c Release -f net6.0
dotnet build AltV.Net.Client.Async -c Release -f net6.0
dotnet build AltV.Net.ColShape -c Release -f net6.0
dotnet build AltV.Net.Sdk.Server -c Release -f net6.0
dotnet build AltV.Net.Sdk.Client -c Release -f net6.0
dotnet build AltV.Net.Sdk.Shared -c Release -f net6.0
dotnet build AltV.Net.Resources.Chat.Api -c Release -f net8.0
dotnet build AltV.Net.EntitySync.ServerEvent -c Release -f net8.0
dotnet build AltV.Net.Client -c Release -f net8.0
dotnet build AltV.Net.Client.Async -c Release -f net8.0
dotnet build AltV.Net.ColShape -c Release -f net8.0
dotnet build AltV.Net.Sdk.Server -c Release -f net8.0
dotnet build AltV.Net.Sdk.Client -c Release -f net8.0
dotnet build AltV.Net.Sdk.Shared -c Release -f net8.0
build:

runs-on: ubuntu-latest
Expand All @@ -47,25 +47,25 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v3
with:
dotnet-version: 6.0.x
dotnet-version: 8.0.x
- name: Build with dotnet
working-directory: ./api
run: |
dotnet build AltV.Net.Host -c Release -f net6.0
dotnet build AltV.Net.Host -c Release -f net6.0
dotnet build AltV.Net.Shared -c Release -f net6.0
dotnet build AltV.Net.CApi -c Release -f net6.0
dotnet build AltV.Net -c Release -f net6.0
dotnet build AltV.Net -c Debug -f net6.0
dotnet build AltV.Net.Async -c Release -f net6.0
dotnet build AltV.Net.Async -c Debug -f net6.0
dotnet build AltV.Net.Interactions -c Release -f net6.0
dotnet build AltV.Net.Host -c Release -f net8.0
dotnet build AltV.Net.Host -c Release -f net8.0
dotnet build AltV.Net.Shared -c Release -f net8.0
dotnet build AltV.Net.CApi -c Release -f net8.0
dotnet build AltV.Net -c Release -f net8.0
dotnet build AltV.Net -c Debug -f net8.0
dotnet build AltV.Net.Async -c Release -f net8.0
dotnet build AltV.Net.Async -c Debug -f net8.0
dotnet build AltV.Net.Interactions -c Release -f net8.0
dotnet build AltV.Net.Async.CodeGen -c Release -f netstandard2.0
dotnet build AltV.Net.Resources.Chat.Api -c Release -f net6.0
dotnet build AltV.Net.EntitySync.ServerEvent -c Release -f net6.0
dotnet build AltV.Net.Client -c Release -f net6.0
dotnet build AltV.Net.Client.Async -c Release -f net6.0
dotnet build AltV.Net.ColShape -c Release -f net6.0
dotnet build AltV.Net.Sdk.Server -c Release -f net6.0
dotnet build AltV.Net.Sdk.Client -c Release -f net6.0
dotnet build AltV.Net.Sdk.Shared -c Release -f net6.0
dotnet build AltV.Net.Resources.Chat.Api -c Release -f net8.0
dotnet build AltV.Net.EntitySync.ServerEvent -c Release -f net8.0
dotnet build AltV.Net.Client -c Release -f net8.0
dotnet build AltV.Net.Client.Async -c Release -f net8.0
dotnet build AltV.Net.ColShape -c Release -f net8.0
dotnet build AltV.Net.Sdk.Server -c Release -f net8.0
dotnet build AltV.Net.Sdk.Client -c Release -f net8.0
dotnet build AltV.Net.Sdk.Shared -c Release -f net8.0
36 changes: 18 additions & 18 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v3
with:
dotnet-version: 6.0.x
dotnet-version: 8.0.x
- id: build_info
run: |
branch=$(git ls-remote --heads origin | grep $GITHUB_SHA | sed "s/.*\///")
Expand Down Expand Up @@ -91,24 +91,24 @@ jobs:
- name: Build
working-directory: ./api
run: |
dotnet publish AltV.Net.Host -c Release -f net6.0
dotnet publish AltV.Net.Host -c Release -f net6.0
dotnet publish AltV.Net.Shared -c Release -f net6.0
dotnet publish AltV.Net.CApi -c Release -f net6.0
dotnet publish AltV.Net -c Release -f net6.0
dotnet publish AltV.Net -c Debug -f net6.0
dotnet publish AltV.Net.Async -c Release -f net6.0
dotnet publish AltV.Net.Async -c Debug -f net6.0
dotnet publish AltV.Net.Interactions -c Release -f net6.0
dotnet publish AltV.Net.Host -c Release -f net8.0
dotnet publish AltV.Net.Host -c Release -f net8.0
dotnet publish AltV.Net.Shared -c Release -f net8.0
dotnet publish AltV.Net.CApi -c Release -f net8.0
dotnet publish AltV.Net -c Release -f net8.0
dotnet publish AltV.Net -c Debug -f net8.0
dotnet publish AltV.Net.Async -c Release -f net8.0
dotnet publish AltV.Net.Async -c Debug -f net8.0
dotnet publish AltV.Net.Interactions -c Release -f net8.0
dotnet publish AltV.Net.Async.CodeGen -c Release -f netstandard2.0
dotnet publish AltV.Net.Resources.Chat.Api -c Release -f net6.0
dotnet publish AltV.Net.EntitySync.ServerEvent -c Release -f net6.0
dotnet publish AltV.Net.Client -c Release -f net6.0
dotnet publish AltV.Net.Client.Async -c Release -f net6.0
dotnet publish AltV.Net.ColShape -c Release -f net6.0
dotnet publish AltV.Net.Sdk.Server -c Release -f net6.0
dotnet publish AltV.Net.Sdk.Client -c Release -f net6.0
dotnet publish AltV.Net.Sdk.Shared -c Release -f net6.0
dotnet publish AltV.Net.Resources.Chat.Api -c Release -f net8.0
dotnet publish AltV.Net.EntitySync.ServerEvent -c Release -f net8.0
dotnet publish AltV.Net.Client -c Release -f net8.0
dotnet publish AltV.Net.Client.Async -c Release -f net8.0
dotnet publish AltV.Net.ColShape -c Release -f net8.0
dotnet publish AltV.Net.Sdk.Server -c Release -f net8.0
dotnet publish AltV.Net.Sdk.Client -c Release -f net8.0
dotnet publish AltV.Net.Sdk.Shared -c Release -f net8.0
- run: |
mkdir -p ./modules/linux
mkdir -p ./modules/windows
Expand Down
2 changes: 1 addition & 1 deletion api/AltV.Net.Async/AltV.Net.Async.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFramework>net8.0</TargetFramework>
<LangVersion>latest</LangVersion>
<Platforms>AnyCPU</Platforms>
<RootNamespace>AltV.Net.Async</RootNamespace>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Configurations>$(Configurations);Testing;Linux</Configurations>
<Platforms>AnyCPU</Platforms>
<RootNamespace>AltV.Net.BenchmarkRunners</RootNamespace>
Expand Down
2 changes: 1 addition & 1 deletion api/AltV.Net.Benchmarks/AltV.Net.Benchmarks.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Configurations>$(Configurations);Testing;Linux</Configurations>
<Platforms>AnyCPU</Platforms>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion api/AltV.Net.CApi.Generator/AltV.Net.CApi.Generator.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>

</Project>
2 changes: 1 addition & 1 deletion api/AltV.Net.CApi/AltV.Net.CApi.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFramework>net8.0</TargetFramework>
<LangVersion>default</LangVersion>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
Expand Down
2 changes: 1 addition & 1 deletion api/AltV.Net.Client.Async/AltV.Net.Client.Async.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<LangVersion>10</LangVersion>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
Expand Down
2 changes: 1 addition & 1 deletion api/AltV.Net.Client.Example/AltV.Net.Client.Example.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion api/AltV.Net.Client/AltV.Net.Client.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<LangVersion>10</LangVersion>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>disable</Nullable>
Expand Down
2 changes: 1 addition & 1 deletion api/AltV.Net.ColShape.Tests/AltV.Net.ColShape.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>

<IsPackable>false</IsPackable>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion api/AltV.Net.ColShape/AltV.Net.ColShape.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFramework>net8.0</TargetFramework>
<LangVersion>default</LangVersion>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion api/AltV.Net.CoreRT.Example/AltV.Net.CoreRT.Example.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<OutputType>Exe</OutputType>
<DebugType>pdbonly</DebugType>
<DebugSymbols>true</DebugSymbols>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<IncludeSymbols>true</IncludeSymbols>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<OutputType>Exe</OutputType>
<DebugType>pdbonly</DebugType>
<DebugSymbols>true</DebugSymbols>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFramework>net8.0</TargetFramework>
<LangVersion>default</LangVersion>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>

<IsPackable>false</IsPackable>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion api/AltV.Net.EntitySync/AltV.Net.EntitySync.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFramework>net8.0</TargetFramework>
<PackageVersion>1.18.0</PackageVersion>
<Authors>AltMp</Authors>
<Description>AltV .NET Core Entity Sync</Description>
Expand Down
2 changes: 1 addition & 1 deletion api/AltV.Net.Example/AltV.Net.Example.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Configurations>$(Configurations);Testing;Linux</Configurations>
<Platforms>AnyCPU</Platforms>
<RootNamespace>AltV.Net.Example</RootNamespace>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<!--<TargetFramework>netcoreapp2.1</TargetFramework>-->
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<OutputType>Exe</OutputType>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion api/AltV.Net.Host/AltV.Net.Host.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFramework>net8.0</TargetFramework>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<LangVersion>default</LangVersion>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion api/AltV.Net.Interactions/AltV.Net.Interactions.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFramework>net8.0</TargetFramework>
<LangVersion>default</LangVersion>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFramework>net8.0</TargetFramework>
<LangVersion>default</LangVersion>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFramework>net8.0</TargetFramework>
<LangVersion>default</LangVersion>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion api/AltV.Net.Resources.Chat/AltV.Net.Resources.Chat.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RootNamespace>AltV.Net.Resources.Chat</RootNamespace>
<PackageVersion>1.0.0-dev-preview</PackageVersion>
<PackageLicenseFile>license.txt</PackageLicenseFile>
Expand Down
2 changes: 1 addition & 1 deletion api/AltV.Net.Sdk.Client/AltV.Net.Sdk.Client.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Authors>AltMp</Authors>
<Description>alt:V .NET client SDK</Description>
<Copyright>AltMp</Copyright>
Expand Down
2 changes: 1 addition & 1 deletion api/AltV.Net.Sdk.Generator/AltV.Net.Sdk.Generator.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion api/AltV.Net.Sdk.Server/AltV.Net.Sdk.Server.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Authors>AltMp</Authors>
<Description>alt:V .NET server SDK</Description>
<Copyright>AltMp</Copyright>
Expand Down
Loading

0 comments on commit 31da6ee

Please sign in to comment.