Skip to content

Commit 5f2f3c6

Browse files
sunnamed434sunnamed434
authored
Merge pull request #60 from RocketModFix/reference-rocket-directly
Reference Rocket. Core/API directly, instead of NuGet Packages (#55)
2 parents 6b7eae4 + 20493f4 commit 5f2f3c6

2 files changed

Lines changed: 45 additions & 2 deletions

File tree

‎Rocket.Unturned.sln‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1010
.editorconfig = .editorconfig
1111
EndProjectSection
1212
EndProject
13+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Rocket.Core", "Rocket\Rocket.Core\Rocket.Core.csproj", "{06848B59-5792-4DDA-9F31-E06E70ABDF71}"
14+
EndProject
15+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Rocket.API", "Rocket\Rocket.API\Rocket.API.csproj", "{FB0FDFB9-D500-4E0F-9467-CA404E64C1E0}"
16+
EndProject
1317
Global
1418
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1519
Debug|Any CPU = Debug|Any CPU
@@ -59,6 +63,42 @@ Global
5963
{0F68CF17-C7C9-41BF-8F76-4DAF1D5146B4}.Release|x64.Build.0 = Release|Any CPU
6064
{0F68CF17-C7C9-41BF-8F76-4DAF1D5146B4}.Release|x86.ActiveCfg = Release|Any CPU
6165
{0F68CF17-C7C9-41BF-8F76-4DAF1D5146B4}.Release|x86.Build.0 = Release|Any CPU
66+
{06848B59-5792-4DDA-9F31-E06E70ABDF71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
67+
{06848B59-5792-4DDA-9F31-E06E70ABDF71}.Debug|Any CPU.Build.0 = Debug|Any CPU
68+
{06848B59-5792-4DDA-9F31-E06E70ABDF71}.Debug|x64.ActiveCfg = Debug|Any CPU
69+
{06848B59-5792-4DDA-9F31-E06E70ABDF71}.Debug|x64.Build.0 = Debug|Any CPU
70+
{06848B59-5792-4DDA-9F31-E06E70ABDF71}.Debug|x86.ActiveCfg = Debug|Any CPU
71+
{06848B59-5792-4DDA-9F31-E06E70ABDF71}.Debug|x86.Build.0 = Debug|Any CPU
72+
{06848B59-5792-4DDA-9F31-E06E70ABDF71}.Local|Any CPU.ActiveCfg = Debug|Any CPU
73+
{06848B59-5792-4DDA-9F31-E06E70ABDF71}.Local|Any CPU.Build.0 = Debug|Any CPU
74+
{06848B59-5792-4DDA-9F31-E06E70ABDF71}.Local|x64.ActiveCfg = Debug|Any CPU
75+
{06848B59-5792-4DDA-9F31-E06E70ABDF71}.Local|x64.Build.0 = Debug|Any CPU
76+
{06848B59-5792-4DDA-9F31-E06E70ABDF71}.Local|x86.ActiveCfg = Debug|Any CPU
77+
{06848B59-5792-4DDA-9F31-E06E70ABDF71}.Local|x86.Build.0 = Debug|Any CPU
78+
{06848B59-5792-4DDA-9F31-E06E70ABDF71}.Release|Any CPU.ActiveCfg = Release|Any CPU
79+
{06848B59-5792-4DDA-9F31-E06E70ABDF71}.Release|Any CPU.Build.0 = Release|Any CPU
80+
{06848B59-5792-4DDA-9F31-E06E70ABDF71}.Release|x64.ActiveCfg = Release|Any CPU
81+
{06848B59-5792-4DDA-9F31-E06E70ABDF71}.Release|x64.Build.0 = Release|Any CPU
82+
{06848B59-5792-4DDA-9F31-E06E70ABDF71}.Release|x86.ActiveCfg = Release|Any CPU
83+
{06848B59-5792-4DDA-9F31-E06E70ABDF71}.Release|x86.Build.0 = Release|Any CPU
84+
{FB0FDFB9-D500-4E0F-9467-CA404E64C1E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
85+
{FB0FDFB9-D500-4E0F-9467-CA404E64C1E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
86+
{FB0FDFB9-D500-4E0F-9467-CA404E64C1E0}.Debug|x64.ActiveCfg = Debug|Any CPU
87+
{FB0FDFB9-D500-4E0F-9467-CA404E64C1E0}.Debug|x64.Build.0 = Debug|Any CPU
88+
{FB0FDFB9-D500-4E0F-9467-CA404E64C1E0}.Debug|x86.ActiveCfg = Debug|Any CPU
89+
{FB0FDFB9-D500-4E0F-9467-CA404E64C1E0}.Debug|x86.Build.0 = Debug|Any CPU
90+
{FB0FDFB9-D500-4E0F-9467-CA404E64C1E0}.Local|Any CPU.ActiveCfg = Debug|Any CPU
91+
{FB0FDFB9-D500-4E0F-9467-CA404E64C1E0}.Local|Any CPU.Build.0 = Debug|Any CPU
92+
{FB0FDFB9-D500-4E0F-9467-CA404E64C1E0}.Local|x64.ActiveCfg = Debug|Any CPU
93+
{FB0FDFB9-D500-4E0F-9467-CA404E64C1E0}.Local|x64.Build.0 = Debug|Any CPU
94+
{FB0FDFB9-D500-4E0F-9467-CA404E64C1E0}.Local|x86.ActiveCfg = Debug|Any CPU
95+
{FB0FDFB9-D500-4E0F-9467-CA404E64C1E0}.Local|x86.Build.0 = Debug|Any CPU
96+
{FB0FDFB9-D500-4E0F-9467-CA404E64C1E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
97+
{FB0FDFB9-D500-4E0F-9467-CA404E64C1E0}.Release|Any CPU.Build.0 = Release|Any CPU
98+
{FB0FDFB9-D500-4E0F-9467-CA404E64C1E0}.Release|x64.ActiveCfg = Release|Any CPU
99+
{FB0FDFB9-D500-4E0F-9467-CA404E64C1E0}.Release|x64.Build.0 = Release|Any CPU
100+
{FB0FDFB9-D500-4E0F-9467-CA404E64C1E0}.Release|x86.ActiveCfg = Release|Any CPU
101+
{FB0FDFB9-D500-4E0F-9467-CA404E64C1E0}.Release|x86.Build.0 = Release|Any CPU
62102
EndGlobalSection
63103
GlobalSection(SolutionProperties) = preSolution
64104
HideSolutionNode = FALSE

‎Rocket.Unturned/Rocket.Unturned.csproj‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,11 @@
88
<Import Project="$(MSBuildThisFileDirectory)\..\props\SharedProjectProps.props"/>
99

1010
<ItemGroup>
11-
<PackageReference Include="RocketModFix.Rocket.API" Version="4.17.0"/>
12-
<PackageReference Include="RocketModFix.Rocket.Core" Version="4.17.0"/>
11+
<ProjectReference Include="..\Rocket\Rocket.API\Rocket.API.csproj" />
12+
<ProjectReference Include="..\Rocket\Rocket.Core\Rocket.Core.csproj" />
13+
</ItemGroup>
14+
15+
<ItemGroup>
1316
<PackageReference Include="RocketModFix.UnityEngine.Redist" Version="2021.3.29.1">
1417
<PrivateAssets>All</PrivateAssets>
1518
</PackageReference>

0 commit comments

Comments
 (0)