Skip to content

Commit a8d3bb6

Browse files
marcpopMSFTmarcpopMSFT
authored
Re-enable C++/CLI tests (#48511)
2 parents 28da9f7 + cfa275a commit a8d3bb6

File tree

4 files changed

+33
-30
lines changed

4 files changed

+33
-30
lines changed

Diff for: ‎test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildACppCliProjectWithTransitiveDeps.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public GivenThatWeWantToBuildACppCliProjectWithTransitiveDeps(ITestOutputHelper
1212

1313
private readonly Lazy<TestAsset> _buildAsset;
1414

15-
[FullMSBuildOnlyFact(Skip = "https://github.com/dotnet/sdk/issues/11008")]
15+
[FullMSBuildOnlyFact]
1616
public void It_can_generate_correct_depsJson_file()
1717
{
1818
TestAsset testAsset = _buildAsset.Value;
@@ -23,7 +23,7 @@ public void It_can_generate_correct_depsJson_file()
2323
depsJsonContent.Should().Contain("NETCoreCppCliTestC.dll", "should contain transitive reference");
2424
}
2525

26-
[FullMSBuildOnlyFact(Skip = "https://github.com/dotnet/sdk/issues/11008")]
26+
[FullMSBuildOnlyFact]
2727
public void It_can_generate_all_runtimeconfig_files_to_output_folder()
2828
{
2929
TestAsset testAsset = _buildAsset.Value;
@@ -35,7 +35,7 @@ public void It_can_generate_all_runtimeconfig_files_to_output_folder()
3535
});
3636
}
3737

38-
[FullMSBuildOnlyFact(Skip = "https://github.com/dotnet/sdk/issues/11008")]
38+
[FullMSBuildOnlyFact]
3939
public void It_can_generate_all_depsjson_files_to_output_folder()
4040
{
4141
TestAsset testAsset = _buildAsset.Value;

Diff for: ‎test/TestAssets/TestProjects/NetCoreCppCliLibWithTransitiveDeps/NETCoreCppCliTest/NETCoreCppCliTest.vcxproj

+10-9
Original file line numberDiff line numberDiff line change
@@ -35,68 +35,69 @@
3535
</ProjectConfiguration>
3636
</ItemGroup>
3737
<PropertyGroup Label="Globals">
38-
<VCProjectVersion>16.0</VCProjectVersion>
38+
<VCProjectVersion>17.0</VCProjectVersion>
3939
<ProjectGuid>{CF5DA8D7-1FDF-4E8F-AFE6-450BE16E906A}</ProjectGuid>
4040
<TargetFramework>$(CurrentTargetFramework)</TargetFramework>
4141
<Keyword>ManagedCProj</Keyword>
4242
<EnableDynamicLoading>true</EnableDynamicLoading>
4343
<RootNamespace>NETCoreCppCliTest</RootNamespace>
4444
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
45+
<EnableManagedpackageReferenceSupport>true</EnableManagedpackageReferenceSupport>
4546
</PropertyGroup>
4647
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
4748
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
4849
<ConfigurationType>DynamicLibrary</ConfigurationType>
4950
<UseDebugLibraries>true</UseDebugLibraries>
50-
<PlatformToolset>v142</PlatformToolset>
51+
<PlatformToolset>v143</PlatformToolset>
5152
<CLRSupport>NetCore</CLRSupport>
5253
<CharacterSet>Unicode</CharacterSet>
5354
</PropertyGroup>
5455
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
5556
<ConfigurationType>DynamicLibrary</ConfigurationType>
5657
<UseDebugLibraries>true</UseDebugLibraries>
57-
<PlatformToolset>v142</PlatformToolset>
58+
<PlatformToolset>v143</PlatformToolset>
5859
<CLRSupport>NetCore</CLRSupport>
5960
<CharacterSet>Unicode</CharacterSet>
6061
</PropertyGroup>
6162
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
6263
<ConfigurationType>DynamicLibrary</ConfigurationType>
6364
<UseDebugLibraries>true</UseDebugLibraries>
64-
<PlatformToolset>v142</PlatformToolset>
65+
<PlatformToolset>v143</PlatformToolset>
6566
<CLRSupport>NetCore</CLRSupport>
6667
<CharacterSet>Unicode</CharacterSet>
6768
</PropertyGroup>
6869
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
6970
<ConfigurationType>DynamicLibrary</ConfigurationType>
7071
<UseDebugLibraries>false</UseDebugLibraries>
71-
<PlatformToolset>v142</PlatformToolset>
72+
<PlatformToolset>v143</PlatformToolset>
7273
<CLRSupport>NetCore</CLRSupport>
7374
<CharacterSet>Unicode</CharacterSet>
7475
</PropertyGroup>
7576
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
7677
<ConfigurationType>DynamicLibrary</ConfigurationType>
7778
<UseDebugLibraries>false</UseDebugLibraries>
78-
<PlatformToolset>v142</PlatformToolset>
79+
<PlatformToolset>v143</PlatformToolset>
7980
<CLRSupport>NetCore</CLRSupport>
8081
<CharacterSet>Unicode</CharacterSet>
8182
</PropertyGroup>
8283
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
8384
<ConfigurationType>DynamicLibrary</ConfigurationType>
8485
<UseDebugLibraries>false</UseDebugLibraries>
85-
<PlatformToolset>v142</PlatformToolset>
86+
<PlatformToolset>v143</PlatformToolset>
8687
<CLRSupport>NetCore</CLRSupport>
8788
<CharacterSet>Unicode</CharacterSet>
8889
</PropertyGroup>
8990
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
9091
<ConfigurationType>DynamicLibrary</ConfigurationType>
9192
<UseDebugLibraries>true</UseDebugLibraries>
92-
<PlatformToolset>v142</PlatformToolset>
93+
<PlatformToolset>v143</PlatformToolset>
9394
<CLRSupport>NetCore</CLRSupport>
9495
<CharacterSet>Unicode</CharacterSet>
9596
</PropertyGroup>
9697
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
9798
<ConfigurationType>DynamicLibrary</ConfigurationType>
9899
<UseDebugLibraries>false</UseDebugLibraries>
99-
<PlatformToolset>v142</PlatformToolset>
100+
<PlatformToolset>v143</PlatformToolset>
100101
<CLRSupport>NetCore</CLRSupport>
101102
<CharacterSet>Unicode</CharacterSet>
102103
</PropertyGroup>

Diff for: ‎test/TestAssets/TestProjects/NetCoreCppCliLibWithTransitiveDeps/NETCoreCppCliTestB/NETCoreCppCliTestB.vcxproj

+10-9
Original file line numberDiff line numberDiff line change
@@ -35,68 +35,69 @@
3535
</ProjectConfiguration>
3636
</ItemGroup>
3737
<PropertyGroup Label="Globals">
38-
<VCProjectVersion>16.0</VCProjectVersion>
38+
<VCProjectVersion>17.0</VCProjectVersion>
3939
<ProjectGuid>{C8D22D0F-0C2D-4B4A-BF28-14A2D001102B}</ProjectGuid>
4040
<TargetFramework>$(CurrentTargetFramework)</TargetFramework>
4141
<Keyword>ManagedCProj</Keyword>
4242
<EnableDynamicLoading>true</EnableDynamicLoading>
4343
<RootNamespace>NETCoreCppCliTest</RootNamespace>
4444
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
45+
<EnableManagedpackageReferenceSupport>true</EnableManagedpackageReferenceSupport>
4546
</PropertyGroup>
4647
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
4748
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
4849
<ConfigurationType>DynamicLibrary</ConfigurationType>
4950
<UseDebugLibraries>true</UseDebugLibraries>
50-
<PlatformToolset>v142</PlatformToolset>
51+
<PlatformToolset>v143</PlatformToolset>
5152
<CLRSupport>NetCore</CLRSupport>
5253
<CharacterSet>Unicode</CharacterSet>
5354
</PropertyGroup>
5455
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
5556
<ConfigurationType>DynamicLibrary</ConfigurationType>
5657
<UseDebugLibraries>true</UseDebugLibraries>
57-
<PlatformToolset>v142</PlatformToolset>
58+
<PlatformToolset>v143</PlatformToolset>
5859
<CLRSupport>NetCore</CLRSupport>
5960
<CharacterSet>Unicode</CharacterSet>
6061
</PropertyGroup>
6162
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
6263
<ConfigurationType>DynamicLibrary</ConfigurationType>
6364
<UseDebugLibraries>true</UseDebugLibraries>
64-
<PlatformToolset>v142</PlatformToolset>
65+
<PlatformToolset>v143</PlatformToolset>
6566
<CLRSupport>NetCore</CLRSupport>
6667
<CharacterSet>Unicode</CharacterSet>
6768
</PropertyGroup>
6869
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
6970
<ConfigurationType>DynamicLibrary</ConfigurationType>
7071
<UseDebugLibraries>false</UseDebugLibraries>
71-
<PlatformToolset>v142</PlatformToolset>
72+
<PlatformToolset>v143</PlatformToolset>
7273
<CLRSupport>NetCore</CLRSupport>
7374
<CharacterSet>Unicode</CharacterSet>
7475
</PropertyGroup>
7576
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
7677
<ConfigurationType>DynamicLibrary</ConfigurationType>
7778
<UseDebugLibraries>false</UseDebugLibraries>
78-
<PlatformToolset>v142</PlatformToolset>
79+
<PlatformToolset>v143</PlatformToolset>
7980
<CLRSupport>NetCore</CLRSupport>
8081
<CharacterSet>Unicode</CharacterSet>
8182
</PropertyGroup>
8283
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
8384
<ConfigurationType>DynamicLibrary</ConfigurationType>
8485
<UseDebugLibraries>false</UseDebugLibraries>
85-
<PlatformToolset>v142</PlatformToolset>
86+
<PlatformToolset>v143</PlatformToolset>
8687
<CLRSupport>NetCore</CLRSupport>
8788
<CharacterSet>Unicode</CharacterSet>
8889
</PropertyGroup>
8990
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
9091
<ConfigurationType>DynamicLibrary</ConfigurationType>
9192
<UseDebugLibraries>true</UseDebugLibraries>
92-
<PlatformToolset>v142</PlatformToolset>
93+
<PlatformToolset>v143</PlatformToolset>
9394
<CLRSupport>NetCore</CLRSupport>
9495
<CharacterSet>Unicode</CharacterSet>
9596
</PropertyGroup>
9697
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
9798
<ConfigurationType>DynamicLibrary</ConfigurationType>
9899
<UseDebugLibraries>false</UseDebugLibraries>
99-
<PlatformToolset>v142</PlatformToolset>
100+
<PlatformToolset>v143</PlatformToolset>
100101
<CLRSupport>NetCore</CLRSupport>
101102
<CharacterSet>Unicode</CharacterSet>
102103
</PropertyGroup>

Diff for: ‎test/TestAssets/TestProjects/NetCoreCppCliLibWithTransitiveDeps/NETCoreCppCliTestC/NETCoreCppCliTestC.vcxproj

+10-9
Original file line numberDiff line numberDiff line change
@@ -35,68 +35,69 @@
3535
</ProjectConfiguration>
3636
</ItemGroup>
3737
<PropertyGroup Label="Globals">
38-
<VCProjectVersion>16.0</VCProjectVersion>
38+
<VCProjectVersion>17.0</VCProjectVersion>
3939
<ProjectGuid>{73B24404-97DE-467A-8251-6542819BCEB4}</ProjectGuid>
4040
<TargetFramework>$(CurrentTargetFramework)</TargetFramework>
4141
<Keyword>ManagedCProj</Keyword>
4242
<EnableDynamicLoading>true</EnableDynamicLoading>
4343
<RootNamespace>NETCoreCppCliTest</RootNamespace>
4444
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
45+
<EnableManagedpackageReferenceSupport>true</EnableManagedpackageReferenceSupport>
4546
</PropertyGroup>
4647
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
4748
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
4849
<ConfigurationType>DynamicLibrary</ConfigurationType>
4950
<UseDebugLibraries>true</UseDebugLibraries>
50-
<PlatformToolset>v142</PlatformToolset>
51+
<PlatformToolset>v143</PlatformToolset>
5152
<CLRSupport>NetCore</CLRSupport>
5253
<CharacterSet>Unicode</CharacterSet>
5354
</PropertyGroup>
5455
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
5556
<ConfigurationType>DynamicLibrary</ConfigurationType>
5657
<UseDebugLibraries>true</UseDebugLibraries>
57-
<PlatformToolset>v142</PlatformToolset>
58+
<PlatformToolset>v143</PlatformToolset>
5859
<CLRSupport>NetCore</CLRSupport>
5960
<CharacterSet>Unicode</CharacterSet>
6061
</PropertyGroup>
6162
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
6263
<ConfigurationType>DynamicLibrary</ConfigurationType>
6364
<UseDebugLibraries>true</UseDebugLibraries>
64-
<PlatformToolset>v142</PlatformToolset>
65+
<PlatformToolset>v143</PlatformToolset>
6566
<CLRSupport>NetCore</CLRSupport>
6667
<CharacterSet>Unicode</CharacterSet>
6768
</PropertyGroup>
6869
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
6970
<ConfigurationType>DynamicLibrary</ConfigurationType>
7071
<UseDebugLibraries>false</UseDebugLibraries>
71-
<PlatformToolset>v142</PlatformToolset>
72+
<PlatformToolset>v143</PlatformToolset>
7273
<CLRSupport>NetCore</CLRSupport>
7374
<CharacterSet>Unicode</CharacterSet>
7475
</PropertyGroup>
7576
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
7677
<ConfigurationType>DynamicLibrary</ConfigurationType>
7778
<UseDebugLibraries>false</UseDebugLibraries>
78-
<PlatformToolset>v142</PlatformToolset>
79+
<PlatformToolset>v143</PlatformToolset>
7980
<CLRSupport>NetCore</CLRSupport>
8081
<CharacterSet>Unicode</CharacterSet>
8182
</PropertyGroup>
8283
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
8384
<ConfigurationType>DynamicLibrary</ConfigurationType>
8485
<UseDebugLibraries>false</UseDebugLibraries>
85-
<PlatformToolset>v142</PlatformToolset>
86+
<PlatformToolset>v143</PlatformToolset>
8687
<CLRSupport>NetCore</CLRSupport>
8788
<CharacterSet>Unicode</CharacterSet>
8889
</PropertyGroup>
8990
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
9091
<ConfigurationType>DynamicLibrary</ConfigurationType>
9192
<UseDebugLibraries>true</UseDebugLibraries>
92-
<PlatformToolset>v142</PlatformToolset>
93+
<PlatformToolset>v143</PlatformToolset>
9394
<CLRSupport>NetCore</CLRSupport>
9495
<CharacterSet>Unicode</CharacterSet>
9596
</PropertyGroup>
9697
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
9798
<ConfigurationType>DynamicLibrary</ConfigurationType>
9899
<UseDebugLibraries>false</UseDebugLibraries>
99-
<PlatformToolset>v142</PlatformToolset>
100+
<PlatformToolset>v143</PlatformToolset>
100101
<CLRSupport>NetCore</CLRSupport>
101102
<CharacterSet>Unicode</CharacterSet>
102103
</PropertyGroup>

0 commit comments

Comments
 (0)