Skip to content

Commit e28bfac

Browse files
CartBlancheCartBlanche
committed
Fix for things to build with 3.8.4
1 parent 4d3d8f6 commit e28bfac

File tree

8 files changed

+27
-19
lines changed

8 files changed

+27
-19
lines changed

‎ShipGame/.config/dotnet-tools.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,31 +3,31 @@
33
"isRoot": true,
44
"tools": {
55
"dotnet-mgcb": {
6-
"version": "3.8.4-preview.4",
6+
"version": "3.8.4",
77
"commands": [
88
"mgcb"
99
]
1010
},
1111
"dotnet-mgcb-editor": {
12-
"version": "3.8.4-preview.4",
12+
"version": "3.8.4",
1313
"commands": [
1414
"mgcb-editor"
1515
]
1616
},
1717
"dotnet-mgcb-editor-linux": {
18-
"version": "3.8.4-preview.4",
18+
"version": "3.8.4",
1919
"commands": [
2020
"mgcb-editor-linux"
2121
]
2222
},
2323
"dotnet-mgcb-editor-windows": {
24-
"version": "3.8.4-preview.4",
24+
"version": "3.8.4",
2525
"commands": [
2626
"mgcb-editor-windows"
2727
]
2828
},
2929
"dotnet-mgcb-editor-mac": {
30-
"version": "3.8.4-preview.4",
30+
"version": "3.8.4",
3131
"commands": [
3232
"mgcb-editor-mac"
3333
]

‎ShipGame/ShipGame.Android/ShipGame.Android.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
</MonoGameContentReference>
1717
</ItemGroup>
1818
<ItemGroup>
19-
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.4" />
20-
<PackageReference Include="MonoGame.Framework.Android" Version="3.8.4" />
19+
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.*" />
20+
<PackageReference Include="MonoGame.Framework.Android" Version="3.8.*" />
2121
</ItemGroup>
2222
<Target Name="RestoreDotnetTools" BeforeTargets="CollectPackageReferences">
2323
<Message Text="Restoring dotnet tools (this might take a while depending on your internet speed and should only happen upon building your project for the first time, or after upgrading MonoGame, or clearing your nuget cache)" Importance="High" />

‎ShipGame/ShipGame.Core/ShipGame.Core.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Platforms>AnyCPU;x64</Platforms>
55
</PropertyGroup>
66
<ItemGroup>
7-
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.4">
7+
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.*">
88
<PrivateAssets>All</PrivateAssets>
99
</PackageReference>
1010
</ItemGroup>

‎ShipGame/ShipGame.Dependencies/BoxCollider/BoxCollider.csproj‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<TargetFramework>net8.0</TargetFramework>
44
</PropertyGroup>
55
<ItemGroup>
6-
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.4">
6+
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.*">
77
<PrivateAssets>All</PrivateAssets>
88
</PackageReference>
99
</ItemGroup>
10+
<Target Name="RestoreDotnetTools" BeforeTargets="CollectPackageReferences">
11+
<Message Text="Restoring dotnet tools (this might take a while depending on your internet speed and should only happen upon building your project for the first time, or after upgrading MonoGame, or clearing your nuget cache)" Importance="High" />
12+
<Exec Command="dotnet tool restore" />
13+
</Target>
1014
</Project>

‎ShipGame/ShipGame.Dependencies/NormalMappingModelProcessor/NormalMappingModelProcessor.csproj‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<TargetFramework>net8.0</TargetFramework>
44
</PropertyGroup>
55
<ItemGroup>
6-
<PackageReference Include="MonoGame.Framework.Content.Pipeline" Version="3.8.4" />
7-
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.4">
6+
<PackageReference Include="MonoGame.Framework.Content.Pipeline" Version="3.8.*" />
7+
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.*" >
88
<PrivateAssets>All</PrivateAssets>
99
</PackageReference>
1010
</ItemGroup>
11+
<Target Name="RestoreDotnetTools" BeforeTargets="CollectPackageReferences">
12+
<Message Text="Restoring dotnet tools (this might take a while depending on your internet speed and should only happen upon building your project for the first time, or after upgrading MonoGame, or clearing your nuget cache)" Importance="High" />
13+
<Exec Command="dotnet tool restore" />
14+
</Target>
1115
</Project>

‎ShipGame/ShipGame.DesktopGL/ShipGame.DesktopGL.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
</MonoGameContentReference>
2020
</ItemGroup>
2121
<ItemGroup>
22-
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.4" />
23-
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.4" />
22+
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.*" />
23+
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.*" />
2424
</ItemGroup>
2525
<Target Name="RestoreDotnetTools" BeforeTargets="CollectPackageReferences">
2626
<Message Text="Restoring dotnet tools (this might take a while depending on your internet speed and should only happen upon building your project for the first time, or after upgrading MonoGame, or clearing your nuget cache)" Importance="High" />

‎ShipGame/ShipGame.WindowsDX/ShipGame.WindowsDX.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
</MonoGameContentReference>
2727
</ItemGroup>
2828
<ItemGroup>
29-
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.4" />
30-
<PackageReference Include="MonoGame.Framework.WindowsDX" Version="3.8.4" />
29+
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.*" />
30+
<PackageReference Include="MonoGame.Framework.WindowsDX" Version="3.8.*" />
3131
</ItemGroup>
3232
<Target Name="RestoreDotnetTools" BeforeTargets="CollectPackageReferences">
3333
<Message Text="Restoring dotnet tools (this might take a while depending on your internet speed and should only happen upon building your project for the first time, or after upgrading MonoGame, or clearing your nuget cache)" Importance="High" />

‎ShipGame/ShipGame.iOS/ShipGame.iOS.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
</MonoGameContentReference>
1515
</ItemGroup>
1616
<ItemGroup>
17-
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.4" />
18-
<PackageReference Include="MonoGame.Framework.iOS" Version="3.8.4" />
17+
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.*" />
18+
<PackageReference Include="MonoGame.Framework.iOS" Version="3.8.*" />
1919
</ItemGroup>
2020
<Target Name="RestoreDotnetTools" BeforeTargets="CollectPackageReferences">
2121
<Message Text="Restoring dotnet tools (this might take a while depending on your internet speed and should only happen upon building your project for the first time, or after upgrading MonoGame, or clearing your nuget cache)" Importance="High" />

0 commit comments

Comments
 (0)