diff --git a/Application/BuildScripts/PostPublish.bat b/Application/BuildScripts/PostPublish.bat index eee1cb7ed..666e737f4 100644 --- a/Application/BuildScripts/PostPublish.bat +++ b/Application/BuildScripts/PostPublish.bat @@ -56,3 +56,4 @@ del "%SolutionDir%Publish\WindowsPrerelease\*pdb" echo making start script @echo dotnet IW4MAdmin.dll > "%SolutionDir%Publish\WindowsPrerelease\StartIW4MAdmin.cmd" +@echo dotnet IW4MAdmin.dll > "%SolutionDir%Publish\Windows\StartIW4MAdmin.cmd" diff --git a/Application/Localization/Configure.cs b/Application/Localization/Configure.cs index cdd489f03..27045824a 100644 --- a/Application/Localization/Configure.cs +++ b/Application/Localization/Configure.cs @@ -6,6 +6,7 @@ using System.Globalization; using System.IO; using System.Linq; using System.Text; +using System.Threading.Tasks; namespace IW4MAdmin.Application.Localization { diff --git a/Master/master/__init__.py b/Master/master/__init__.py index ce4335bb6..a3008498d 100644 --- a/Master/master/__init__.py +++ b/Master/master/__init__.py @@ -6,7 +6,6 @@ from flask import Flask from flask_restful import Resource, Api from flask_jwt_extended import JWTManager from master.context.base import Base -import json app = Flask(__name__) app.config['JWT_SECRET_KEY'] = 'my key!' @@ -14,7 +13,7 @@ app.config['PROPAGATE_EXCEPTIONS'] = True jwt = JWTManager(app) api = Api(app) ctx = Base() -config = json.load(open('./master/config/master.json')) +#config = json.load(open('./master/config/master.json')) import master.routes import master.views diff --git a/Master/master/config/master.json b/Master/master/config/master.json index c23b10ed7..0607c5b3c 100644 --- a/Master/master/config/master.json +++ b/Master/master/config/master.json @@ -1,4 +1,4 @@ { - "current-version-stable": 2.0, + "current-version-stable": 2.1, "current-version-prerelease": 2.1 } \ No newline at end of file diff --git a/Master/master/resources/version.py b/Master/master/resources/version.py index 15d78ddd4..efe83974f 100644 --- a/Master/master/resources/version.py +++ b/Master/master/resources/version.py @@ -1,8 +1,9 @@ from flask_restful import Resource -from master import config +import json class Version(Resource): def get(self): + config = json.load(open('./master/config/master.json')) return { 'current-version-stable' : config['current-version-stable'], 'current-version-prerelease' : config['current-version-prerelease']