Skip to content

Commit b0cd5b2

Browse files
axunonbaxunonb
authored
Add net80 as target framework (#5)
* Add net80 as target framework * Update nuget packages to latests * Update unit test to use the constraint model * Bump version to v2.1.0
1 parent 934889e commit b0cd5b2

7 files changed

Lines changed: 46 additions & 60 deletions

File tree

‎.github/workflows/dotnet.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,19 @@ jobs:
1616
name: Build
1717
runs-on: ${{ matrix.os }}
1818
env:
19-
version: '2.0.1'
20-
versionFile: '2.0.1'
21-
packDotNetVersion: '6'
19+
version: '2.1.0'
20+
versionFile: '2.1.0'
21+
packDotNetVersion: '8'
2222
strategy:
2323
matrix:
2424
os: [ ubuntu-latest ]
25-
dotnet-version: [ '3.x', '6.x' ]
25+
dotnet-version: [ '3.x', '6.x', '8.x' ]
2626

2727
steps:
2828
- name: Checkout
29-
uses: actions/checkout@v3
29+
uses: actions/checkout@v4
3030
- name: Setup .NET
31-
uses: actions/setup-dotnet@v3
31+
uses: actions/setup-dotnet@v4
3232
with:
3333
dotnet-version: ${{ matrix.dotnet-version }}
3434
- name: Restore dependencies
@@ -44,7 +44,7 @@ jobs:
4444
dotnet build ./Src/VirtualFileSystem.sln /verbosity:minimal --configuration release /p:IncludeSymbols=true /p:SymbolPackageFormat=snupkg /p:ContinuousIntegrationBuild=true /p:PackageOutputPath=${{ github.workspace }}/artifacts/ /p:Version=${{ env.version }} /p:FileVersion=${{ env.versionFile }}
4545
dotnet pack ./Src/VirtualFileSystem.sln /verbosity:minimal --configuration release
4646
- name: Upload Artifacts
47-
uses: actions/upload-artifact@v3
47+
uses: actions/upload-artifact@v4
4848
if: startsWith(matrix.dotnet-version, env.packDotNetVersion)
4949
with:
5050
name: Packages_${{ env.version }}

‎Src/Axuno.VirtualFileSystem.Tests/Axuno.VirtualFileSystem.Tests.csproj‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,32 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
32
<PropertyGroup>
43
<OutputType>Exe</OutputType>
54
<TargetFrameworks>net60</TargetFrameworks>
65
<SignAssembly>true</SignAssembly>
76
<AssemblyOriginatorKeyFile>..\Axuno.VirtualFileSystem\Axuno.VirtualFileSystem.snk</AssemblyOriginatorKeyFile>
87
</PropertyGroup>
9-
108
<ItemGroup>
119
<None Remove="Assets\Testfile_{2}.txt" />
1210
</ItemGroup>
13-
1411
<ItemGroup>
1512
<EmbeddedResource Include="Assets\*" />
1613
</ItemGroup>
17-
1814
<ItemGroup>
1915
<EmbeddedResource Include="Assets\Text\Testfile_1.txt" />
2016
<EmbeddedResource Include="Assets\Text\Testfile_{2}.txt" />
2117
</ItemGroup>
22-
2318
<ItemGroup>
24-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
25-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
26-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
27-
<PackageReference Include="NUnit" Version="3.13.3" />
28-
<PackageReference Include="NUnit3TestAdapter" Version="4.3.1" />
19+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
20+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
21+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
22+
<PackageReference Include="NUnit" Version="4.1.0" />
23+
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
24+
<PackageReference Include="NUnit.Analyzers" Version="4.2.0">
25+
<PrivateAssets>all</PrivateAssets>
26+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
27+
</PackageReference>
2928
</ItemGroup>
30-
3129
<ItemGroup>
3230
<ProjectReference Include="..\Axuno.VirtualFileSystem\Axuno.VirtualFileSystem.csproj" />
3331
</ItemGroup>
34-
3532
</Project>

‎Src/Axuno.VirtualFileSystem.Tests/DynamicFileProviderTests.cs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ public void Should_Get_Created_Files()
2929
);
3030

3131
var fileInfo = _dynamicFileProvider.GetFileInfo("/my-files/test.txt");
32-
Assert.IsNotNull(fileInfo);
33-
Assert.AreEqual(fileContent, fileInfo.ReadAsString());
32+
Assert.That(fileInfo, Is.Not.Null);
33+
Assert.That(fileInfo.ReadAsString(), Is.EqualTo(fileContent));
3434
}
3535

3636
[Test]
@@ -56,21 +56,21 @@ public void Should_Create_and_Delete_Files()
5656
() => { fileCallbackCalled = true; });
5757

5858
var fileInfo = _dynamicFileProvider.GetFileInfo(dynamicPath);
59-
Assert.IsTrue(fileInfo.Exists);
59+
Assert.That(fileInfo.Exists);
6060

6161
// Deleting the file should trigger the callback
6262

6363
_dynamicFileProvider.Delete(dynamicPath);
6464
fileInfo = _dynamicFileProvider.GetFileInfo(dynamicPath);
65-
Assert.IsFalse(fileInfo.Exists);
66-
67-
Assert.IsTrue(fileCallbackCalled);
65+
Assert.That(fileInfo.Exists, Is.False);
66+
67+
Assert.That(fileCallbackCalled);
6868
}
6969

7070
[Test]
7171
public void Deleting_Non_Existing_File_Just_Fails()
7272
{
73-
Assert.IsFalse(_dynamicFileProvider.Delete("does-not-exist"));
73+
Assert.That(_dynamicFileProvider.Delete("does-not-exist"), Is.False);
7474
}
7575

7676
[Test]
@@ -104,7 +104,7 @@ public void Should_Get_Notified_On_File_Change()
104104
)
105105
);
106106

107-
Assert.IsTrue(fileCallbackCalled);
107+
Assert.That(fileCallbackCalled);
108108

109109
// Updating the file should trigger the callback (2nd test)
110110

@@ -118,6 +118,6 @@ public void Should_Get_Notified_On_File_Change()
118118
)
119119
);
120120

121-
Assert.IsTrue(fileCallbackCalled);
121+
Assert.That(fileCallbackCalled);
122122
}
123123
}

‎Src/Axuno.VirtualFileSystem.Tests/VirtualFilePathHelperTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ public class VirtualFilePathHelperTests
99
public void NormalizePath()
1010
{
1111
// Hyphens should be normalized to underscores
12-
Assert.AreEqual("~/test_one/test_two/test-three.txt", VirtualFilePathHelper.NormalizePath("~/test-one/test-two/test-three.txt"));
12+
Assert.That(VirtualFilePathHelper.NormalizePath("~/test-one/test-two/test-three.txt"), Is.EqualTo("~/test_one/test_two/test-three.txt"));
1313
}
1414
}

‎Src/Axuno.VirtualFileSystem.Tests/VirtualFileProviderTests.cs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,37 +22,37 @@ public void Should_Define_And_Get_Embedded_Resources()
2222
{
2323
var resource = _virtualFileProvider.GetFileInfo("/Text/Testfile_1.txt");
2424

25-
Assert.IsNotNull(resource);
26-
Assert.IsTrue(resource.Exists);
25+
Assert.That(resource, Is.Not.Null);
26+
Assert.That(resource.Exists);
2727

2828
// file is expected as UTF8 without BOM
2929
using var stream = resource.CreateReadStream();
30-
Assert.AreEqual("Testfile_1.txt Content No <Cr><Lf>!", Encoding.UTF8.GetString(stream.GetAllBytes()));
30+
Assert.That(Encoding.UTF8.GetString(stream.GetAllBytes()), Is.EqualTo("Testfile_1.txt Content No <Cr><Lf>!"));
3131
}
3232

3333
[Test]
3434
public void Should_Define_And_Get_Embedded_Resources_With_Special_Chars()
3535
{
3636
var resource = _virtualFileProvider.GetFileInfo("/Text/Testfile_{2}.txt");
37-
Assert.IsNotNull(resource);
38-
Assert.IsTrue(resource.Exists);
37+
Assert.That(resource, Is.Not.Null);
38+
Assert.That(resource.Exists);
3939

4040
// file is expected as UTF8 without BOM
4141
using var stream = resource.CreateReadStream();
42-
Assert.AreEqual("Testfile_{2}.txt Content No <Cr><Lf>!", Encoding.UTF8.GetString(stream.GetAllBytes()));
42+
Assert.That(Encoding.UTF8.GetString(stream.GetAllBytes()), Is.EqualTo("Testfile_{2}.txt Content No <Cr><Lf>!"));
4343
}
4444

4545
[Test]
4646
public void Should_Define_And_Get_Embedded_Directory_Contents()
4747
{
4848
var contents = _virtualFileProvider.GetDirectoryContents("/Text");
4949

50-
Assert.IsTrue(contents.Exists);
50+
Assert.That(contents.Exists);
5151

5252
var contentList = contents.ToList();
5353

54-
Assert.Contains("Testfile_1.txt", contentList.Select(c => c.Name).ToList());
55-
Assert.Contains("Testfile_{2}.txt", contentList.Select(c => c.Name).ToList());
54+
Assert.That(contentList.Select(c => c.Name).ToList(), Does.Contain("Testfile_1.txt"));
55+
Assert.That(contentList.Select(c => c.Name).ToList(), Does.Contain("Testfile_{2}.txt"));
5656
}
5757

5858
[TestCase("/")]
@@ -61,9 +61,9 @@ public void Should_Define_And_Get_Embedded_Root_Directory_Contents(string path)
6161
{
6262
var contents = _virtualFileProvider.GetDirectoryContents(path);
6363

64-
Assert.IsTrue(contents.Exists);
64+
Assert.That(contents.Exists);
6565

6666
var contentList = contents.ToList();
67-
Assert.Contains("Text", contents.ToList().Select(c => c.Name).ToList());
67+
Assert.That(contents.ToList().Select(c => c.Name).ToList(), Does.Contain("Text"));
6868
}
6969
}

‎Src/Axuno.VirtualFileSystem/Axuno.VirtualFileSystem.csproj‎

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
32
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.1;net60</TargetFrameworks>
3+
<TargetFrameworks>netstandard2.1;net60;net80</TargetFrameworks>
54
<Nullable>enable</Nullable>
65
<NoWarn>$(NoWarn);1591</NoWarn>
76
<SignAssembly>true</SignAssembly>
@@ -13,8 +12,7 @@
1312
<PublishRepositoryUrl>true</PublishRepositoryUrl>
1413
<PackageIcon>VirtualFileSystem.png</PackageIcon>
1514
<PackageTags>virtual file system netstandard c#</PackageTags>
16-
<PackageReleaseNotes>Bumped to v2.0.0
17-
Breaking changes caused by updated dependencies</PackageReleaseNotes>
15+
<PackageReleaseNotes></PackageReleaseNotes>
1816
<Description>The Virtual File System makes it possible to manage files that do not exist on a physical file system (e.g. disk).
1917

2018
* The VirtualFileSystem can be extended by additional IVirtualFileProviders.
@@ -26,13 +24,11 @@ The library is a modified version of Volo.Abp.VirtualFileSystem 7.0</Description
2624
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
2725
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
2826
</PropertyGroup>
29-
3027
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
3128
<DefineConstants>DEBUG;TRACE</DefineConstants>
3229
<DocumentationFile></DocumentationFile>
3330
<OutputPath>bin\Debug\</OutputPath>
3431
</PropertyGroup>
35-
3632
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
3733
<OutputPath>bin\Release\</OutputPath>
3834
<DocumentationFile>bin\Release\Axuno.VirtualFileSystem.xml</DocumentationFile>
@@ -42,32 +38,25 @@ The library is a modified version of Volo.Abp.VirtualFileSystem 7.0</Description
4238
<EmbedUntrackedSources>true</EmbedUntrackedSources>
4339
<IncludeSymbols>true</IncludeSymbols>
4440
</PropertyGroup>
45-
4641
<ItemGroup>
47-
<PackageReference Include="Microsoft.Extensions.FileProviders.Composite" Version="7.0.0" />
48-
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.2" />
49-
<PackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="7.0.0" />
50-
<PackageReference Include="Microsoft.Extensions.Options" Version="7.0.0" />
51-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
42+
<PackageReference Include="Microsoft.Extensions.FileProviders.Composite" Version="8.0.0" />
43+
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.6" />
44+
<PackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="8.0.0" />
45+
<PackageReference Include="Microsoft.Extensions.Options" Version="8.0.2" />
46+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
5247
<PrivateAssets>all</PrivateAssets>
5348
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
5449
</PackageReference>
5550
</ItemGroup>
56-
5751
<ItemGroup>
5852
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
59-
<!-- Generate PublicKey: -->
60-
<!-- Export public key: sn -p Axuno.VirtualFileSystem.snk Axuno.VirtualFileSystem.publickey -->
61-
<!-- Display PublicKey: sn -tp Axuno.VirtualFileSystem.publickey -->
6253
<_Parameter1>Axuno.VirtualFileSystem.Tests, PublicKey=002400000480000094000000060200000024000052534131000400000100010091cc5ebb97cd2f332fbb3f69e2c1b0092fdc87141c9f3085913c152796473e3772c3d0cc09f55a16bbd33eec598fd583ef5ab28f1a459672f56f1b9a9b68ead56c0a238800864d25c480d185b16a198ff19d15449ec18d2c19af4049432e3d089731430ea28d378c2c70f051d3f5356d0d1d483ad9cffb0762b748029bd3e0cb</_Parameter1>
6354
</AssemblyAttribute>
6455
</ItemGroup>
65-
6656
<ItemGroup>
6757
<None Include="..\..\VirtualFileSystem.png">
6858
<Pack>True</Pack>
6959
<PackagePath></PackagePath>
7060
</None>
7161
</ItemGroup>
72-
7362
</Project>

‎Src/Directory.Build.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
<PropertyGroup>
44
<Product>Axuno.VirtualFileSystem</Product>
5-
<Version>2.0.1</Version>
6-
<FileVersion>2.0.1</FileVersion>
5+
<Version>2.1.0</Version>
6+
<FileVersion>2.1.0</FileVersion>
77
<AssemblyVersion>2.0.0.0</AssemblyVersion> <!--only update AssemblyVersion with major releases -->
88
<Company>axuno gGmbH</Company>
99
<Authors>axuno gGmbH</Authors>

0 commit comments

Comments
 (0)