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,
       isDocker,
@@ -163,7 +162,7 @@ class GeneralSettings extends Component {
                 <UpdateSettings
                   advancedSettings={advancedSettings}
                   settings={settings}
-                  isMono={isMono}
+                  isWindows={isWindows}
                   isDocker={isDocker}
                   onInputChange={onInputChange}
                 />
@@ -205,7 +204,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,
   isDocker: PropTypes.bool.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',
         isDocker: systemStatus.isDocker,

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

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

frontend/src/Settings/MediaManagement/MediaManagement.js

@@ -49,7 +49,7 @@ class MediaManagement extends Component {
       error,
       settings,
       hasSettings,
-      isMono,
+      isWindows,
       onInputChange,
       onSavePress,
       ...otherProps
@@ -129,7 +129,7 @@ class MediaManagement extends Component {
                       legend="Importing"
                     >
                       {
-                        isMono &&
+                        !isWindows &&
                           <FormGroup
                             advancedSettings={advancedSettings}
                             isAdvanced={true}
@@ -340,7 +340,7 @@ class MediaManagement extends Component {
                 </FieldSet>
 
                 {
-                  advancedSettings && isMono &&
+                  advancedSettings && !isWindows &&
                     <FieldSet
                       legend="Permissions"
                     >
@@ -445,7 +445,7 @@ MediaManagement.propTypes = {
   error: PropTypes.object,
   settings: PropTypes.object.isRequired,
   hasSettings: PropTypes.bool.isRequired,
-  isMono: PropTypes.bool.isRequired,
+  isWindows: PropTypes.bool.isRequired,
   onSavePress: PropTypes.func.isRequired,
   onInputChange: PropTypes.func.isRequired
 };

frontend/src/Settings/MediaManagement/MediaManagementConnector.js

@@ -22,7 +22,7 @@ function createMapStateToProps() {
         advancedSettings,
         ...sectionSettings,
         hasPendingChanges: !_.isEmpty(namingSettings.pendingChanges) || sectionSettings.hasPendingChanges,
-        isMono: systemStatus.isMono
+        isWindows: systemStatus.isWindows
       };
     }
   );