Skip to content

Commit

Permalink
Merge branch 'rename' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
18107 committed Sep 18, 2021
2 parents fe06c08 + a521732 commit 82f114d
Show file tree
Hide file tree
Showing 119 changed files with 1,233 additions and 1,233 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ jobs:
COMMIT_HASH: "${{ steps.version.outputs.hash }}"
shell: "powershell"
run: |
7z a PulsarPluginBootstrapper-${Env:BUILD_VERSION}-${Env:COMMIT_HASH}.zip README.md VERSION.md .\lib\System.Windows.Forms.dll .\PulsarInjector\bin\Release\* -xr!'*.pdb' -mx=7
7z a PulsarPluginLoader.dll-${Env:BUILD_VERSION}-${Env:COMMIT_HASH}.zip README.md VERSION.md .\PulsarPluginLoader\bin\Release\PulsarPluginLoader.dll -mx=7
7z a PulsarModBootstrapper-${Env:BUILD_VERSION}-${Env:COMMIT_HASH}.zip README.md VERSION.md .\lib\System.Windows.Forms.dll .\PulsarInjector\bin\Release\* -xr!'*.pdb' -mx=7
7z a PulsarModLoader.dll-${Env:BUILD_VERSION}-${Env:COMMIT_HASH}.zip README.md VERSION.md .\PulsarModLoader\bin\Release\PulsarModLoader.dll -mx=7
- name: "Publish to GitHub Releases"
uses: "marvinpinto/action-automatic-releases@latest"
Expand All @@ -93,8 +93,8 @@ jobs:
- name: "NuGet Pack and Push"
shell: "powershell"
run: |
cd PulsarPluginLoader
cd PulsarModLoader
$GITHUB_OWNER = $Env:GITHUB_REPOSITORY.Split("/", 2)[0]
$version = [System.Reflection.Assembly]::LoadFrom("$(pwd)\bin\Release\PulsarPluginLoader.dll").GetName().Version.ToString()
nuget pack PulsarPluginLoader.csproj -Version $version -Prop Configuration=Release
$version = [System.Reflection.Assembly]::LoadFrom("$(pwd)\bin\Release\PulsarModLoader.dll").GetName().Version.ToString()
nuget pack PulsarModLoader.csproj -Version $version -Prop Configuration=Release
nuget push **/*.nupkg -SkipDuplicate -NoSymbols -Source "GitHub/${GITHUB_OWNER}"
6 changes: 3 additions & 3 deletions PulsarInjector/Injector.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using PulsarPluginLoader.Injections;
using PulsarPluginLoader.Utilities;
using PulsarModLoader.Injections;
using PulsarModLoader.Utilities;
using System;
using System.IO;
using System.Reflection;
Expand Down Expand Up @@ -143,7 +143,7 @@ public static void CopyAssemblies(string targetAssemblyDir)
/* Copy important assemblies to target assembly's directory */
string sourceDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
string[] copyables = new string[] {
typeof(PulsarPluginLoader.PulsarPlugin).Assembly.Location,
typeof(PulsarModLoader.PulsarMod).Assembly.Location,
Path.Combine(sourceDir, "0Harmony.dll")
};

Expand Down
6 changes: 3 additions & 3 deletions PulsarInjector/PulsarInjector.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<ProjectGuid>{F15E6EFA-3584-4503-98E0-17D3E87900F5}</ProjectGuid>
<OutputType>Exe</OutputType>
<RootNamespace>PulsarInjector</RootNamespace>
<AssemblyName>PulsarPluginBootstrapper</AssemblyName>
<AssemblyName>PulsarModBootstrapper</AssemblyName>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic>
Expand Down Expand Up @@ -87,9 +87,9 @@
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\PulsarPluginLoader\PulsarPluginLoader.csproj">
<ProjectReference Include="..\PulsarModLoader\PulsarModLoader.csproj">
<Project>{cf6ce9ba-9603-439d-9173-96c052c94417}</Project>
<Name>PulsarPluginLoader</Name>
<Name>PulsarModLoader</Name>
<Private>True</Private>
</ProjectReference>
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
using NUnit.Framework;
using PulsarPluginLoader.Chat.Commands;
using PulsarPluginLoader.Chat.Commands.CommandRouter;
using PulsarModLoader.Chat.Commands;
using PulsarModLoader.Chat.Commands.CommandRouter;
using System;
using System.IO;

namespace PulsarPluginLoader.Tests.Chat.Commands
namespace PulsarModLoader.Tests.Chat.Commands
{
[TestFixture]
class ChatCommandRouterTests
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using PulsarPluginLoader.Chat.Commands.CommandRouter;
using PulsarModLoader.Chat.Commands.CommandRouter;
using System;

namespace PulsarPluginLoader.Tests.Chat.Commands
namespace PulsarModLoader.Tests.Chat.Commands
{
class PrintCommand : ChatCommand
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
using System.Collections.Generic;
using System.Linq;
using System.Reflection.Emit;
using static PulsarPluginLoader.Patches.HarmonyHelpers;
using static PulsarModLoader.Patches.HarmonyHelpers;

namespace PulsarPluginLoader.Tests.Patches
namespace PulsarModLoader.Tests.Patches
{
[TestFixture]
class PatchBySequenceTests
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using System.Linq;
using System.Text;

namespace PulsarPluginLoader.Tests.Patches
namespace PulsarModLoader.Tests.Patches
{
class SampleClass
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
// 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("PulsarPluginLoader.Tests")]
[assembly: AssemblyTitle("PulsarModLoader.Tests")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("PulsarPluginLoader.Tests")]
[assembly: AssemblyProduct("PulsarModLoader.Tests")]
[assembly: AssemblyCopyright("Copyright © 2018")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
<ProjectGuid>{9ACD22DC-0BEB-44AB-A012-D93E993D75F3}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>PulsarPluginLoader.Tests</RootNamespace>
<AssemblyName>PulsarPluginLoader.Tests</AssemblyName>
<RootNamespace>PulsarModLoader.Tests</RootNamespace>
<AssemblyName>PulsarModLoader.Tests</AssemblyName>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic>
Expand Down Expand Up @@ -107,9 +107,9 @@
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\PulsarPluginLoader\PulsarPluginLoader.csproj">
<ProjectReference Include="..\PulsarModLoader\PulsarModLoader.csproj">
<Project>{cf6ce9ba-9603-439d-9173-96c052c94417}</Project>
<Name>PulsarPluginLoader</Name>
<Name>PulsarModLoader</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions PulsarPluginLoader.sln → PulsarModLoader.sln
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.30523.141
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PulsarPluginLoader", "PulsarPluginLoader\PulsarPluginLoader.csproj", "{CF6CE9BA-9603-439D-9173-96C052C94417}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PulsarModLoader", "PulsarModLoader\PulsarModLoader.csproj", "{CF6CE9BA-9603-439D-9173-96C052C94417}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PulsarInjector", "PulsarInjector\PulsarInjector.csproj", "{F15E6EFA-3584-4503-98E0-17D3E87900F5}"
EndProject
Expand All @@ -15,7 +15,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
.github\workflows\UpdateAssemblyInfo.ps1 = .github\workflows\UpdateAssemblyInfo.ps1
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PulsarPluginLoader.Tests", "PulsarPluginLoader.Tests\PulsarPluginLoader.Tests.csproj", "{9ACD22DC-0BEB-44AB-A012-D93E993D75F3}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PulsarModLoader.Tests", "PulsarModLoader.Tests\PulsarModLoader.Tests.csproj", "{9ACD22DC-0BEB-44AB-A012-D93E993D75F3}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using PulsarPluginLoader.Chat.Commands.CommandRouter;
using PulsarModLoader.Chat.Commands.CommandRouter;

namespace PulsarPluginLoader.Chat.Commands
namespace PulsarModLoader.Chat.Commands
{
class ClearCommand : ChatCommand
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

using System.Text;

namespace PulsarPluginLoader.Chat.Commands.CommandRouter
namespace PulsarModLoader.Chat.Commands.CommandRouter
{
public abstract class ChatCommand
{
Expand Down

0 comments on commit 82f114d

Please sign in to comment.