Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 9 additions & 3 deletions .cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,17 @@
"languageSettings": [
{
"languageId": "csharp",
"words": ["bazz", "browsable", "nologo", "zyxwvutsrq"]
"words": ["bazz", "browsable", "netcoreapp", "nologo", "zyxwvutsrq"]
},
{
"languageId": "csproj",
"words": ["buildtransitive", "contentfiles", "linq", "visualstudio"]
"words": [
"buildtransitive",
"contentfiles",
"linq",
"netcoreapp",
"visualstudio"
]
},
{
"languageId": "nuspec",
Expand All @@ -41,5 +47,5 @@
"languageId": "props"
}
],
"words": ["asbjornu", "teardowns", "thomaslevesque", "xunit"]
"words": ["asbjornu", "netstandard", "teardowns", "thomaslevesque", "xunit"]
}
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## 2.9.305

target .NET 4.7.2 and .NET 8.0, 'best-effort' support for netstandard 2.0

## 2.9.304

multi-target .NET 4.7.2 and .NET 6.0
Expand Down
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>

<PropertyGroup>
<SupportedDotnetVersion>net6.0</SupportedDotnetVersion>
<SupportedDotnetVersion>net8.0</SupportedDotnetVersion>
<SupportedFrameworkVersion>net472</SupportedFrameworkVersion>
<LatestDotnetVersion>net9.0</LatestDotnetVersion>
<Deterministic>true</Deterministic>
Expand Down
34 changes: 25 additions & 9 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,31 @@
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
<CentralPackageVersionOverrideEnabled>false</CentralPackageVersionOverrideEnabled>
</PropertyGroup>
<ItemGroup Condition="$(TargetFramework)!=$(SupportedDotnetVersion)">
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.0" />
</ItemGroup>
<ItemGroup Condition="$(TargetFramework)==$(SupportedDotnetVersion)">
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
<PackageVersion Include="xunit.runner.visualstudio" Version="3.0.2" />
</ItemGroup>

<Choose>
<When Condition="$([MSBuild]::IsTargetFrameworkCompatible($(TargetFramework), 'net8.0')) or $([MSBuild]::IsTargetFrameworkCompatible($(TargetFramework), 'net472'))">
<ItemGroup>
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
<PackageVersion Include="xunit.runner.utility" Version="2.9.3" />
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.0" />
</ItemGroup>
</When>
<When Condition="$([MSBuild]::IsTargetFrameworkCompatible($(TargetFramework), 'net6.0'))">
<ItemGroup>
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
<PackageVersion Include="xunit.runner.utility" Version="2.9.3" />
<PackageVersion Include="xunit.runner.visualstudio" Version="3.0.2" />
</ItemGroup>
</When>
<Otherwise>
<ItemGroup>
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
<PackageVersion Include="xunit.runner.utility" Version="2.4.0" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" />
</ItemGroup>
</Otherwise>
</Choose>

<ItemGroup>
<PackageVersion Include="Bullseye" Version="6.0.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="4.14.0" />
Expand All @@ -21,6 +38,5 @@
<PackageVersion Include="xunit" Version="2.9.3" />
<PackageVersion Include="xunit.extensibility.core" Version="2.9.3" />
<PackageVersion Include="xunit.extensibility.execution" Version="2.9.3" />
<PackageVersion Include="xunit.runner.utility" Version="2.9.3" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ _[![LambdaTale NuGet version](https://img.shields.io/nuget/v/bbv.LambdaTale?labe
[![Lint](https://github.com/bbvch/LambdaTale/actions/workflows/lint.yml/badge.svg)](https://github.com/bbvch/LambdaTale/actions/workflows/lint.yml)
[![Spell check](https://github.com/bbvch/LambdaTale/actions/workflows/spell-check.yml/badge.svg)](https://github.com/bbvch/LambdaTale/actions/workflows/spell-check.yml)

Platform support: [.NET 6](https://learn.microsoft.com/en-us/dotnet/core/whats-new/dotnet-6) and [.NET 4.7.2](https://learn.microsoft.com/en-us/dotnet/framework/whats-new) upwards.
Platform support: [.NET 8](https://learn.microsoft.com/en-us/dotnet/core/whats-new/dotnet-8) and [.NET 4.7.2](https://learn.microsoft.com/en-us/dotnet/framework/whats-new) upwards. There are best-effort [netstandard2.0](https://learn.microsoft.com/en-us/dotnet/standard/net-standard?tabs=net-standard-2-0#net-standard-versions) assets 'without any guarantees', I'll try to keep them as long as reasonable.

## Usage

Expand Down
2 changes: 1 addition & 1 deletion src/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<PropertyGroup>
<AnalysisMode>All</AnalysisMode>
<TargetFrameworks>$(SupportedDotnetVersion);$(SupportedFrameworkVersion)</TargetFrameworks>
<TargetFrameworks>$(SupportedDotnetVersion);$(SupportedFrameworkVersion);netstandard2.0</TargetFrameworks>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<ProduceReferenceAssembly>true</ProduceReferenceAssembly>
</PropertyGroup>
Expand Down
53 changes: 52 additions & 1 deletion src/LambdaTale.Execution/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,58 @@
}
}
},
"net6.0": {
".NETStandard,Version=v2.0": {
"MinVer": {
"type": "Direct",
"requested": "[6.0.0, )",
"resolved": "6.0.0",
"contentHash": "+/SsmiySsXJlvQLCGBqaZKNVt3s/Y/HbAdwtop7Km2CnuZbaScoqkWJEBQ5Cy9ebkn6kCYKrHsXgwrFdTgcb3g=="
},
"NETStandard.Library": {
"type": "Direct",
"requested": "[2.0.3, )",
"resolved": "2.0.3",
"contentHash": "st47PosZSHrjECdjeIzZQbzivYBJFv6P2nv4cj2ypdI204DO+vZ7l5raGMiX4eXMJ53RfOIg+/s4DHVZ54Nu2A==",
"dependencies": {
"Microsoft.NETCore.Platforms": "1.1.0"
}
},
"xunit.extensibility.execution": {
"type": "Direct",
"requested": "[2.9.3, )",
"resolved": "2.9.3",
"contentHash": "yMb6vMESlSrE3Wfj7V6cjQ3S4TXdXpRqYeNEI3zsX31uTsGMJjEw6oD5F5u1cHnMptjhEECnmZSsPxB6ChZHDQ==",
"dependencies": {
"xunit.extensibility.core": "[2.9.3]"
}
},
"Microsoft.NETCore.Platforms": {
"type": "Transitive",
"resolved": "1.1.0",
"contentHash": "kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A=="
},
"xunit.abstractions": {
"type": "Transitive",
"resolved": "2.0.3",
"contentHash": "pot1I4YOxlWjIb5jmwvvQNbTrZ3lJQ+jUGkGjWE3hEFM0l5gOnBWS+H3qsex68s5cO52g+44vpGzhAt+42vwKg=="
},
"lambdatale": {
"type": "Project",
"dependencies": {
"xunit.extensibility.core": "[2.9.3, )"
}
},
"xunit.extensibility.core": {
"type": "CentralTransitive",
"requested": "[2.9.3, )",
"resolved": "2.9.3",
"contentHash": "kf3si0YTn2a8J8eZNb+zFpwfoyvIrQ7ivNk5ZYA5yuYk1bEtMe4DxJ2CF/qsRgmEnDr7MnW1mxylBaHTZ4qErA==",
"dependencies": {
"xunit.abstractions": "2.0.3"
}
}
},
"net8.0": {
"MinVer": {
"type": "Direct",
"requested": "[6.0.0, )",
Expand Down
10 changes: 10 additions & 0 deletions src/LambdaTale/LambdaTale.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@
<dependency id="xunit.core" version="[2.9.3, 2.10)" />
<dependency id="xunit.extensibility.execution" version="[2.9.3, 2.10)" />
</group>
<group targetFramework="netstandard2.0">
<dependency id="xunit.core" version="[2.9.3, 2.10)" />
<dependency id="xunit.extensibility.execution" version="[2.9.3, 2.10)" />
</group>
</dependencies>
</metadata>
<files>
Expand All @@ -37,5 +41,11 @@
<file src="bin\Release\$SupportedFrameworkVersion$\LambdaTale.xml" target="lib\$SupportedFrameworkVersion$" />
<file src="..\LambdaTale.Execution\bin\Release\$SupportedFrameworkVersion$\LambdaTale.Execution.dll" target="lib\$SupportedFrameworkVersion$" />
<file src="..\LambdaTale.Execution\bin\Release\$SupportedFrameworkVersion$\LambdaTale.Execution.pdb" target="lib\$SupportedFrameworkVersion$" />

<file src="bin\Release\netstandard2.0\LambdaTale.dll" target="lib\netstandard2.0" />
<file src="bin\Release\netstandard2.0\LambdaTale.pdb" target="lib\netstandard2.0" />
<file src="bin\Release\netstandard2.0\LambdaTale.xml" target="lib\netstandard2.0" />
<file src="..\LambdaTale.Execution\bin\Release\netstandard2.0\LambdaTale.Execution.dll" target="lib\netstandard2.0" />
<file src="..\LambdaTale.Execution\bin\Release\netstandard2.0\LambdaTale.Execution.pdb" target="lib\netstandard2.0" />
</files>
</package>
44 changes: 43 additions & 1 deletion src/LambdaTale/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,49 @@
"contentHash": "pot1I4YOxlWjIb5jmwvvQNbTrZ3lJQ+jUGkGjWE3hEFM0l5gOnBWS+H3qsex68s5cO52g+44vpGzhAt+42vwKg=="
}
},
"net6.0": {
".NETStandard,Version=v2.0": {
"Microsoft.CodeAnalysis.PublicApiAnalyzers": {
"type": "Direct",
"requested": "[4.14.0, )",
"resolved": "4.14.0",
"contentHash": "5zBDSa8D1pfn5VyDzRekcYdVx/DGAzwegblVJhzdN0kvPt97TPr12haA6ZG0wS2WgBb1W42GeZJRiRtlNaoY1w=="
},
"MinVer": {
"type": "Direct",
"requested": "[6.0.0, )",
"resolved": "6.0.0",
"contentHash": "+/SsmiySsXJlvQLCGBqaZKNVt3s/Y/HbAdwtop7Km2CnuZbaScoqkWJEBQ5Cy9ebkn6kCYKrHsXgwrFdTgcb3g=="
},
"NETStandard.Library": {
"type": "Direct",
"requested": "[2.0.3, )",
"resolved": "2.0.3",
"contentHash": "st47PosZSHrjECdjeIzZQbzivYBJFv6P2nv4cj2ypdI204DO+vZ7l5raGMiX4eXMJ53RfOIg+/s4DHVZ54Nu2A==",
"dependencies": {
"Microsoft.NETCore.Platforms": "1.1.0"
}
},
"xunit.extensibility.core": {
"type": "Direct",
"requested": "[2.9.3, )",
"resolved": "2.9.3",
"contentHash": "kf3si0YTn2a8J8eZNb+zFpwfoyvIrQ7ivNk5ZYA5yuYk1bEtMe4DxJ2CF/qsRgmEnDr7MnW1mxylBaHTZ4qErA==",
"dependencies": {
"xunit.abstractions": "2.0.3"
}
},
"Microsoft.NETCore.Platforms": {
"type": "Transitive",
"resolved": "1.1.0",
"contentHash": "kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A=="
},
"xunit.abstractions": {
"type": "Transitive",
"resolved": "2.0.3",
"contentHash": "pot1I4YOxlWjIb5jmwvvQNbTrZ3lJQ+jUGkGjWE3hEFM0l5gOnBWS+H3qsex68s5cO52g+44vpGzhAt+42vwKg=="
}
},
"net8.0": {
"Microsoft.CodeAnalysis.PublicApiAnalyzers": {
"type": "Direct",
"requested": "[4.14.0, )",
Expand Down
3 changes: 3 additions & 0 deletions targets/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@
static IEnumerable<string> TargetFrameworks()
{
var data = Assembly.GetExecutingAssembly().GetCustomAttributes<AssemblyMetadataAttribute>();
yield return "netcoreapp3.1";
yield return "net5.0";
yield return "net6.0";
yield return data.Single(d => d.Key == "SupportedDotnetVersion").Value;
yield return data.Single(d => d.Key == "LatestDotnetVersion").Value;
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
Expand Down
2 changes: 1 addition & 1 deletion tests/LambdaTale.Test/LambdaTale.Test.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
<RollForward>major</RollForward>
<TargetFrameworks>$(SupportedDotnetVersion);$(SupportedFrameworkVersion);$(LatestDotnetVersion)</TargetFrameworks>
<TargetFrameworks>$(SupportedDotnetVersion);$(SupportedFrameworkVersion);$(LatestDotnetVersion);netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
Expand Down
Loading