Skip to content

Commit 42a7402

Browse files
HarrisonTCodesHarrisonTCodes
committed
Merge branch 'main' into fix/file-stream-sharing
2 parents 795891b + a59f554 commit 42a7402

18 files changed

+1589
-12
lines changed

‎.github/workflows/build.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ jobs:
2424
7.0.x
2525
8.0.x
2626
9.0.x
27+
10.0.x
2728
- name: Run unit tests (windows)
2829
if: matrix.os == 'windows-latest'
2930
run: ./build.ps1 CodeCoverage
@@ -56,6 +57,7 @@ jobs:
5657
7.0.x
5758
8.0.x
5859
9.0.x
60+
10.0.x
5961
- name: API checks
6062
run: ./build.sh ApiChecks
6163
- name: Upload artifacts
@@ -86,6 +88,7 @@ jobs:
8688
7.0.x
8789
8.0.x
8890
9.0.x
91+
10.0.x
8992
- name: Run sonarcloud analysis
9093
run: ./build.sh CodeAnalysis
9194

@@ -126,6 +129,7 @@ jobs:
126129
7.0.x
127130
8.0.x
128131
9.0.x
132+
10.0.x
129133
- name: Pack nuget packages
130134
run: ./build.sh Pack
131135
- name: Upload packages

‎.github/workflows/ci.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ jobs:
2424
7.0.x
2525
8.0.x
2626
9.0.x
27+
10.0.x
2728
- name: Run unit tests (windows)
2829
if: matrix.os == 'windows-latest'
2930
run: ./build.ps1 CodeCoverage
@@ -56,6 +57,7 @@ jobs:
5657
7.0.x
5758
8.0.x
5859
9.0.x
60+
10.0.x
5961
- name: API checks
6062
run: ./build.sh ApiChecks
6163
- name: Upload artifacts
@@ -87,6 +89,7 @@ jobs:
8789
7.0.x
8890
8.0.x
8991
9.0.x
92+
10.0.x
9093
- name: Run sonarcloud analysis
9194
run: ./build.sh CodeAnalysis
9295

‎Directory.Build.props‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
<PackageLicenseExpression>MIT</PackageLicenseExpression>
1414
<PackageReadmeFile>README.md</PackageReadmeFile>
1515
<DefineConstants Condition="'$(TargetFramework)' != 'net472'">$(DefineConstants);FEATURE_FILE_SYSTEM_ACL_EXTENSIONS</DefineConstants>
16-
<DefineConstants Condition="'$(TargetFramework)' == 'net9.0' OR '$(TargetFramework)' == 'net8.0' OR '$(TargetFramework)' == 'net6.0' OR '$(TargetFramework)' == 'netstandard2.1'">$(DefineConstants);FEATURE_ASYNC_FILE;FEATURE_ENUMERATION_OPTIONS;FEATURE_ADVANCED_PATH_OPERATIONS;FEATURE_PATH_JOIN_WITH_SPAN;FEATURE_SPAN</DefineConstants>
17-
<DefineConstants Condition="'$(TargetFramework)' == 'net9.0' OR '$(TargetFramework)' == 'net8.0' OR '$(TargetFramework)' == 'net6.0'">$(DefineConstants);FEATURE_FILE_MOVE_WITH_OVERWRITE;FEATURE_SUPPORTED_OS_ATTRIBUTE;FEATURE_FILE_SYSTEM_WATCHER_FILTERS;FEATURE_ENDS_IN_DIRECTORY_SEPARATOR;FEATURE_PATH_JOIN_WITH_PARAMS;FEATURE_PATH_JOIN_WITH_FOUR_PATHS;FEATURE_FILE_SYSTEM_INFO_LINK_TARGET;FEATURE_CREATE_SYMBOLIC_LINK;FEATURE_FILESTREAM_OPTIONS</DefineConstants>
18-
<DefineConstants Condition="'$(TargetFramework)' == 'net9.0' OR '$(TargetFramework)' == 'net8.0'">$(DefineConstants);FEATURE_PATH_EXISTS;FEATURE_FILE_SYSTEM_WATCHER_WAIT_WITH_TIMESPAN;FEATURE_FILE_ATTRIBUTES_VIA_HANDLE;FEATURE_CREATE_TEMP_SUBDIRECTORY;FEATURE_READ_LINES_ASYNC;FEATURE_UNIX_FILE_MODE</DefineConstants>
19-
<DefineConstants Condition="'$(TargetFramework)' == 'net9.0'">$(DefineConstants);FEATURE_PATH_SPAN;FEATURE_FILE_SPAN</DefineConstants>
16+
<DefineConstants Condition="'$(TargetFramework)' == 'net10.0' OR '$(TargetFramework)' == 'net9.0' OR '$(TargetFramework)' == 'net8.0' OR '$(TargetFramework)' == 'net6.0' OR '$(TargetFramework)' == 'netstandard2.1'">$(DefineConstants);FEATURE_ASYNC_FILE;FEATURE_ENUMERATION_OPTIONS;FEATURE_ADVANCED_PATH_OPERATIONS;FEATURE_PATH_JOIN_WITH_SPAN;FEATURE_SPAN</DefineConstants>
17+
<DefineConstants Condition="'$(TargetFramework)' == 'net10.0' OR '$(TargetFramework)' == 'net9.0' OR '$(TargetFramework)' == 'net8.0' OR '$(TargetFramework)' == 'net6.0'">$(DefineConstants);FEATURE_FILE_MOVE_WITH_OVERWRITE;FEATURE_SUPPORTED_OS_ATTRIBUTE;FEATURE_FILE_SYSTEM_WATCHER_FILTERS;FEATURE_ENDS_IN_DIRECTORY_SEPARATOR;FEATURE_PATH_JOIN_WITH_PARAMS;FEATURE_PATH_JOIN_WITH_FOUR_PATHS;FEATURE_FILE_SYSTEM_INFO_LINK_TARGET;FEATURE_CREATE_SYMBOLIC_LINK;FEATURE_FILESTREAM_OPTIONS</DefineConstants>
18+
<DefineConstants Condition="'$(TargetFramework)' == 'net10.0' OR '$(TargetFramework)' == 'net9.0' OR '$(TargetFramework)' == 'net8.0'">$(DefineConstants);FEATURE_PATH_EXISTS;FEATURE_FILE_SYSTEM_WATCHER_WAIT_WITH_TIMESPAN;FEATURE_FILE_ATTRIBUTES_VIA_HANDLE;FEATURE_CREATE_TEMP_SUBDIRECTORY;FEATURE_READ_LINES_ASYNC;FEATURE_UNIX_FILE_MODE</DefineConstants>
19+
<DefineConstants Condition="'$(TargetFramework)' == 'net10.0' OR '$(TargetFramework)' == 'net9.0'">$(DefineConstants);FEATURE_PATH_SPAN;FEATURE_FILE_SPAN</DefineConstants>
2020
<DefineConstants>$(DefineConstants);FEATURE_SERIALIZABLE</DefineConstants>
2121
</PropertyGroup>
2222
<PropertyGroup>

‎Directory.Packages.props‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,29 @@
22
<PropertyGroup>
33
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
44
</PropertyGroup>
5+
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
6+
<PackageVersion Include="System.Text.Json" Version="10.0.0"/>
7+
</ItemGroup>
8+
<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
9+
<PackageVersion Include="System.Text.Json" Version="10.0.0"/>
10+
</ItemGroup>
11+
<ItemGroup Condition=" '$(TargetFramework)' != 'net8.0' And '$(TargetFramework)' != 'net6.0' ">
12+
<PackageVersion Include="System.Text.Json" Version="10.0.0"/>
13+
</ItemGroup>
514
<ItemGroup>
615
<PackageVersion Include="System.IO.FileSystem.AccessControl" Version="5.0.0" />
7-
<PackageVersion Include="System.Text.Json" Version="9.0.10"/>
816
<PackageVersion Include="IsExternalInit" Version="1.0.3" />
917
<PackageVersion Include="Nullable" Version="1.3.1" />
10-
<PackageVersion Include="Testably.Abstractions.FileSystem.Interface" Version="9.0.0" />
18+
<PackageVersion Include="Testably.Abstractions.FileSystem.Interface" Version="10.0.0" />
1119
</ItemGroup>
1220
<ItemGroup>
13-
<PackageVersion Include="BenchmarkDotNet" Version="0.15.4" />
21+
<PackageVersion Include="BenchmarkDotNet" Version="0.15.7" />
1422
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
1523
<PackageVersion Include="GitHubActionsTestLogger" Version="2.4.1" />
1624
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.0" />
1725
<PackageVersion Include="Moq" Version="4.20.72" />
1826
<PackageVersion Include="NUnit" Version="4.4.0" />
19-
<PackageVersion Include="NUnit.Analyzers" Version="4.11.0" />
27+
<PackageVersion Include="NUnit.Analyzers" Version="4.11.2" />
2028
<PackageVersion Include="NUnit3TestAdapter" Version="5.2.0" />
2129
<PackageVersion Include="PublicApiGenerator" Version="11.5.0"/>
2230
<PackageVersion Include="aweXpect" Version="2.26.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": "9.0.306",
3+
"version": "10.0.100",
44
"rollForward": "latestMinor"
55
}
66
}

‎src/Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
Condition="Exists('$(MSBuildThisFileDirectory)/../Directory.Build.props')"/>
55

66
<PropertyGroup>
7-
<TargetFrameworks>net472;netstandard2.0;netstandard2.1;net6.0;net8.0;net9.0</TargetFrameworks>
7+
<TargetFrameworks>net472;netstandard2.0;netstandard2.1;net6.0;net8.0;net9.0;net10.0</TargetFrameworks>
88
</PropertyGroup>
99

1010
<PropertyGroup>

‎tests/Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
Condition="Exists('$(MSBuildThisFileDirectory)/../Directory.Build.props')"/>
55

66
<PropertyGroup>
7-
<TargetFrameworks>net9.0;net8.0;net6.0</TargetFrameworks>
7+
<TargetFrameworks>net10.0;net9.0;net8.0;net6.0</TargetFrameworks>
88
<TargetFrameworks Condition="!$([MSBuild]::IsOsUnixLike())">$(TargetFrameworks);net472</TargetFrameworks>
99
<NoWarn>$(NoWarn);S2699</NoWarn>
1010
<IsPackable>false</IsPackable>

0 commit comments

Comments
 (0)