diff options
| author | Sandy Armstrong <sandy@xamarin.com> | 2022-01-09 16:53:37 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-09 16:53:37 +0300 |
| commit | 6237fdb87e79241b142433ac1e5e4725f001e4db (patch) | |
| tree | 91b373595984d9f87722649ff01450c73be849dc /tools | |
| parent | dd3404f0a60f215c43a970284317b93fdcf39cd2 (diff) | |
Build improvements (#591)
* HtmlGenerator: Load converters lazily
This is a workaround so that .NET 6 apps can use the .NET FW
build of monodoc.dll without worrying about TypeInitializationExceptions
for converters they don't use.
* Fix netstandard2.0 compatibility
* Replace SharpZipLib submodule with package reference
Remove mdoc/packages.config as well.
* Bump Lucene.Net.Light to latest version to support NetStandard
* monodoc: Change to SDK-style project
* monodoc: Move to netstandard2.0
* Replace all packages.config with PackageReference
Bump mdoc.Test.FSharp.fsproj to .NET 4.7.1 to fix issues using
System.ValueTuple.
* Adjust to mdoc.Test.FSharp.fsproj bump to v4.7.1
* mdoc.Test.FSharp.fsproj: Convert to SDK-style
Fixes errors building in VS2022.
* mdoc.Test.csproj: Update to SDK-style too
* mdoc.Test.csproj no longer needs a direct FSharp.Core reference
* mdoc.Test.FSharp.fsproj: Fix FSharp.Core reference
https://github.com/dotnet/fsharp/blob/main/docs/fsharp-core-notes.md#how-to-explicitly-reference-fsharpcore
* mdoc.Test.csproj: Restore manual WPF reference
* Use AppendTargetFrameworkToOutputPath to avoid touching Makefiles
* Update en.expected-fsharp/index.xml
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/DocStat/DocStat.Tests/DocStat.Tests.csproj | 7 | ||||
| -rw-r--r-- | tools/DocStat/DocStat.Tests/packages.config | 4 |
2 files changed, 3 insertions, 8 deletions
diff --git a/tools/DocStat/DocStat.Tests/DocStat.Tests.csproj b/tools/DocStat/DocStat.Tests/DocStat.Tests.csproj index d8e6c822..650aefdc 100644 --- a/tools/DocStat/DocStat.Tests/DocStat.Tests.csproj +++ b/tools/DocStat/DocStat.Tests/DocStat.Tests.csproj @@ -26,18 +26,17 @@ </PropertyGroup>
<ItemGroup>
<Reference Include="System" />
- <Reference Include="nunit.framework">
- <HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
- </Reference>
<Reference Include="System.Xml" />
<Reference Include="System.Xml.Linq" />
</ItemGroup>
<ItemGroup>
+ <PackageReference Include="NUnit" Version="$(NuGetVersionNUnit)" />
+ </ItemGroup>
+ <ItemGroup>
<Compile Include="EcmaXmlHelperTests.cs" />
<Compile Include="CommandUtilsTests.cs" />
</ItemGroup>
<ItemGroup>
- <None Include="packages.config" />
<None Include="TestData\currentxml\t1.xml">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
diff --git a/tools/DocStat/DocStat.Tests/packages.config b/tools/DocStat/DocStat.Tests/packages.config deleted file mode 100644 index 01c187cc..00000000 --- a/tools/DocStat/DocStat.Tests/packages.config +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<packages> - <package id="NUnit" version="2.6.4" targetFramework="net461" /> -</packages>
\ No newline at end of file |