Skip to content

Commit 2da2909

Browse files
committed
Backport from master: Visual Basic test project re-included
1 parent 2d66691 commit 2da2909

16 files changed

Lines changed: 566 additions & 980 deletions

Directory.Build.props

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,14 +71,14 @@
7171
<TargetFrameworks Condition="'$(TargetFrameworks)'==''">net8.0;net7.0;net6.0</TargetFrameworks> <!-- fallback to default -->
7272
</PropertyGroup>
7373

74-
<PropertyGroup Condition = "$(Configuration.Contains('Debug')) == 'true'">
75-
<DefineConstants>$(DefineConstants);TRACE;DEBUG</DefineConstants>
76-
<DebugSymbols>true</DebugSymbols>
77-
<DebugType>portable</DebugType>
74+
<PropertyGroup Condition = "$(Configuration.Contains('Debug')) == 'true' AND $(MSBuildProjectName.Contains('Tests.VB')) == 'false'">
75+
<DefineConstants>$(DefineConstants);TRACE;DEBUG</DefineConstants>
76+
<DebugSymbols>true</DebugSymbols>
77+
<DebugType>portable</DebugType>
7878
</PropertyGroup>
7979

80-
<PropertyGroup Condition = "$(Configuration.Contains('Release')) == 'true'">
81-
<DefineConstants>$(DefineConstants);TRACE</DefineConstants>
80+
<PropertyGroup Condition = "$(Configuration.Contains('Release')) == 'true' AND $(MSBuildProjectName.Contains('Tests.VB')) == 'false'">
81+
<DefineConstants>$(DefineConstants);TRACE</DefineConstants>
8282
</PropertyGroup>
8383

8484
<PropertyGroup>

Orm.sln

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,13 +86,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NuGetPublish", "Publish\NuG
8686
EndProject
8787
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Xtensive.Orm.Tests.FSharp", "Orm\Xtensive.Orm.Tests.FSharp\Xtensive.Orm.Tests.FSharp.fsproj", "{A68C90C1-AD82-40FD-A18D-F04923514743}"
8888
EndProject
89+
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Xtensive.Orm.Tests.VB", "Orm\Xtensive.Orm.Tests.VB\Xtensive.Orm.Tests.VB.vbproj", "{C78BE7F5-2B6F-D34B-A2D9-EFA97EEF9225}"
90+
EndProject
8991
Global
9092
GlobalSection(SolutionConfigurationPlatforms) = preSolution
9193
Debug|Any CPU = Debug|Any CPU
92-
Release|Any CPU = Release|Any CPU
9394
Debug-NET6|Any CPU = Debug-NET6|Any CPU
9495
Debug-NET7|Any CPU = Debug-NET7|Any CPU
9596
Debug-NET8|Any CPU = Debug-NET8|Any CPU
97+
Release|Any CPU = Release|Any CPU
9698
Release-NET6|Any CPU = Release-NET6|Any CPU
9799
Release-NET7|Any CPU = Release-NET7|Any CPU
98100
Release-NET8|Any CPU = Release-NET8|Any CPU
@@ -602,6 +604,22 @@ Global
602604
{A68C90C1-AD82-40FD-A18D-F04923514743}.Release-NET7|Any CPU.Build.0 = Release-NET7|Any CPU
603605
{A68C90C1-AD82-40FD-A18D-F04923514743}.Release-NET8|Any CPU.ActiveCfg = Release-NET8|Any CPU
604606
{A68C90C1-AD82-40FD-A18D-F04923514743}.Release-NET8|Any CPU.Build.0 = Release-NET8|Any CPU
607+
{C78BE7F5-2B6F-D34B-A2D9-EFA97EEF9225}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
608+
{C78BE7F5-2B6F-D34B-A2D9-EFA97EEF9225}.Debug|Any CPU.Build.0 = Debug|Any CPU
609+
{C78BE7F5-2B6F-D34B-A2D9-EFA97EEF9225}.Debug-NET6|Any CPU.ActiveCfg = Debug-NET6|Any CPU
610+
{C78BE7F5-2B6F-D34B-A2D9-EFA97EEF9225}.Debug-NET6|Any CPU.Build.0 = Debug-NET6|Any CPU
611+
{C78BE7F5-2B6F-D34B-A2D9-EFA97EEF9225}.Debug-NET7|Any CPU.ActiveCfg = Debug-NET7|Any CPU
612+
{C78BE7F5-2B6F-D34B-A2D9-EFA97EEF9225}.Debug-NET7|Any CPU.Build.0 = Debug-NET7|Any CPU
613+
{C78BE7F5-2B6F-D34B-A2D9-EFA97EEF9225}.Debug-NET8|Any CPU.ActiveCfg = Debug-NET8|Any CPU
614+
{C78BE7F5-2B6F-D34B-A2D9-EFA97EEF9225}.Debug-NET8|Any CPU.Build.0 = Debug-NET8|Any CPU
615+
{C78BE7F5-2B6F-D34B-A2D9-EFA97EEF9225}.Release|Any CPU.ActiveCfg = Release|Any CPU
616+
{C78BE7F5-2B6F-D34B-A2D9-EFA97EEF9225}.Release|Any CPU.Build.0 = Release|Any CPU
617+
{C78BE7F5-2B6F-D34B-A2D9-EFA97EEF9225}.Release-NET6|Any CPU.ActiveCfg = Release-NET6|Any CPU
618+
{C78BE7F5-2B6F-D34B-A2D9-EFA97EEF9225}.Release-NET6|Any CPU.Build.0 = Release-NET6|Any CPU
619+
{C78BE7F5-2B6F-D34B-A2D9-EFA97EEF9225}.Release-NET7|Any CPU.ActiveCfg = Release-NET7|Any CPU
620+
{C78BE7F5-2B6F-D34B-A2D9-EFA97EEF9225}.Release-NET7|Any CPU.Build.0 = Release-NET7|Any CPU
621+
{C78BE7F5-2B6F-D34B-A2D9-EFA97EEF9225}.Release-NET8|Any CPU.ActiveCfg = Release-NET8|Any CPU
622+
{C78BE7F5-2B6F-D34B-A2D9-EFA97EEF9225}.Release-NET8|Any CPU.Build.0 = Release-NET8|Any CPU
605623
EndGlobalSection
606624
GlobalSection(SolutionProperties) = preSolution
607625
HideSolutionNode = FALSE
@@ -638,6 +656,7 @@ Global
638656
{45000ADE-F647-4171-A91A-428CDF682603} = {2302847B-292A-4650-A852-BDED40E1BB1C}
639657
{2CC55F3E-8EA5-4305-8716-D5B944120F82} = {5726BBD8-14F9-4909-B765-3E7709223B61}
640658
{A68C90C1-AD82-40FD-A18D-F04923514743} = {8AAB1719-253A-47D2-970F-1911CFEE84B7}
659+
{C78BE7F5-2B6F-D34B-A2D9-EFA97EEF9225} = {8AAB1719-253A-47D2-970F-1911CFEE84B7}
641660
EndGlobalSection
642661
GlobalSection(ExtensibilityGlobals) = postSolution
643662
SolutionGuid = {F995719A-8D35-49A3-B271-42898A587F57}

0 commit comments

Comments
 (0)