Skip to content

Commit

Permalink
Sync to latest KSoft BCL and PhxStudio, add PhxStudio to Vita.sln, cr…
Browse files Browse the repository at this point in the history
…eate root Directory.Build.props and define VitaNugetPackagesDir to have all HintPaths alias to the root packages folder. In theory, AppVeyor won't vomit on all of this.
  • Loading branch information
kornman00 committed Apr 15, 2020
1 parent bb16404 commit f2bcd37
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 7 deletions.
6 changes: 6 additions & 0 deletions Directory.Build.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>
<PropertyGroup>
<VitaNugetPackagesDir>$(MSBuildThisFileDirectory)\packages</VitaNugetPackagesDir>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion Games/PhxStudio
17 changes: 12 additions & 5 deletions Vita.sln
Original file line number Diff line number Diff line change
Expand Up @@ -45,20 +45,22 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PhxTool", "Games\Phoenix\Ph
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PhxGui", "Games\Phoenix\PhxGui\PhxGui.csproj", "{39F76124-673A-4DCE-AEAA-BD571AB38AAB}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PhxStudio", "Games\PhxStudio\PhxStudio\PhxStudio.csproj", "{C643B043-00A2-4D8D-8F78-7E57E194B2E6}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{EB07F515-E27C-4768-8BD8-2829F657807E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EB07F515-E27C-4768-8BD8-2829F657807E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EB07F515-E27C-4768-8BD8-2829F657807E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EB07F515-E27C-4768-8BD8-2829F657807E}.Release|Any CPU.Build.0 = Release|Any CPU
{17AB134C-9C71-4CCF-84D9-D90F6DD58A0A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{17AB134C-9C71-4CCF-84D9-D90F6DD58A0A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{17AB134C-9C71-4CCF-84D9-D90F6DD58A0A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{17AB134C-9C71-4CCF-84D9-D90F6DD58A0A}.Release|Any CPU.Build.0 = Release|Any CPU
{EB07F515-E27C-4768-8BD8-2829F657807E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EB07F515-E27C-4768-8BD8-2829F657807E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EB07F515-E27C-4768-8BD8-2829F657807E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EB07F515-E27C-4768-8BD8-2829F657807E}.Release|Any CPU.Build.0 = Release|Any CPU
{0B27603C-CEB1-4A3A-B56F-CBC14B8C06E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0B27603C-CEB1-4A3A-B56F-CBC14B8C06E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0B27603C-CEB1-4A3A-B56F-CBC14B8C06E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand Down Expand Up @@ -119,13 +121,17 @@ Global
{39F76124-673A-4DCE-AEAA-BD571AB38AAB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{39F76124-673A-4DCE-AEAA-BD571AB38AAB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{39F76124-673A-4DCE-AEAA-BD571AB38AAB}.Release|Any CPU.Build.0 = Release|Any CPU
{C643B043-00A2-4D8D-8F78-7E57E194B2E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C643B043-00A2-4D8D-8F78-7E57E194B2E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C643B043-00A2-4D8D-8F78-7E57E194B2E6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C643B043-00A2-4D8D-8F78-7E57E194B2E6}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{EB07F515-E27C-4768-8BD8-2829F657807E} = {29A6065E-B7E7-43B1-BC6D-102F17ED9643}
{17AB134C-9C71-4CCF-84D9-D90F6DD58A0A} = {29A6065E-B7E7-43B1-BC6D-102F17ED9643}
{EB07F515-E27C-4768-8BD8-2829F657807E} = {29A6065E-B7E7-43B1-BC6D-102F17ED9643}
{0B27603C-CEB1-4A3A-B56F-CBC14B8C06E7} = {29A6065E-B7E7-43B1-BC6D-102F17ED9643}
{18F32228-8351-4F99-992F-78E9D1CE83D9} = {29A6065E-B7E7-43B1-BC6D-102F17ED9643}
{423F13FC-DA0C-4C82-B75E-60A1BFEA7BB6} = {29A6065E-B7E7-43B1-BC6D-102F17ED9643}
Expand All @@ -143,6 +149,7 @@ Global
{FAB723AE-4CBF-4858-9D7D-14343F5CBACF} = {2218BEA4-9F80-49EF-8AFD-7CA6B480CF8B}
{FF4C18C7-4F54-4FD9-8347-10AC805FD129} = {2218BEA4-9F80-49EF-8AFD-7CA6B480CF8B}
{39F76124-673A-4DCE-AEAA-BD571AB38AAB} = {2218BEA4-9F80-49EF-8AFD-7CA6B480CF8B}
{C643B043-00A2-4D8D-8F78-7E57E194B2E6} = {2218BEA4-9F80-49EF-8AFD-7CA6B480CF8B}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {67C0E08D-C895-4661-B8CB-BDA95B1CF420}
Expand Down

0 comments on commit f2bcd37

Please sign in to comment.