Merge pull request #148 from EasyAbp/rollback-fix-path

Roll back the fix-path package version
EasyAbp · Jan 17, 2023 · 0ac00a6 · 0ac00a6
2 parents 92897b3 + eb5ac60
commit 0ac00a6
Show file tree

Hide file tree

Showing 5 changed files with 6,954 additions and 939 deletions.
diff --git a/dotnet/common.props b/dotnet/common.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
-    <Version>2.5.1</Version>
+    <Version>2.5.2</Version>
     <NoWarn>$(NoWarn);CS1591;CS0436</NoWarn>
 	<AbpProjectType>app</AbpProjectType>
   </PropertyGroup>

diff --git a/dotnet/src/EasyAbp.AbpHelper.Gui.Blazor/package.json b/dotnet/src/EasyAbp.AbpHelper.Gui.Blazor/package.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.5.1",
+  "version": "2.5.2",
   "name": "easyabp-abphelper-gui",
   "private": true,
   "dependencies": {

diff --git a/electron/main.js b/electron/main.js
@@ -1,8 +1,3 @@
-// require('update-electron-app')({
-//   logger: require('electron-log')
-// })
-
-const fetch = require('electron-main-fetch')
 const path = require('path')
 const {spawn, exec} = require('child_process')
 const {app, Menu, Tray, BrowserWindow, shell, dialog} = require('electron')
@@ -85,7 +80,6 @@ function initialize () {
     if (debug) {
       mainWindow.webContents.openDevTools()
       mainWindow.maximize()
-      // require('devtron').install()
     }
 
     mainWindow.on('closed', () => {
@@ -103,7 +97,7 @@ function initialize () {
   app.on('ready', () => {
     let checkDotnetProcess = exec("dotnet --version", (error, stdout, stderr) => {
       if (error) {
-        dialog.showMessageBoxSync({type: "error", message: "Required .NET 5.0+ runtime is not installed."})
+        dialog.showMessageBoxSync({type: "error", message: "Required .NET 7.0+ runtime is not installed."})
         app.quit()
         return
       }
@@ -146,19 +140,6 @@ let tray = null
 let template = [{
   label: 'Show',
   click: () => mainWindow.show()
-//   label: 'Abp CLI...',
-//   click: () => loadShowPage('abp-cli-new')
-// }, {
-//   label: 'AbpHelper CLI...',
-//   click: () => loadShowPage('abphelper-cli-generate-crud')
-// }, {
-//   label: 'Modules Manager...',
-//   click: () => loadShowPage('modules-manager-market')
-// }, {
-//   label: 'Awesome Tools...',
-//   click: () => loadShowPage('awesome-tools-ef-provider')
-// }, {
-//   type: 'separator'
 }, {
   label: 'Help',
   submenu: [{