Skip to content

Commit b4af838

Browse files
3F3F
committed
Fixed #29. XProjectByFile() now works through copy
Also, for XProjectByFile() improved init of blank ProjectItem for GetOrLoadProject() part. Added tests.
1 parent 1c5cf6a commit b4af838

File tree

5 files changed

+135
-12
lines changed

5 files changed

+135
-12
lines changed

‎MvsSln/Core/XProjectEnv.cs

+30-12
Original file line numberDiff line numberDiff line change
@@ -561,19 +561,11 @@ protected IXProject XProjectByFile(string file, IConfPlatform cfg, bool tryLoad,
561561
return found;
562562
}
563563

564-
var prj = GetOrLoadProject
564+
return AddOrGet(GetOrLoadProject
565565
(
566-
new ProjectItem()
567-
{
568-
fullPath = file,
569-
path = Sln?.SolutionDir.MakeRelativePath(file),
570-
pGuid = props.GetOrDefault(PropertyNames.PRJ_GUID),
571-
EpType = FileExt.GetProjectTypeByFile(file),
572-
},
573-
DefProperties(cfg, slnProperties.AddOrUpdate(props))
574-
);
575-
576-
return AddOrGet(prj);
566+
GetProjectItem(file, props),
567+
DefProperties(cfg, slnProperties.ToDictionary(k => k.Key, v => v.Value).AddOrUpdate(props))
568+
));
577569
}
578570

579571
/// <summary>
@@ -607,5 +599,31 @@ protected bool Eq(IConfPlatformPrj a, IConfPlatform b)
607599
{
608600
return (ConfigItem)a == (ConfigItem)b;
609601
}
602+
603+
private ProjectItem GetProjectItem(string file, IDictionary<string, string> props)
604+
{
605+
var ret = new ProjectItem()
606+
{
607+
fullPath = file,
608+
pGuid = props.GetOrDefault(PropertyNames.PRJ_GUID) ?? Guid.Empty.ToString(),
609+
EpType = FileExt.GetProjectTypeByFile(file),
610+
name = Path.GetFileNameWithoutExtension(file),
611+
};
612+
ret.pType = Guids.GuidBy(ret.EpType);
613+
614+
if(Sln == null)
615+
{
616+
return ret;
617+
}
618+
619+
var found = Sln.ProjectItems.FirstOrDefault(p => p.fullPath == file);
620+
if(found.path != null)
621+
{
622+
return found;
623+
}
624+
625+
ret.path = Sln.SolutionDir.MakeRelativePath(file);
626+
return ret;
627+
}
610628
}
611629
}

‎MvsSlnTest/Core/XProjectEnv.cs

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
using System.Collections.Generic;
2+
using System.Linq;
3+
using net.r_eg.MvsSln;
4+
using net.r_eg.MvsSln.Core;
5+
using Xunit;
6+
7+
namespace MvsSlnTest.Core
8+
{
9+
public class XProjectEnv
10+
{
11+
[Fact]
12+
public void SlnPropertiesTest()
13+
{
14+
var cfgsln = new Dictionary<string, string>() { { PropertyNames.CONFIG, "Debug" }, { PropertyNames.PLATFORM, "Any CPU" } };
15+
var cfgprj = new Dictionary<string, string>() { { PropertyNames.CONFIG, "DBGprj" }, { PropertyNames.PLATFORM, "Win32" } };
16+
var cfg = new ConfigItem("DBGprj", "Win32");
17+
18+
using(var sln = new Sln(TestData.PathTo(@"XProjectEnv\slnProperties\Cpp\App.sln"), SlnItems.Env))
19+
{
20+
var env = new XProjectEnvStub(sln.Result, cfgsln);
21+
env.XProjectByFile(sln.Result.ProjectItems.First().fullPath, cfg, cfgprj);
22+
23+
Assert.Equal("Debug", cfgsln[PropertyNames.CONFIG]);
24+
Assert.Equal("Any CPU", cfgsln[PropertyNames.PLATFORM]);
25+
26+
Assert.Equal("DBGprj", cfgprj[PropertyNames.CONFIG]);
27+
Assert.Equal("Win32", cfgprj[PropertyNames.PLATFORM]);
28+
29+
Assert.Equal("DBGprj", cfg.Configuration);
30+
Assert.Equal("Win32", cfg.Platform);
31+
32+
Assert.Equal(cfgsln[PropertyNames.CONFIG], env.SlnProperties[PropertyNames.CONFIG]);
33+
Assert.Equal(cfgsln[PropertyNames.PLATFORM], env.SlnProperties[PropertyNames.PLATFORM]);
34+
}
35+
}
36+
}
37+
}

‎MvsSlnTest/XProjectEnvStub.cs

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
using System.Collections.Generic;
2+
using net.r_eg.MvsSln.Core;
3+
4+
namespace MvsSlnTest
5+
{
6+
internal sealed class XProjectEnvStub: XProjectEnv
7+
{
8+
internal IDictionary<string, string> SlnProperties => slnProperties;
9+
10+
internal XProjectEnvStub(ISlnResult data, IDictionary<string, string> properties, IDictionary<string, RawText> raw = null)
11+
: base(data, properties, raw)
12+
{
13+
14+
}
15+
}
16+
}

‎MvsSlnTest/resources/XProjectEnv/slnProperties/Cpp/App.sln

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio Version 16
4+
VisualStudioVersion = 16.0.30225.117
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "App", "App.vcxproj", "{DB88328E-4614-40E3-894C-A8F25FC51433}"
7+
EndProject
8+
Global
9+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
10+
DBGsln|x64 = DBGsln|x64
11+
DBGsln|x86 = DBGsln|x86
12+
Release|x64 = Release|x64
13+
Release|x86 = Release|x86
14+
EndGlobalSection
15+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
16+
{DB88328E-4614-40E3-894C-A8F25FC51433}.DBGsln|x64.ActiveCfg = DBGprj|x64
17+
{DB88328E-4614-40E3-894C-A8F25FC51433}.DBGsln|x64.Build.0 = DBGprj|x64
18+
{DB88328E-4614-40E3-894C-A8F25FC51433}.DBGsln|x86.ActiveCfg = DBGprj|Win32
19+
{DB88328E-4614-40E3-894C-A8F25FC51433}.DBGsln|x86.Build.0 = DBGprj|Win32
20+
{DB88328E-4614-40E3-894C-A8F25FC51433}.Release|x64.ActiveCfg = Release|x64
21+
{DB88328E-4614-40E3-894C-A8F25FC51433}.Release|x64.Build.0 = Release|x64
22+
{DB88328E-4614-40E3-894C-A8F25FC51433}.Release|x86.ActiveCfg = Release|Win32
23+
{DB88328E-4614-40E3-894C-A8F25FC51433}.Release|x86.Build.0 = Release|Win32
24+
EndGlobalSection
25+
GlobalSection(SolutionProperties) = preSolution
26+
HideSolutionNode = FALSE
27+
EndGlobalSection
28+
GlobalSection(ExtensibilityGlobals) = postSolution
29+
SolutionGuid = {D3478A3A-E67A-43FF-896B-3714382161EF}
30+
EndGlobalSection
31+
EndGlobal

‎MvsSlnTest/resources/XProjectEnv/slnProperties/Cpp/App.vcxproj

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup Label="ProjectConfigurations">
4+
<ProjectConfiguration Include="DBGprj|Win32">
5+
<Configuration>DBGprj</Configuration>
6+
<Platform>Win32</Platform>
7+
</ProjectConfiguration>
8+
<ProjectConfiguration Include="Release|Win32">
9+
<Configuration>Release</Configuration>
10+
<Platform>Win32</Platform>
11+
</ProjectConfiguration>
12+
<ProjectConfiguration Include="DBGprj|x64">
13+
<Configuration>DBGprj</Configuration>
14+
<Platform>x64</Platform>
15+
</ProjectConfiguration>
16+
<ProjectConfiguration Include="Release|x64">
17+
<Configuration>Release</Configuration>
18+
<Platform>x64</Platform>
19+
</ProjectConfiguration>
20+
</ItemGroup>
21+
</Project>

0 commit comments

Comments
 (0)