Skip to content

Commit

Permalink
Merge pull request #1 from TheServerExtenders/development
Browse files Browse the repository at this point in the history
Development
  • Loading branch information
generalwrex authored Sep 29, 2020
2 parents 52f45f2 + aa65296 commit d7187fc
Show file tree
Hide file tree
Showing 8 changed files with 37 additions and 44 deletions.
12 changes: 12 additions & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# These are supported funding model platforms

github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
patreon: irse
open_collective: # Replace with a single Open Collective username
ko_fi: # Replace with a single Ko-fi username
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
liberapay: # Replace with a single Liberapay username
issuehunt: # Replace with a single IssueHunt username
otechie: # Replace with a single Otechie username
custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
39 changes: 0 additions & 39 deletions InterstellarRiftServerExtender.sln
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,8 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.30503.244
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "zhesref", "hesref\HellionExtendedServer\zhesref.csproj", "{C0C5B3FF-D475-4237-AB7D-69851F591A22}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InterstellarRiftServerExtender", "InterstellarRiftServerExtender\InterstellarRiftServerExtender.csproj", "{62FB3518-F1BB-4D73-A51A-6360C7330C27}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IRSEConfigConverter", "IRSEConfigConverter\IRSEConfigConverter.csproj", "{0CAE4545-B74B-4152-A4CE-ABD17FB7010B}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IRSEDiscordChatBot_Plugin", "IRSEDiscordChatBot\IRSEDiscordChatBot_Plugin.csproj", "{0CD0E1DD-068A-4A35-AAF1-9BCD7AF14241}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -21,16 +15,6 @@ Global
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{C0C5B3FF-D475-4237-AB7D-69851F591A22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C0C5B3FF-D475-4237-AB7D-69851F591A22}.Debug|x64.ActiveCfg = Debug|x64
{C0C5B3FF-D475-4237-AB7D-69851F591A22}.Debug|x64.Build.0 = Debug|x64
{C0C5B3FF-D475-4237-AB7D-69851F591A22}.Debug|x86.ActiveCfg = Debug|x86
{C0C5B3FF-D475-4237-AB7D-69851F591A22}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C0C5B3FF-D475-4237-AB7D-69851F591A22}.Release|Any CPU.Build.0 = Release|Any CPU
{C0C5B3FF-D475-4237-AB7D-69851F591A22}.Release|x64.ActiveCfg = Release|x64
{C0C5B3FF-D475-4237-AB7D-69851F591A22}.Release|x64.Build.0 = Release|x64
{C0C5B3FF-D475-4237-AB7D-69851F591A22}.Release|x86.ActiveCfg = Release|x86
{C0C5B3FF-D475-4237-AB7D-69851F591A22}.Release|x86.Build.0 = Release|x86
{62FB3518-F1BB-4D73-A51A-6360C7330C27}.Debug|Any CPU.ActiveCfg = Debug|x86
{62FB3518-F1BB-4D73-A51A-6360C7330C27}.Debug|Any CPU.Build.0 = Debug|x86
{62FB3518-F1BB-4D73-A51A-6360C7330C27}.Debug|x64.ActiveCfg = Debug|Any CPU
Expand All @@ -43,29 +27,6 @@ Global
{62FB3518-F1BB-4D73-A51A-6360C7330C27}.Release|x64.Build.0 = Release|Any CPU
{62FB3518-F1BB-4D73-A51A-6360C7330C27}.Release|x86.ActiveCfg = Release|Any CPU
{62FB3518-F1BB-4D73-A51A-6360C7330C27}.Release|x86.Build.0 = Release|Any CPU
{0CAE4545-B74B-4152-A4CE-ABD17FB7010B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0CAE4545-B74B-4152-A4CE-ABD17FB7010B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0CAE4545-B74B-4152-A4CE-ABD17FB7010B}.Debug|x64.ActiveCfg = Debug|Any CPU
{0CAE4545-B74B-4152-A4CE-ABD17FB7010B}.Debug|x64.Build.0 = Debug|Any CPU
{0CAE4545-B74B-4152-A4CE-ABD17FB7010B}.Debug|x86.ActiveCfg = Debug|Any CPU
{0CAE4545-B74B-4152-A4CE-ABD17FB7010B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0CAE4545-B74B-4152-A4CE-ABD17FB7010B}.Release|Any CPU.Build.0 = Release|Any CPU
{0CAE4545-B74B-4152-A4CE-ABD17FB7010B}.Release|x64.ActiveCfg = Release|Any CPU
{0CAE4545-B74B-4152-A4CE-ABD17FB7010B}.Release|x64.Build.0 = Release|Any CPU
{0CAE4545-B74B-4152-A4CE-ABD17FB7010B}.Release|x86.ActiveCfg = Release|Any CPU
{0CAE4545-B74B-4152-A4CE-ABD17FB7010B}.Release|x86.Build.0 = Release|Any CPU
{0CD0E1DD-068A-4A35-AAF1-9BCD7AF14241}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0CD0E1DD-068A-4A35-AAF1-9BCD7AF14241}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0CD0E1DD-068A-4A35-AAF1-9BCD7AF14241}.Debug|x64.ActiveCfg = Debug|x64
{0CD0E1DD-068A-4A35-AAF1-9BCD7AF14241}.Debug|x64.Build.0 = Debug|x64
{0CD0E1DD-068A-4A35-AAF1-9BCD7AF14241}.Debug|x86.ActiveCfg = Debug|Any CPU
{0CD0E1DD-068A-4A35-AAF1-9BCD7AF14241}.Debug|x86.Build.0 = Debug|Any CPU
{0CD0E1DD-068A-4A35-AAF1-9BCD7AF14241}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0CD0E1DD-068A-4A35-AAF1-9BCD7AF14241}.Release|Any CPU.Build.0 = Release|Any CPU
{0CD0E1DD-068A-4A35-AAF1-9BCD7AF14241}.Release|x64.ActiveCfg = Release|x64
{0CD0E1DD-068A-4A35-AAF1-9BCD7AF14241}.Release|x64.Build.0 = Release|x64
{0CD0E1DD-068A-4A35-AAF1-9BCD7AF14241}.Release|x86.ActiveCfg = Release|Any CPU
{0CD0E1DD-068A-4A35-AAF1-9BCD7AF14241}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,8 @@
<StartupObject>IRSE.Program</StartupObject>
</PropertyGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\TelerikCommon.dll" />
<EmbeddedResource Include="Resources\System.Net.Http.Formatting.dll" />
<EmbeddedResource Include="Resources\System.Web.Http.dll" />
<EmbeddedResource Include="Resources\Telerik.WinControls.Themes.FluentDark.dll" />
<EmbeddedResource Include="Resources\Telerik.WinControls.Themes.Office2013Dark.dll" />
<EmbeddedResource Include="Resources\Telerik.WinControls.UI.dll" />
<EmbeddedResource Include="GUI\Forms\Browser\BrowserForm.resx">
<DependentUpon>BrowserForm.cs</DependentUpon>
</EmbeddedResource>
Expand All @@ -80,7 +76,7 @@
<EmbeddedResource Include="Resources\NLog.dll" />
<EmbeddedResource Include="Resources\Octokit.dll" />
<None Include="App.config" />
<Content Include="Assets\hesicon.ico" />
<Content Include="Assets\irse_icon.ico" />
<Content Include="NLog.config">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
Expand Down Expand Up @@ -284,4 +280,28 @@
</PropertyGroup>
<Error Condition="!Exists('..\packages\GitInfo.2.0.34\build\GitInfo.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GitInfo.2.0.34\build\GitInfo.targets'))" />
</Target>
<PropertyGroup>
<PostBuildEvent>;;@echo off

echo Running build event for $(ProjectName)..


xcopy "$(TargetDir)$(TargetFileName)" "$(ProjectDir)bin\IRSERelease\" /y
xcopy "$(TargetDir)$(TargetFileName).config" "$(ProjectDir)bin\IRSERelease\" /y

xcopy "$(TargetDir)l" "$(ProjectDir)Resources" /y
xcopy "$(TargetDir)NLog.dll" "$(ProjectDir)Resources" /y
xcopy "$(TargetDir)NLog.config" "$(ProjectDir)Resources" /y

echo $(ProjectName) files have been copied to "$(ProjectDir)bin\HESRelease\".

echo This is used to build the proper folder/file structure for releases to be zipped up.

REM Dont remove this line below! VS hates when you dont exit 0!
EXIT 0</PostBuildEvent>
</PropertyGroup>
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
</PropertyGroup>
</Project>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 comments on commit d7187fc

Please sign in to comment.