Merge branch 'master' into master

LemonUIbyLemon · Oct 24, 2023 · b48620c · b48620c
2 parents 9c2c825 + 6bbc838
commit b48620c
Show file tree

Hide file tree

Showing 90 changed files with 2,860 additions and 1,105 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -6,61 +6,94 @@ on:
   push:
   pull_request:
 
+permissions:
+  contents: write
+  id-token: write
+  pages: write
+  packages: write
+
 jobs:
   lint-and-compile:
     strategy:
       matrix:
         configuration: [Debug, Release]
     runs-on: ubuntu-22.04
     steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Setup .NET
-        uses: actions/[email protected]
+      - uses: actions/checkout@v3
+      - uses: actions/[email protected]
         with:
           dotnet-version: "7.0.x"
-      - name: Restore NuGet Packages
-        run: dotnet restore ${{ github.event.repository.name }}.sln
-      - name: Patch csproj version
-        uses: justalemon/[email protected]
+      - run: dotnet restore ${{ github.event.repository.name }}.sln
+      - uses: justalemon/[email protected]
         with:
-          version: 1.2.2.${{ github.run_number }}
+          version: 1.10.0.${{ github.run_number }}
           use-tag: true
-          csproj-files: "**/**.csproj"
-      - name: Compile
+          csproj-files: "**/*.csproj"
+      - run: dotnet build ${{ github.event.repository.name }}.sln -c ${{ matrix.configuration }}
         working-directory: ${{ env.GITHUB_WORKSPACE }}
-        run: dotnet build ${{ github.event.repository.name }}.sln -c ${{ matrix.configuration }}
-      - name: Upload Artifact
-        uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v3
         with:
           name: ${{ github.event.repository.name }}.${{ matrix.configuration }}
           path: bin/${{ matrix.configuration }}
+  docs:
+    runs-on: ubuntu-22.04
+    if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
+    needs:
+      - lint-and-compile
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/[email protected]
+        with:
+          dotnet-version: "7.0.x"
+      - uses: actions/download-artifact@v3
+        with:
+          name: ${{ github.event.repository.name }}.Release
+          path: bin/Release
+      - run: ls -R
+        working-directory: bin/Release
+      - run: dotnet tool update -g docfx
+      - run: docfx docs/docfx.json
+      - uses: actions/[email protected]
+        with:
+          path: "docs/_site"
+      - uses: actions/[email protected]
+  github-package-registry:
+    runs-on: ubuntu-22.04
+    if: ${{ github.ref == 'refs/heads/master' }}
+    needs:
+      - lint-and-compile
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/[email protected]
+        with:
+          dotnet-version: "7.0.x"
+      - uses: actions/download-artifact@v3
+        with:
+          name: ${{ github.event.repository.name }}.Release
+          path: bin/Release
+      - run: ls -R
+        working-directory: bin/Release
+      - run: 7z a ${{ github.event.repository.name }}.zip ${{ github.workspace }}/bin/Release/*
+      - run: dotnet nuget push "**/*.nupkg" -s 'https://nuget.pkg.github.com/${{ github.event.repository.owner.name }}/index.json' -k ${{ secrets.GITHUB_TOKEN }}
   deploy:
     runs-on: ubuntu-22.04
     if: ${{ github.event_name == 'release' }}
     needs:
       - lint-and-compile
     steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Setup .NET
-        uses: actions/[email protected]
+      - uses: actions/checkout@v3
+      - uses: actions/[email protected]
         with:
           dotnet-version: "7.0.x"
-      - name: Download the Artifact
-        uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v3
         with:
           name: ${{ github.event.repository.name }}.Release
           path: bin/Release
-      - name: List Everything
-        run: ls -R
+      - run: ls -R
         working-directory: bin/Release
-      - name: Repackage Files
-        run: 7z a ${{ github.event.repository.name }}.zip ${{ github.workspace }}/bin/Release/*
-      - name: Deploy NuGet
-        run: dotnet nuget push "**/*.nupkg" -s 'https://api.nuget.org/v3/index.json' -k ${{secrets.NUGET}}
-      - name: Create Release
-        uses: ncipollo/[email protected]
+      - run: 7z a ${{ github.event.repository.name }}.zip ${{ github.workspace }}/bin/Release/*
+      - run: dotnet nuget push "**/*.nupkg" -s 'https://api.nuget.org/v3/index.json' -k ${{ secrets.NUGET }}
+      - uses: ncipollo/[email protected]
         with:
           allowUpdates: true
           artifactErrorsFailBuild: true

diff --git a/.gitignore b/.gitignore
@@ -348,3 +348,6 @@ MigrationBackup/
 
 # Ionide (cross platform F# VS Code tools) working folder
 .ionide/
+
+# Remove JetBrains project files
+.idea/
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
     <ItemGroup>
-        <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.435" PrivateAssets="all"/>
+        <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.507" PrivateAssets="all"/>
         <AdditionalFiles Include="..\stylecop.json" />
     </ItemGroup>
 </Project>
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020-2021 Hannele Ruiz
+Copyright (c) 2020-2023 Hannele Ruiz
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/LemonUI.AltV.Async/LemonUI.AltV.Async.csproj b/LemonUI.AltV.Async/LemonUI.AltV.Async.csproj
@@ -0,0 +1,45 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>net6.0</TargetFramework>
+        <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+        <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+        <AssemblyName>$(AssemblyName)</AssemblyName>
+        <DefineConstants>ALTV,CLIENT</DefineConstants>
+        <Version>1.10.0</Version>
+        <OutputPath>$(SolutionDir)bin\$(Configuration)\AltV\</OutputPath>
+        <PlatformTarget>AnyCPU</PlatformTarget>
+        <DebugType>embedded</DebugType>
+        <DebugSymbols>true</DebugSymbols>
+        <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+        <CheckEolTargetFramework>false</CheckEolTargetFramework>
+
+        <GenerateDocumentationFile>true</GenerateDocumentationFile>
+        <DocumentationFile>$(OutputPath)\$(AssemblyName).xml</DocumentationFile>
+
+        <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+        <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
+        <PackageIcon>logo.png</PackageIcon>
+        <PackageId>$(ProjectName)</PackageId>
+        <Authors>Hannele "Lemon" Ruiz</Authors>
+        <Company>Hannele "Lemon" Ruiz</Company>
+        <Product>LemonUI</Product>
+        <Description>UI system for Grand Theft Auto V. This package is for AltV Client (Asynchronous).</Description>
+        <PackageLicenseExpression>MIT</PackageLicenseExpression>
+        <PackageProjectUrl>https://github.com/justalemon/LemonUI</PackageProjectUrl>
+        <RepositoryUrl>https://github.com/justalemon/LemonUI.git</RepositoryUrl>
+        <RepositoryType>git</RepositoryType>
+        <NeutralLanguage>en-US</NeutralLanguage>
+        <PackageOutputPath>$(SolutionDir)bin\$(Configuration)\FOR DEVELOPERS</PackageOutputPath>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <Compile Include="$(ProjectDir)../LemonUI/**/*.cs" />
+        <None Include="$(ProjectDir)../README.md" Pack="true" Visible="false" PackagePath="" />
+        <None Include="$(ProjectDir)../logo.png" Pack="true" Visible="false" PackagePath="" />
+        <PackageReference Include="AltV.Net.Client.Async" Version="15.0.105-dev">
+            <IncludeAssets>compile</IncludeAssets>
+        </PackageReference>
+    </ItemGroup>
+
+</Project>
diff --git a/LemonUI.AltV/LemonUI.AltV.csproj b/LemonUI.AltV/LemonUI.AltV.csproj
@@ -0,0 +1,45 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>net6.0</TargetFramework>
+        <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+        <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+        <AssemblyName>$(AssemblyName)</AssemblyName>
+        <DefineConstants>ALTV,CLIENT</DefineConstants>
+        <Version>1.10.0</Version>
+        <OutputPath>$(SolutionDir)bin\$(Configuration)\AltV\</OutputPath>
+        <PlatformTarget>AnyCPU</PlatformTarget>
+        <DebugType>embedded</DebugType>
+        <DebugSymbols>true</DebugSymbols>
+        <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+        <CheckEolTargetFramework>false</CheckEolTargetFramework>
+
+        <GenerateDocumentationFile>true</GenerateDocumentationFile>
+        <DocumentationFile>$(OutputPath)\$(AssemblyName).xml</DocumentationFile>
+
+        <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+        <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
+        <PackageIcon>logo.png</PackageIcon>
+        <PackageId>$(ProjectName)</PackageId>
+        <Authors>Hannele "Lemon" Ruiz</Authors>
+        <Company>Hannele "Lemon" Ruiz</Company>
+        <Product>LemonUI</Product>
+        <Description>UI system for Grand Theft Auto V. This package is for AltV Client.</Description>
+        <PackageLicenseExpression>MIT</PackageLicenseExpression>
+        <PackageProjectUrl>https://github.com/justalemon/LemonUI</PackageProjectUrl>
+        <RepositoryUrl>https://github.com/justalemon/LemonUI.git</RepositoryUrl>
+        <RepositoryType>git</RepositoryType>
+        <NeutralLanguage>en-US</NeutralLanguage>
+        <PackageOutputPath>$(SolutionDir)bin\$(Configuration)\FOR DEVELOPERS</PackageOutputPath>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <Compile Include="$(ProjectDir)../LemonUI/**/*.cs" />
+        <None Include="$(ProjectDir)../README.md" Pack="true" Visible="false" PackagePath="" />
+        <None Include="$(ProjectDir)../logo.png" Pack="true" Visible="false" PackagePath="" />
+        <PackageReference Include="AltV.Net.Client" Version="15.0.105-dev">
+            <IncludeAssets>compile</IncludeAssets>
+        </PackageReference>
+    </ItemGroup>
+
+</Project>
diff --git a/LemonUI.FiveM/LemonUI.FiveM.csproj b/LemonUI.FiveM/LemonUI.FiveM.csproj
@@ -1,24 +1,45 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
     <PropertyGroup>
-        <ForFramework>FiveM</ForFramework>
         <TargetFramework>net452</TargetFramework>
-        <DefineConstants>FIVEM</DefineConstants>
-    </PropertyGroup>
-
-    <PropertyGroup>
+        <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+        <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+        <AssemblyName>$(AssemblyName)</AssemblyName>
+        <DefineConstants>FIVEM,CLIENT</DefineConstants>
+        <Version>1.10.0</Version>
+        <OutputPath>$(SolutionDir)bin\$(Configuration)\FiveM\</OutputPath>
+        <PlatformTarget>AnyCPU</PlatformTarget>
         <DebugType>embedded</DebugType>
         <DebugSymbols>true</DebugSymbols>
-    </PropertyGroup>
+        <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+        <CheckEolTargetFramework>false</CheckEolTargetFramework>
 
-    <Import Project="../root.props" />
+        <GenerateDocumentationFile>true</GenerateDocumentationFile>
+        <DocumentationFile>$(OutputPath)\$(AssemblyName).xml</DocumentationFile>
 
-    <PropertyGroup>
+        <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+        <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
+        <PackageIcon>logo.png</PackageIcon>
+        <PackageId>$(ProjectName)</PackageId>
+        <Authors>Hannele "Lemon" Ruiz</Authors>
+        <Company>Hannele "Lemon" Ruiz</Company>
+        <Product>LemonUI</Product>
         <Description>UI system for Grand Theft Auto V. This package is for FiveM Client.</Description>
+        <PackageLicenseExpression>MIT</PackageLicenseExpression>
+        <PackageProjectUrl>https://github.com/justalemon/LemonUI</PackageProjectUrl>
+        <RepositoryUrl>https://github.com/justalemon/LemonUI.git</RepositoryUrl>
+        <RepositoryType>git</RepositoryType>
+        <NeutralLanguage>en-US</NeutralLanguage>
+        <PackageOutputPath>$(SolutionDir)bin\$(Configuration)\FOR DEVELOPERS</PackageOutputPath>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="CitizenFX.Core.Client" Version="1.0.6008">
+        <Compile Include="$(ProjectDir)../LemonUI/**/*.cs" />
+        <None Include="$(ProjectDir)../README.md" Pack="true" Visible="false" PackagePath="" />
+        <None Include="$(ProjectDir)../logo.png" Pack="true" Visible="false" PackagePath="" />
+        <PackageReference Include="CitizenFX.Core.Client" Version="1.0.6370">
             <IncludeAssets>compile</IncludeAssets>
         </PackageReference>
     </ItemGroup>
+
 </Project>
diff --git a/LemonUI.RageMP/LemonUI.RageMP.csproj b/LemonUI.RageMP/LemonUI.RageMP.csproj
@@ -1,30 +1,49 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
     <PropertyGroup>
-        <ForFramework>RageMP</ForFramework>
         <TargetFramework>netcoreapp2.2</TargetFramework>
-        <DefineConstants>RAGEMP</DefineConstants>
-    </PropertyGroup>
-
-    <PropertyGroup>
-        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+        <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+        <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+        <AssemblyName>$(AssemblyName)</AssemblyName>
+        <DefineConstants>RAGEMP,CLIENT</DefineConstants>
+        <Version>1.10.0</Version>
+        <OutputPath>$(SolutionDir)bin\$(Configuration)\RageMP\</OutputPath>
         <PlatformTarget>x64</PlatformTarget>
+        <DebugType>portable</DebugType>
+        <DebugSymbols>true</DebugSymbols>
+        <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
         <CheckEolTargetFramework>false</CheckEolTargetFramework>
-    </PropertyGroup>
 
-    <Import Project="../root.props" />
+        <GenerateDocumentationFile>true</GenerateDocumentationFile>
+        <DocumentationFile>$(OutputPath)\$(AssemblyName).xml</DocumentationFile>
 
-    <PropertyGroup>
+        <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+        <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
+        <PackageIcon>logo.png</PackageIcon>
+        <PackageId>$(ProjectName)</PackageId>
+        <Authors>Hannele "Lemon" Ruiz</Authors>
+        <Company>Hannele "Lemon" Ruiz</Company>
+        <Product>LemonUI</Product>
         <Description>UI system for Grand Theft Auto V. This package is for RageMP.</Description>
+        <PackageLicenseExpression>MIT</PackageLicenseExpression>
+        <PackageProjectUrl>https://github.com/justalemon/LemonUI</PackageProjectUrl>
+        <RepositoryUrl>https://github.com/justalemon/LemonUI.git</RepositoryUrl>
+        <RepositoryType>git</RepositoryType>
+        <NeutralLanguage>en-US</NeutralLanguage>
+        <PackageOutputPath>$(SolutionDir)bin\$(Configuration)\FOR DEVELOPERS</PackageOutputPath>
     </PropertyGroup>
-
+    
     <ItemGroup>
+        <Compile Include="$(ProjectDir)../LemonUI/**/*.cs" />
+        <None Include="$(ProjectDir)../README.md" Pack="true" Visible="false" PackagePath="" />
+        <None Include="$(ProjectDir)../logo.png" Pack="true" Visible="false" PackagePath="" />
         <PackageReference Include="RAGEMP-ragesharp" Version="1.1.3">
             <IncludeAssets>compile</IncludeAssets>
         </PackageReference>
-        <PackageReference Update="Microsoft.NETCore.App" Version="2.2.8" />
     </ItemGroup>
 
     <Target Name="PostBuild" AfterTargets="PostBuildEvent">
         <Exec Command="python &quot;$(SolutionDir)ragemp.py&quot; &quot;$(SolutionDir)LemonUI&quot; &quot;$(OutDir)..\FOR DEVELOPERS\LemonUI.RageMP.cs&quot;" />
     </Target>
+
 </Project>