diff --git a/projects/IoTCenter/IoTCenter.csproj b/projects/IoTCenter/IoTCenter.csproj index 1fbc2706..4a218311 100644 --- a/projects/IoTCenter/IoTCenter.csproj +++ b/projects/IoTCenter/IoTCenter.csproj @@ -1,8 +1,8 @@  netcoreapp2.2 + InProcess true - false diff --git a/publish/src/linux-arm64/publish/files/bellsoft-jdk1.8.0-linux-arm64.deb b/publish/src/linux-arm64/publish/files/bellsoft-jdk1.8.0-linux-arm64.deb new file mode 100644 index 00000000..22d340cd Binary files /dev/null and b/publish/src/linux-arm64/publish/files/bellsoft-jdk1.8.0-linux-arm64.deb differ diff --git a/publish/src/linux-arm64/publish/files/bellsoft-jdk11.0.3-linux-arm32-vfp-hflt.deb.REMOVED.git-id b/publish/src/linux-arm64/publish/files/bellsoft-jdk11.0.3-linux-arm32-vfp-hflt.deb.REMOVED.git-id deleted file mode 100644 index b51ca6b4..00000000 --- a/publish/src/linux-arm64/publish/files/bellsoft-jdk11.0.3-linux-arm32-vfp-hflt.deb.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -9ddd066bb9fc45cfee5b35a1f49c9107f405435b \ No newline at end of file diff --git a/publish/src/linux-arm64/publish/files/dotnet-sdk-2.2.204-linux-arm.tar.gz b/publish/src/linux-arm64/publish/files/dotnet-sdk-2.2.300-linux-arm.tar.gz similarity index 85% rename from publish/src/linux-arm64/publish/files/dotnet-sdk-2.2.204-linux-arm.tar.gz rename to publish/src/linux-arm64/publish/files/dotnet-sdk-2.2.300-linux-arm.tar.gz index 17be5eb8..02a9b7e5 100644 Binary files a/publish/src/linux-arm64/publish/files/dotnet-sdk-2.2.204-linux-arm.tar.gz and b/publish/src/linux-arm64/publish/files/dotnet-sdk-2.2.300-linux-arm.tar.gz differ diff --git a/publish/src/linux-arm64/publish/files/dotnet-sdk-2.2.300-linux-arm64.tar.gz b/publish/src/linux-arm64/publish/files/dotnet-sdk-2.2.300-linux-arm64.tar.gz new file mode 100644 index 00000000..1dbc4ee3 Binary files /dev/null and b/publish/src/linux-arm64/publish/files/dotnet-sdk-2.2.300-linux-arm64.tar.gz differ diff --git a/publish/src/linux-arm64/publish/install.sh b/publish/src/linux-arm64/publish/install.sh index a08f1ac0..7bf9955e 100644 --- a/publish/src/linux-arm64/publish/install.sh +++ b/publish/src/linux-arm64/publish/install.sh @@ -11,17 +11,21 @@ sudo dpkg -i ~/publish/files/python-meld3_1.0.2-2_all.deb sudo dpkg -i ~/publish/files/supervisor_3.3.5-1_all.deb sudo dpkg -i ~/publish/files/fonts-wqy-zenhei_0.9.45-7_all.deb mkdir -p ~/dotnet -tar zxf ~/publish/files/dotnet-sdk-2.2.204-linux-arm.tar.gz -C ~/dotnet -if [ `which dotnet` ]; then - echo 'dotnet command has in path' +if [ `uname -m` == "aarch64" ];then + tar zxf ~/publish/files/dotnet-sdk-2.2.300-linux-arm64.tar.gz -C ~/dotnet else + tar zxf ~/publish/files/dotnet-sdk-2.2.300-linux-arm.tar.gz -C ~/dotnet +fi +if [ "`which dotnet`" == "" ]; then echo 'export PATH=$PATH:/home/pi/dotnet'>>~/.bashrc echo 'export DOTNET_ROOT=/home/pi/dotnet'>>~/.bashrc fi #sudo dpkg --purge oracle-java8-jdk -#sudo dpkg -i ~/publish/files/bellsoft-jdk11.0.3-linux-arm32-vfp-hflt.deb +if [ `uname -m` == "aarch64" ];then + sudo dpkg -i ~/publish/files/bellsoft-jdk1.8.0-linux-arm64.deb +fi -config system +#config system sudo systemctl enable ssh sudo timedatectl set-timezone 'Asia/Shanghai' sudo timedatectl set-ntp true