Skip to content

Commit c0d4c22

Browse files
BornToBeRootBornToBeRoot
committed
Update
1 parent 7793ffc commit c0d4c22

14 files changed

Lines changed: 124 additions & 13 deletions

Source/NETworkManager/Converters/IsDefaultSettingsLocationToBooleanConverter.cs renamed to Source/NETworkManager.Converters/IsDefaultSettingsLocationToBooleanConverter.cs

File renamed without changes.

Source/NETworkManager/Converters/IsSettingsLocationToBooleanConverter.cs renamed to Source/NETworkManager.Converters/IsSettingsLocationToBooleanConverter.cs

File renamed without changes.

‎Source/NETworkManager.Converters/NETworkManager.Converters.csproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@
4747
</ItemGroup>
4848
<ItemGroup>
4949
<Compile Include="AccentToBrushConverter.cs" />
50+
<Compile Include="IsDefaultSettingsLocationToBooleanConverter.cs" />
51+
<Compile Include="IsSettingsLocationToBooleanConverter.cs" />
5052
<Compile Include="SettingsViewGroupToTranslatedStringConverter.cs" />
5153
<Compile Include="SettingsViewNameToTranslatedStringConverter.cs" />
5254
<Compile Include="ProfileViewNameToTranslatedStringConverter.cs" />

‎Source/NETworkManager.Validators/NETworkManager.Validators.csproj‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@
7070
<Compile Include="PortValidator.cs" />
7171
<Compile Include="PrivacyAESValidator.cs" />
7272
<Compile Include="Properties\AssemblyInfo.cs" />
73+
<Compile Include="SettingsFolderExistsValidator.cs" />
7374
<Compile Include="SubnetmaskValidator.cs" />
7475
</ItemGroup>
7576
<ItemGroup>
@@ -81,6 +82,14 @@
8182
<Project>{8a2859dc-38b6-4e9d-a6b2-1828dc6641b3}</Project>
8283
<Name>NETworkManager.Models</Name>
8384
</ProjectReference>
85+
<ProjectReference Include="..\NETworkManager.Profiles\NETworkManager.Profiles.csproj">
86+
<Project>{d3b37f13-e8e6-4218-9e8e-96d52432a9cf}</Project>
87+
<Name>NETworkManager.Profiles</Name>
88+
</ProjectReference>
89+
<ProjectReference Include="..\NETworkManager.Settings\NETworkManager.Settings.csproj">
90+
<Project>{954e8703-3e6e-42bf-bd28-f0b19be10e0c}</Project>
91+
<Name>NETworkManager.Settings</Name>
92+
</ProjectReference>
8493
<ProjectReference Include="..\NETworkManager.Utilities\NETworkManager.Utilities.csproj">
8594
<Project>{5c3d1749-d260-4566-b448-b94b3ad9eeff}</Project>
8695
<Name>NETworkManager.Utilities</Name>

Source/NETworkManager/Validators/SettingsFolderExistsValidator.cs renamed to Source/NETworkManager.Validators/SettingsFolderExistsValidator.cs

File renamed without changes.

‎Source/NETworkManager.ViewModels/NETworkManager.ViewModels.csproj‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
4+
<PropertyGroup>
5+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7+
<ProjectGuid>{E2B6FF5D-9FA5-4137-B170-AB217E5C7399}</ProjectGuid>
8+
<OutputType>Library</OutputType>
9+
<AppDesignerFolder>Properties</AppDesignerFolder>
10+
<RootNamespace>NETworkManager.ViewModels</RootNamespace>
11+
<AssemblyName>NETworkManager.ViewModels</AssemblyName>
12+
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
13+
<FileAlignment>512</FileAlignment>
14+
<Deterministic>true</Deterministic>
15+
</PropertyGroup>
16+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
17+
<DebugSymbols>true</DebugSymbols>
18+
<DebugType>full</DebugType>
19+
<Optimize>false</Optimize>
20+
<OutputPath>bin\Debug\</OutputPath>
21+
<DefineConstants>DEBUG;TRACE</DefineConstants>
22+
<ErrorReport>prompt</ErrorReport>
23+
<WarningLevel>4</WarningLevel>
24+
</PropertyGroup>
25+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
26+
<DebugType>pdbonly</DebugType>
27+
<Optimize>true</Optimize>
28+
<OutputPath>bin\Release\</OutputPath>
29+
<DefineConstants>TRACE</DefineConstants>
30+
<ErrorReport>prompt</ErrorReport>
31+
<WarningLevel>4</WarningLevel>
32+
</PropertyGroup>
33+
<ItemGroup>
34+
<Reference Include="System" />
35+
<Reference Include="System.Core" />
36+
<Reference Include="System.Xml.Linq" />
37+
<Reference Include="System.Data.DataSetExtensions" />
38+
<Reference Include="Microsoft.CSharp" />
39+
<Reference Include="System.Data" />
40+
<Reference Include="System.Net.Http" />
41+
<Reference Include="System.Xml" />
42+
</ItemGroup>
43+
<ItemGroup>
44+
<Compile Include="Properties\AssemblyInfo.cs" />
45+
</ItemGroup>
46+
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
47+
</Project>

‎Source/NETworkManager.ViewModels/Properties/AssemblyInfo.cs‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
using System.Reflection;
2+
using System.Runtime.CompilerServices;
3+
using System.Runtime.InteropServices;
4+
5+
// General Information about an assembly is controlled through the following
6+
// set of attributes. Change these attribute values to modify the information
7+
// associated with an assembly.
8+
[assembly: AssemblyTitle("NETworkManager.ViewModels")]
9+
[assembly: AssemblyDescription("")]
10+
[assembly: AssemblyConfiguration("")]
11+
[assembly: AssemblyCompany("")]
12+
[assembly: AssemblyProduct("NETworkManager.ViewModels")]
13+
[assembly: AssemblyCopyright("Copyright © 2020")]
14+
[assembly: AssemblyTrademark("")]
15+
[assembly: AssemblyCulture("")]
16+
17+
// Setting ComVisible to false makes the types in this assembly not visible
18+
// to COM components. If you need to access a type in this assembly from
19+
// COM, set the ComVisible attribute to true on that type.
20+
[assembly: ComVisible(false)]
21+
22+
// The following GUID is for the ID of the typelib if this project is exposed to COM
23+
[assembly: Guid("e2b6ff5d-9fa5-4137-b170-ab217e5c7399")]
24+
25+
// Version information for an assembly consists of the following four values:
26+
//
27+
// Major Version
28+
// Minor Version
29+
// Build Number
30+
// Revision
31+
//
32+
// You can specify all the values or you can default the Build and Revision Numbers
33+
// by using the '*' as shown below:
34+
// [assembly: AssemblyVersion("1.0.*")]
35+
[assembly: AssemblyVersion("1.0.0.0")]
36+
[assembly: AssemblyFileVersion("1.0.0.0")]

‎Source/NETworkManager.sln‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NETworkManager.Settings", "
3030
EndProject
3131
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NETworkManager.Profiles", "NETworkManager.Profiles\NETworkManager.Profiles.csproj", "{D3B37F13-E8E6-4218-9E8E-96D52432A9CF}"
3232
EndProject
33+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NETworkManager.ViewModels", "NETworkManager.ViewModels\NETworkManager.ViewModels.csproj", "{E2B6FF5D-9FA5-4137-B170-AB217E5C7399}"
34+
EndProject
3335
Global
3436
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3537
Debug|Any CPU = Debug|Any CPU
@@ -285,6 +287,26 @@ Global
285287
{D3B37F13-E8E6-4218-9E8E-96D52432A9CF}.Release|x64.Build.0 = Release|Any CPU
286288
{D3B37F13-E8E6-4218-9E8E-96D52432A9CF}.Release|x86.ActiveCfg = Release|Any CPU
287289
{D3B37F13-E8E6-4218-9E8E-96D52432A9CF}.Release|x86.Build.0 = Release|Any CPU
290+
{E2B6FF5D-9FA5-4137-B170-AB217E5C7399}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
291+
{E2B6FF5D-9FA5-4137-B170-AB217E5C7399}.Debug|Any CPU.Build.0 = Debug|Any CPU
292+
{E2B6FF5D-9FA5-4137-B170-AB217E5C7399}.Debug|ARM.ActiveCfg = Debug|Any CPU
293+
{E2B6FF5D-9FA5-4137-B170-AB217E5C7399}.Debug|ARM.Build.0 = Debug|Any CPU
294+
{E2B6FF5D-9FA5-4137-B170-AB217E5C7399}.Debug|ARM64.ActiveCfg = Debug|Any CPU
295+
{E2B6FF5D-9FA5-4137-B170-AB217E5C7399}.Debug|ARM64.Build.0 = Debug|Any CPU
296+
{E2B6FF5D-9FA5-4137-B170-AB217E5C7399}.Debug|x64.ActiveCfg = Debug|Any CPU
297+
{E2B6FF5D-9FA5-4137-B170-AB217E5C7399}.Debug|x64.Build.0 = Debug|Any CPU
298+
{E2B6FF5D-9FA5-4137-B170-AB217E5C7399}.Debug|x86.ActiveCfg = Debug|Any CPU
299+
{E2B6FF5D-9FA5-4137-B170-AB217E5C7399}.Debug|x86.Build.0 = Debug|Any CPU
300+
{E2B6FF5D-9FA5-4137-B170-AB217E5C7399}.Release|Any CPU.ActiveCfg = Release|Any CPU
301+
{E2B6FF5D-9FA5-4137-B170-AB217E5C7399}.Release|Any CPU.Build.0 = Release|Any CPU
302+
{E2B6FF5D-9FA5-4137-B170-AB217E5C7399}.Release|ARM.ActiveCfg = Release|Any CPU
303+
{E2B6FF5D-9FA5-4137-B170-AB217E5C7399}.Release|ARM.Build.0 = Release|Any CPU
304+
{E2B6FF5D-9FA5-4137-B170-AB217E5C7399}.Release|ARM64.ActiveCfg = Release|Any CPU
305+
{E2B6FF5D-9FA5-4137-B170-AB217E5C7399}.Release|ARM64.Build.0 = Release|Any CPU
306+
{E2B6FF5D-9FA5-4137-B170-AB217E5C7399}.Release|x64.ActiveCfg = Release|Any CPU
307+
{E2B6FF5D-9FA5-4137-B170-AB217E5C7399}.Release|x64.Build.0 = Release|Any CPU
308+
{E2B6FF5D-9FA5-4137-B170-AB217E5C7399}.Release|x86.ActiveCfg = Release|Any CPU
309+
{E2B6FF5D-9FA5-4137-B170-AB217E5C7399}.Release|x86.Build.0 = Release|Any CPU
288310
EndGlobalSection
289311
GlobalSection(SolutionProperties) = preSolution
290312
HideSolutionNode = FALSE

‎Source/NETworkManager/NETworkManager.csproj‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -952,8 +952,6 @@
952952
<Compile Include="Views\AboutView.xaml.cs">
953953
<DependentUpon>AboutView.xaml</DependentUpon>
954954
</Compile>
955-
<Compile Include="Converters\IsSettingsLocationToBooleanConverter.cs" />
956-
<Compile Include="Converters\IsDefaultSettingsLocationToBooleanConverter.cs" />
957955
<Compile Include="Views\PortScannerView.xaml.cs">
958956
<DependentUpon>PortScannerView.xaml</DependentUpon>
959957
</Compile>
@@ -966,7 +964,6 @@
966964
<Compile Include="Views\SettingsView.xaml.cs">
967965
<DependentUpon>SettingsView.xaml</DependentUpon>
968966
</Compile>
969-
<Compile Include="Validators\SettingsFolderExistsValidator.cs" />
970967
<Compile Include="Views\WakeOnLANView.xaml.cs">
971968
<DependentUpon>WakeOnLANView.xaml</DependentUpon>
972969
</Compile>

‎Source/NETworkManager/Views/IPScannerView.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
xmlns:validators="clr-namespace:NETworkManager.Validators;assembly=NETworkManager.Validators"
1111
xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
1212
xmlns:viewModels="clr-namespace:NETworkManager.ViewModels"
13-
xmlns:network="clr-namespace:NETworkManager.Models.Network"
13+
xmlns:network="clr-namespace:NETworkManager.Models.Network;assembly=NETworkManager.Models"
1414
xmlns:localization="clr-namespace:NETworkManager.Localization.Resources;assembly=NETworkManager.Localization"
1515
xmlns:controls="clr-namespace:NETworkManager.Controls;assembly=NETworkManager.Controls"
1616
xmlns:dialogs="clr-namespace:MahApps.Metro.Controls.Dialogs;assembly=MahApps.Metro"

0 commit comments

Comments
 (0)