diff --git a/.editorconfig b/.editorconfig
deleted file mode 100644
index 2fe2411b..00000000
--- a/.editorconfig
+++ /dev/null
@@ -1,4 +0,0 @@
-[*.cs]
-
-# SYSLIB0014: Type or member is obsolete
-dotnet_diagnostic.SYSLIB0014.severity = suggestion
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 3c4efe20..16c5761d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -252,6 +252,7 @@ paket-files/
# JetBrains Rider
.idea/
*.sln.iml
+*.DotSettings
# CodeRush
.cr/
diff --git a/App.config b/App.config
deleted file mode 100644
index 22d18a12..00000000
--- a/App.config
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/Dotnet/AssetBundleCacher.cs b/Dotnet/AssetBundleCacher.cs
index a6ca564a..a87b80b6 100644
--- a/Dotnet/AssetBundleCacher.cs
+++ b/Dotnet/AssetBundleCacher.cs
@@ -107,7 +107,9 @@ namespace VRCX
// old asset bundle cacher downloader method reused for updating, it's not pretty
public void DownloadFile(string fileUrl, string hashUrl, int size)
{
+#pragma warning disable SYSLIB0014 // Type or member is obsolete
client = new WebClient();
+#pragma warning restore SYSLIB0014 // Type or member is obsolete
client.Headers.Add("user-agent", Program.Version);
DownloadProgress = 0;
DownloadSize = size;
diff --git a/Dotnet/WebApi.cs b/Dotnet/WebApi.cs
index 440c44de..f00596a9 100644
--- a/Dotnet/WebApi.cs
+++ b/Dotnet/WebApi.cs
@@ -298,7 +298,9 @@ namespace VRCX
{
try
{
+#pragma warning disable SYSLIB0014 // Type or member is obsolete
var request = WebRequest.CreateHttp((string)options["url"]);
+#pragma warning restore SYSLIB0014 // Type or member is obsolete
if (ProxySet)
request.Proxy = Proxy;
diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
deleted file mode 100644
index 4fb72ab1..00000000
--- a/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using System.Runtime.Versioning;
-
-// ComVisible을 false로 설정하면 이 어셈블리의 형식이 COM 구성 요소에
-// 표시되지 않습니다. COM에서 이 어셈블리의 형식에 액세스하려면
-// 해당 형식에 대해 ComVisible 특성을 true로 설정하세요.
-[assembly: ComVisible(false)]
-
-// 이 프로젝트가 COM에 노출되는 경우 다음 GUID는 typelib의 ID를 나타냅니다.
-[assembly: Guid("d9f66f2e-3ed9-4d53-a6ac-adcc1513562a")]
-[assembly: SupportedOSPlatform("windows")]
diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs
deleted file mode 100644
index ad62a905..00000000
--- a/Properties/Resources.Designer.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-//------------------------------------------------------------------------------
-//
-// This code was generated by a tool.
-// Runtime Version:4.0.30319.42000
-//
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
-//
-//------------------------------------------------------------------------------
-
-namespace VRCX.Properties {
- using System;
-
-
- ///
- /// A strongly-typed resource class, for looking up localized strings, etc.
- ///
- // This class was auto-generated by the StronglyTypedResourceBuilder
- // class via a tool like ResGen or Visual Studio.
- // To add or remove a member, edit your .ResX file then rerun ResGen
- // with the /str option, or rebuild your VS project.
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
- [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- internal class Resources {
-
- private static global::System.Resources.ResourceManager resourceMan;
-
- private static global::System.Globalization.CultureInfo resourceCulture;
-
- [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
- internal Resources() {
- }
-
- ///
- /// Returns the cached ResourceManager instance used by this class.
- ///
- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
- internal static global::System.Resources.ResourceManager ResourceManager {
- get {
- if (object.ReferenceEquals(resourceMan, null)) {
- global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("VRCX.Properties.Resources", typeof(Resources).Assembly);
- resourceMan = temp;
- }
- return resourceMan;
- }
- }
-
- ///
- /// Overrides the current thread's CurrentUICulture property for all
- /// resource lookups using this strongly typed resource class.
- ///
- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
- internal static global::System.Globalization.CultureInfo Culture {
- get {
- return resourceCulture;
- }
- set {
- resourceCulture = value;
- }
- }
- }
-}
diff --git a/Properties/Resources.resx b/Properties/Resources.resx
deleted file mode 100644
index af7dbebb..00000000
--- a/Properties/Resources.resx
+++ /dev/null
@@ -1,117 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/microsoft-resx
-
-
- 2.0
-
-
- System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
\ No newline at end of file
diff --git a/Properties/Settings.Designer.cs b/Properties/Settings.Designer.cs
deleted file mode 100644
index 81d5072f..00000000
--- a/Properties/Settings.Designer.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-//------------------------------------------------------------------------------
-//
-// This code was generated by a tool.
-// Runtime Version:4.0.30319.42000
-//
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
-//
-//------------------------------------------------------------------------------
-
-namespace VRCX.Properties {
-
-
- [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0")]
- internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
-
- private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-
- public static Settings Default {
- get {
- return defaultInstance;
- }
- }
- }
-}
diff --git a/Properties/Settings.settings b/Properties/Settings.settings
deleted file mode 100644
index 39645652..00000000
--- a/Properties/Settings.settings
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
diff --git a/VRCX.csproj b/VRCX.csproj
index ef623817..e2539d13 100644
--- a/VRCX.csproj
+++ b/VRCX.csproj
@@ -51,67 +51,27 @@
- librsync.net\Blake2Sharp.dll
+ libs\Blake2Sharp.dll
- librsync.net\librsync.net.dll
+ libs\librsync.net.dll
-
- Form
-
-
- MainForm.cs
-
-
- Form
-
-
- VRForm.cs
-
-
- Form
-
-
- MainForm.cs
- Designer
-
-
- VRForm.cs
- Designer
-
-
- ResXFileCodeGenerator
- Resources.Designer.cs
- Designer
-
-
- True
- Resources.resx
- True
-
-
- SettingsSingleFileGenerator
- Settings.Designer.cs
-
-
- True
- Settings.settings
- True
-
Always
-
- PreserveNewest
-
-
- PreserveNewest
-
+
+ PreserveNewest
+ openvr_api.dll
+
+
+ PreserveNewest
+ sqlite3.dll
+
PreserveNewest
diff --git a/VRCX.csproj.DotSettings b/VRCX.csproj.DotSettings
deleted file mode 100644
index 6e7fff86..00000000
--- a/VRCX.csproj.DotSettings
+++ /dev/null
@@ -1,2 +0,0 @@
-
- No
\ No newline at end of file
diff --git a/build-all.ps1 b/build-scripts/build-all.ps1
similarity index 99%
rename from build-all.ps1
rename to build-scripts/build-all.ps1
index 74faa038..fbd87b7e 100644
--- a/build-all.ps1
+++ b/build-scripts/build-all.ps1
@@ -1,3 +1,5 @@
+cd ..
+
$ErrorActionPreference = "Stop"
$installPath = &"C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe" -version 16.0 -property installationpath
diff --git a/build-dotnet.cmd b/build-scripts/build-dotnet.cmd
similarity index 97%
rename from build-dotnet.cmd
rename to build-scripts/build-dotnet.cmd
index 1df9e60b..0d36c40c 100644
--- a/build-dotnet.cmd
+++ b/build-scripts/build-dotnet.cmd
@@ -1,4 +1,5 @@
@echo off
+cd ..
dotnet build VRCX.sln -p:Configuration=Release -p:Platform=x64 -p:RestorePackagesConfig=true -t:"Restore;Clean;Build" -m --self-contained
mklink /J "%~dp0\bin\x64\Release\html" "%~dp0\html\dist"
pause
diff --git a/build-node.js.cmd b/build-scripts/build-node.js.cmd
similarity index 81%
rename from build-node.js.cmd
rename to build-scripts/build-node.js.cmd
index 48579101..e9b8a426 100644
--- a/build-node.js.cmd
+++ b/build-scripts/build-node.js.cmd
@@ -1,4 +1,4 @@
-cd html
+cd ../html
call npm ci
call npm run production
cd ..
diff --git a/build-scripts/make-junction.cmd b/build-scripts/make-junction.cmd
new file mode 100644
index 00000000..40c00fbc
--- /dev/null
+++ b/build-scripts/make-junction.cmd
@@ -0,0 +1,3 @@
+mklink /J "%~dp0\..\bin\x64\Debug\html" "%~dp0\..\html\dist"
+mklink /J "%~dp0\..\bin\x64\Release\html" "%~dp0\..\html\dist"
+pause
diff --git a/make-zip-7z.cmd b/build-scripts/make-zip-7z.cmd
similarity index 98%
rename from make-zip-7z.cmd
rename to build-scripts/make-zip-7z.cmd
index fe893d67..b521f365 100644
--- a/make-zip-7z.cmd
+++ b/build-scripts/make-zip-7z.cmd
@@ -1,4 +1,5 @@
@echo off
+cd ..
setlocal
where /q 7z
IF ERRORLEVEL 1 (
diff --git a/make-zip.cmd b/build-scripts/make-zip.cmd
similarity index 98%
rename from make-zip.cmd
rename to build-scripts/make-zip.cmd
index 69106386..b93103fb 100644
--- a/make-zip.cmd
+++ b/build-scripts/make-zip.cmd
@@ -1,4 +1,5 @@
@echo off
+cd ..
setlocal
for /f %%a in ('powershell -Command "Get-Date -format yyyyMMdd"') do set TODAY=%%a
set ZIP_NAME=VRCX_%TODAY%.zip
diff --git a/librsync.net/README.md b/librsync.net/README.md
deleted file mode 100644
index d6bc252e..00000000
--- a/librsync.net/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# librsync.net
-
-Source code is available here: [https://github.com/braddodson/librsync.net](https://github.com/braddodson/librsync.net)
diff --git a/librsync.net/Blake2Sharp.dll b/libs/Blake2Sharp.dll
similarity index 100%
rename from librsync.net/Blake2Sharp.dll
rename to libs/Blake2Sharp.dll
diff --git a/libs/README.md b/libs/README.md
new file mode 100644
index 00000000..d5b32843
--- /dev/null
+++ b/libs/README.md
@@ -0,0 +1,11 @@
+### librsync.net.dll
+- [https://github.com/braddodson/librsync.net](https://github.com/braddodson/librsync.net)
+
+### Blake2Sharp.dll
+- [https://github.com/BLAKE2/BLAKE2/tree/master/csharp](https://github.com/BLAKE2/BLAKE2/tree/master/csharp)
+
+### openvr_api.dll
+- [https://github.com/ValveSoftware/openvr](https://github.com/ValveSoftware/openvr)
+
+### sqlite3.dll
+- [https://www.sqlite.org/index.html](https://www.sqlite.org/index.html)
\ No newline at end of file
diff --git a/librsync.net/librsync.net.dll b/libs/librsync.net.dll
similarity index 100%
rename from librsync.net/librsync.net.dll
rename to libs/librsync.net.dll
diff --git a/openvr_api.dll b/libs/openvr_api.dll
similarity index 100%
rename from openvr_api.dll
rename to libs/openvr_api.dll
diff --git a/sqlite3.dll b/libs/sqlite3.dll
similarity index 100%
rename from sqlite3.dll
rename to libs/sqlite3.dll
diff --git a/make-junction.cmd b/make-junction.cmd
deleted file mode 100644
index 03de438d..00000000
--- a/make-junction.cmd
+++ /dev/null
@@ -1,3 +0,0 @@
-mklink /J "%~dp0\bin\x64\Debug\html" "%~dp0\html\dist"
-mklink /J "%~dp0\bin\x64\Release\html" "%~dp0\html\dist"
-pause