mirror of
https://github.com/Ylianst/MeshCentralRouter
synced 2025-12-06 00:13:33 +00:00
Merge branch 'master' into proxy
This commit is contained in:
@@ -10,7 +10,7 @@
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>MeshCentralRouter</RootNamespace>
|
||||
<AssemblyName>MeshCentralRouter</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<StartupObject>MeshCentralRouter.Program</StartupObject>
|
||||
<ApplicationIcon>MeshServer.ico</ApplicationIcon>
|
||||
@@ -94,6 +94,24 @@
|
||||
<Compile Include="AddRelayMapForm.designer.cs">
|
||||
<DependentUpon>AddRelayMapForm.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="CustomAppsAddForm.cs">
|
||||
<SubType>Form</SubType>
|
||||
</Compile>
|
||||
<Compile Include="CustomAppsAddForm.Designer.cs">
|
||||
<DependentUpon>CustomAppsAddForm.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="CustomAppsForm.cs">
|
||||
<SubType>Form</SubType>
|
||||
</Compile>
|
||||
<Compile Include="CustomAppsForm.Designer.cs">
|
||||
<DependentUpon>CustomAppsForm.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="CustomAppsRunForm.cs">
|
||||
<SubType>Form</SubType>
|
||||
</Compile>
|
||||
<Compile Include="CustomAppsRunForm.Designer.cs">
|
||||
<DependentUpon>CustomAppsRunForm.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="FileConfirmOverwriteForm.cs">
|
||||
<SubType>Form</SubType>
|
||||
</Compile>
|
||||
@@ -111,6 +129,14 @@
|
||||
</Compile>
|
||||
<Compile Include="ProxySettings.Designer.cs">
|
||||
<DependentUpon>ProxySettings.cs</DependentUpon>
|
||||
<Compile Include="ListViewExtended.cs">
|
||||
<SubType>Component</SubType>
|
||||
</Compile>
|
||||
<Compile Include="KVMViewerExtra.cs">
|
||||
<SubType>Form</SubType>
|
||||
</Compile>
|
||||
<Compile Include="KVMViewerExtra.Designer.cs">
|
||||
<DependentUpon>KVMViewerExtra.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="LocalPipe.cs" />
|
||||
<Compile Include="SshUsernameForm.cs">
|
||||
@@ -274,6 +300,15 @@
|
||||
<EmbeddedResource Include="AddRelayMapForm.resx">
|
||||
<DependentUpon>AddRelayMapForm.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="CustomAppsAddForm.resx">
|
||||
<DependentUpon>CustomAppsAddForm.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="CustomAppsForm.resx">
|
||||
<DependentUpon>CustomAppsForm.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="CustomAppsRunForm.resx">
|
||||
<DependentUpon>CustomAppsRunForm.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="FileConfirmOverwriteForm.resx">
|
||||
<DependentUpon>FileConfirmOverwriteForm.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
@@ -283,6 +318,9 @@
|
||||
<EmbeddedResource Include="ProxySettings.resx">
|
||||
<DependentUpon>ProxySettings.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="KVMViewerExtra.resx">
|
||||
<DependentUpon>KVMViewerExtra.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="SshUsernameForm.resx">
|
||||
<DependentUpon>SshUsernameForm.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
@@ -376,6 +414,7 @@
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Content Include="MeshServer.ico" />
|
||||
<None Include="Resources\icon-monitor1.png" />
|
||||
<None Include="Resources\folderzip.png" />
|
||||
<None Include="Resources\arrowleft16.png" />
|
||||
<None Include="Resources\arrowright16.png" />
|
||||
|
||||
Reference in New Issue
Block a user