Update project to work on VS Code mac

diff --git a/SuperPolarity.userprefs b/SuperPolarity.userprefs
deleted file mode 100644 (file)
index 4fdd746..0000000
--- a/SuperPolarity.userprefs
+++ /dev/null
@@ -1,15 +0,0 @@
-<Properties MonoDevelop.MonoMac.LastXamMacNagTime="5/31/2014 6:17:13 PM">
-  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
-  <MonoDevelop.Ide.Workbench ActiveDocument="SuperPolarity/Program.cs">
-    <Files>
-      <File FileName="SuperPolarity/Program.cs" Line="1" Column="1" />
-      <File FileName="SuperPolarityMac/Program.cs" Line="1" Column="1" />
-      <File FileName="SuperPolarity/SuperPolarity.cs" Line="1" Column="1" />
-      <File FileName="SuperPolarityLinux/Program.cs" Line="1" Column="1" />
-    </Files>
-  </MonoDevelop.Ide.Workbench>
-  <MonoDevelop.Ide.DebuggingService.Breakpoints>
-    <BreakpointStore />
-  </MonoDevelop.Ide.DebuggingService.Breakpoints>
-  <MonoDevelop.Ide.DebuggingService.PinnedWatches />
-</Properties>
\ No newline at end of file

diff --git a/SuperPolarityContent/SuperPolarityContentContent/Sound/polaritytheme.wav b/SuperPolarityContent/SuperPolarityContentContent/Sound/polaritytheme.wav
deleted file mode 100644 (file)
index 28a6bce..0000000
Binary files a/SuperPolarityContent/SuperPolarityContentContent/Sound/polaritytheme.wav and /dev/null differ

diff --git a/SuperPolarityMac/Info.plist b/SuperPolarityMac/Info.plist
index 07a58c3b77f7e366a48d9f82663ef6eab206c091..54844a3a1cd477f9d5ccdb787b05f5bc877bf6ec 100644 (file)
--- a/SuperPolarityMac/Info.plist
+++ b/SuperPolarityMac/Info.plist
@@ -2,16 +2,17 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>

-       <key>CFBundleIdentifier</key>
-       <string>com.yourcompany.MonoGame.Samples.Draw2D.MacOS</string>

        <key>CFBundleName</key>
        <key>CFBundleName</key>

-       <string>MonoGame.Samples.Draw2D.MacOS</string>
+       <string>PetitCochon.SuperPolarity.MacOS</string>

        <key>CFBundleVersion</key>
        <string>1</string>
        <key>LSMinimumSystemVersion</key>
        <key>CFBundleVersion</key>
        <string>1</string>
        <key>LSMinimumSystemVersion</key>

-       <string>10.6</string>
+       <string>10.13</string>

        <key>NSPrincipalClass</key>
        <string>NSApplication</string>
        <key>NSPrincipalClass</key>
        <string>NSApplication</string>

+       <key>CFBundleIdentifier</key>
+       <string>co.petitcochon.super-polarity</string>
+       <key>CFBundleShortVersionString</key>
+       <string>0.0.1</string>

 </dict>
 </plist>
 </dict>
 </plist>

-

diff --git a/SuperPolarityMac/Program.cs b/SuperPolarityMac/Program.cs
index e6ab5cfcff83cbcb2c0c837749b0a4bbd918c271..5c7bbbcfd1a46782d155f7aec167d9c8813adf0b 100644 (file)
--- a/SuperPolarityMac/Program.cs
+++ b/SuperPolarityMac/Program.cs
@@ -1,11 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using MonoMac.AppKit;
-using MonoMac.Foundation;
+using AppKit;
+using Foundation;

 
 namespace SuperPolarity
 {
 
 namespace SuperPolarity
 {

+       [Register ("AppDelegate")]

        static class Program
        {
                /// <summary>
        static class Program
        {
                /// <summary>


@@ -28,15 +26,18 @@ namespace SuperPolarity
        {
                SuperPolarity superPolarity;
 
        {
                SuperPolarity superPolarity;
 

-               public override void FinishedLaunching (MonoMac.Foundation.NSObject notification)
+               public AppDelegate ()
+               {         
+               }
+
+               public override void DidFinishLaunching (NSNotification notification)

                {
                        superPolarity = new SuperPolarity();
                        superPolarity.Run ();
                }
 
                {
                        superPolarity = new SuperPolarity();
                        superPolarity.Run ();
                }
 

-               public override bool ApplicationShouldTerminateAfterLastWindowClosed (NSApplication sender)
+               public override void WillTerminate (NSNotification notification)

                {
                {

-                       return true;

                }
        }
 }
                }
        }
 }

diff --git a/SuperPolarityMac/SuperPolarityMac.csproj b/SuperPolarityMac/SuperPolarityMac.csproj
index 740745a40025e2a4aa6355adfa6233917364081e..689b1a7bc3d5d84157977314459933378f1db1ca 100644 (file)
--- a/SuperPolarityMac/SuperPolarityMac.csproj
+++ b/SuperPolarityMac/SuperPolarityMac.csproj
@@ -6,12 +6,13 @@
     <ProductVersion>10.0.0</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{EE77A85A-089B-4055-90D0-6E08DF409410}</ProjectGuid>
     <ProductVersion>10.0.0</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{EE77A85A-089B-4055-90D0-6E08DF409410}</ProjectGuid>

-    <ProjectTypeGuids>{948B3504-5B70-4649-8FE4-BDE1FB46EC69};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <ProjectTypeGuids>{A3F8F2AB-B479-4A4A-A458-A89E7DC349F1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>

     <OutputType>Exe</OutputType>
     <RootNamespace>SuperPolarityMac</RootNamespace>
     <MonoMacResourcePrefix>Resources</MonoMacResourcePrefix>
     <AssemblyName>SuperPolarityMac</AssemblyName>
     <OutputType>Exe</OutputType>
     <RootNamespace>SuperPolarityMac</RootNamespace>
     <MonoMacResourcePrefix>Resources</MonoMacResourcePrefix>
     <AssemblyName>SuperPolarityMac</AssemblyName>

-    <SuppressXamMacUpsell>True</SuppressXamMacUpsell>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkIdentifier>Xamarin.Mac</TargetFrameworkIdentifier>

   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>


@@ -27,6 +28,8 @@
     <CodeSigningKey>Mac Developer</CodeSigningKey>
     <EnableCodeSigning>false</EnableCodeSigning>
     <CreatePackage>false</CreatePackage>
     <CodeSigningKey>Mac Developer</CodeSigningKey>
     <EnableCodeSigning>false</EnableCodeSigning>
     <CreatePackage>false</CreatePackage>

+    <AOTMode>None</AOTMode>
+    <PackageSigningKey>3rd Party Mac Developer Installer</PackageSigningKey>

   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>full</DebugType>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>full</DebugType>


@@ -34,13 +37,14 @@
     <OutputPath>bin\Release</OutputPath>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
     <OutputPath>bin\Release</OutputPath>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>

-    <LinkMode>Full</LinkMode>
+    <LinkMode>None</LinkMode>

     <UseSGen>false</UseSGen>
     <IncludeMonoRuntime>true</IncludeMonoRuntime>
     <EnablePackageSigning>false</EnablePackageSigning>
     <CodeSigningKey>Developer ID Application</CodeSigningKey>
     <EnableCodeSigning>true</EnableCodeSigning>
     <CreatePackage>true</CreatePackage>
     <UseSGen>false</UseSGen>
     <IncludeMonoRuntime>true</IncludeMonoRuntime>
     <EnablePackageSigning>false</EnablePackageSigning>
     <CodeSigningKey>Developer ID Application</CodeSigningKey>
     <EnableCodeSigning>true</EnableCodeSigning>
     <CreatePackage>true</CreatePackage>

+    <AOTMode>None</AOTMode>

   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'AppStore|AnyCPU' ">
     <DebugType>full</DebugType>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'AppStore|AnyCPU' ">
     <DebugType>full</DebugType>


@@ -48,7 +52,7 @@
     <OutputPath>bin\AppStore</OutputPath>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
     <OutputPath>bin\AppStore</OutputPath>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>

-    <LinkMode>Full</LinkMode>
+    <LinkMode>None</LinkMode>

     <UseSGen>false</UseSGen>
     <IncludeMonoRuntime>true</IncludeMonoRuntime>
     <PackageSigningKey>3rd Party Mac Developer Installer</PackageSigningKey>
     <UseSGen>false</UseSGen>
     <IncludeMonoRuntime>true</IncludeMonoRuntime>
     <PackageSigningKey>3rd Party Mac Developer Installer</PackageSigningKey>


@@ -56,28 +60,24 @@
     <CodeSigningKey>3rd Party Mac Developer Application</CodeSigningKey>
     <EnableCodeSigning>true</EnableCodeSigning>
     <EnablePackageSigning>true</EnablePackageSigning>
     <CodeSigningKey>3rd Party Mac Developer Application</CodeSigningKey>
     <EnableCodeSigning>true</EnableCodeSigning>
     <EnablePackageSigning>true</EnablePackageSigning>

+    <AOTMode>None</AOTMode>

   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />

-    <Reference Include="System.Drawing" />
-    <Reference Include="Lidgren.Network">
-      <HintPath>..\SuperPolarity\Vendor\osx\Lidgren.Network.dll</HintPath>
-    </Reference>

     <Reference Include="MonoGame.Framework">
     <Reference Include="MonoGame.Framework">

-      <HintPath>..\SuperPolarity\Vendor\osx\MonoGame.Framework.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\Library\Frameworks\MonoGame.framework\v3.7.0.1508\Assemblies\MacOSX\MonoGame.Framework.dll</HintPath>

     </Reference>
     </Reference>

-    <Reference Include="MonoMac">
-      <HintPath>..\SuperPolarity\Vendor\osx\MonoMac.dll</HintPath>
+    <Reference Include="MonoGame.Framework.Net">
+      <HintPath>..\..\..\..\..\..\Library\Frameworks\MonoGame.framework\v3.7.0.1508\Assemblies\MacOSX\MonoGame.Framework.Net.dll</HintPath>

     </Reference>
     </Reference>

-    <Reference Include="Tao.Sdl">
-      <HintPath>..\SuperPolarity\Vendor\osx\Tao.Sdl.dll</HintPath>
+    <Reference Include="Xamarin.Mac" />
+    <Reference Include="Lidgren.Network">
+      <HintPath>..\..\..\..\..\..\Library\Frameworks\MonoGame.framework\v3.7.0.1508\Assemblies\MacOSX\Lidgren.Network.dll</HintPath>

     </Reference>
   </ItemGroup>
     </Reference>
   </ItemGroup>

-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(MSBuildExtensionsPath)\Mono\MonoMac\v0.0\Mono.MonoMac.targets" />

   <ItemGroup>
     <Compile Include="..\SuperPolarity\ActorFactory.cs">
       <Link>ActorFactory.cs</Link>
   <ItemGroup>
     <Compile Include="..\SuperPolarity\ActorFactory.cs">
       <Link>ActorFactory.cs</Link>


@@ -190,21 +190,7 @@
     <None Include="..\SuperPolarity\scores.txt">
       <Link>scores.txt</Link>
     </None>
     <None Include="..\SuperPolarity\scores.txt">
       <Link>scores.txt</Link>
     </None>

-    <None Include="..\SuperPolarity\Vendor\Lidgren.Network.dll">
-      <Link>Vendor\Lidgren.Network.dll</Link>
-    </None>
-    <None Include="..\SuperPolarity\Vendor\MonoGame.Framework.dll">
-      <Link>Vendor\MonoGame.Framework.dll</Link>
-    </None>
-    <None Include="..\SuperPolarity\Vendor\MonoMac.dll">
-      <Link>Vendor\MonoMac.dll</Link>
-    </None>
-    <None Include="..\SuperPolarity\Vendor\Tao.Sdl.dll">
-      <Link>Vendor\Tao.Sdl.dll</Link>
-    </None>
-    <None Include="..\SuperPolarity\Vendor\Tao.Sdl.dll.config">
-      <Link>Vendor\Tao.Sdl.dll.config</Link>
-    </None>
+    <None Include="Info.plist" />

   </ItemGroup>
   <ItemGroup>
     <Folder Include="Actors\" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Actors\" />


@@ -290,7 +276,6 @@
     <BundleResource Include="..\SuperPolarity\Content\Fonts\smallfont.xnb">
       <Link>Content\Fonts\smallfont.xnb</Link>
     </BundleResource>
     <BundleResource Include="..\SuperPolarity\Content\Fonts\smallfont.xnb">
       <Link>Content\Fonts\smallfont.xnb</Link>
     </BundleResource>

-    <BundleResource Include="Info.plist" />

     <BundleResource Include="..\SuperPolarity\Content\Sound\bomb.xnb">
       <Link>Content\Sound\bomb.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     <BundleResource Include="..\SuperPolarity\Content\Sound\bomb.xnb">
       <Link>Content\Sound\bomb.xnb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>


@@ -320,4 +305,15 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </BundleResource>
   </ItemGroup>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </BundleResource>
   </ItemGroup>

-</Project>
\ No newline at end of file
+  <ItemGroup>
+    <NativeReference Include="..\..\..\..\..\..\Library\Frameworks\MonoGame.framework\v3.7.0.1508\Assemblies\MacOSX\libopenal.1.dylib">
+      <Kind>Dynamic</Kind>
+      <SmartLink>False</SmartLink>
+    </NativeReference>
+    <NativeReference Include="..\..\..\..\..\..\Library\Frameworks\MonoGame.framework\v3.7.0.1508\Assemblies\MacOSX\libSDL2-2.0.0.dylib">
+      <Kind>Dynamic</Kind>
+      <SmartLink>False</SmartLink>
+    </NativeReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" />
+</Project>

diff --git a/SuperPolarityMac/SuperPolarityMac.userprefs b/SuperPolarityMac/SuperPolarityMac.userprefs
index e2d5d0c447daec0b265dbca92e2766b7596dcb62..73cd64142dff1202467a87bc110d76ace2fa39f4 100644 (file)
--- a/SuperPolarityMac/SuperPolarityMac.userprefs
+++ b/SuperPolarityMac/SuperPolarityMac.userprefs
@@ -1,4 +1,4 @@
-<Properties MonoDevelop.MonoMac.LastXamMacNagTime="5/31/2014 6:13:47 PM">
+<Properties MonoDevelop.MonoMac.LastXamMacNagTime="3/14/2015 11:07:50 PM">

   <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
   <MonoDevelop.Ide.Workbench ActiveDocument="../SuperPolarity/SuperPolarity.cs">
     <Files>
   <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
   <MonoDevelop.Ide.Workbench ActiveDocument="../SuperPolarity/SuperPolarity.cs">
     <Files>


@@ -7,9 +7,14 @@
       <File FileName="../SuperPolarity/Actors/Bullet.cs" Line="1" Column="1" />
       <File FileName="../SuperPolarity/Actors/Ship.cs" Line="1" Column="1" />
       <File FileName="../SuperPolarity/ActorManager.cs" Line="1" Column="1" />
       <File FileName="../SuperPolarity/Actors/Bullet.cs" Line="1" Column="1" />
       <File FileName="../SuperPolarity/Actors/Ship.cs" Line="1" Column="1" />
       <File FileName="../SuperPolarity/ActorManager.cs" Line="1" Column="1" />

-      <File FileName="../SuperPolarity/Actors/MainShip.cs" Line="1" Column="1" />
+      <File FileName="../SuperPolarity/Actors/MainShip.cs" Line="112" Column="47" />

       <File FileName="../SuperPolarity/Actors/Generators/Generator.cs" Line="1" Column="1" />
       <File FileName="../SuperPolarity/Actors/Generators/Generator.cs" Line="1" Column="1" />

-      <File FileName="../SuperPolarity/SuperPolarity.cs" Line="1" Column="1" />
+      <File FileName="../SuperPolarity/SuperPolarity.cs" Line="45" Column="6" />
+      <File FileName="../SuperPolarity/Player.cs" Line="1" Column="1" />
+      <File FileName="../SuperPolarity/InputController.cs" Line="56" Column="39" />
+      <File FileName="../SuperPolarity/GameScreen.cs" Line="41" Column="70" />
+      <File FileName="../SuperPolarity/ScreenManager.cs" Line="21" Column="10" />
+      <File FileName="Program.cs" Line="1" Column="1" />

     </Files>
   </MonoDevelop.Ide.Workbench>
   <MonoDevelop.Ide.DebuggingService.Breakpoints>
     </Files>
   </MonoDevelop.Ide.Workbench>
   <MonoDevelop.Ide.DebuggingService.Breakpoints>