Skip to content

Commit f1ed7e0

Browse files
david-driscolldavid-driscoll
committed
initial changes for dropping net 9
1 parent 380caba commit f1ed7e0

11 files changed

Lines changed: 56 additions & 58 deletions

‎.build/Build.CI.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public static RocketSurgeonGitHubActionsConfiguration LintStagedMiddleware(Rocke
7676
configuration
7777
.Jobs.OfType<RocketSurgeonsGithubActionsJob>()
7878
.First(z => z.Name.Equals("Build", StringComparison.OrdinalIgnoreCase))
79-
.UseDotNetSdks("8.0", "9.0", "10.0");
79+
.UseDotNetSdks("8.0", "10.0");
8080

8181
return configuration;
8282
}

‎.build/Build.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ internal partial class Pipeline : NukeBuild,
163163
/// </summary>
164164
public Target JetBrainsCleanupCode => _ => _
165165
.Inherit<ICanDotNetFormat>(x => x.JetBrainsCleanupCode)
166-
.OnlyWhenStatic(() => IsServerBuild);
166+
.OnlyWhenStatic(() => false);
167167

168168
[OptionalGitRepository]
169169
public GitRepository? GitRepository { get; }

‎.github/workflows/lint.yml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,6 @@ jobs:
6363
uses: actions/setup-dotnet@v5
6464
with:
6565
dotnet-version: '8.0.x'
66-
- name: 🔨 Use .NET Core 9.0 SDK
67-
uses: actions/setup-dotnet@v5
68-
with:
69-
dotnet-version: '9.0.x'
7066
- name: 🔨 Use .NET Core 10.0 SDK
7167
uses: actions/setup-dotnet@v5
7268
with:

‎Directory.Build.props‎

Lines changed: 41 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,53 @@
11
<Project>
2-
<PropertyGroup>
3-
<Company>Rocket Surgeons Guild</Company>
4-
<Copyright>Copyright Rocket Surgeons Guild © $([System.DateTime]::Now.ToString('yyyy'))</Copyright>
5-
<Authors>David Driscoll,Rocket Surgeons Guild contributors</Authors>
6-
<PackageProjectUrl>https://rocketsurgeonsguild.github.io/</PackageProjectUrl>
7-
<PublishRepositoryUrl>true</PublishRepositoryUrl>
8-
<PackageIcon>images/packageicon.png</PackageIcon>
9-
<PackageLicenseFile>LICENSE</PackageLicenseFile>
10-
<!--
2+
<PropertyGroup>
3+
<Company>Rocket Surgeons Guild</Company>
4+
<Copyright>Copyright Rocket Surgeons Guild © $([System.DateTime]::Now.ToString('yyyy'))</Copyright>
5+
<Authors>David Driscoll,Rocket Surgeons Guild contributors</Authors>
6+
<PackageProjectUrl>https://rocketsurgeonsguild.github.io/</PackageProjectUrl>
7+
<PublishRepositoryUrl>true</PublishRepositoryUrl>
8+
<PackageIcon>images/packageicon.png</PackageIcon>
9+
<PackageLicenseFile>LICENSE</PackageLicenseFile>
10+
<!--
1111
in package
1212
Title
1313
Description
1414
Tags
1515
-->
16-
<LangVersion>preview</LangVersion>
17-
<Features>strict</Features>
18-
<Nullable>enable</Nullable>
19-
<AnalysisMode>AllEnabledByDefault</AnalysisMode>
20-
<EnableNETAnalyzers>true</EnableNETAnalyzers>
21-
<NukeTelemetryVersion>1</NukeTelemetryVersion>
22-
<ProduceReferenceAssembly>true</ProduceReferenceAssembly>
23-
<ImplicitUsings>enable</ImplicitUsings>
24-
<AnalysisLevel>latest</AnalysisLevel>
25-
<!-- <TreatWarningsAsErrors>true</TreatWarningsAsErrors>-->
26-
<!-- <WarningsNotAsErrors></WarningsNotAsErrors>-->
27-
<WarningsAsErrors>RS0017</WarningsAsErrors>
16+
<LangVersion>preview</LangVersion>
17+
<Features>strict</Features>
18+
<Nullable>enable</Nullable>
19+
<AnalysisMode>AllEnabledByDefault</AnalysisMode>
20+
<EnableNETAnalyzers>true</EnableNETAnalyzers>
21+
<NukeTelemetryVersion>1</NukeTelemetryVersion>
22+
<ProduceReferenceAssembly>true</ProduceReferenceAssembly>
23+
<ImplicitUsings>enable</ImplicitUsings>
24+
<AnalysisLevel>latest</AnalysisLevel>
25+
<!-- <TreatWarningsAsErrors>true</TreatWarningsAsErrors>-->
26+
<!-- <WarningsNotAsErrors></WarningsNotAsErrors>-->
27+
<WarningsAsErrors>RS0017</WarningsAsErrors>
2828

29-
<NuGetAudit>true</NuGetAudit>
30-
<NuGetAuditMode>all</NuGetAuditMode>
31-
<NuGetAuditLevel>moderate</NuGetAuditLevel>
32-
<SolutionDir>$(MSBuildThisFileDirectory)</SolutionDir>
33-
</PropertyGroup>
34-
<ItemGroup>
35-
<None
29+
<NuGetAudit>true</NuGetAudit>
30+
<NuGetAuditMode>all</NuGetAuditMode>
31+
<NuGetAuditLevel>moderate</NuGetAuditLevel>
32+
<SolutionDir>$(MSBuildThisFileDirectory)</SolutionDir>
33+
</PropertyGroup>
34+
<ItemGroup>
35+
<None
3636
Include="$(MSBuildThisFileDirectory)/.nuke/temp/packageicon.png"
3737
Condition="Exists('$(MSBuildThisFileDirectory)/.nuke/temp/packageicon.png')"
3838
Pack="true"
3939
PackagePath="/images/"
40-
Visible="false" />
41-
<None Include="$(MSBuildThisFileDirectory)/LICENSE" Pack="true" PackagePath="/" Visible="false" />
42-
</ItemGroup>
43-
<ItemGroup>
44-
<ProjectCapability Include="DynamicDependentFile" />
45-
<ProjectCapability Include="DynamicFileNesting" />
46-
</ItemGroup>
47-
<ItemGroup>
48-
<Using Include="JetBrains.Annotations" />
49-
<Using Include="System.Diagnostics.CodeAnalysis" />
50-
<Using Include="System.Diagnostics.CodeAnalysis.NotNullAttribute" Alias="NotNullAttribute" />
51-
</ItemGroup>
40+
Visible="false"
41+
/>
42+
<None Include="$(MSBuildThisFileDirectory)/LICENSE" Pack="true" PackagePath="/" Visible="false" />
43+
</ItemGroup>
44+
<ItemGroup>
45+
<ProjectCapability Include="DynamicDependentFile" />
46+
<ProjectCapability Include="DynamicFileNesting" />
47+
</ItemGroup>
48+
<ItemGroup>
49+
<Using Include="JetBrains.Annotations" />
50+
<Using Include="System.Diagnostics.CodeAnalysis" />
51+
<Using Include="System.Diagnostics.CodeAnalysis.NotNullAttribute" Alias="NotNullAttribute" />
52+
</ItemGroup>
5253
</Project>

‎Directory.Build.targets‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
1+
<?xml version="1.0" encoding="utf-8" ?>
32
<Project>
43
<ItemGroup>
5-
<PackageReference Include="JetBrains.Annotations" PrivateAssets="all" />
4+
<PackageReference Include="JetBrains.Annotations.Sources" PrivateAssets="all" Condition="'$(MSBuildProjectName)'!='.build'" />
65
</ItemGroup>
76
</Project>

‎Directory.Packages.props‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
1+
<?xml version="1.0" encoding="utf-8" ?>
32
<Project>
43
<PropertyGroup>
54
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
@@ -19,6 +18,7 @@
1918
<GlobalPackageReference Include="Roslynator.CodeFixes" Version="4.15.0" />
2019
<GlobalPackageReference Include="Roslynator.Refactorings" Version="4.15.0" />
2120
<GlobalPackageReference Include="FakeItEasy.Analyzer.CSharp" Version="6.1.1" />
21+
<GlobalPackageReference Include="JetBrains.ExternalAnnotations" Version="10.2.163" />
2222
</ItemGroup>
2323
<ItemGroup>
2424
<PackageVersion Include="JetBrains.Annotations" Version="2025.2.4" />
@@ -62,5 +62,6 @@
6262
</ItemGroup>
6363
<Import
6464
Project="$(MSBuildThisFileDirectory)/Directory.Packages.support.props"
65-
Condition="Exists('$(MSBuildThisFileDirectory)/Directory.Packages.support.props')" />
65+
Condition="Exists('$(MSBuildThisFileDirectory)/Directory.Packages.support.props')"
66+
/>
6667
</Project>

‎src/DependencyInjection.Analyzers.roslyn4.8/Rocket.Surgery.DependencyInjection.Analyzers.roslyn4.8.csproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
<GenerateDocumentationFile>false</GenerateDocumentationFile>
44
<TargetFramework>netstandard2.0</TargetFramework>
55
<NoPackageAnalysis>true</NoPackageAnalysis>
6-
<_Analyzer_Roslyn_Version_>$(MSBuildProjectName.Replace("Rocket.Surgery.DependencyInjection.Analyzers.",""))</_Analyzer_Roslyn_Version_>
6+
<_Analyzer_Roslyn_Version_>
7+
$(MSBuildProjectName.Replace("Rocket.Surgery.DependencyInjection.Analyzers.",""))</_Analyzer_Roslyn_Version_>
78
<DefineConstants>$(DefineConstants);ROSLYN4_8</DefineConstants>
89
<IsPackable>false</IsPackable>
910
<AssemblyName>Rocket.Surgery.DependencyInjection.Analyzers</AssemblyName>
@@ -13,7 +14,7 @@
1314
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" VersionOverride="5.0.0" PrivateAssets="all" />
1415
<PackageReference Include="PolySharp" PrivateAssets="all" />
1516
<PackageReference Include="System.Text.Json" OverrideVersion="9.0.9" PrivateAssets="all" />
16-
<PackageReference Include="JetBrains.Annotations" PrivateAssets="all" />
17+
<PackageReference Include="JetBrains.Annotations.Sources" PrivateAssets="all" Condition="'$(MSBuildProjectName)'!='.build'" />
1718
</ItemGroup>
1819
<ItemGroup>
1920
<Compile Include="..\DependencyInjection.Analyzers\**\*.cs" Exclude="..\DependencyInjection.Analyzers\obj\**\*.cs" />

‎src/Directory.Build.targets‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<Project>
22
<ItemGroup>
33
<!-- <PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" PrivateAssets="All" /> -->
4+
<PackageReference Include="JetBrains.Annotations.Sources" PrivateAssets="all" />
45
</ItemGroup>
56
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))" />
67
</Project>

‎src/Linq.Extensions/Rocket.Surgery.Linq.Extensions.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
</PropertyGroup>
55
<ItemGroup>
66
<PackageReference Include="System.Interactive" />
7-
<PackageReference Include="System.Interactive.Async" Condition="'$(TargetFramework)' == 'net8.0' or '$(TargetFramework)' == 'net9.0'" />
7+
<PackageReference Include="System.Interactive.Async" Condition="'$(TargetFramework)' == 'net8.0'" />
88
</ItemGroup>
99
</Project>

‎src/System/Rocket.Surgery.System.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</ItemGroup>
1010
<ItemGroup>
1111
<PackageReference Include="System.Interactive" />
12-
<PackageReference Include="System.Interactive.Async" Condition="'$(TargetFramework)' == 'net8.0' or '$(TargetFramework)' == 'net9.0'" />
12+
<PackageReference Include="System.Interactive.Async" Condition="'$(TargetFramework)' == 'net8.0'" />
1313
<PackageReference Include="System.Reactive" />
1414
<PackageReference Include="System.Reactive.Observable.Aliases" />
1515
</ItemGroup>

0 commit comments

Comments
 (0)