Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge with develop and Updated Version numbers to be 2.5.0.0

  • Loading branch information...
commit b21cbaa54268ee0b075b0895a5176ab56b3fd007 1 parent f4ad478
@CartBlanche CartBlanche authored
View
4 MonoGame.Framework/MonoGame.Framework.Android.csproj
@@ -17,7 +17,9 @@
<MandroidI18n />
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
<AndroidApplication>True</AndroidApplication>
- <DeployExternal>false</DeployExternal>
+ <DeployExternal>false</DeployExternal>
+ <ReleaseVersion>2.5.0.0</ReleaseVersion>
+ <SynchReleaseVersion>false</SynchReleaseVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
View
4 MonoGame.Framework/MonoGame.Framework.Linux.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -9,6 +9,8 @@
<OutputType>Library</OutputType>
<RootNamespace>MonoGame.Framework.Linux</RootNamespace>
<AssemblyName>MonoGame.Framework.Linux</AssemblyName>
+ <ReleaseVersion>2.5.0.0</ReleaseVersion>
+ <SynchReleaseVersion>false</SynchReleaseVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<DebugSymbols>true</DebugSymbols>
View
4 MonoGame.Framework/MonoGame.Framework.MacOS.csproj
@@ -10,6 +10,8 @@
<OutputType>Library</OutputType>
<RootNamespace>Microsoft.Xna.Framework</RootNamespace>
<AssemblyName>MonoGame.Framework.MacOS</AssemblyName>
+ <ReleaseVersion>2.5.0.0</ReleaseVersion>
+ <SynchReleaseVersion>false</SynchReleaseVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -394,7 +396,7 @@
<Folder Include="MacOS\Storage\" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\ThirdParty\Lidgren.Network\Lidgren.Network.MacOS.csproj">
+ <ProjectReference Include="..\..\CartBlanche\MonoGame\ThirdParty\Lidgren.Network\Lidgren.Network.MacOS.csproj">
<Project>{AE483C29-042E-4226-BA52-D247CE7676DA}</Project>
<Name>Lidgren.Network.MacOS</Name>
</ProjectReference>
View
6 MonoGame.Framework/MonoGame.Framework.Windows.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -16,7 +16,9 @@
<OldToolsVersion>3.5</OldToolsVersion>
<UpgradeBackupLocation />
<NoStdLib>False</NoStdLib>
- <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+ <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+ <ReleaseVersion>2.5.0.0</ReleaseVersion>
+ <SynchReleaseVersion>false</SynchReleaseVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<DebugType>full</DebugType>
View
2  MonoGame.Framework/MonoGame.Framework.iOS.csproj
@@ -11,7 +11,7 @@
<Description>XNA implementation for MonoTouch</Description>
<RootNamespace>Microsoft.Xna.Framework</RootNamespace>
<SynchReleaseVersion>false</SynchReleaseVersion>
- <ReleaseVersion>1.6</ReleaseVersion>
+ <ReleaseVersion>2.5.0.0</ReleaseVersion>
<MtouchSdkVersion>3.0</MtouchSdkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
View
6 MonoGame.Framework/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
@@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.0.0")]
-[assembly: AssemblyFileVersion("2.0.0.0")]
+[assembly: AssemblyVersion("2.5.0.0")]
+[assembly: AssemblyFileVersion("2.5.0.0")]
View
6 ThirdParty/Lidgren.Network/Lidgren.Network.Android.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -14,7 +14,9 @@
<AssemblyName>Lidgren.Network.Android</AssemblyName>
<AndroidSupportedAbis>armeabi%3barmeabi-v7a</AndroidSupportedAbis>
<AndroidStoreUncompressedFileExtensions />
- <MandroidI18n />
+ <MandroidI18n />
+ <ReleaseVersion>2.5.0.0</ReleaseVersion>
+ <SynchReleaseVersion>false</SynchReleaseVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
View
6 ThirdParty/Lidgren.Network/Lidgren.Network.Linux.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -24,7 +24,9 @@
</FileUpgradeFlags>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
- <OldToolsVersion>3.5</OldToolsVersion>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <ReleaseVersion>2.5.0.0</ReleaseVersion>
+ <SynchReleaseVersion>false</SynchReleaseVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
View
4 ThirdParty/Lidgren.Network/Lidgren.Network.MacOS.csproj
@@ -24,7 +24,9 @@
</FileUpgradeFlags>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
- <OldToolsVersion>3.5</OldToolsVersion>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <ReleaseVersion>2.5.0.0</ReleaseVersion>
+ <SynchReleaseVersion>false</SynchReleaseVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
View
6 ThirdParty/Lidgren.Network/Lidgren.Network.Windows.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -24,7 +24,9 @@
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<OldToolsVersion>3.5</OldToolsVersion>
- <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <ReleaseVersion>2.5.0.0</ReleaseVersion>
+ <SynchReleaseVersion>false</SynchReleaseVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
View
2  ThirdParty/Lidgren.Network/Lidgren.Network.iOS.csproj
@@ -10,6 +10,8 @@
<OutputType>Library</OutputType>
<RootNamespace>Lidgren.Network.iOS</RootNamespace>
<AssemblyName>Lidgren.Network.iOS</AssemblyName>
+ <ReleaseVersion>2.5.0.0</ReleaseVersion>
+ <SynchReleaseVersion>false</SynchReleaseVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Please sign in to comment.
Something went wrong with that request. Please try again.