summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Williamson <mike@zwobble.org>2024-06-10 16:55:39 +0100
committerMichael Williamson <mike@zwobble.org>2024-06-10 16:55:39 +0100
commit39aa3befe449fb32fac7554e567bac95289188de (patch)
treed56816bd45f9a61122901d2e9bdaa73c0a85e046
parent7583c2b9865ebbe355091608687e9be3bc682910 (diff)
Update to netstandard2.0
-rw-r--r--Mammoth.Cli/Mammoth.Cli.csproj2
-rw-r--r--Mammoth.Tests/Mammoth.Tests.csproj12
-rw-r--r--Mammoth/Mammoth.csproj2
-rw-r--r--makefile2
4 files changed, 7 insertions, 11 deletions
diff --git a/Mammoth.Cli/Mammoth.Cli.csproj b/Mammoth.Cli/Mammoth.Cli.csproj
index 7de9f54..740ce62 100644
--- a/Mammoth.Cli/Mammoth.Cli.csproj
+++ b/Mammoth.Cli/Mammoth.Cli.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
- <TargetFramework>net45</TargetFramework>
+ <TargetFramework>netstandard2.0</TargetFramework>
<AssemblyTitle>Mammoth.Cli</AssemblyTitle>
<Copyright>Michael Williamson</Copyright>
<Deterministic>false</Deterministic>
diff --git a/Mammoth.Tests/Mammoth.Tests.csproj b/Mammoth.Tests/Mammoth.Tests.csproj
index ebfb1c9..2668695 100644
--- a/Mammoth.Tests/Mammoth.Tests.csproj
+++ b/Mammoth.Tests/Mammoth.Tests.csproj
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net45</TargetFramework>
+ <TargetFramework>net6.0</TargetFramework>
<AssemblyTitle>Mammoth.Tests</AssemblyTitle>
<Copyright>Michael Williamson</Copyright>
<Deterministic>false</Deterministic>
@@ -16,14 +16,10 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<OutputPath>bin\Release</OutputPath>
</PropertyGroup>
- <Import Project="..\packages\xunit.core.2.1.0\build\portable-net45+win8+wp8+wpa81\xunit.core.props" Condition="Exists('..\packages\xunit.core.2.1.0\build\portable-net45+win8+wp8+wpa81\xunit.core.props')" />
<ItemGroup>
- <PackageReference Include="xunit" Version="2.1.0" />
- <PackageReference Include="xunit.abstractions" Version="2.0.0" />
- <PackageReference Include="xunit.assert" Version="2.1.0" />
- <PackageReference Include="xunit.core" Version="2.1.0" />
- <PackageReference Include="xunit.extensibility.core" Version="2.1.0" />
- <PackageReference Include="xunit.extensibility.execution" Version="2.1.0" />
+ <PackageReference Include="xunit" Version="2.8.1" />
+ <PackageReference Include="xunit.runner.visualstudio" Version="2.8.1" />
+ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="TestData\empty.docx" />
diff --git a/Mammoth/Mammoth.csproj b/Mammoth/Mammoth.csproj
index 3818306..c369dcd 100644
--- a/Mammoth/Mammoth.csproj
+++ b/Mammoth/Mammoth.csproj
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net45</TargetFramework>
+ <TargetFramework>netstandard2.0</TargetFramework>
<AssemblyTitle>Mammoth</AssemblyTitle>
<Company>Michael Williamson</Company>
<Product>Mammoth</Product>
diff --git a/makefile b/makefile
index deaf585..1f31062 100644
--- a/makefile
+++ b/makefile
@@ -7,4 +7,4 @@ build:
.PHONY: test
test: build
- mono --debug packages/xunit.runner.console.2.1.0/tools/xunit.console.exe Mammoth.Tests/bin/Debug/net45/Mammoth.Tests.dll -noshadow
+ dotnet test