diff --git a/.github/workflows/nightly-build.yaml b/.github/workflows/nightly-build.yaml
index 26952fd..b34472a 100644
--- a/.github/workflows/nightly-build.yaml
+++ b/.github/workflows/nightly-build.yaml
@@ -24,16 +24,14 @@ jobs:
run: dotnet restore
- name: Restore nuget packages
run: nuget restore
- - name: Build client
- run: dotnet build RageCoop.Client/RageCoop.Client.csproj --configuration Release -o bin/Release/Client/RageCoop
+ - name: Build client and installer
+ run: dotnet build RageCoop.Client.Installer/RageCoop.Client.Installer.csproj --configuration Release -o bin/Release/Client/RageCoop
- name: Build server win-x64
run: dotnet publish RageCoop.Server/RageCoop.Server.csproj --self-contained -p:PublishSingleFile=true -p:PublishTrimmed=false -r win-x64 -o bin/Release/Server/win-x64 -c Release
- name: Build server linux-x64
run: dotnet publish RageCoop.Server/RageCoop.Server.csproj --self-contained -p:PublishSingleFile=true -p:PublishTrimmed=false -r linux-x64 -o bin/Release/Server/linux-x64 -c Release
- name: Build server linux-arm
run: dotnet publish RageCoop.Server/RageCoop.Server.csproj --self-contained -p:PublishSingleFile=true -p:PublishTrimmed=false -r linux-arm -o bin/Release/Server/linux-arm -c Release
- - name: Build installer
- run: dotnet build RageCoop.Client.Installer/RageCoop.Client.Installer.csproj --configuration Release -o bin/Release/Client
- uses: vimtor/action-zip@v1
with:
files: bin/Release/Client
diff --git a/RageCoop.Client.Installer/FodyWeavers.xml b/RageCoop.Client.Installer/FodyWeavers.xml
deleted file mode 100644
index a5dcf04..0000000
--- a/RageCoop.Client.Installer/FodyWeavers.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/RageCoop.Client.Installer/FodyWeavers.xsd b/RageCoop.Client.Installer/FodyWeavers.xsd
deleted file mode 100644
index 05e92c1..0000000
--- a/RageCoop.Client.Installer/FodyWeavers.xsd
+++ /dev/null
@@ -1,141 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
- A list of assembly names to exclude from the default action of "embed all Copy Local references", delimited with line breaks
-
-
-
-
- A list of assembly names to include from the default action of "embed all Copy Local references", delimited with line breaks.
-
-
-
-
- A list of runtime assembly names to exclude from the default action of "embed all Copy Local references", delimited with line breaks
-
-
-
-
- A list of runtime assembly names to include from the default action of "embed all Copy Local references", delimited with line breaks.
-
-
-
-
- A list of unmanaged 32 bit assembly names to include, delimited with line breaks.
-
-
-
-
- A list of unmanaged 64 bit assembly names to include, delimited with line breaks.
-
-
-
-
- The order of preloaded assemblies, delimited with line breaks.
-
-
-
-
-
- This will copy embedded files to disk before loading them into memory. This is helpful for some scenarios that expected an assembly to be loaded from a physical file.
-
-
-
-
- Controls if .pdbs for reference assemblies are also embedded.
-
-
-
-
- Controls if runtime assemblies are also embedded.
-
-
-
-
- Controls whether the runtime assemblies are embedded with their full path or only with their assembly name.
-
-
-
-
- Embedded assemblies are compressed by default, and uncompressed when they are loaded. You can turn compression off with this option.
-
-
-
-
- As part of Costura, embedded assemblies are no longer included as part of the build. This cleanup can be turned off.
-
-
-
-
- Costura by default will load as part of the module initialization. This flag disables that behavior. Make sure you call CosturaUtility.Initialize() somewhere in your code.
-
-
-
-
- Costura will by default use assemblies with a name like 'resources.dll' as a satellite resource and prepend the output path. This flag disables that behavior.
-
-
-
-
- A list of assembly names to exclude from the default action of "embed all Copy Local references", delimited with |
-
-
-
-
- A list of assembly names to include from the default action of "embed all Copy Local references", delimited with |.
-
-
-
-
- A list of runtime assembly names to exclude from the default action of "embed all Copy Local references", delimited with |
-
-
-
-
- A list of runtime assembly names to include from the default action of "embed all Copy Local references", delimited with |.
-
-
-
-
- A list of unmanaged 32 bit assembly names to include, delimited with |.
-
-
-
-
- A list of unmanaged 64 bit assembly names to include, delimited with |.
-
-
-
-
- The order of preloaded assemblies, delimited with |.
-
-
-
-
-
-
-
- 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.
-
-
-
-
- A comma-separated list of error codes that can be safely ignored in assembly verification.
-
-
-
-
- 'false' to turn off automatic generation of the XML Schema file.
-
-
-
-
-
\ No newline at end of file
diff --git a/RageCoop.Client.Installer/MainWindow.xaml.cs b/RageCoop.Client.Installer/MainWindow.xaml.cs
index 4e692de..a001716 100644
--- a/RageCoop.Client.Installer/MainWindow.xaml.cs
+++ b/RageCoop.Client.Installer/MainWindow.xaml.cs
@@ -22,7 +22,6 @@ using System.Windows.Forms;
using Path = System.IO.Path;
using MessageBox = System.Windows.MessageBox;
using OpenFileDialog = Microsoft.Win32.OpenFileDialog;
-using ICSharpCode.SharpZipLib.Zip;
namespace RageCoop.Client.Installer
{
@@ -71,7 +70,7 @@ namespace RageCoop.Client.Installer
var scriptsPath = Path.Combine(root, "Scripts");
var lemonPath = Path.Combine(scriptsPath, "LemonUI.SHVDN3.dll");
var installPath = Path.Combine(scriptsPath, "RageCoop");
- if(Directory.GetParent(Assembly.GetExecutingAssembly().Location).FullName == scriptsPath)
+ if(Directory.GetParent(Assembly.GetExecutingAssembly().Location).FullName == installPath)
{
throw new InvalidOperationException("The installer is not meant to be run in the game folder, please extract the zip to somewhere else and run again.");
}
@@ -90,7 +89,7 @@ namespace RageCoop.Client.Installer
if (shvdnVer UpdateStatus($"Downloading {e1.ProgressPercentage}%");
- client.DownloadFileCompleted += (s, e2) =>
- {
-
- UpdateStatus("Installing...");
- Directory.CreateDirectory(installPath);
- new FastZip().ExtractZip(downloadPath, scriptsPath, FastZip.Overwrite.Always, null, null, null, true);
- Finish();
- };
- client.DownloadFileAsync(new Uri("https://github.com/RAGECOOP/RAGECOOP-V/releases/download/nightly/RageCoop.Client.zip"), downloadPath);
+ throw new Exception("Required files are missing, please re-download the zip from official website");
}
void Finish()
@@ -191,7 +171,6 @@ namespace RageCoop.Client.Installer
}
}
- checkZT:
UpdateStatus("Checking ZeroTier");
try
{
@@ -208,20 +187,6 @@ namespace RageCoop.Client.Installer
HttpHelper.DownloadFile(url, "ZeroTier.msi", (p) => UpdateStatus("Downloading ZeroTier " + p + "%"));
UpdateStatus("Installing ZeroTier");
Process.Start("ZeroTier.msi").WaitForExit();
- /*
- for (int i = 0; i < 10; i++)
- {
- Thread.Sleep(1000);
- UpdateStatus("Waiting ZeroTier to start... " + i);
- try
- {
- ZeroTierHelper.Check();
- break;
- }
- catch(Exception ex) { UpdateStatus(ex.ToString()); }
- }
- goto checkZT;
- */
}
catch
{
diff --git a/RageCoop.Client.Installer/RageCoop.Client.Installer.csproj b/RageCoop.Client.Installer/RageCoop.Client.Installer.csproj
index 500f019..e35c73e 100644
--- a/RageCoop.Client.Installer/RageCoop.Client.Installer.csproj
+++ b/RageCoop.Client.Installer/RageCoop.Client.Installer.csproj
@@ -8,24 +8,7 @@
-
-
-
-
-
-
-
- all
- runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
- all
- runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
-
-
diff --git a/RageCoop.Client/Properties/AssemblyInfo.cs b/RageCoop.Client/Properties/AssemblyInfo.cs
index 8293971..f6068d7 100644
--- a/RageCoop.Client/Properties/AssemblyInfo.cs
+++ b/RageCoop.Client/Properties/AssemblyInfo.cs
@@ -16,7 +16,7 @@ using System.Resources;
// Version informationr(
-[assembly: AssemblyVersion("1.5.2.80")]
-[assembly: AssemblyFileVersion("1.5.2.80")]
+[assembly: AssemblyVersion("1.5.2.90")]
+[assembly: AssemblyFileVersion("1.5.2.90")]
[assembly: NeutralResourcesLanguageAttribute( "en-US" )]