diff --git a/Novetus/Novetus.Bootstrapper/Novetus.Bootstrapper.csproj b/Novetus/Novetus.Bootstrapper/Novetus.Bootstrapper.csproj index 7b04ba0..c05a793 100644 --- a/Novetus/Novetus.Bootstrapper/Novetus.Bootstrapper.csproj +++ b/Novetus/Novetus.Bootstrapper/Novetus.Bootstrapper.csproj @@ -8,7 +8,7 @@ WinExe Novetus.Bootstrapper NovetusBootstrapper - v4.8 + v4.5.1 512 false @@ -21,7 +21,7 @@ full false bin\Debug\ - TRACE;DEBUG;BASICLAUNCHER;NOVETUS_APPS;NET481 + TRACE;DEBUG;BASICLAUNCHER;NOVETUS_APPS prompt 4 false @@ -42,6 +42,9 @@ app.manifest + + true + diff --git a/Novetus/Novetus.Bootstrapper/Properties/AssemblyInfo.cs b/Novetus/Novetus.Bootstrapper/Properties/AssemblyInfo.cs index 78caa37..a448dff 100644 --- a/Novetus/Novetus.Bootstrapper/Properties/AssemblyInfo.cs +++ b/Novetus/Novetus.Bootstrapper/Properties/AssemblyInfo.cs @@ -31,4 +31,4 @@ using System.Runtime.InteropServices; // // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.3.*")] +[assembly: AssemblyVersion("2.0.*")] diff --git a/Novetus/Novetus.Bootstrapper/Properties/Settings.Designer.cs b/Novetus/Novetus.Bootstrapper/Properties/Settings.Designer.cs index f579b53..2b7db12 100644 --- a/Novetus/Novetus.Bootstrapper/Properties/Settings.Designer.cs +++ b/Novetus/Novetus.Bootstrapper/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace Novetus.Bootstrapper.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.2.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.5.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/Novetus/Novetus.Bootstrapper/app.config b/Novetus/Novetus.Bootstrapper/app.config index 27f653e..1710b39 100644 --- a/Novetus/Novetus.Bootstrapper/app.config +++ b/Novetus/Novetus.Bootstrapper/app.config @@ -1,18 +1,12 @@ - + - + - - + + - - - - - - diff --git a/Novetus/NovetusCore/CharCustom/Forms/Extended/CharacterCustomizationExtended.cs b/Novetus/NovetusCore/CharCustom/Forms/Extended/CharacterCustomizationExtended.cs index 1a75840..9b8dfe5 100644 --- a/Novetus/NovetusCore/CharCustom/Forms/Extended/CharacterCustomizationExtended.cs +++ b/Novetus/NovetusCore/CharCustom/Forms/Extended/CharacterCustomizationExtended.cs @@ -18,11 +18,7 @@ public partial class CharacterCustomizationExtended : Form { InitializeComponent(); InitExtendedForm(); -#if NET4 - Size = new Size(671, 337); -#elif NET481 Size = new Size(681, 347); -#endif panel2.Size = new Size(568, 302); } #endregion diff --git a/Novetus/NovetusCore/Classes/WebProxy.cs b/Novetus/NovetusCore/Classes/WebProxy.cs index 80a7fbe..01133bb 100644 --- a/Novetus/NovetusCore/Classes/WebProxy.cs +++ b/Novetus/NovetusCore/Classes/WebProxy.cs @@ -21,7 +21,7 @@ namespace Novetus.Core public virtual bool IsValidURL(string absolutePath, string host) { return false; } - public virtual Task OnBeforeTunnelConnectRequest(object sender, TunnelConnectSessionEventArgs e) { return Task.CompletedTask; } + public virtual Task OnBeforeTunnelConnectRequest(object sender, TunnelConnectSessionEventArgs e) { return Task.FromResult(0); } public virtual async Task OnRequest(object sender, SessionEventArgs e) { e.Ok("Test successful. \nRunning Novetus " + GlobalVars.ProgramInformation.Version + " on " + GlobalVars.ProgramInformation.NetVersion); diff --git a/Novetus/NovetusCore/StorageAndFunctions/FileManagement.cs b/Novetus/NovetusCore/StorageAndFunctions/FileManagement.cs index 3511b26..21f6e7a 100644 --- a/Novetus/NovetusCore/StorageAndFunctions/FileManagement.cs +++ b/Novetus/NovetusCore/StorageAndFunctions/FileManagement.cs @@ -14,7 +14,7 @@ using System.Xml.Serialization; using System.Xml; using System.Xml.Linq; #if !BASICLAUNCHER -using System.Text.Json; +using Newtonsoft.Json; #endif #endregion @@ -338,11 +338,7 @@ namespace Novetus.Core DefaultMap = ""; VersionName = ""; //HACK -#if NET4 - NetVersion = ".NET 4.0"; -#elif NET481 - NetVersion = ".NET 4.8"; -#endif + NetVersion = ".NET Framework 4.5.1"; InitialBootup = true; IsSnapshot = false; } diff --git a/Novetus/NovetusCore/StorageAndFunctions/Util.cs b/Novetus/NovetusCore/StorageAndFunctions/Util.cs index 92329a1..1703ca5 100644 --- a/Novetus/NovetusCore/StorageAndFunctions/Util.cs +++ b/Novetus/NovetusCore/StorageAndFunctions/Util.cs @@ -495,17 +495,6 @@ namespace Novetus.Core } } - //http://stevenhollidge.blogspot.com/2012/06/async-taskdelay.html - public static Task Delay(int milliseconds) - { -#if NET4 - var tcs = new TaskCompletionSource(); - new System.Threading.Timer(_ => tcs.SetResult(null)).Change(milliseconds, -1); - return tcs.Task; -#elif NET481 - return Task.Delay(milliseconds); -#endif - } public static void LogPrint(string text, int type = 1) { //TODO, remove nlog support for bootstrapper completely. this is a temp fix. diff --git a/Novetus/NovetusLauncher/Forms/LauncherForm/Extended/LauncherFormExtended.cs b/Novetus/NovetusLauncher/Forms/LauncherForm/Extended/LauncherFormExtended.cs index fb36a0d..6806b7d 100644 --- a/Novetus/NovetusLauncher/Forms/LauncherForm/Extended/LauncherFormExtended.cs +++ b/Novetus/NovetusLauncher/Forms/LauncherForm/Extended/LauncherFormExtended.cs @@ -25,11 +25,7 @@ namespace NovetusLauncher InitializeComponent(); InitExtendedForm(); -#if NET4 - Size = new Size(745, 377); -#elif NET481 - Size = new Size(755, 387); -#endif + Size = new Size(755, 387); panel2.Size = new Size(646, 272); } #endregion diff --git a/Novetus/NovetusLauncher/Forms/LauncherForm/LauncherFormShared.cs b/Novetus/NovetusLauncher/Forms/LauncherForm/LauncherFormShared.cs index d2f7a3e..531fa7d 100644 --- a/Novetus/NovetusLauncher/Forms/LauncherForm/LauncherFormShared.cs +++ b/Novetus/NovetusLauncher/Forms/LauncherForm/LauncherFormShared.cs @@ -346,7 +346,7 @@ namespace NovetusLauncher break; case ScriptType.EasterEgg: ClientManagement.LaunchRBXClient(ScriptType.EasterEggServer, false, false, new EventHandler(ServerExited)); - await Util.Delay(1500); + await Task.Delay(1500); ClientManagement.LaunchRBXClient(ScriptType.EasterEgg, false, true, new EventHandler(EasterEggExited)); break; case ScriptType.None: diff --git a/Novetus/NovetusLauncher/Novetus.Launcher.csproj b/Novetus/NovetusLauncher/Novetus.Launcher.csproj index a1aafdd..35e9162 100644 --- a/Novetus/NovetusLauncher/Novetus.Launcher.csproj +++ b/Novetus/NovetusLauncher/Novetus.Launcher.csproj @@ -7,7 +7,7 @@ WinExe NovetusLauncher Novetus - v4.8 + v4.5.1 Properties @@ -68,7 +68,7 @@ false x86 - TRACE;DEBUG;LAUNCHER;NOVETUS_APPS;NET481 + TRACE;DEBUG;LAUNCHER;NOVETUS_APPS bin\Debug\ @@ -85,56 +85,38 @@ + + true + - - ..\packages\Portable.BouncyCastle.1.9.0\lib\net40\BouncyCastle.Crypto.dll - - - ..\packages\BouncyCastle.Cryptography.2.0.0\lib\net461\BouncyCastle.Cryptography.dll + + ..\packages\Portable.BouncyCastle.1.8.8\lib\net40\BouncyCastle.Crypto.dll - C:\Users\Bitl\Documents\GitHub\Novetus\Novetus_src\Novetus\packages\BrotliSharpLib.0.3.3\lib\net451\BrotliSharpLib.dll + ..\packages\BrotliSharpLib.0.3.3\lib\net451\BrotliSharpLib.dll ..\packages\DotNetZip.1.16.0\lib\net40\DotNetZip.dll - - ..\packages\Microsoft.Bcl.AsyncInterfaces.7.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll - - - ..\packages\Microsoft.Win32.Primitives.4.3.0\lib\net46\Microsoft.Win32.Primitives.dll - True - True + + ..\packages\Mono.Nat.1.2.24.0\lib\net40\Mono.Nat.dll - - C:\Users\Bitl\Documents\GitHub\Novetus\Novetus_src\Novetus\packages\Microsoft.Win32.Registry.5.0.0\lib\net461\Microsoft.Win32.Registry.dll - - - ..\packages\Mono.Nat.3.0.4\lib\netstandard2.0\Mono.Nat.dll + + ..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll - ..\packages\NLog.5.1.0\lib\net46\NLog.dll + ..\packages\NLog.5.2.6\lib\net45\NLog.dll - - ..\packages\System.AppContext.4.3.0\lib\net463\System.AppContext.dll - True - True - - C:\Users\Bitl\Documents\GitHub\Novetus\Novetus_src\Novetus\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll + ..\packages\System.Buffers.4.5.1\lib\netstandard1.1\System.Buffers.dll - - ..\packages\System.Console.4.3.0\lib\net46\System.Console.dll - True - True - 3.5 @@ -142,141 +124,24 @@ 3.5 - - ..\packages\System.Diagnostics.Tracing.4.3.0\lib\net462\System.Diagnostics.Tracing.dll - True - True - - - ..\packages\System.Globalization.Calendars.4.3.0\lib\net46\System.Globalization.Calendars.dll - True - True - - - ..\packages\System.IO.4.3.0\lib\net462\System.IO.dll - True - True - - - ..\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll - True - True - - - ..\packages\System.IO.Compression.ZipFile.4.3.0\lib\net46\System.IO.Compression.ZipFile.dll - True - True - - - ..\packages\System.IO.FileSystem.4.3.0\lib\net46\System.IO.FileSystem.dll - True - True - - - ..\packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll - True - True - - - ..\packages\System.Linq.4.3.0\lib\net463\System.Linq.dll - True - True - - - ..\packages\System.Linq.Expressions.4.3.0\lib\net463\System.Linq.Expressions.dll - True - True - - - ..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll + + ..\packages\System.Memory.4.5.4\lib\netstandard1.1\System.Memory.dll - - ..\packages\System.Net.Http.4.3.0\lib\net46\System.Net.Http.dll - True - True - - - ..\packages\System.Net.Sockets.4.3.0\lib\net46\System.Net.Sockets.dll - True - True - C:\Users\Bitl\Documents\GitHub\Novetus\Novetus_src\Novetus\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - ..\packages\System.Reflection.4.3.0\lib\net462\System.Reflection.dll - True - True - - - ..\packages\System.Runtime.4.3.0\lib\net462\System.Runtime.dll - True - True - - - ..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll - - - ..\packages\System.Runtime.Extensions.4.3.0\lib\net462\System.Runtime.Extensions.dll - True - True - - - ..\packages\System.Runtime.InteropServices.4.3.0\lib\net463\System.Runtime.InteropServices.dll - True - True - - - ..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll - True - True + + ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll - - ..\packages\System.Security.AccessControl.6.0.0\lib\net461\System.Security.AccessControl.dll - - - ..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net463\System.Security.Cryptography.Algorithms.dll - True - True - - - ..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll - True - True - - - ..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll - True - True - - - ..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll - True - True - - - C:\Users\Bitl\Documents\GitHub\Novetus\Novetus_src\Novetus\packages\System.Security.Principal.Windows.5.0.0\lib\net461\System.Security.Principal.Windows.dll - - - ..\packages\System.Text.Encodings.Web.7.0.0\lib\net462\System.Text.Encodings.Web.dll - - - ..\packages\System.Text.Json.7.0.3\lib\net462\System.Text.Json.dll - - - ..\packages\System.Text.RegularExpressions.4.3.0\lib\net463\System.Text.RegularExpressions.dll - True - True - - C:\Users\Bitl\Documents\GitHub\Novetus\Novetus_src\Novetus\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll + ..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\portable-net45+win8+wp8+wpa81\System.Threading.Tasks.Extensions.dll @@ -289,13 +154,8 @@ 3.5 - - ..\packages\System.Xml.ReaderWriter.4.3.0\lib\net46\System.Xml.ReaderWriter.dll - True - True - - ..\packages\Titanium.Web.Proxy.3.2.2-beta\lib\net461\Titanium.Web.Proxy.dll + ..\packages\Titanium.Web.Proxy.3.2.0\lib\net451\Titanium.Web.Proxy.dll diff --git a/Novetus/NovetusLauncher/Properties/AssemblyInfo.cs b/Novetus/NovetusLauncher/Properties/AssemblyInfo.cs index 9172081..30840c4 100644 --- a/Novetus/NovetusLauncher/Properties/AssemblyInfo.cs +++ b/Novetus/NovetusLauncher/Properties/AssemblyInfo.cs @@ -24,4 +24,4 @@ using System.Runtime.InteropServices; // // 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.3.*")] +[assembly: AssemblyVersion("2.0.*")] diff --git a/Novetus/NovetusLauncher/app.config b/Novetus/NovetusLauncher/app.config index 052836e..5e4c947 100644 --- a/Novetus/NovetusLauncher/app.config +++ b/Novetus/NovetusLauncher/app.config @@ -1,35 +1,19 @@  - + + - - - - - - - - - - - - - - - - - - + + - diff --git a/Novetus/NovetusLauncher/packages.config b/Novetus/NovetusLauncher/packages.config index 69daf68..97d844d 100644 --- a/Novetus/NovetusLauncher/packages.config +++ b/Novetus/NovetusLauncher/packages.config @@ -1,67 +1,14 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + \ No newline at end of file diff --git a/Novetus/NovetusURI/App.config b/Novetus/NovetusURI/App.config index d73074e..4baad5f 100644 --- a/Novetus/NovetusURI/App.config +++ b/Novetus/NovetusURI/App.config @@ -1,35 +1,19 @@  - + + - - - - - - - - - - - - - - - - - - + + - diff --git a/Novetus/NovetusURI/Novetus.URI.csproj b/Novetus/NovetusURI/Novetus.URI.csproj index 3d3d642..473eb00 100644 --- a/Novetus/NovetusURI/Novetus.URI.csproj +++ b/Novetus/NovetusURI/Novetus.URI.csproj @@ -9,7 +9,7 @@ Properties NovetusURI NovetusURI - v4.8 + v4.5.1 512 true @@ -22,7 +22,7 @@ full false bin\Debug\ - TRACE;DEBUG;URI;NOVETUS_APPS;NET481 + TRACE;DEBUG;URI;NOVETUS_APPS none 4 4096 @@ -47,183 +47,48 @@ app.manifest - - ..\packages\Portable.BouncyCastle.1.9.0\lib\net40\BouncyCastle.Crypto.dll - - - ..\packages\BouncyCastle.Cryptography.2.0.0\lib\net461\BouncyCastle.Cryptography.dll + + ..\packages\Portable.BouncyCastle.1.8.8\lib\net40\BouncyCastle.Crypto.dll - C:\Users\Bitl\Documents\GitHub\Novetus\Novetus_src\Novetus\packages\BrotliSharpLib.0.3.3\lib\net451\BrotliSharpLib.dll + ..\packages\BrotliSharpLib.0.3.3\lib\net451\BrotliSharpLib.dll - - ..\packages\Microsoft.Bcl.AsyncInterfaces.7.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll + + ..\packages\DotNetZip.1.16.0\lib\net40\DotNetZip.dll - - ..\packages\Microsoft.Win32.Primitives.4.3.0\lib\net46\Microsoft.Win32.Primitives.dll - True - True + + ..\packages\Mono.Nat.1.2.24.0\lib\net40\Mono.Nat.dll - - C:\Users\Bitl\Documents\GitHub\Novetus\Novetus_src\Novetus\packages\Microsoft.Win32.Registry.5.0.0\lib\net461\Microsoft.Win32.Registry.dll - - - ..\packages\Mono.Nat.3.0.4\lib\netstandard2.0\Mono.Nat.dll + + ..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll - ..\packages\NLog.5.1.0\lib\net46\NLog.dll + ..\packages\NLog.5.2.6\lib\net45\NLog.dll - - ..\packages\System.AppContext.4.3.0\lib\net463\System.AppContext.dll - True - True - - C:\Users\Bitl\Documents\GitHub\Novetus\Novetus_src\Novetus\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll + ..\packages\System.Buffers.4.5.1\lib\netstandard1.1\System.Buffers.dll - - ..\packages\System.Console.4.3.0\lib\net46\System.Console.dll - True - True - - - ..\packages\System.Diagnostics.Tracing.4.3.0\lib\net462\System.Diagnostics.Tracing.dll - True - True - - - ..\packages\System.Globalization.Calendars.4.3.0\lib\net46\System.Globalization.Calendars.dll - True - True - - - ..\packages\System.IO.4.3.0\lib\net462\System.IO.dll - True - True - - - ..\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll - True - True - - - ..\packages\System.IO.Compression.ZipFile.4.3.0\lib\net46\System.IO.Compression.ZipFile.dll - True - True - - - ..\packages\System.IO.FileSystem.4.3.0\lib\net46\System.IO.FileSystem.dll - True - True - - - ..\packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll - True - True - - - ..\packages\System.Linq.4.3.0\lib\net463\System.Linq.dll - True - True - - - ..\packages\System.Linq.Expressions.4.3.0\lib\net463\System.Linq.Expressions.dll - True - True - - - ..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll + + ..\packages\System.Memory.4.5.4\lib\netstandard1.1\System.Memory.dll - - ..\packages\System.Net.Http.4.3.0\lib\net46\System.Net.Http.dll - True - True - - - ..\packages\System.Net.Sockets.4.3.0\lib\net46\System.Net.Sockets.dll - True - True - C:\Users\Bitl\Documents\GitHub\Novetus\Novetus_src\Novetus\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - ..\packages\System.Reflection.4.3.0\lib\net462\System.Reflection.dll - True - True - - - ..\packages\System.Runtime.4.3.0\lib\net462\System.Runtime.dll - True - True - - - ..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll - - - ..\packages\System.Runtime.Extensions.4.3.0\lib\net462\System.Runtime.Extensions.dll - True - True - - - ..\packages\System.Runtime.InteropServices.4.3.0\lib\net463\System.Runtime.InteropServices.dll - True - True - - - ..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll - True - True + + ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll - - ..\packages\System.Security.AccessControl.6.0.0\lib\net461\System.Security.AccessControl.dll - - - ..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net463\System.Security.Cryptography.Algorithms.dll - True - True - - - ..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll - True - True - - - ..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll - True - True - - - ..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll - True - True - - - C:\Users\Bitl\Documents\GitHub\Novetus\Novetus_src\Novetus\packages\System.Security.Principal.Windows.5.0.0\lib\net461\System.Security.Principal.Windows.dll - - - ..\packages\System.Text.Encodings.Web.7.0.0\lib\net462\System.Text.Encodings.Web.dll - - - ..\packages\System.Text.Json.7.0.3\lib\net462\System.Text.Json.dll - - - ..\packages\System.Text.RegularExpressions.4.3.0\lib\net463\System.Text.RegularExpressions.dll - True - True - - C:\Users\Bitl\Documents\GitHub\Novetus\Novetus_src\Novetus\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll + ..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\portable-net45+win8+wp8+wpa81\System.Threading.Tasks.Extensions.dll @@ -238,13 +103,8 @@ - - ..\packages\System.Xml.ReaderWriter.4.3.0\lib\net46\System.Xml.ReaderWriter.dll - True - True - - ..\packages\Titanium.Web.Proxy.3.2.2-beta\lib\net461\Titanium.Web.Proxy.dll + ..\packages\Titanium.Web.Proxy.3.2.0\lib\net451\Titanium.Web.Proxy.dll diff --git a/Novetus/NovetusURI/Properties/AssemblyInfo.cs b/Novetus/NovetusURI/Properties/AssemblyInfo.cs index 62bcb43..e837b38 100644 --- a/Novetus/NovetusURI/Properties/AssemblyInfo.cs +++ b/Novetus/NovetusURI/Properties/AssemblyInfo.cs @@ -30,4 +30,4 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.3.*")] +[assembly: AssemblyVersion("2.0.*")] diff --git a/Novetus/NovetusURI/Properties/Settings.Designer.cs b/Novetus/NovetusURI/Properties/Settings.Designer.cs index 9392135..502c1a0 100644 --- a/Novetus/NovetusURI/Properties/Settings.Designer.cs +++ b/Novetus/NovetusURI/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace NovetusURI.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.2.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.5.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/Novetus/NovetusURI/packages.config b/Novetus/NovetusURI/packages.config index 2f93a62..97d844d 100644 --- a/Novetus/NovetusURI/packages.config +++ b/Novetus/NovetusURI/packages.config @@ -1,66 +1,14 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + \ No newline at end of file