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
4 changes: 2 additions & 2 deletions .github/workflows/dotnet-component.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
- .github/workflows/dotnet-component.yml
- src/SampSharp.*/**
- src/TestMode.*/**
- SampSharp.sln
- SampSharp.slnx
- Directory.Build.props
- build.sh

Expand All @@ -21,7 +21,7 @@ on:
- .github/workflows/dotnet-component.yml
- src/SampSharp.*/**
- src/TestMode.*/**
- SampSharp.sln
- SampSharp.slnx
- Directory.Build.props
- build.sh

Expand Down
106 changes: 0 additions & 106 deletions SampSharp.sln

This file was deleted.

26 changes: 26 additions & 0 deletions SampSharp.slnx
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<Solution>
<Folder Name="/CodeAnalysis/">
<Project Path="src/SampSharp.Analyzer/SampSharp.Analyzer.csproj" />
<Project Path="src/SampSharp.CodeFixes/SampSharp.CodeFixes.csproj" />
<Project Path="src/SampSharp.SourceGenerator/SampSharp.SourceGenerator.csproj" />
</Folder>
<Folder Name="/SampSharp/">
<Project Path="src/SampSharp.OpenMp.Core/SampSharp.OpenMp.Core.csproj" />
<Project Path="src/SampSharp.OpenMp.Entities.Commands/SampSharp.OpenMp.Entities.Commands.csproj" />
<Project Path="src/SampSharp.OpenMp.Entities/SampSharp.OpenMp.Entities.csproj" />
<Project Path="src/SampSharp.Sdk/SampSharp.Sdk.csproj" />
</Folder>
<Folder Name="/Solution Items/">
<File Path=".editorconfig" />
<File Path=".gitignore" />
<File Path="Directory.Build.props" />
<File Path="Directory.Packages.props" />
<File Path="LICENSE" />
<File Path="README.md" />
</Folder>
<Folder Name="/TestingModes/">
<Project Path="src/TestMode.OpenMp.Core/TestMode.OpenMp.Core.csproj" />
<Project Path="src/TestMode.OpenMp.Entities/TestMode.OpenMp.Entities.csproj" />
<Project Path="src/TestMode.UnitTests/TestMode.UnitTests.csproj" />
</Folder>
</Solution>
File renamed without changes.
8 changes: 4 additions & 4 deletions build.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -99,15 +99,15 @@ exit /b 1
cd /d "%SCRIPTDIR%src\legacy"
echo.
echo Building C# libraries...
dotnet build SampSharp.sln -c Release
dotnet build SampSharp.Legacy.slnx -c Release
if errorlevel 1 exit /b 1
exit /b 0

:pack_legacy_libraries
cd /d "%SCRIPTDIR%src\legacy"
echo.
echo Packing C# libraries...
dotnet pack SampSharp.sln -c Release
dotnet pack SampSharp.Legacy.slnx -c Release
if errorlevel 1 exit /b 1
echo.
echo NuGet packages created in: %SCRIPTDIR%build\artifacts\packages
Expand All @@ -117,15 +117,15 @@ exit /b 0
cd /d "%SCRIPTDIR%"
echo.
echo Building C# libraries...
dotnet build SampSharp.sln -c Release
dotnet build SampSharp.slnx -c Release
if errorlevel 1 exit /b 1
exit /b 0

:pack_component_libraries
cd /d "%SCRIPTDIR%"
echo.
echo Packing C# libraries...
dotnet pack SampSharp.sln -c Release
dotnet pack SampSharp.slnx -c Release
if errorlevel 1 exit /b 1
echo.
echo NuGet packages created in: %SCRIPTDIR%build\artifacts\packages
Expand Down
16 changes: 8 additions & 8 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ build_component_libraries() {
echo ""
echo "Building C# libraries..."
if [ -n "$CiVersion" ]; then
dotnet build SampSharp.sln -c Release "/p:CiVersion=$CiVersion"
dotnet build SampSharp.slnx -c Release "/p:CiVersion=$CiVersion"
else
dotnet build SampSharp.sln -c Release
dotnet build SampSharp.slnx -c Release
fi
}

Expand All @@ -40,9 +40,9 @@ pack_component_libraries() {
echo ""
echo "Packing C# libraries..."
if [ -n "$CiVersion" ]; then
dotnet pack SampSharp.sln -c Release "/p:CiVersion=$CiVersion"
dotnet pack SampSharp.slnx -c Release "/p:CiVersion=$CiVersion"
else
dotnet pack SampSharp.sln -c Release
dotnet pack SampSharp.slnx -c Release
fi

echo ""
Expand All @@ -56,9 +56,9 @@ build_legacy_libraries() {
echo ""
echo "Building C# libraries..."
if [ -n "$CiVersion" ]; then
dotnet build SampSharp.sln -c Release "/p:CiVersion=$CiVersion"
dotnet build SampSharp.Legacy.slnx -c Release "/p:CiVersion=$CiVersion"
else
dotnet build SampSharp.sln -c Release
dotnet build SampSharp.Legacy.slnx -c Release
fi
}

Expand All @@ -69,9 +69,9 @@ pack_legacy_libraries() {
echo ""
echo "Packing C# libraries..."
if [ -n "$CiVersion" ]; then
dotnet pack SampSharp.sln -c Release "/p:CiVersion=$CiVersion"
dotnet pack SampSharp.Legacy.slnx -c Release "/p:CiVersion=$CiVersion"
else
dotnet pack SampSharp.sln -c Release
dotnet pack SampSharp.Legacy.slnx -c Release
fi

echo ""
Expand Down
12 changes: 12 additions & 0 deletions src/legacy/SampSharp.Legacy.slnx
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<Solution>
<Folder Name="/build/">
<File Path="Directory.Build.props" />
<File Path="Directory.Packages.props" />
</Folder>
<Project Path="SampSharp.Core.UnitTests/SampSharp.Core.UnitTests.csproj" />
<Project Path="SampSharp.Core/SampSharp.Core.csproj" />
<Project Path="SampSharp.Entities/SampSharp.Entities.csproj" />
<Project Path="SampSharp.GameMode/SampSharp.GameMode.csproj" />
<Project Path="TestMode.Entities/TestMode.Entities.csproj" />
<Project Path="TestMode.GameMode/TestMode.GameMode.csproj" />
</Solution>
31 changes: 0 additions & 31 deletions src/legacy/SampSharp.Plugin.sln

This file was deleted.

Loading
Loading