Skip to content

Commit 616d21d

Browse files
WilliamQiufengWilliamQiufeng
committed
Update csproj:
* Use MonoGame exported DLLs instead * Upgrade Newtonsoft.Json to 13.0.3 * Use Latest MonoGame.Extended and FontStashSharp
1 parent 6a4c286 commit 616d21d

File tree

9 files changed

+31
-32
lines changed

9 files changed

+31
-32
lines changed

‎.gitmodules‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +0,0 @@
1-
[submodule "MonoGame"]
2-
path = MonoGame
3-
url = https://github.com/Quaver/MonoGame
4-
[submodule "SpriteFontPlus"]
5-
path = SpriteFontPlus
6-
url = https://github.com/Quaver/SpriteFontPlus

‎MonoGame‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎SpriteFontPlus‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎Wobble.Extended/Wobble.Extended.csproj‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netstandard2.1</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<ProjectReference Include="../MonoGame/MonoGame.Framework/MonoGame.Framework.DesktopGL.csproj" />
98
<ProjectReference Include="../Wobble/Wobble.csproj" />
109
</ItemGroup>
1110

@@ -17,4 +16,10 @@
1716
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
1817
</ItemGroup>
1918

19+
<ItemGroup>
20+
<Reference Include="MonoGame.Framework">
21+
<HintPath>..\MonoGame.Framework.dll</HintPath>
22+
</Reference>
23+
</ItemGroup>
24+
2025
</Project>

‎Wobble.Tests.Hotload/Wobble.Tests.Hotload.csproj‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,18 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>netcoreapp3.1</TargetFramework>
5+
<TargetFramework>net8.0</TargetFramework>
66
</PropertyGroup>
77

88
<ItemGroup>
99
<ProjectReference Include="../Wobble.Extended/Wobble.Extended.csproj" />
1010
<ProjectReference Include="../Wobble.Tests/Wobble.Tests.csproj" />
1111
</ItemGroup>
1212

13+
<ItemGroup>
14+
<Reference Include="MonoGame.Framework">
15+
<HintPath>..\MonoGame.Framework.dll</HintPath>
16+
</Reference>
17+
</ItemGroup>
18+
1319
</Project>

‎Wobble.Tests.Unit/Wobble.Tests.Unit.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.1</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55

66
<IsPackable>false</IsPackable>
77
</PropertyGroup>

‎Wobble.Tests/Wobble.Tests.csproj‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,21 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>Exe</OutputType>
4-
<TargetFramework>netcoreapp3.1</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
</PropertyGroup>
66
<ItemGroup>
77
<PackageReference Include="System.Runtime.Extensions" Version="4.3.0" />
88
</ItemGroup>
99
<ItemGroup>
10-
<ProjectReference Include="../MonoGame/MonoGame.Framework/MonoGame.Framework.DesktopGL.csproj" />
1110
<ProjectReference Include="../Wobble.Tests.Resources/Wobble.Tests.Resources.csproj" />
1211
<ProjectReference Include="../Wobble/Wobble.csproj" />
1312
</ItemGroup>
1413
<ItemGroup>
1514
<Folder Include="Content/" />
1615
</ItemGroup>
16+
<ItemGroup>
17+
<Reference Include="MonoGame.Framework">
18+
<HintPath>..\MonoGame.Framework.dll</HintPath>
19+
</Reference>
20+
</ItemGroup>
1721
</Project>

‎Wobble.sln‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wobble.Extended", "Wobble.E
1515
EndProject
1616
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wobble.Tests.Hotload", "Wobble.Tests.Hotload\Wobble.Tests.Hotload.csproj", "{AB46D815-2DA6-452A-9A99-4AF5CF06D19F}"
1717
EndProject
18-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Framework.DesktopGL", "MonoGame\MonoGame.Framework\MonoGame.Framework.DesktopGL.csproj", "{C93E372C-7A7D-4657-A514-C4EF20960E50}"
19-
EndProject
2018
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wobble.Tests.Unit", "Wobble.Tests.Unit\Wobble.Tests.Unit.csproj", "{A8B8CC69-03FC-47B5-85DB-87A7EEEDBF2C}"
2119
EndProject
22-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpriteFontPlus", "SpriteFontPlus\src\SpriteFontPlus\SpriteFontPlus.csproj", "{8C770216-930A-4C0B-92F7-4E747F905C89}"
23-
EndProject
2420
Global
2521
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2622
Debug|Any CPU = Debug|Any CPU
@@ -51,18 +47,10 @@ Global
5147
{AB46D815-2DA6-452A-9A99-4AF5CF06D19F}.Debug|Any CPU.Build.0 = Debug|Any CPU
5248
{AB46D815-2DA6-452A-9A99-4AF5CF06D19F}.Release|Any CPU.ActiveCfg = Release|Any CPU
5349
{AB46D815-2DA6-452A-9A99-4AF5CF06D19F}.Release|Any CPU.Build.0 = Release|Any CPU
54-
{C93E372C-7A7D-4657-A514-C4EF20960E50}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
55-
{C93E372C-7A7D-4657-A514-C4EF20960E50}.Debug|Any CPU.Build.0 = Debug|Any CPU
56-
{C93E372C-7A7D-4657-A514-C4EF20960E50}.Release|Any CPU.ActiveCfg = Release|Any CPU
57-
{C93E372C-7A7D-4657-A514-C4EF20960E50}.Release|Any CPU.Build.0 = Release|Any CPU
5850
{A8B8CC69-03FC-47B5-85DB-87A7EEEDBF2C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
5951
{A8B8CC69-03FC-47B5-85DB-87A7EEEDBF2C}.Debug|Any CPU.Build.0 = Debug|Any CPU
6052
{A8B8CC69-03FC-47B5-85DB-87A7EEEDBF2C}.Release|Any CPU.ActiveCfg = Release|Any CPU
6153
{A8B8CC69-03FC-47B5-85DB-87A7EEEDBF2C}.Release|Any CPU.Build.0 = Release|Any CPU
62-
{8C770216-930A-4C0B-92F7-4E747F905C89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
63-
{8C770216-930A-4C0B-92F7-4E747F905C89}.Debug|Any CPU.Build.0 = Debug|Any CPU
64-
{8C770216-930A-4C0B-92F7-4E747F905C89}.Release|Any CPU.ActiveCfg = Release|Any CPU
65-
{8C770216-930A-4C0B-92F7-4E747F905C89}.Release|Any CPU.Build.0 = Release|Any CPU
6654
EndGlobalSection
6755
GlobalSection(SolutionProperties) = preSolution
6856
HideSolutionNode = FALSE

‎Wobble/Wobble.csproj‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,26 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>netstandard2.1</TargetFramework>
3+
<TargetFramework>net8.0</TargetFramework>
44
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
55
<LangVersion>7.1</LangVersion>
66
</PropertyGroup>
77
<PropertyGroup>
88
<ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles>
99
</PropertyGroup>
1010
<ItemGroup>
11+
<PackageReference Include="FontStashSharp.MonoGame" Version="1.3.7" />
1112
<PackageReference Include="ImGui.NET" Version="1.67.0" />
1213
<PackageReference Include="IniFileParserStandard" Version="1.0.1" />
1314
<PackageReference Include="ManagedBass" Version="2.0.4" />
1415
<PackageReference Include="ManagedBass.Fx" Version="2.0.1" />
1516
<PackageReference Include="Microsoft.Win32.Registry" Version="4.6.0-preview7.19362.9" />
16-
<PackageReference Include="MonoGame.Extended" Version="1.1.0" />
17-
<PackageReference Include="MonoGame.Extended.Content.Pipeline" Version="1.1.0" />
18-
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
17+
<PackageReference Include="MonoGame.Extended" Version="3.9.0-prerelease.4" />
18+
<PackageReference Include="MonoGame.Extended.Content.Pipeline" Version="3.9.0-prerelease.4" />
19+
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
1920
<PackageReference Include="System.Drawing.Common" Version="4.5.0" />
2021
<PackageReference Include="System.Runtime.Extensions" Version="4.3.0" />
2122
</ItemGroup>
2223
<ItemGroup>
23-
<ProjectReference Include="../MonoGame/MonoGame.Framework/MonoGame.Framework.DesktopGL.csproj" />
24-
<ProjectReference Include="../SpriteFontPlus/src/SpriteFontPlus/SpriteFontPlus.csproj" />
2524
<ProjectReference Include="../Wobble.Resources/Wobble.Resources.csproj" />
2625
</ItemGroup>
2726
<ItemGroup>
@@ -41,4 +40,9 @@
4140
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
4241
</None>
4342
</ItemGroup>
43+
<ItemGroup>
44+
<Reference Include="MonoGame.Framework">
45+
<HintPath>..\MonoGame.Framework.dll</HintPath>
46+
</Reference>
47+
</ItemGroup>
4448
</Project>

0 commit comments

Comments
 (0)