Using VS 2015 now! NovetusShared is now a proper Shared project (NovetusFuncs)

This commit is contained in:
Bitl 2019-10-11 09:03:35 -07:00
parent 76a3ba21e5
commit d83b2b438e
34 changed files with 91 additions and 205 deletions

Binary file not shown.

View File

@ -73,11 +73,6 @@
<None Include="app.config" />
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\NovetusShared\NovetusShared.csproj">
<Project>{759bfc2b-c130-4a2a-a01f-65abfee85b4c}</Project>
<Name>NovetusShared</Name>
</ProjectReference>
</ItemGroup>
<Import Project="..\NovetusFuncs\NovetusFuncs.projitems" Label="Shared" />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

View File

@ -8,11 +8,10 @@
*/
using System;
using Mono.Nat;
using NovetusShared;
using System.Diagnostics;
using System.IO;
using System.ComponentModel;
using System.Reflection;
namespace NovetusCMD
{

View File

@ -6,12 +6,11 @@
*
* To change this template use Tools | Options | Coding | Edit Standard Headers.
*/
using System;
using System.Drawing;
using System.Windows.Forms;
using System.Diagnostics;
using System.Linq;
public static class RichTextBoxExtensions
{

View File

@ -9,7 +9,6 @@
using System;
using System.Security.Cryptography;
using System.Linq;
public class CryptoRandom : RandomNumberGenerator
{

View File

@ -7,9 +7,7 @@
* To change this template use Tools | Options | Coding | Edit Standard Headers.
*/
using System;
using System.Runtime.InteropServices;
using System.Linq;
//Discord Rich Presence Integration :D
public class DiscordRpc

View File

@ -10,7 +10,6 @@
using System;
using System.IO;
using System.Reflection;
using System.Linq;
public static class GlobalVars
{

View File

@ -7,10 +7,8 @@
* To change this template use Tools | Options | Coding | Edit Standard Headers.
*/
using System;
using System.Text;
using System.Runtime.InteropServices;
using System.Linq;
//credit to BLaZiNiX
public class IniFile

View File

@ -8,11 +8,7 @@
*/
using System;
using System.IO;
using System.Linq;
/// <summary>
/// Description of LauncherFuncs.
/// </summary>
public class LauncherFuncs
{
public LauncherFuncs()

View File

@ -0,0 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
<HasSharedItems>true</HasSharedItems>
<SharedGUID>54856a61-1ee2-40c3-85ae-c54b8de7cc30</SharedGUID>
</PropertyGroup>
<PropertyGroup Label="Configuration">
<Import_RootNamespace>NovetusFuncs</Import_RootNamespace>
</PropertyGroup>
<ItemGroup>
<Compile Include="$(MSBuildThisFileDirectory)ClientScript.cs" />
<Compile Include="$(MSBuildThisFileDirectory)CodeExtensions.cs" />
<Compile Include="$(MSBuildThisFileDirectory)CryptoRandom.cs" />
<Compile Include="$(MSBuildThisFileDirectory)DiscordRpc.cs" />
<Compile Include="$(MSBuildThisFileDirectory)GlobalVars.cs" />
<Compile Include="$(MSBuildThisFileDirectory)IniFile.cs" />
<Compile Include="$(MSBuildThisFileDirectory)LauncherFuncs.cs" />
<Compile Include="$(MSBuildThisFileDirectory)ScriptGenerator.cs" />
<Compile Include="$(MSBuildThisFileDirectory)SecurityFuncs.cs" />
<Compile Include="$(MSBuildThisFileDirectory)SplashReader.cs" />
<Compile Include="$(MSBuildThisFileDirectory)TextLineRemover.cs" />
<Compile Include="$(MSBuildThisFileDirectory)TreeNodeHelper.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UPnP.cs" />
<Compile Include="$(MSBuildThisFileDirectory)WebServer.cs" />
</ItemGroup>
</Project>

View File

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Label="Globals">
<ProjectGuid>54856a61-1ee2-40c3-85ae-c54b8de7cc30</ProjectGuid>
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
</PropertyGroup>
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
<PropertyGroup />
<Import Project="NovetusFuncs.projitems" Label="Shared" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
</Project>

View File

@ -12,7 +12,6 @@ using System.Collections.Generic;
using System.IO;
using System.Reflection;
using System.Text.RegularExpressions;
using System.Linq;
/*
* so, in order for us to generate a good script, we have to:

View File

@ -9,7 +9,6 @@
using System;
using System.IO;
using System.Linq;
public static class SplashReader
{

View File

@ -10,7 +10,6 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
public static class TextLineRemover
{

View File

@ -11,7 +11,6 @@ using System;
using System.Collections.Generic;
using System.Windows.Forms;
using System.IO;
using System.Linq;
public static class TreeNodeHelper
{

View File

@ -8,7 +8,6 @@
*/
using System;
using System.Linq;
using Mono.Nat;
public static class UPnP

View File

@ -13,7 +13,6 @@ using System.IO;
using System.Diagnostics;
using System.Threading;
using System.Text;
using System.Linq;
using System.Net.Sockets;
using System.Net;

View File

@ -1,14 +1,20 @@

Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
# SharpDevelop 5.1
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NovetusLauncher", "NovetusLauncher\NovetusLauncher.csproj", "{F92FFBED-2767-4676-9711-BB89CDA58A43}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NovetusCMD", "NovetusCMD\NovetusCMD.csproj", "{BAC99C87-F6C1-4ED0-AA2E-05C6AE8979EA}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NovetusShared", "NovetusShared\NovetusShared.csproj", "{759BFC2B-C130-4A2A-A01F-65ABFEE85B4C}"
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "NovetusFuncs", "NovetusFuncs\NovetusFuncs.shproj", "{54856A61-1EE2-40C3-85AE-C54B8DE7CC30}"
EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
NovetusFuncs\NovetusFuncs.projitems*{54856a61-1ee2-40c3-85ae-c54b8de7cc30}*SharedItemsImports = 13
NovetusFuncs\NovetusFuncs.projitems*{bac99c87-f6c1-4ed0-aa2e-05c6ae8979ea}*SharedItemsImports = 4
NovetusFuncs\NovetusFuncs.projitems*{f92ffbed-2767-4676-9711-bb89cda58a43}*SharedItemsImports = 4
EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
@ -22,9 +28,8 @@ Global
{BAC99C87-F6C1-4ED0-AA2E-05C6AE8979EA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BAC99C87-F6C1-4ED0-AA2E-05C6AE8979EA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BAC99C87-F6C1-4ED0-AA2E-05C6AE8979EA}.Release|Any CPU.Build.0 = Release|Any CPU
{759BFC2B-C130-4A2A-A01F-65ABFEE85B4C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{759BFC2B-C130-4A2A-A01F-65ABFEE85B4C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{759BFC2B-C130-4A2A-A01F-65ABFEE85B4C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{759BFC2B-C130-4A2A-A01F-65ABFEE85B4C}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal

View File

@ -10,13 +10,9 @@ using System;
using System.Drawing;
using System.Windows.Forms;
using System.IO;
using System.Reflection;
using System.Security.Cryptography;
using System.Text;
using System.Text.RegularExpressions;
using System.Diagnostics;
using System.ComponentModel;
using NovetusShared;
namespace NovetusLauncher
{

View File

@ -7,10 +7,9 @@
* To change this template use Tools | Options | Coding | Edit Standard Headers.
*/
using System;
using System.Drawing;
using System.Windows.Forms;
using System.IO;
using NovetusShared;
namespace NovetusLauncher
{

View File

@ -7,12 +7,9 @@
* To change this template use Tools | Options | Coding | Edit Standard Headers.
*/
using System;
using System.Drawing;
using System.Windows.Forms;
using System.IO;
using System.Diagnostics;
using System.Threading;
using NovetusShared;
namespace NovetusLauncher
{

View File

@ -7,13 +7,9 @@
* To change this template use Tools | Options | Coding | Edit Standard Headers.
*/
using System;
using System.Drawing;
using System.Windows.Forms;
using System.Net;
using System.IO;
using System.Reflection;
using System.ComponentModel;
using NovetusShared;
namespace NovetusLauncher
{

View File

@ -10,13 +10,9 @@ using System;
using System.IO;
using System.Diagnostics;
using System.Threading;
using System.Drawing;
using System.Windows.Forms;
using System.Reflection;
using System.Security.Cryptography;
using System.Text;
using System.Text.RegularExpressions;
using NovetusShared;
namespace NovetusLauncher
{

View File

@ -15,7 +15,7 @@ using System.Diagnostics;
using System.ComponentModel;
using System.Reflection;
using Mono.Nat;
using NovetusShared;
namespace NovetusLauncher
{

View File

@ -68,35 +68,51 @@
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="CharacterCustomization.cs" />
<Compile Include="CharacterCustomization.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="CharacterCustomization.Designer.cs">
<DependentUpon>CharacterCustomization.cs</DependentUpon>
</Compile>
<Compile Include="ClientinfoCreator.cs" />
<Compile Include="ClientinfoCreator.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="ClientinfoCreator.Designer.cs">
<DependentUpon>ClientinfoCreator.cs</DependentUpon>
</Compile>
<Compile Include="ClientScriptDocumentation.cs" />
<Compile Include="ClientScriptDocumentation.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="ClientScriptDocumentation.Designer.cs">
<DependentUpon>ClientScriptDocumentation.cs</DependentUpon>
</Compile>
<Compile Include="ItemMaker.cs" />
<Compile Include="ItemMaker.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="ItemMaker.Designer.cs">
<DependentUpon>ItemMaker.cs</DependentUpon>
</Compile>
<Compile Include="LoaderForm.cs" />
<Compile Include="LoaderForm.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="LoaderForm.Designer.cs">
<DependentUpon>LoaderForm.cs</DependentUpon>
</Compile>
<Compile Include="QuickConfigure.cs" />
<Compile Include="QuickConfigure.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="QuickConfigure.Designer.cs">
<DependentUpon>QuickConfigure.cs</DependentUpon>
</Compile>
<Compile Include="ServerInfo.cs" />
<Compile Include="ServerInfo.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="ServerInfo.Designer.cs">
<DependentUpon>ServerInfo.cs</DependentUpon>
</Compile>
<Compile Include="MainForm.cs" />
<Compile Include="MainForm.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="MainForm.Designer.cs">
<DependentUpon>MainForm.cs</DependentUpon>
</Compile>
@ -133,11 +149,6 @@
<None Include="app.config" />
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\NovetusShared\NovetusShared.csproj">
<Project>{759bfc2b-c130-4a2a-a01f-65abfee85b4c}</Project>
<Name>NovetusShared</Name>
</ProjectReference>
</ItemGroup>
<Import Project="..\NovetusFuncs\NovetusFuncs.projitems" Label="Shared" />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

View File

@ -8,7 +8,7 @@
*/
using System;
using System.Windows.Forms;
using NovetusShared;
namespace NovetusLauncher
{

View File

@ -7,15 +7,10 @@
* To change this template use Tools | Options | Coding | Edit Standard Headers.
*/
using System;
using System.Drawing;
using System.Windows.Forms;
using System.Reflection;
using System.Security.Cryptography;
using System.Text;
using System.Text.RegularExpressions;
using System.IO;
using System.ComponentModel;
using NovetusShared;
namespace NovetusLauncher
{

View File

@ -7,10 +7,9 @@
* To change this template use Tools | Options | Coding | Edit Standard Headers.
*/
using System;
using System.Drawing;
using System.Windows.Forms;
using System.Net;
using NovetusShared;
namespace NovetusLauncher
{

View File

@ -1,72 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
<PropertyGroup>
<ProjectGuid>{759BFC2B-C130-4A2A-A01F-65ABFEE85B4C}</ProjectGuid>
<ProjectTypeGuids>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<OutputType>Library</OutputType>
<RootNamespace>NovetusShared</RootNamespace>
<AssemblyName>NovetusShared</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<AppDesignerFolder>Properties</AppDesignerFolder>
</PropertyGroup>
<PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<OutputPath>bin\Debug\</OutputPath>
<DebugSymbols>True</DebugSymbols>
<DebugType>Full</DebugType>
<Optimize>False</Optimize>
<CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
<DefineConstants>DEBUG;TRACE</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<OutputPath>bin\Release\</OutputPath>
<DebugSymbols>False</DebugSymbols>
<DebugType>None</DebugType>
<Optimize>True</Optimize>
<CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
<DefineConstants>TRACE</DefineConstants>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.CSharp">
<RequiredTargetFramework>4.0</RequiredTargetFramework>
</Reference>
<Reference Include="Mono.Nat">
<HintPath>..\packages\Mono.Nat.1.2.24.0\lib\net40\Mono.Nat.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
<Reference Include="System.Xml.Linq">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="ClientScript.cs" />
<Compile Include="CodeExtensions.cs" />
<Compile Include="CryptoRandom.cs" />
<Compile Include="GlobalVars.cs" />
<Compile Include="IniFile.cs" />
<Compile Include="SplashReader.cs" />
<Compile Include="UPnP.cs" />
<Compile Include="DiscordRpc.cs" />
<Compile Include="LauncherFuncs.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="ScriptGenerator.cs" />
<Compile Include="SecurityFuncs.cs" />
<Compile Include="TextLineRemover.cs" />
<Compile Include="TreeNodeHelper.cs" />
<Compile Include="WebServer.cs" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

View File

@ -1,18 +0,0 @@

Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
# SharpDevelop 5.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NovetusShared", "NovetusShared.csproj", "{759BFC2B-C130-4A2A-A01F-65ABFEE85B4C}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{759BFC2B-C130-4A2A-A01F-65ABFEE85B4C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{759BFC2B-C130-4A2A-A01F-65ABFEE85B4C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{759BFC2B-C130-4A2A-A01F-65ABFEE85B4C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{759BFC2B-C130-4A2A-A01F-65ABFEE85B4C}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
EndGlobal

View File

@ -1,31 +0,0 @@
#region Using directives
using System;
using System.Reflection;
using System.Runtime.InteropServices;
#endregion
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("NovetusShared")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("NovetusShared")]
[assembly: AssemblyCopyright("Copyright 2019")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// This sets the default COM visibility of types in the assembly to invisible.
// If you need to expose a type to COM, use [ComVisible(true)] on that type.
[assembly: ComVisible(false)]
// The assembly version has following format :
//
// Major.Minor.Build.Revision
//
// You can specify all the values or you can use the default the Revision and
// Build Numbers by using the '*' as shown below:
[assembly: AssemblyVersion("1.0.*")]

View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Mono.Nat" version="1.2.24.0" targetFramework="net40" />
</packages>