Skip to content

Commit 287a781

Browse files
committed
Update to net10.0
1 parent 40d27cb commit 287a781

File tree

5 files changed

+24
-53
lines changed

5 files changed

+24
-53
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -18,29 +18,8 @@ jobs:
1818
os: [ubuntu-latest, windows-latest]
1919

2020
steps:
21-
- name: Checkout
22-
uses: actions/checkout@v5
23-
with:
24-
submodules: true
25-
fetch-depth: 0
26-
27-
- name: Install .NET 8.0, .NET 9.0 and .NET 10.0
28-
uses: actions/setup-dotnet@v5
29-
with:
30-
dotnet-version: |
31-
8.0.x
32-
9.0.x
33-
10.0.x
34-
- name: Build, Test, Pack, Publish
35-
if: matrix.os == 'windows-latest'
36-
shell: bash
37-
run: |
38-
dotnet tool install -g dotnet-releaser --configfile .github/workflows/nuget_org_only.config
39-
dotnet-releaser run --nuget-token "${{secrets.NUGET_TOKEN}}" --github-token "${{secrets.GITHUB_TOKEN}}" src/dotnet-releaser.toml
40-
41-
- name: Build, Test
42-
if: matrix.os == 'ubuntu-latest'
43-
shell: bash
44-
run: |
45-
dotnet tool install -g dotnet-releaser --configfile .github/workflows/nuget_org_only.config
46-
dotnet-releaser build src/dotnet-releaser.toml
21+
- name: "Build, Test, Pack and Publish"
22+
uses: xoofx/.github/.github/actions/dotnet-releaser-action@main
23+
with:
24+
NUGET_TOKEN: ${{ secrets.NUGET_TOKEN }}
25+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

src/Directory.Packages.props

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,10 @@
55
</PropertyGroup>
66
<ItemGroup>
77
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
8-
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
9-
<PackageVersion Include="MinVer" Version="4.3.0" />
8+
<PackageVersion Include="MinVer" Version="7.0.0" />
109
<PackageVersion Include="MSTest" Version="4.1.0" />
11-
</ItemGroup>
12-
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
13-
<PackageVersion Include="System.IO.Compression" Version="4.3.0" />
14-
<PackageVersion Include="System.IO.Compression.ZipFile" Version="4.3.0" />
15-
<PackageVersion Include="System.Memory" Version="4.6.0" />
16-
</ItemGroup>
17-
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
1810
<PackageVersion Include="System.IO.Compression" Version="4.3.0" />
1911
<PackageVersion Include="System.IO.Compression.ZipFile" Version="4.3.0" />
12+
<PackageVersion Include="System.Memory" Version="4.6.3" />
2013
</ItemGroup>
21-
</Project>
14+
</Project>

src/Zio.Tests/Zio.Tests.csproj

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

33
<PropertyGroup>
4-
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
4+
<TargetFrameworks>net10.0</TargetFrameworks>
55
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net472</TargetFrameworks>
66
<IsPackable>false</IsPackable>
77
<LangVersion>10</LangVersion>
@@ -11,6 +11,11 @@
1111
<PackageReference Include="MSTest" />
1212
</ItemGroup>
1313

14+
<ItemGroup Condition="'$(TargetFramework)' == 'net472'">
15+
<PackageReference Include="System.IO.Compression" />
16+
<PackageReference Include="System.IO.Compression.ZipFile" />
17+
</ItemGroup>
18+
1419
<ItemGroup>
1520
<ProjectReference Include="..\Zio\Zio.csproj" />
1621
</ItemGroup>

src/Zio/Zio.csproj

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<Description>An abstract/virtual filesystem framework with many built-ins filesystems for .NET</Description>
44
<Copyright>Alexandre Mutel</Copyright>
55
<AssemblyTitle>Zio</AssemblyTitle>
66
<NeutralLanguage>en-US</NeutralLanguage>
77
<Authors>Alexandre Mutel</Authors>
8-
<TargetFrameworks>netstandard2.0;netstandard2.1;net8.0;net9.0</TargetFrameworks>
8+
<TargetFrameworks>netstandard2.0;netstandard2.1;net8.0;net10.0</TargetFrameworks>
99
<AssemblyName>Zio</AssemblyName>
1010
<PackageId>Zio</PackageId>
1111
<PackageTags>filesystem;vfs;VirtualFileSystem;virtual;abstract;directory;files;io;mock</PackageTags>
@@ -24,27 +24,21 @@
2424
<ItemGroup>
2525
<None Include="../../img/zio.png" Pack="true" PackagePath="" />
2626
<None Include="../../readme.md" Pack="true" PackagePath="/" />
27-
<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
2827
<PackageReference Include="MinVer">
2928
<PrivateAssets>all</PrivateAssets>
3029
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3130
</PackageReference>
3231
</ItemGroup>
3332

3433
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
35-
<PackageReference Include="System.IO.Compression">
36-
</PackageReference>
37-
<PackageReference Include="System.IO.Compression.ZipFile">
38-
</PackageReference>
39-
<PackageReference Include="System.Memory">
40-
</PackageReference>
34+
<PackageReference Include="System.IO.Compression"/>
35+
<PackageReference Include="System.IO.Compression.ZipFile"/>
36+
<PackageReference Include="System.Memory"/>
4137
</ItemGroup>
4238

4339
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
44-
<PackageReference Include="System.IO.Compression">
45-
</PackageReference>
46-
<PackageReference Include="System.IO.Compression.ZipFile">
47-
</PackageReference>
40+
<PackageReference Include="System.IO.Compression"/>
41+
<PackageReference Include="System.IO.Compression.ZipFile"/>
4842
</ItemGroup>
4943

5044
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0'">
@@ -61,7 +55,7 @@
6155
<DefineConstants>$(AdditionalConstants);NETSTANDARD;HAS_ZIPARCHIVE;HAS_NULLABLEANNOTATIONS</DefineConstants>
6256
</PropertyGroup>
6357

64-
<PropertyGroup Condition=" '$(TargetFramework)' == 'net9.0'">
58+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net10.0'">
6559
<IsTrimmable>true</IsTrimmable>
6660
<IsAotCompatible>true</IsAotCompatible>
6761
<DefineConstants>$(AdditionalConstants);NETSTANDARD;HAS_ZIPARCHIVE;HAS_NULLABLEANNOTATIONS;HAS_ALTERNATEEQUALITYCOMPARER</DefineConstants>

src/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": "9.0.100",
3+
"version": "10.0.100",
44
"rollForward": "latestMinor",
55
"allowPrerelease": false
66
}

0 commit comments

Comments
 (0)