Skip to content

Commit

Permalink
revert back to r11 control center (1/2)
Browse files Browse the repository at this point in the history
  • Loading branch information
rounk-ctrl committed Oct 14, 2023
1 parent 934596b commit 24b147f
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 13 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ jobs:
- name: Restore NuGet Packages
run: |
nuget restore Rectify11Installer.sln
nuget restore Rectify11ControlCenter\Rectify11ControlCenter.sln
- name: Build R11 Control Centre
run: msbuild Rectify11ControlCenter\Rectify11ControlCenter.sln /p:Configuration=Release
- name: Build
run: msbuild Rectify11Installer.sln /p:Configuration=Release /p:platform=x64
- name: Create single exe
Expand Down
6 changes: 3 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "RectifyControlPanel2"]
path = RectifyControlPanel2
url = https://github.com/Rectify11/RectifyControlPanel2.git
[submodule "Rectify11ControlCenter"]
path = Rectify11ControlCenter
url = https://github.com/ojask/Rectify11ControlCenter.git
8 changes: 0 additions & 8 deletions Rectify11Installer.sln
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
VisualStudioVersion = 17.7.34031.279
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Rectify11Installer", "Rectify11Installer\Rectify11Installer.csproj", "{F1F7B13F-9EF7-4B77-9500-B062CC9DB17D}"
ProjectSection(ProjectDependencies) = postProject
{0B7DE49A-33C6-41B1-A9CE-D353031F8454} = {0B7DE49A-33C6-41B1-A9CE-D353031F8454}
{50A4AEC2-9A0D-4F1C-8F38-EE7542BBE81A} = {50A4AEC2-9A0D-4F1C-8F38-EE7542BBE81A}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Rectify11.Phase2", "Rectify11.Phase2\Rectify11.Phase2.csproj", "{8D66B017-3A76-439B-847B-C7379191E109}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Rectify11CPL", "RectifyControlPanel2\Rectify11CPL\Rectify11CPL.vcxproj", "{50A4AEC2-9A0D-4F1C-8F38-EE7542BBE81A}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectUI", "RectifyControlPanel2\dui70\DirectUI\DirectUI.vcxproj", "{0B7DE49A-33C6-41B1-A9CE-D353031F8454}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down
2 changes: 1 addition & 1 deletion Rectify11Installer/Properties/Resources.resx
Original file line number Diff line number Diff line change
Expand Up @@ -2495,7 +2495,7 @@
<value>..\Resources\extras.7z;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="Rectify11CPL" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Rectify11CPL.dll;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>..\Resources\Rectify11ControlCenter.exe;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="blackPreview" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
Expand Down
1 change: 0 additions & 1 deletion RectifyControlPanel2
Submodule RectifyControlPanel2 deleted from 793419

0 comments on commit 24b147f

Please sign in to comment.