New: Multi target net framework 4.6.2 and net core 3.0

frontend/src/Settings/General/GeneralSettings.js

@@ -97,7 +97,6 @@ class GeneralSettings extends Component {
       settings,
       hasSettings,
       isResettingApiKey,
-      isMono,
       isWindows,
       isWindowsService,
       mode,
@@ -162,7 +161,7 @@ class GeneralSettings extends Component {
                 <UpdateSettings
                   advancedSettings={advancedSettings}
                   settings={settings}
-                  isMono={isMono}
+                  isWindows={isWindows}
                   onInputChange={onInputChange}
                 />
 
@@ -203,7 +202,6 @@ GeneralSettings.propTypes = {
   settings: PropTypes.object.isRequired,
   isResettingApiKey: PropTypes.bool.isRequired,
   hasSettings: PropTypes.bool.isRequired,
-  isMono: PropTypes.bool.isRequired,
   isWindows: PropTypes.bool.isRequired,
   isWindowsService: PropTypes.bool.isRequired,
   mode: PropTypes.string.isRequired,

frontend/src/Settings/General/GeneralSettingsConnector.js

@@ -24,7 +24,6 @@ function createMapStateToProps() {
       return {
         advancedSettings,
         isResettingApiKey,
-        isMono: systemStatus.isMono,
         isWindows: systemStatus.isWindows,
         isWindowsService: systemStatus.isWindows && systemStatus.mode === 'service',
         mode: systemStatus.mode,

frontend/src/Settings/General/HostSettings.js

@@ -88,7 +88,7 @@ function HostSettings(props) {
       </FormGroup>
 
       {
-        enableSsl.value &&
+        enableSsl.value ?
           <FormGroup
             advancedSettings={advancedSettings}
             isAdvanced={true}
@@ -104,11 +104,12 @@ function HostSettings(props) {
               onChange={onInputChange}
               {...sslPort}
             />
-          </FormGroup>
+          </FormGroup> :
+          null
       }
 
       {
-        enableSsl.value &&
+        enableSsl.value ?
           <FormGroup
             advancedSettings={advancedSettings}
             isAdvanced={true}
@@ -123,11 +124,12 @@ function HostSettings(props) {
               onChange={onInputChange}
               {...sslCertPath}
             />
-          </FormGroup>
+          </FormGroup> :
+          null
       }
 
       {
-        enableSsl.value &&
+        enableSsl.value ?
           <FormGroup
             advancedSettings={advancedSettings}
             isAdvanced={true}
@@ -142,7 +144,8 @@ function HostSettings(props) {
               onChange={onInputChange}
               {...sslCertPassword}
             />
-          </FormGroup>
+          </FormGroup> :
+          null
       }
 
       {

frontend/src/Settings/General/UpdateSettings.js

@@ -10,7 +10,7 @@ function UpdateSettings(props) {
   const {
     advancedSettings,
     settings,
-    isMono,
+    isWindows,
     onInputChange
   } = props;
 
@@ -49,7 +49,7 @@ function UpdateSettings(props) {
       </FormGroup>
 
       {
-        isMono &&
+        !isWindows &&
         <div>
           <FormGroup
             advancedSettings={advancedSettings}
@@ -110,7 +110,7 @@ function UpdateSettings(props) {
 UpdateSettings.propTypes = {
   advancedSettings: PropTypes.bool.isRequired,
   settings: PropTypes.object.isRequired,
-  isMono: PropTypes.bool.isRequired,
+  isWindows: PropTypes.bool.isRequired,
   onInputChange: PropTypes.func.isRequired
 };