Skip to content

Commit 215b2a9

Browse files
authored
Revert net6 for mdoc.test csproj (#653)
* Add a sample interface for static virtual * revert net6.0 for tes proj * update * update
1 parent ab8ec7a commit 215b2a9

2 files changed

Lines changed: 14 additions & 21 deletions

File tree

mdoc/Makefile

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,6 @@ cleanup:
6161
nunit:
6262
mono ../packages/NUnit.ConsoleRunner.3.6.0/tools/nunit3-console.exe mdoc.Test/bin/$(CONFIGURATION)/mdoc.Test.dll
6363

64-
dotnet-test:
65-
dotnet test mdoc.Test/bin/$(CONFIGURATION)-net6.0/mdoc.Test.dll
66-
6764
Test/DocTest-VB-Eii.dll:
6865
$(VBCOMPILE) -out:Test/DocTest-VB-Eii.dll Test/ClassEnumerator.vb
6966

@@ -987,5 +984,5 @@ check-doc-tools-update: check-monodocer-since-update \
987984
check-mdoc-export-msxdoc-update \
988985
check-mdoc-validate-update
989986

990-
check: nunit dotnet-test check-doc-tools
987+
check: nunit check-doc-tools
991988
@echo "mdoc Tests Complete!"

mdoc/mdoc.Test/mdoc.Test.csproj

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net471;net6.0</TargetFrameworks>
3+
<TargetFramework>net471</TargetFramework>
44
<OutputType>Library</OutputType>
55
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
66
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
7+
</PropertyGroup>
8+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
9+
<OutputPath>bin\Debug</OutputPath>
10+
<DefineConstants>DEBUG;</DefineConstants>
711
<LangVersion>latest</LangVersion>
8-
<RunPostBuildEvent>Always</RunPostBuildEvent>
9-
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
10-
<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
1112
</PropertyGroup>
12-
13-
<PropertyGroup Condition=" '$(TargetFramework)' == 'net471' ">
14-
<OutputPath>bin\$(Configuration)</OutputPath>
13+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
14+
<OutputPath>bin\Release</OutputPath>
15+
<LangVersion>latest</LangVersion>
1516
</PropertyGroup>
16-
17-
<PropertyGroup Condition=" '$(TargetFramework)' != 'net471' ">
18-
<OutputPath>bin\$(Configuration)-$(TargetFramework)</OutputPath>
17+
<PropertyGroup>
18+
<RunPostBuildEvent>Always</RunPostBuildEvent>
19+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
1920
</PropertyGroup>
20-
21-
<ItemGroup Condition=" '$(TargetFramework)' == 'net471' ">
21+
<ItemGroup>
2222
<Reference Include="mdoc.Test.Cplusplus, Version=1.0.6709.28740, Culture=neutral, processorArchitecture=x86">
2323
<SpecificVersion>False</SpecificVersion>
2424
<HintPath>..\..\external\Test\mdoc.Test.Cplusplus.dll</HintPath>
@@ -37,15 +37,11 @@
3737
<HintPath>..\..\external\Windows\Windows.Foundation.UniversalApiContract.winmd</HintPath>
3838
</Reference>
3939
</ItemGroup>
40-
4140
<ItemGroup>
4241
<PackageReference Include="Mono.Cecil" Version="$(NuGetVersionMonoCecil)" />
43-
<PackageReference Include="Newtonsoft.Json" Version="$(NuGetVersionNewtonsoftJson)" />
4442
<PackageReference Include="NUnit" Version="$(NuGetVersionNUnit)" />
45-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(NuGetVersionMicrosoftNETTestSdk)" />
46-
<PackageReference Include="NUnit3TestAdapter" Version="$(NuGetVersionNUnit3TestAdapter)" />
43+
<PackageReference Include="NUnit3TestAdapter" Version="$(NuGetVersionNUnit3TestAdapter)" />
4744
</ItemGroup>
48-
4945
<ItemGroup>
5046
<None Update="cppcli\cppcli\cppcli.h">
5147
<Link>SampleClasses\cppcli.h</Link>

0 commit comments

Comments
 (0)