Merge branch 'master' of https://github.com/purerosefallen/DataEditorX

.gitlab-ci.yml

@@ -25,9 +25,9 @@ upload_to_minio:
     - build_dex
   tags: 
     - linux
-  image: banst/awscli
+  image: python
   script:
-    - pip install -U awscli
+    - pip install -U -i https://mirrors.aliyun.com/pypi/simple/ awscli
     - aws s3 --endpoint=https://minio.mycard.moe:9000 sync dist/ s3://mycard/DataEditorX
   only:
     - master

DataEditorX/Properties/AssemblyInfo.cs

@@ -10,11 +10,11 @@
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("DataEditorX")]
-[assembly: AssemblyDescription("E-mail:247321452@qq.com")]
+[assembly: AssemblyDescription("E-mail:nanahira@momobako.com")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("DataEditorX")]
-[assembly: AssemblyCopyright("Copyright 2016")]
+[assembly: AssemblyCopyright("Copyright 2020")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

DataEditorX/changed.txt

 ★更新历史
+3.0.0.0
+不少改善，增加了窗口缩放
 2.4.3.7
 增加了一些自动完成
 2.4.3.6
@@ -390,4 +392,4 @@ txt文件，顺序可以打乱，关键是数值不能重复
 更改检查更新网址为我的百度空间
 1.2.0.0
 添加检查新版本
-修复setname
\ No newline at end of file
+修复setname

ci/build.sh

@@ -2,11 +2,20 @@
 set -x
 set -o errexit
 DEX_VERSION=$(grep -oP '\[DataEditorX\](.+)\[DataEditorX\]' DataEditorX/readme.txt | sed 's/\[DataEditorX\]//g')
+
+# apt packages
+sed -i '/download.mono-project.com/d' /etc/apt/sources.list /etc/apt/sources.list.d/*
 apt update
-apt -y install p7zip-full
+apt -y install wget p7zip-full
+
+# data files
+wget -O DataEditorX/data/constant.lua https://koishi.pro/ygopro/script/constant.lua
+wget -O DataEditorX/data/strings.conf https://koishi.pro/ygopro/strings.conf
 
-xbuild /p:Configuration=Release /p:TargetFrameworkVersion=v4.6 /p:OutDir=$PWD/output/
+# build
+xbuild /p:Configuration=Release /p:OutDir=$PWD/output/ /p:TargetFrameworkVersion=v4.6 
 
+# zip
 mkdir -p dist/releases
 cd output
 7z a -mx9 ../dist/releases/DataEditorX-$DEX_VERSION.zip ./*