Merge branch 'develop' into mh/static-virtual

# Conflicts:
#	mdoc/mdoc.Test/mdoc.Test.csproj

3 files changed, 14 insertions, 22 deletions

diff --git a/external/Test/StaticVirtualMembers.dll b/external/Test/StaticVirtualMembers.dll
new file mode 100644
index 00000000..1e28bf58
--- /dev/null
+++ b/external/Test/StaticVirtualMembers.dll
diff --git a/mdoc/Makefile b/mdoc/Makefile
index 5fe352dd..e78672a3 100644
--- a/mdoc/Makefile
+++ b/mdoc/Makefile
@@ -61,9 +61,6 @@ cleanup:
 nunit: 
 	mono ../packages/NUnit.ConsoleRunner.3.6.0/tools/nunit3-console.exe mdoc.Test/bin/$(CONFIGURATION)/mdoc.Test.dll
 
-dotnet-test:
-	dotnet test mdoc.Test/bin/$(CONFIGURATION)-net6.0/mdoc.Test.dll
-
 Test/DocTest-VB-Eii.dll:
 	$(VBCOMPILE) -out:Test/DocTest-VB-Eii.dll  Test/ClassEnumerator.vb
 	
@@ -987,5 +984,5 @@ check-doc-tools-update: check-monodocer-since-update \
 	check-mdoc-export-msxdoc-update \
 	check-mdoc-validate-update 
 
-check: nunit dotnet-test check-doc-tools
+check: nunit check-doc-tools
 	@echo "mdoc Tests Complete!"
diff --git a/mdoc/mdoc.Test/mdoc.Test.csproj b/mdoc/mdoc.Test/mdoc.Test.csproj
index f9967e97..0ae687e7 100644
--- a/mdoc/mdoc.Test/mdoc.Test.csproj
+++ b/mdoc/mdoc.Test/mdoc.Test.csproj
@@ -1,25 +1,24 @@
 <Project Sdk="Microsoft.NET.Sdk">

   <PropertyGroup>

-    <TargetFrameworks>net471;net6.0</TargetFrameworks>

+    <TargetFramework>net471</TargetFramework>

     <OutputType>Library</OutputType>

     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>

     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>

+  </PropertyGroup>

+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

+    <OutputPath>bin\Debug</OutputPath>

+    <DefineConstants>DEBUG;</DefineConstants>

     <LangVersion>latest</LangVersion>

-    <RunPostBuildEvent>Always</RunPostBuildEvent>

-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

-    <ProduceReferenceAssembly>false</ProduceReferenceAssembly>

   </PropertyGroup>

-

-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net471' ">

-    <OutputPath>bin\$(Configuration)</OutputPath>

+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

+    <OutputPath>bin\Release</OutputPath>

+    <LangVersion>latest</LangVersion>

   </PropertyGroup>

-

-  <PropertyGroup Condition=" '$(TargetFramework)' != 'net471' ">

-     <OutputPath>bin\$(Configuration)-$(TargetFramework)</OutputPath>

-	  <EnablePreviewFeatures>true</EnablePreviewFeatures>

+  <PropertyGroup>

+    <RunPostBuildEvent>Always</RunPostBuildEvent>

+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

   </PropertyGroup>

-

-  <ItemGroup Condition=" '$(TargetFramework)' == 'net471' ">

+  <ItemGroup>

     <Reference Include="mdoc.Test.Cplusplus, Version=1.0.6709.28740, Culture=neutral, processorArchitecture=x86">

       <SpecificVersion>False</SpecificVersion>

       <HintPath>..\..\external\Test\mdoc.Test.Cplusplus.dll</HintPath>

@@ -38,15 +37,11 @@
       <HintPath>..\..\external\Windows\Windows.Foundation.UniversalApiContract.winmd</HintPath>

     </Reference>

   </ItemGroup>

-

   <ItemGroup>

     <PackageReference Include="Mono.Cecil" Version="$(NuGetVersionMonoCecil)" />

-    <PackageReference Include="Newtonsoft.Json" Version="$(NuGetVersionNewtonsoftJson)" />

     <PackageReference Include="NUnit" Version="$(NuGetVersionNUnit)" />

-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(NuGetVersionMicrosoftNETTestSdk)" />

-    <PackageReference Include="NUnit3TestAdapter" Version="$(NuGetVersionNUnit3TestAdapter)" />

+	<PackageReference Include="NUnit3TestAdapter" Version="$(NuGetVersionNUnit3TestAdapter)" />

   </ItemGroup>

-

   <ItemGroup>

     <None Update="cppcli\cppcli\cppcli.h">

       <Link>SampleClasses\cppcli.h</Link>