cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-26 14:37:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #427 from Cyberboss/SLNFixes

Browse Source 
Fixes issues with building xbuild Client configuration
This commit is contained in:
Jordan Brown
2017-11-29 10:21:39 -05:00
committed by GitHub
parent 2566be3da1 3fcdfd9534
commit 3260ac6d8d
5 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TGS.ControlPanel/GithubLoginPrompt.Designer.cs → TGS.ControlPanel/GitHubLoginPrompt.Designer.cs
Generated
View File
TGS.ControlPanel/GithubLoginPrompt.cs → TGS.ControlPanel/GitHubLoginPrompt.cs
View File
TGS.ControlPanel/GithubLoginPrompt.resx → TGS.ControlPanel/GitHubLoginPrompt.resx
View File
TGS.ControlPanel/TGS.ControlPanel.csproj
+1 -1
View File
@@ -114,7 +114,7 @@
<Compile Include="ServerOpForm.cs">
<SubType>Form</SubType>
</Compile>
<EmbeddedResource Include="GithubLoginPrompt.resx">
<EmbeddedResource Include="GitHubLoginPrompt.resx">
<DependentUpon>GitHubLoginPrompt.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="InstanceSelector.resx">
TGStationServer3.sln
+1 -5
View File
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.27004.2006
VisualStudioVersion = 15.0.26730.16
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TGS.Server", "TGS.Server\TGS.Server.csproj", "{F32EDA25-0855-411C-AF5E-F0D042917E2D}"
EndProject
@@ -166,19 +166,15 @@ Global
{3F81E398-B223-4006-B40C-C2800714CE29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3F81E398-B223-4006-B40C-C2800714CE29}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3F81E398-B223-4006-B40C-C2800714CE29}.Debug-Client|Any CPU.ActiveCfg = Debug|Any CPU
{3F81E398-B223-4006-B40C-C2800714CE29}.Debug-Client|Any CPU.Build.0 = Debug|Any CPU
{3F81E398-B223-4006-B40C-C2800714CE29}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3F81E398-B223-4006-B40C-C2800714CE29}.Release|Any CPU.Build.0 = Release|Any CPU
{3F81E398-B223-4006-B40C-C2800714CE29}.Release-Client|Any CPU.ActiveCfg = Release|Any CPU
{3F81E398-B223-4006-B40C-C2800714CE29}.Release-Client|Any CPU.Build.0 = Release|Any CPU
{509433F6-AEFB-44CA-BFE3-C782166D2CC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{509433F6-AEFB-44CA-BFE3-C782166D2CC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{509433F6-AEFB-44CA-BFE3-C782166D2CC3}.Debug-Client|Any CPU.ActiveCfg = Debug|Any CPU
{509433F6-AEFB-44CA-BFE3-C782166D2CC3}.Debug-Client|Any CPU.Build.0 = Debug|Any CPU
{509433F6-AEFB-44CA-BFE3-C782166D2CC3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{509433F6-AEFB-44CA-BFE3-C782166D2CC3}.Release|Any CPU.Build.0 = Release|Any CPU
{509433F6-AEFB-44CA-BFE3-C782166D2CC3}.Release-Client|Any CPU.ActiveCfg = Release|Any CPU
{509433F6-AEFB-44CA-BFE3-C782166D2CC3}.Release-Client|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE