Merge pull request #8 from atel0/develop

-update: version to 0.0.1.2
NL0bP · Jan 24, 2019 · d41deac · d41deac
2 parents 915ba82 + d9d5efe
commit d41deac
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,3 +11,4 @@ AAEmu.Login/bin/
 AAEmu.Login/obj/
 AAEmu.Game/Data/compact.sqlite3
 AAEmu.Game/Data/Worlds/*/hmap.dat
+publish/
diff --git a/AAEmu.Game/AAEmu.Game.csproj b/AAEmu.Game/AAEmu.Game.csproj
@@ -4,7 +4,7 @@
         <OutputType>Exe</OutputType>
         <TargetFramework>netcoreapp2.2</TargetFramework>
         <RuntimeIdentifiers>win7-x64;win7-x86;win8-x64;win8-x86;win81-x64;win81-x86;win10-x64;win10-x86;centos.7-x64;debian.9-x64;ubuntu.18.04-x64;sles-x64;sles.12-x64;sles.12.1-x64;sles.12.2-x64;sles.12.3-x64;alpine-x64;alpine.3.7-x64</RuntimeIdentifiers>
-        <VersionPrefix>0.0.1.1</VersionPrefix>
+        <VersionPrefix>0.0.1.2</VersionPrefix>
         <VersionSuffix>alpha</VersionSuffix>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     </PropertyGroup>

diff --git a/AAEmu.Game/ExampleConfig.json b/AAEmu.Game/ExampleConfig.json
@@ -20,7 +20,7 @@
       "Port": "3306",
       "User": "root",
       "Password": "",
-      "Database": "aaemu"
+      "Database": "aaemu_game"
     }
   },
   "CharacterNameRegex": "^[a-zA-Z0-9а-яА-Я]{1,18}$",

diff --git a/AAEmu.Login/AAEmu.Login.csproj b/AAEmu.Login/AAEmu.Login.csproj
@@ -4,7 +4,7 @@
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.2</TargetFramework>
     <RuntimeIdentifiers>win7-x64;win7-x86;win8-x64;win8-x86;win81-x64;win81-x86;win10-x64;win10-x86;centos.7-x64;debian.9-x64;ubuntu.18.04-x64;sles-x64;sles.12-x64;sles.12.1-x64;sles.12.2-x64;sles.12.3-x64;alpine-x64;alpine.3.7-x64</RuntimeIdentifiers>
-    <VersionPrefix>0.0.1.1</VersionPrefix>
+    <VersionPrefix>0.0.1.2</VersionPrefix>
     <VersionSuffix>alpha</VersionSuffix>
   </PropertyGroup>
 

diff --git a/AAEmu.Login/ExampleConfig.json b/AAEmu.Login/ExampleConfig.json
@@ -14,7 +14,7 @@
       "Port": "3306",
       "User": "root",
       "Password": "",
-      "Database": "aaemu"
+      "Database": "aaemu_login"
     }
   }
 }
diff --git a/publish.sh b/publish.sh
@@ -1,6 +1,6 @@
 #!bin/bash
 
-VERSION_PREFIX=0.0.1.1
+VERSION_PREFIX=0.0.1.2
 VERSION_SUFFIX=alpha
 
 FRAMEWORK=netcoreapp2.2