Skip to content

Commit ac712c6

Browse files
updated for net10, with preview packages and so forth (#1703)
* updated for net10, with preview packages and so forth * updated for net10, with preview packages and so forth
1 parent 8e2b2cd commit ac712c6

234 files changed

Lines changed: 308 additions & 354 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Directory.Build.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,15 @@
2929
<NuGetAudit>true</NuGetAudit>
3030
<NuGetAuditMode>all</NuGetAuditMode>
3131
<NuGetAuditLevel>moderate</NuGetAuditLevel>
32+
<SolutionDir>$(MSBuildThisFileDirectory)</SolutionDir>
3233
</PropertyGroup>
3334
<ItemGroup>
3435
<None
3536
Include="$(MSBuildThisFileDirectory)/.nuke/temp/packageicon.png"
3637
Condition="Exists('$(MSBuildThisFileDirectory)/.nuke/temp/packageicon.png')"
3738
Pack="true"
3839
PackagePath="/images/"
39-
Visible="false"
40-
/>
40+
Visible="false" />
4141
<None Include="$(MSBuildThisFileDirectory)/LICENSE" Pack="true" PackagePath="/" Visible="false" />
4242
</ItemGroup>
4343
<ItemGroup>

Directory.Packages.props

Lines changed: 17 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
<GlobalPackageReference Include="Rocket.Surgery.MSBuild.GitVersion" Version="1.3.0-beta.2" />
1111
<GlobalPackageReference Include="Rocket.Surgery.MSBuild.SourceLink" Version="1.3.0-beta.2" />
1212
<GlobalPackageReference Include="Rocket.Surgery.MyAssembly" Version="1.3.0-beta.2" />
13-
<GlobalPackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="4.14.0" />
14-
<GlobalPackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="4.14.0" />
13+
<GlobalPackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="5.0.0-1.25277.114" />
14+
<GlobalPackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="5.0.0-1.25277.114" />
1515
<GlobalPackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
1616
<GlobalPackageReference Include="Roslynator.Analyzers" Version="4.14.0" />
1717
<GlobalPackageReference Include="Roslynator.Formatting.Analyzers" Version="4.14.0" />
@@ -23,61 +23,42 @@
2323
<ItemGroup>
2424
<PackageVersion Include="JetBrains.Annotations" Version="2025.2.2" />
2525
<PackageVersion Include="JetBrains.dotCover.CommandLineTools" Version="2024.3.8" />
26-
27-
2826
<PackageVersion Include="JetBrains.ReSharper.GlobalTools" Version="2024.3.8" />
2927
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.14.0" />
3028
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Features" Version="4.14.0" />
3129
<PackageVersion Include="Microsoft.Testing.Extensions.CodeCoverage" Version="17.14.2" />
3230
<PackageVersion Include="Microsoft.Testing.Extensions.TrxReport" Version="1.8.4" />
33-
34-
3531
<PackageVersion Include="GitVersion.Tool" Version="6.4.0" />
3632
<PackageVersion Include="Nuke.Common" Version="9.0.4" />
37-
<PackageVersion Include="PolySharp" Version="1.15.0">
38-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
39-
<PrivateAssets>all</PrivateAssets>
40-
</PackageVersion>
33+
<PackageVersion Include="Polyfill" Version="8.8.1" />
34+
<PackageVersion Include="PolySharp" Version="1.15.0" />
4135
<PackageVersion Include="ReportGenerator" Version="5.4.12" />
4236
<PackageVersion Include="Rocket.Surgery.Nuke" Version="2.9.11" />
4337
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.14.0" />
44-
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="9.0.8" />
45-
<PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.8" />
46-
<PackageVersion Include="Microsoft.Extensions.Configuration.Ini" Version="9.0.8" />
47-
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="9.0.8" />
48-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.8" />
49-
50-
51-
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.8" />
38+
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="10.0.0-rc.1.25451.107" />
39+
<PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0-rc.1.25451.107" />
40+
<PackageVersion Include="Microsoft.Extensions.Configuration.Ini" Version="10.0.0-rc.1.25451.107" />
41+
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="10.0.0-rc.1.25451.107" />
42+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0-rc.1.25451.107" />
43+
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.0-rc.1.25451.107" />
5244
<PackageVersion Include="FastExpressionCompiler" Version="5.3.0" />
5345
<PackageVersion Include="NetEscapades.Configuration.Yaml" Version="3.1.0" />
54-
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
55-
<PackageVersion Include="Serilog.Sinks.Console" Version="6.0.0" />
56-
46+
<PackageVersion Include="Newtonsoft.Json" Version="13.0.4-beta1" />
47+
<PackageVersion Include="Serilog.Sinks.Console" Version="6.0.1-dev-00953" />
5748
<PackageVersion Include="System.Interactive" Version="6.0.3" />
5849
<PackageVersion Include="System.Interactive.Async" Version="6.0.3" />
59-
<PackageVersion Include="System.Text.Json" Version="9.0.6" />
50+
<PackageVersion Include="System.Text.Json" Version="8.0.6" />
6051
<PackageVersion Include="System.Reactive" Version="6.0.2" />
6152
<PackageVersion Include="System.Reactive.Observable.Aliases" Version="6.0.2" />
62-
63-
6453
<PackageVersion Include="Microsoft.Reactive.Testing" Version="6.0.2" />
65-
66-
6754
<PackageVersion Include="Bogus" Version="35.6.3" />
68-
69-
7055
<PackageVersion Include="Shouldly" Version="4.3.0" />
71-
72-
73-
<PackageVersion Include="Rocket.Surgery.Extensions.Testing.FakeItEasy" Version="9.0.5" />
74-
<PackageVersion Include="Rocket.Surgery.Extensions.Testing.TUnit" Version="9.0.5" />
75-
<PackageVersion Include="Rocket.Surgery.Extensions.Testing.SourceGenerators" Version="9.0.5" />
76-
<PackageVersion Include="TUnit" Version="0.57.65" />
56+
<PackageVersion Include="Rocket.Surgery.Extensions.Testing.FakeItEasy" Version="10.0.0-beta.1" />
57+
<PackageVersion Include="Rocket.Surgery.Extensions.Testing.TUnit" Version="10.0.0-beta.1" />
58+
<PackageVersion Include="Rocket.Surgery.Extensions.Testing.SourceGenerators" Version="10.0.0-beta.1" />
59+
<PackageVersion Include="TUnit" Version="0.57.24" />
7760
<PackageVersion Include="Verify.DiffPlex" Version="3.1.2" />
7861
<PackageVersion Include="Verify.TUnit" Version="30.12.0" />
79-
80-
8162
</ItemGroup>
8263
<Import
8364
Project="$(MSBuildThisFileDirectory)/Directory.Packages.support.props"

Directory.Packages.support.props

Lines changed: 3 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,13 @@
1-
<?xml version="1.0" encoding="utf-8" ?>
1+
<?xml version="1.0" encoding="utf-8"?>
2+
23
<Project>
34
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0' or '$(TargetFramework)' == 'netstandard2.0'">
45
<PackageVersion Update="Microsoft.Extensions.Configuration" Version="8.0.0" />
56
<PackageVersion Update="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
6-
7-
8-
9-
<PackageVersion Update="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
10-
11-
<PackageVersion Update="Microsoft.Extensions.Configuration" Version="8.0.0" />
12-
<PackageVersion Update="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
137
<PackageVersion Update="Microsoft.Extensions.Configuration.Ini" Version="8.0.0" />
148
<PackageVersion Update="Microsoft.Extensions.Configuration.Json" Version="8.0.1" />
159
<PackageVersion Update="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
1610
<PackageVersion Update="Microsoft.Extensions.Logging.Abstractions" Version="8.0.3" />
17-
18-
</ItemGroup>
19-
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
20-
<PackageVersion Update="Microsoft.Extensions.Configuration" Version="9.0.7" />
21-
<PackageVersion Update="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.7" />
22-
<PackageVersion Update="Microsoft.Extensions.Configuration.Ini" Version="9.0.7" />
23-
<PackageVersion Update="Microsoft.Extensions.Configuration.Json" Version="9.0.7" />
24-
<PackageVersion Update="Microsoft.Extensions.Configuration" Version="9.0.7" />
25-
<PackageVersion Update="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.7" />
26-
27-
28-
29-
<PackageVersion Update="Microsoft.Extensions.Configuration.Ini" Version="9.0.7" />
30-
<PackageVersion Update="Microsoft.Extensions.Configuration.Json" Version="9.0.7" />
31-
32-
<PackageVersion Update="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.7" />
33-
<PackageVersion Update="Microsoft.Extensions.Logging.Abstractions" Version="9.0.7" />
34-
11+
<PackageVersion Update="System.Text.Json" Version="8.0.6" />
3512
</ItemGroup>
3613
</Project>

src/Binding.Extensions/Rocket.Surgery.Extensions.Binding.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
3+
<TargetFrameworks>net8.0;net10.0</TargetFrameworks>
44
</PropertyGroup>
55
<ItemGroup>
66
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute">

src/Configuration.Ini/ConfigurationOptions.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using Microsoft.Extensions.Configuration;
2-
using IMsftConfigurationBuilder = Microsoft.Extensions.Configuration.IConfigurationBuilder;
32

43
namespace Rocket.Surgery.Extensions.Configuration;
54

src/Configuration.Ini/Rocket.Surgery.Extensions.Configuration.Ini.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
3+
<TargetFrameworks>net8.0;net10.0</TargetFrameworks>
44
<PackageDescription>Provides the ability to provide configuration to the hosted application
55
by convention.</PackageDescription>
66
<PackageTags>$(PackageTags);config;configuration</PackageTags>

src/Configuration.Json/ConfigurationOptions.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using Microsoft.Extensions.Configuration;
2-
using IMsftConfigurationBuilder = Microsoft.Extensions.Configuration.IConfigurationBuilder;
32

43
namespace Rocket.Surgery.Extensions.Configuration;
54

src/Configuration.Json/Rocket.Surgery.Extensions.Configuration.Json.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
3+
<TargetFrameworks>net8.0;net10.0</TargetFrameworks>
44
<PackageDescription>Provides the ability to provide configuration to the hosted application
55
by convention.</PackageDescription>
66
<PackageTags>$(PackageTags);config;configuration</PackageTags>

src/Configuration.Yaml/ConfigurationOptions.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using Microsoft.Extensions.Configuration;
2-
using IMsftConfigurationBuilder = Microsoft.Extensions.Configuration.IConfigurationBuilder;
32

43
namespace Rocket.Surgery.Extensions.Configuration;
54

src/Configuration.Yaml/Rocket.Surgery.Extensions.Configuration.Yaml.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
3+
<TargetFrameworks>net8.0;net10.0</TargetFrameworks>
44
<PackageDescription>Provides the ability to provide configuration to the hosted application
55
by convention.</PackageDescription>
66
<PackageTags>$(PackageTags);config;configuration</PackageTags>

0 commit comments

Comments
 (0)