Skip to content

Commit

Permalink
Removed submodule and switch to nuget package
Browse files Browse the repository at this point in the history
  • Loading branch information
MarkSuckerberg committed Oct 25, 2023
1 parent 90d5f69 commit 2c3bb7e
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 19 deletions.
3 changes: 0 additions & 3 deletions .gitmodules

This file was deleted.

6 changes: 0 additions & 6 deletions Blocktest.sln
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DedicatedServer", "Dedicate
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Shared", "Shared\Shared.csproj", "{391CA9CC-64C8-45C5-8902-4C7C718AB113}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Myra.MonoGame", "submodules\myra\src\Myra\Myra.MonoGame.csproj", "{48B9EA4E-5DFF-4206-87D3-C0776DA88F32}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -26,9 +24,5 @@ Global
{391CA9CC-64C8-45C5-8902-4C7C718AB113}.Debug|Any CPU.Build.0 = Debug|Any CPU
{391CA9CC-64C8-45C5-8902-4C7C718AB113}.Release|Any CPU.ActiveCfg = Release|Any CPU
{391CA9CC-64C8-45C5-8902-4C7C718AB113}.Release|Any CPU.Build.0 = Release|Any CPU
{48B9EA4E-5DFF-4206-87D3-C0776DA88F32}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{48B9EA4E-5DFF-4206-87D3-C0776DA88F32}.Debug|Any CPU.Build.0 = Debug|Any CPU
{48B9EA4E-5DFF-4206-87D3-C0776DA88F32}.Release|Any CPU.ActiveCfg = Release|Any CPU
{48B9EA4E-5DFF-4206-87D3-C0776DA88F32}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
EndGlobal
2 changes: 1 addition & 1 deletion Blocktest/Blocktest.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@
<ItemGroup>
<PackageReference Include="LiteNetLib" Version="1.1.0"/>
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.*"/>
<PackageReference Include="Myra" Version="1.5.0"/>
<PackageReference Include="Nopipeline.Task" Version="2.2.*"/>
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.*"/>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Shared\Shared.csproj"/>
<ProjectReference Include="..\submodules\myra\src\Myra\Myra.MonoGame.csproj"/>
</ItemGroup>
<ItemGroup>
<Folder Include="Content\Fonts\"/>
Expand Down
19 changes: 11 additions & 8 deletions Blocktest/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,17 @@
"resolved": "3.8.1.303",
"contentHash": "eGYhqn0n1olk8MNYeE9EuBmoNNECN1T18rPMaQpkzsEQ0H3nVyFPXC+uCo78v5pi5juQpJ3PSFnSkjzZJ1U58A=="
},
"Myra": {
"type": "Direct",
"requested": "[1.5.0, )",
"resolved": "1.5.0",
"contentHash": "0UlrR+BEwFMzC1F/u3Fl0oyCldkZvG7xgADUvMeqIxlEHUK1InA1zb902eixAR32M7dSzqd/1GCno8blfvQGaQ==",
"dependencies": {
"FontStashSharp.MonoGame": "1.3.0",
"XNAssets.MonoGame": "0.6.7",
"info.lundin.math.dll": "1.2.6"
}
},
"Nopipeline.Task": {
"type": "Direct",
"requested": "[2.2.*, )",
Expand Down Expand Up @@ -97,14 +108,6 @@
"resolved": "13.7.0",
"contentHash": "RKkoQSCyk/94N20SL3U15hWAqBVXHu+59upcPi8R2uhrcAalyVa4Y/vYdXQ7MXQ71Lut//DH0tLcYByAkGmXhA=="
},
"Myra": {
"type": "Project",
"dependencies": {
"FontStashSharp.MonoGame": "[1.3.0, )",
"XNAssets.MonoGame": "[0.6.7, )",
"info.lundin.math.dll": "[1.2.6, )"
}
},
"shared": {
"type": "Project",
"dependencies": {
Expand Down
1 change: 0 additions & 1 deletion submodules/myra
Submodule myra deleted from 3fea1a

0 comments on commit 2c3bb7e

Please sign in to comment.