Skip to content

Revert net6 for mdoc.test csproj #653

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
huangmin-ms merged 4 commits into from
Nov 6, 2022
Merged

Revert net6 for mdoc.test csproj #653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b005e94
Add a sample interface for static virtual
huangmin-ms Nov 4, 2022
61e7ff2
revert net6.0 for tes proj
huangmin-ms Nov 6, 2022
d86fb2e
update
huangmin-ms Nov 6, 2022
d84bebf
update
huangmin-ms Nov 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions mdoc/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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!"
30 changes: 13 additions & 17 deletions mdoc/mdoc.Test/mdoc.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +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>
<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>
Expand All @@ -37,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>
Expand Down