Skip to content

Commit 29b2211

Browse files
agockeagocke
authored
Add helpful extensions (#275)
1 parent 87fe8da commit 29b2211

17 files changed

Lines changed: 140 additions & 58 deletions

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ jobs:
1313
steps:
1414
- uses: actions/checkout@v2
1515
- name: Setup .NET
16-
uses: actions/setup-dotnet@v1
16+
uses: actions/setup-dotnet@v5
1717
with:
18-
dotnet-version: 8.0.*
18+
dotnet-version: '10.0.100-rc.2.25502.107'
1919
- name: Restore dependencies
2020
run: dotnet restore
2121
- name: Build

‎.github/workflows/pack.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ jobs:
99
steps:
1010
- uses: actions/checkout@v2
1111
- name: Setup .NET
12-
uses: actions/setup-dotnet@v1
12+
uses: actions/setup-dotnet@v5
1313
with:
14-
dotnet-version: 8.0.*
14+
dotnet-version: '10.0.100-rc.2.25502.107'
1515
- name: Pack
1616
run: ./build.sh --pack
1717
- name: Upload package

‎.github/workflows/publish.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ jobs:
1313
steps:
1414
- uses: actions/checkout@v2
1515
- name: Setup .NET
16-
uses: actions/setup-dotnet@v1
16+
uses: actions/setup-dotnet@v5
1717
with:
18-
dotnet-version: 8.0.*
18+
dotnet-version: '10.0.100-rc.2.25502.107'
1919
- name: Pack
2020
run: ./build.sh --pack
2121
- name: Publish package

‎Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<UseArtifactsOutput>true</UseArtifactsOutput>
44
<Nullable>enable</Nullable>
55
<Deterministic>true</Deterministic>
6-
<TestTfm>net8.0</TestTfm>
6+
<TestTfm>net10.0</TestTfm>
77
<SerdeAssemblyVersion>0.9.0</SerdeAssemblyVersion>
88
<SerdePkgVersion>0.9.0</SerdePkgVersion>
99
</PropertyGroup>

‎Directory.Packages.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<PackageVersion Include="BenchmarkDotNet" Version="0.13.12" />
99
<PackageVersion Include="FsCheck" Version="2.16.6" />
1010
<PackageVersion Include="FsCheck.Xunit" Version="2.16.6" />
11-
<PackageVersion Include="NuGetizer" Version="1.2.3" />
11+
<PackageVersion Include="NuGetizer" Version="1.4.5" />
1212
<PackageVersion Include="StaticCs" Version="0.3.1" />
1313
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.11.0" />
1414
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.11.0" />

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "8.0.100",
3+
"version": "10.0.100-rc.2.25502.107",
44
"rollForward": "latestFeature"
55
}
66
}

‎pack/Serde.Pkg.csproj‎

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,14 @@
1-
<Project Sdk="Microsoft.Build.NoTargets/3.5.0">
2-
3-
<!-- Package settings -->
1+
<Project Sdk="Microsoft.NET.Sdk">
42
<PropertyGroup>
5-
<TargetFramework>net8.0</TargetFramework>
6-
7-
<PackageId>Serde</PackageId>
8-
<PackageVersion>$(SerdePkgVersion)</PackageVersion>
9-
<IsPackable>true</IsPackable>
10-
<PackageLicenseExpression>BSD-3-Clause</PackageLicenseExpression>
11-
<RepositoryUrl>https://github.com/agocke/serde-dn</RepositoryUrl>
12-
<PackageProjectUrl>https://commentout.com/serde-dn</PackageProjectUrl>
13-
<PackageReadmeFile>README.Serde.md</PackageReadmeFile>
14-
3+
<TargetFrameworks>net10.0;net8.0</TargetFrameworks>
4+
<IncludeBuildOutput>false</IncludeBuildOutput>
5+
<NuspecFile>Serde.Pkg.nuspec</NuspecFile>
6+
<NuspecProperties>SerdePkgVersion=$(SerdePkgVersion)</NuspecProperties>
157
</PropertyGroup>
168

179
<ItemGroup>
1810
<ProjectReference Include="../src/serde/Serde.csproj" />
1911
<ProjectReference Include="../src/generator/SerdeGenerator.csproj" />
20-
21-
<PackageReference Include="NuGetizer">
22-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
23-
<PrivateAssets>all</PrivateAssets>
24-
</PackageReference>
2512
</ItemGroup>
2613

2714
</Project>

‎pack/Serde.Pkg.nuspec‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
3+
<metadata>
4+
<id>Serde</id>
5+
<authors>Serde.NET</authors>
6+
<description>Serde.NET is a multi-format serialization library.</description>
7+
<version>$SerdePkgVersion$</version>
8+
<license type="expression">BSD-3-Clause</license>
9+
<projectUrl>https://commentout.com/serde-dn</projectUrl>
10+
<repository type="git" url="https://github.com/agocke/serde-dn" />
11+
<dependencies>
12+
<group targetFramework="net10.0" />
13+
<group targetFramework="net8.0" />
14+
</dependencies>
15+
</metadata>
16+
<files>
17+
<file src="README.Serde.md" target="docs" />
18+
<file src="../artifacts/bin/Serde/release_net10.0/Serde.dll" target="lib/net10.0" />
19+
<file src="../artifacts/bin/Serde/release_net8.0/Serde.dll" target="lib/net8.0" />
20+
<file src="../artifacts/bin/SerdeGenerator/release/SerdeGenerator.dll" target="analyzers/dotnet/cs" />
21+
</files>
22+
</package>

‎src/serde/Proxies.List.cs‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -129,13 +129,6 @@ protected DeListBase(ISerdeInfo serdeInfo)
129129
protected sealed override TList FromVar(TBuilder builder) => ToList(builder);
130130
}
131131

132-
public static partial class DeserializeExtensions
133-
{
134-
public static IDeserialize<List<T>> GetDeserialize<T>(this List<T>? _)
135-
where T : IDeserializeProvider<T>
136-
=> ListProxy.De<T, T>.Instance;
137-
}
138-
139132
internal static class ArraySerdeTypeInfo<T>
140133
{
141134
public static readonly ISerdeInfo SerdeInfo = Serde.SerdeInfo.MakeEnumerable(typeof(T[]).ToString());

‎src/serde/Serde.csproj‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFrameworks>net10.0;net8.0</TargetFrameworks>
55
<EmbedUntrackedSources>true</EmbedUntrackedSources>
6-
<IsPackable>false</IsPackable>
6+
<IsPackable>true</IsPackable>
77
<DebugType>embedded</DebugType>
88
<IsTrimmable>true</IsTrimmable>
99
<EnableAotAnalyzer>true</EnableAotAnalyzer>
@@ -22,10 +22,6 @@
2222
<StronglyTypedClassName>SR</StronglyTypedClassName>
2323
<OutputName>SR.resources</OutputName>
2424
</EmbeddedResource>
25-
<PackageReference Include="NuGetizer">
26-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
27-
<PrivateAssets>all</PrivateAssets>
28-
</PackageReference>
2925
<PackageReference Include="StaticCs">
3026
<Pack>false</Pack>
3127
</PackageReference>

0 commit comments

Comments
 (0)