Kaynağa Gözat

Fixes to get iOS and Android building and deploying to at least the sims/emus

Dominique Louis 2 hafta önce
ebeveyn
işleme
7322e526c6

+ 10 - 16
CardsStarterKit/.vscode/launch.json

@@ -6,7 +6,7 @@
             "type": "coreclr",
             "type": "coreclr",
             "request": "launch",
             "request": "launch",
             "preLaunchTask": "build-desktop",
             "preLaunchTask": "build-desktop",
-            "program": "${workspaceFolder}/Platforms/Desktop/bin/Debug/net8.0/Blackjack.dll",
+            "program": "${workspaceFolder}/Platforms/Desktop/bin/Debug/net9.0/Blackjack.dll",
             "args": [],
             "args": [],
             "cwd": "${workspaceFolder}/Platforms/Desktop",
             "cwd": "${workspaceFolder}/Platforms/Desktop",
             "console": "internalConsole",
             "console": "internalConsole",
@@ -17,7 +17,7 @@
             "type": "coreclr",
             "type": "coreclr",
             "request": "launch",
             "request": "launch",
             "preLaunchTask": "build-windows",
             "preLaunchTask": "build-windows",
-            "program": "${workspaceFolder}/Platforms/Windows/bin/Debug/net8.0/Blackjack.dll",
+            "program": "${workspaceFolder}/Platforms/Windows/bin/Debug/net9.0/Blackjack.dll",
             "args": [],
             "args": [],
             "cwd": "${workspaceFolder}/Platforms/Windows",
             "cwd": "${workspaceFolder}/Platforms/Windows",
             "console": "internalConsole",
             "console": "internalConsole",
@@ -25,25 +25,19 @@
         },
         },
         {
         {
             "name": "Launch Android",
             "name": "Launch Android",
-            "type": "coreclr",
-            "request": "launch",
+            "type": "mono",
+            "request": "attach",
             "preLaunchTask": "build-android",
             "preLaunchTask": "build-android",
-            "program": "${workspaceFolder}/Platforms/Android/bin/Debug/net8.0/Blackjack.dll",
-            "args": [],
-            "cwd": "${workspaceFolder}/Platforms/Android",
-            "console": "internalConsole",
-            "stopAtEntry": false
+            "address": "localhost",
+            "port": 10000,
         },
         },
         {
         {
             "name": "Launch iOS",
             "name": "Launch iOS",
-            "type": "coreclr",
-            "request": "launch",
+            "type": "mono",
+            "request": "attach",
             "preLaunchTask": "build-ios",
             "preLaunchTask": "build-ios",
-            "program": "${workspaceFolder}/Platforms/iOS/bin/Debug/net8.0/Blackjack.dll",
-            "args": [],
-            "cwd": "${workspaceFolder}/Platforms/iOS",
-            "console": "internalConsole",
-            "stopAtEntry": false
+            "address": "localhost",
+            "port": 10001,
         }
         }
     ]
     ]
 }
 }

+ 12 - 9
CardsStarterKit/.vscode/tasks.json

@@ -45,16 +45,17 @@
             "command": "dotnet",
             "command": "dotnet",
             "args": [
             "args": [
                 "build",
                 "build",
-                "${workspaceFolder}/Platforms/Android/BlackJack.Android.csproj"
+                "${workspaceFolder}/Platforms/Android/BlackJack.Android.csproj",
+                "-t:Run",
+                "/property:Configuration=Debug"
             ],
             ],
-            "group": "build",
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            },
             "presentation": {
             "presentation": {
-                "echo": true,
-                "reveal": "always",
-                "focus": false,
-                "panel": "shared",
-                "showReuseMessage": true,
-                "clear": false
+                "reveal": "silent",
+                "panel": "shared"
             },
             },
             "problemMatcher": "$msCompile"
             "problemMatcher": "$msCompile"
         },
         },
@@ -64,7 +65,9 @@
             "command": "dotnet",
             "command": "dotnet",
             "args": [
             "args": [
                 "build",
                 "build",
-                "${workspaceFolder}/Platforms/iOS/BlackJack.iOS.csproj"
+                "${workspaceFolder}/Platforms/iOS/BlackJack.iOS.csproj",
+                "-t:Run",
+                "/property:Configuration=Debug"
             ],
             ],
             "group": "build",
             "group": "build",
             "presentation": {
             "presentation": {

+ 1 - 1
CardsStarterKit/Core/Game/Blackjack.Core.csproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <RootNamespace>Blackjack.Core</RootNamespace>
     <RootNamespace>Blackjack.Core</RootNamespace>
     <AssemblyTitle>Blackjack</AssemblyTitle>
     <AssemblyTitle>Blackjack</AssemblyTitle>
     <AssemblyProduct>Blackjack</AssemblyProduct>
     <AssemblyProduct>Blackjack</AssemblyProduct>

+ 1 - 1
CardsStarterKit/Framework/Cards.Framework.csproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <RootNamespace>CardsFramework</RootNamespace>
     <RootNamespace>CardsFramework</RootNamespace>
     <AssemblyTitle>CardsFramework</AssemblyTitle>
     <AssemblyTitle>CardsFramework</AssemblyTitle>
     <AssemblyProduct>CardsFramework</AssemblyProduct>
     <AssemblyProduct>CardsFramework</AssemblyProduct>

+ 1 - 1
CardsStarterKit/Platforms/Desktop/BlackJack.DesktopGL.csproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <OutputType>Exe</OutputType>
     <RootNamespace>Blackjack.DesktopGL</RootNamespace>
     <RootNamespace>Blackjack.DesktopGL</RootNamespace>
     <AssemblyName>Blackjack</AssemblyName>
     <AssemblyName>Blackjack</AssemblyName>

+ 1 - 1
CardsStarterKit/Platforms/Windows/BlackJack.Windows.csproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <OutputType>WinExe</OutputType>
     <OutputType>WinExe</OutputType>
     <RootNamespace>Blackjack.Windows</RootNamespace>
     <RootNamespace>Blackjack.Windows</RootNamespace>
     <AssemblyName>Blackjack</AssemblyName>
     <AssemblyName>Blackjack</AssemblyName>

+ 9 - 0
CardsStarterKit/Platforms/iOS/BlackJack.iOS.csproj

@@ -11,6 +11,15 @@
     <Company>MonoGame Foundation</Company>
     <Company>MonoGame Foundation</Company>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
   </PropertyGroup>
   </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
+    <MtouchLink>None</MtouchLink>
+    <UseInterpreter>true</UseInterpreter>
+    <EnableAssemblyILStripping>false</EnableAssemblyILStripping>
+    <UseMonoRuntime>true</UseMonoRuntime>
+    <_IsAotCompatible>false</_IsAotCompatible>
+    <EnableSGenConc>true</EnableSGenConc>
+  </PropertyGroup>
   
   
   <ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Core\Game\BlackJack.Core.csproj" />
     <ProjectReference Include="..\..\Core\Game\BlackJack.Core.csproj" />