Fixing MonoGame dependency that was pruned from the dev feeds. (#193)

AscensionGameDev · May 4, 2020 · 8cdf93f · 8cdf93f
1 parent 6fa425e
commit 8cdf93f
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 16 deletions.
diff --git a/Intersect.Client/Intersect.Client.csproj b/Intersect.Client/Intersect.Client.csproj
@@ -199,7 +199,7 @@
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="MonoGame.Framework, Version=3.8.0.1217, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MonoGame.Framework.DesktopGL.3.8.0.1217-develop\lib\net452\MonoGame.Framework.dll</HintPath>
+      <HintPath>..\packages\AscensionGameDev.Client.DesktopGL.3.8.0.1217-develop\lib\net452\MonoGame.Framework.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -214,39 +214,39 @@
     <EmbeddedResource Include="Icon.ico" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="..\packages\MonoGame.Framework.DesktopGL.3.8.0.1217-develop\lib\net452\MonoGame.Framework.dll">
+    <EmbeddedResource Include="..\packages\AscensionGameDev.Client.DesktopGL.3.8.0.1217-develop\lib\net452\MonoGame.Framework.dll">
       <Link>Resources\MonoGame.Framework.dll</Link>
     </EmbeddedResource>
-    <EmbeddedResource Include="..\packages\MonoGame.Framework.DesktopGL.3.8.0.1217-develop\runtimes\win-x86\native\SDL2.dll">
+    <EmbeddedResource Include="..\packages\AscensionGameDev.Client.DesktopGL.3.8.0.1217-develop\runtimes\win-x86\native\SDL2.dll">
       <Link>Resources\x86\SDL2.dll</Link>
     </EmbeddedResource>
-    <EmbeddedResource Include="..\packages\MonoGame.Framework.DesktopGL.3.8.0.1217-develop\runtimes\win-x64\native\SDL2.dll">
+    <EmbeddedResource Include="..\packages\AscensionGameDev.Client.DesktopGL.3.8.0.1217-develop\runtimes\win-x64\native\SDL2.dll">
       <Link>Resources\x64\SDL2.dll</Link>
     </EmbeddedResource>
-    <EmbeddedResource Include="..\packages\MonoGame.Framework.DesktopGL.3.8.0.1217-develop\runtimes\win-x86\native\soft_oal.dll">
+    <EmbeddedResource Include="..\packages\AscensionGameDev.Client.DesktopGL.3.8.0.1217-develop\runtimes\win-x86\native\soft_oal.dll">
       <Link>Resources\x86\soft_oal.dll</Link>
     </EmbeddedResource>
-    <EmbeddedResource Include="..\packages\MonoGame.Framework.DesktopGL.3.8.0.1217-develop\runtimes\win-x64\native\soft_oal.dll">
+    <EmbeddedResource Include="..\packages\AscensionGameDev.Client.DesktopGL.3.8.0.1217-develop\runtimes\win-x64\native\soft_oal.dll">
       <Link>Resources\x64\soft_oal.dll</Link>
     </EmbeddedResource>
     <None Include="app.config" />
     <None Include="packages.config" />
-    <EmbeddedResource Include="..\packages\MonoGame.Framework.DesktopGL.3.8.0.1217-develop\runtimes\linux-x64\native\libSDL2-2.0.so.0">
+    <EmbeddedResource Include="..\packages\AscensionGameDev.Client.DesktopGL.3.8.0.1217-develop\runtimes\linux-x64\native\libSDL2-2.0.so.0">
       <Link>Resources\x86\libSDL2</Link>
     </EmbeddedResource>
-    <EmbeddedResource Include="..\packages\MonoGame.Framework.DesktopGL.3.8.0.1217-develop\runtimes\linux-x64\native\libSDL2-2.0.so.0">
+    <EmbeddedResource Include="..\packages\AscensionGameDev.Client.DesktopGL.3.8.0.1217-develop\runtimes\linux-x64\native\libSDL2-2.0.so.0">
       <Link>Resources\x64\libSDL2</Link>
     </EmbeddedResource>
-    <EmbeddedResource Include="..\packages\MonoGame.Framework.DesktopGL.3.8.0.1217-develop\runtimes\linux-x64\native\libopenal.so.1">
+    <EmbeddedResource Include="..\packages\AscensionGameDev.Client.DesktopGL.3.8.0.1217-develop\runtimes\linux-x64\native\libopenal.so.1">
       <Link>Resources\x86\libopenal</Link>
     </EmbeddedResource>
-    <EmbeddedResource Include="..\packages\MonoGame.Framework.DesktopGL.3.8.0.1217-develop\runtimes\linux-x64\native\libopenal.so.1">
+    <EmbeddedResource Include="..\packages\AscensionGameDev.Client.DesktopGL.3.8.0.1217-develop\runtimes\linux-x64\native\libopenal.so.1">
       <Link>Resources\x64\libopenal</Link>
     </EmbeddedResource>
-    <EmbeddedResource Include="..\packages\MonoGame.Framework.DesktopGL.3.8.0.1217-develop\runtimes\osx\native\libSDL2-2.0.0.dylib">
+    <EmbeddedResource Include="..\packages\AscensionGameDev.Client.DesktopGL.3.8.0.1217-develop\runtimes\osx\native\libSDL2-2.0.0.dylib">
       <Link>Resources\libSDL2-2.0.0.dylib</Link>
     </EmbeddedResource>
-    <EmbeddedResource Include="..\packages\MonoGame.Framework.DesktopGL.3.8.0.1217-develop\runtimes\osx\native\libopenal.1.dylib">
+    <EmbeddedResource Include="..\packages\AscensionGameDev.Client.DesktopGL.3.8.0.1217-develop\runtimes\osx\native\libopenal.1.dylib">
       <Link>Resources\libopenal.1.dylib</Link>
     </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">
@@ -299,11 +299,11 @@
     <Error Condition="!Exists('..\packages\MonoGame.Content.Builder.3.7.0.9\build\MonoGame.Content.Builder.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MonoGame.Content.Builder.3.7.0.9\build\MonoGame.Content.Builder.targets'))" />
     <Error Condition="!Exists('..\packages\Costura.Fody.3.3.3\build\Costura.Fody.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.3.3.3\build\Costura.Fody.props'))" />
     <Error Condition="!Exists('..\packages\Fody.4.2.1\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.4.2.1\build\Fody.targets'))" />
-    <Error Condition="!Exists('..\packages\MonoGame.Framework.DesktopGL.3.8.0.1217-develop\build\MonoGame.Framework.DesktopGL.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MonoGame.Framework.DesktopGL.3.8.0.1217-develop\build\MonoGame.Framework.DesktopGL.targets'))" />
+    <Error Condition="!Exists('..\packages\AscensionGameDev.Client.DesktopGL.3.8.0.1217-develop\build\AscensionGameDev.Client.DesktopGL.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\AscensionGameDev.Client.DesktopGL.3.8.0.1217-develop\build\AscensionGameDev.Client.DesktopGL.targets'))" />
   </Target>
   <Import Project="..\packages\MonoGame.Content.Builder.3.7.0.9\build\MonoGame.Content.Builder.targets" Condition="Exists('..\packages\MonoGame.Content.Builder.3.7.0.9\build\MonoGame.Content.Builder.targets')" />
   <Import Project="..\packages\Fody.4.2.1\build\Fody.targets" Condition="Exists('..\packages\Fody.4.2.1\build\Fody.targets')" />
-  <Import Project="..\packages\MonoGame.Framework.DesktopGL.3.8.0.1217-develop\build\MonoGame.Framework.DesktopGL.targets" Condition="Exists('..\packages\MonoGame.Framework.DesktopGL.3.8.0.1217-develop\build\MonoGame.Framework.DesktopGL.targets')" />
+  <Import Project="..\packages\AscensionGameDev.Client.DesktopGL.3.8.0.1217-develop\build\AscensionGameDev.Client.DesktopGL.targets" Condition="Exists('..\packages\AscensionGameDev.Client.DesktopGL.3.8.0.1217-develop\build\AscensionGameDev.Client.DesktopGL.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

diff --git a/Intersect.Client/packages.config b/Intersect.Client/packages.config
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="AscensionGameDev.Client.DesktopGL" version="3.8.0.1217-develop" targetFramework="net461" />
   <package id="AscensionGameDev.Lidgren.Network" version="1.7.2" targetFramework="net461" />
   <package id="Costura.Fody" version="3.3.3" targetFramework="net461" developmentDependency="true" />
   <package id="Fody" version="4.2.1" targetFramework="net461" developmentDependency="true" />
   <package id="JetBrains.Annotations" version="2018.3.0" targetFramework="net461" />
   <package id="MonoGame.Content.Builder" version="3.7.0.9" targetFramework="net461" />
-  <package id="MonoGame.Framework.DesktopGL" version="3.8.0.1217-develop" targetFramework="net461" />
   <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net461" />
   <package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net45" />
 </packages>
diff --git a/NuGet.Config b/NuGet.Config
@@ -4,6 +4,5 @@
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
     <add key="nuget2" value="https://www.nuget.org/api/v2" />
     <add key="Nancy MyGet" value="https://www.myget.org/F/nancyfx/api/v3/index.json" />
-	<add key="MonoGame Dev" value="http://teamcity.monogame.net/guestAuth/app/nuget/v1/FeedService.svc/" />
   </packageSources>
 </configuration>